[Truffle] More complete logic for the verbosity level.

jruby · Nov 6, 2016 · a092518 · a092518
1 parent f625405
commit a092518
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -845,8 +845,23 @@ private void initializeGlobalVariables() {
 
         globals.put("$DEBUG", context.getInstanceConfig().isDebug());
 
-        Object value = context.warningsEnabled() ? context.isVerbose() : nilObject;
-        globals.put("$VERBOSE", value);
+        final Object verbose;
+
+        switch (context.getInstanceConfig().getVerbosity()) {
+            case NIL:
+                verbose = getNilObject();
+                break;
+            case FALSE:
+                verbose = false;
+                break;
+            case TRUE:
+                verbose = true;
+                break;
+            default:
+                throw new UnsupportedOperationException();
+        }
+
+        globals.put("$VERBOSE", verbose);
 
         final DynamicObject defaultRecordSeparator = StringOperations.createString(context, StringOperations.encodeRope(CLI_RECORD_SEPARATOR, UTF8Encoding.INSTANCE));
         node.freezeNode.executeFreeze(defaultRecordSeparator);