[Truffle] Verbosity is false by default, not nil.

jruby · Dec 9, 2016 · 4db07f2 · 4db07f2
1 parent 59e593a
commit 4db07f2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tool/truffle/generate-options.rb b/tool/truffle/generate-options.rb
@@ -32,7 +32,7 @@
                   when 'false'
                     'Verbosity.FALSE'
                 end
-      null_default = 'Verbosity.NIL'
+      null_default = 'Verbosity.FALSE'
     when 'integer'
       type = 'int'
       type_cons = 'IntegerOptionDescription'

diff --git a/tool/truffle/options.yml b/tool/truffle/options.yml
@@ -7,7 +7,7 @@ ARGUMENTS: [arguments, string-array, [], Command line arguments for the Ruby pro
 DISPLAYED_FILE_NAME: [displayed_file_name, string, null, Displayed file name]
 
 DEBUG: [debug, boolean, false, Debug]
-VERBOSITY: [verbosity, verbosity, nil, Verbosity]
+VERBOSITY: [verbosity, verbosity, false, Verbosity]
 FROZEN_STRING_LITERALS: [frozen_string_literals, boolean, false, Use frozen string literals]
 DISABLE_GEMS: [disable_gems, boolean, false, Disable Gems]
 

diff --git a/truffle/src/main/java/org/jruby/truffle/options/Options.java b/truffle/src/main/java/org/jruby/truffle/options/Options.java
@@ -117,7 +117,7 @@ public class Options {
         ARGUMENTS = builder.getOrDefault(OptionsCatalog.ARGUMENTS);
         DISPLAYED_FILE_NAME = builder.getOrDefault(OptionsCatalog.DISPLAYED_FILE_NAME);
         DEBUG = builder.getOrDefault(OptionsCatalog.DEBUG);
-        VERBOSITY = builder.getOrDefault(OptionsCatalog.VERBOSITY, Verbosity.NIL);
+        VERBOSITY = builder.getOrDefault(OptionsCatalog.VERBOSITY, Verbosity.FALSE);
         FROZEN_STRING_LITERALS = builder.getOrDefault(OptionsCatalog.FROZEN_STRING_LITERALS);
         DISABLE_GEMS = builder.getOrDefault(OptionsCatalog.DISABLE_GEMS);
         INTERNAL_ENCODING = builder.getOrDefault(OptionsCatalog.INTERNAL_ENCODING);

diff --git a/truffle/src/main/java/org/jruby/truffle/options/OptionsCatalog.java b/truffle/src/main/java/org/jruby/truffle/options/OptionsCatalog.java
@@ -23,7 +23,7 @@ public class OptionsCatalog {
     public static final OptionDescription ARGUMENTS = new StringArrayOptionDescription("arguments", "Command line arguments for the Ruby program", new String[]{});
     public static final OptionDescription DISPLAYED_FILE_NAME = new StringOptionDescription("displayed_file_name", "Displayed file name", null);
     public static final OptionDescription DEBUG = new BooleanOptionDescription("debug", "Debug", false);
-    public static final OptionDescription VERBOSITY = new VerbosityOptionDescription("verbosity", "Verbosity", Verbosity.NIL);
+    public static final OptionDescription VERBOSITY = new VerbosityOptionDescription("verbosity", "Verbosity", Verbosity.FALSE);
     public static final OptionDescription FROZEN_STRING_LITERALS = new BooleanOptionDescription("frozen_string_literals", "Use frozen string literals", false);
     public static final OptionDescription DISABLE_GEMS = new BooleanOptionDescription("disable_gems", "Disable Gems", false);
     public static final OptionDescription INTERNAL_ENCODING = new StringOptionDescription("internal_encoding", "Internal encoding", null);

diff --git a/truffle/src/main/java/org/jruby/truffle/options/RubyInstanceConfig.java b/truffle/src/main/java/org/jruby/truffle/options/RubyInstanceConfig.java
@@ -620,7 +620,7 @@ public static ClassLoader defaultClassLoader() {
     private Map<String, String> optionGlobals = new HashMap<String, String>();
     private boolean processLineEnds = false;
     private boolean split = false;
-    private Verbosity verbosity = Verbosity.NIL;
+    private Verbosity verbosity = Verbosity.FALSE;
     private boolean debug = false;
     private boolean showVersion = false;
     private boolean showBytecode = false;