jruby · Feb 17, 2016 · Feb 17, 2016 · Feb 17, 2016 · Feb 17, 2016 · Feb 17, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/language/backtrace/Activation.java b/truffle/src/main/java/org/jruby/truffle/language/backtrace/Activation.java
@@ -32,4 +32,5 @@ public Node getCallNode() {
     public MaterializedFrame getMaterializedFrame() {
         return materializedFrame;
     }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java b/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java
@@ -35,7 +35,8 @@ public class BacktraceFormatter {
     public enum FormattingFlags {
         OMIT_EXCEPTION,
         OMIT_FROM_PREFIX,
-        INCLUDE_CORE_FILES
+        INCLUDE_CORE_FILES,
+        INTERLEAVE_JAVA
     }
 
     private final RubyContext context;
@@ -48,15 +49,19 @@ public static BacktraceFormatter createDefaultFormatter(RubyContext context) {
             flags.add(FormattingFlags.INCLUDE_CORE_FILES);
         }
 
+        if (context.getOptions().BACKTRACES_INTERLEAVE_JAVA) {
+            flags.add(FormattingFlags.INTERLEAVE_JAVA);
+        }
+
         return new BacktraceFormatter(context, flags);
     }
 
-    // for debugging
+    // For debugging
     public static List<String> rubyBacktrace(RubyContext context) {
         return BacktraceFormatter.createDefaultFormatter(context).formatBacktrace(context, null, context.getCallStack().getBacktrace(null));
     }
 
-    // for debugging
+    // For debugging
     public static String printableRubyBacktrace(RubyContext context) {
         final StringBuilder builder = new StringBuilder();
         for (String line : rubyBacktrace(context)) {
@@ -87,6 +92,7 @@ public List<String> formatBacktrace(RubyContext context, DynamicObject exception
         if (backtrace == null) {
             backtrace = context.getCallStack().getBacktrace(null);
         }
+
         final List<Activation> activations = backtrace.getActivations();
         final ArrayList<String> lines = new ArrayList<>();
 
@@ -112,7 +118,7 @@ public List<String> formatBacktrace(RubyContext context, DynamicObject exception
             }
         }
 
-        if (backtrace.getJavaThrowable() != null && context.getOptions().BACKTRACES_INTERLEAVE_JAVA) {
+        if (backtrace.getJavaThrowable() != null && flags.contains(FormattingFlags.INTERLEAVE_JAVA)) {
             return BacktraceInterleaver.interleave(lines, backtrace.getJavaThrowable().getStackTrace());
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/AndNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/AndNode.java
@@ -17,31 +17,32 @@
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;
 import org.jruby.truffle.language.RubyNode;
 
-/**
- * Represents a Ruby {@code and} or {@code &&} expression.
- */
 public class AndNode extends RubyNode {
 
     @Child private RubyNode left;
-    @Child private BooleanCastNode leftCast;
     @Child private RubyNode right;
+
+    @Child private BooleanCastNode leftCast;
+
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
     public AndNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {
         super(context, sourceSection);
         this.left = left;
-        leftCast = BooleanCastNodeGen.create(context, sourceSection, null);
         this.right = right;
+        leftCast = BooleanCastNodeGen.create(context, sourceSection, null);
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
         final Object leftValue = left.execute(frame);
-        if (conditionProfile.profile(leftCast.executeBoolean(frame, leftValue))) {
-            // Right expression evaluated and returned if left expression returns true.
+        final boolean leftBoolean = leftCast.executeBoolean(frame, leftValue);
+
+        if (conditionProfile.profile(leftBoolean)) {
             return right.execute(frame);
         } else {
             return leftValue;
         }
     }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/BreakShellException.java b/truffle/src/main/java/org/jruby/truffle/language/control/BreakShellException.java
diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/IfNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/IfNode.java
@@ -17,24 +17,17 @@
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;
 import org.jruby.truffle.language.RubyNode;
 
-/**
- * Represents a Ruby {@code if} expression. Note that in this representation we always have an
- * {@code else} part.
- */
 public class IfNode extends RubyNode {
 
     @Child private BooleanCastNode condition;
     @Child private RubyNode thenBody;
     @Child private RubyNode elseBody;
+
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
     public IfNode(RubyContext context, SourceSection sourceSection, RubyNode condition, RubyNode thenBody, RubyNode elseBody) {
         super(context, sourceSection);
 
-        assert condition != null;
-        assert thenBody != null;
-        assert elseBody != null;
-
         this.condition = BooleanCastNodeGen.create(context, sourceSection, condition);
         this.thenBody = thenBody;
         this.elseBody = elseBody;
@@ -48,4 +41,5 @@ public Object execute(VirtualFrame frame) {
             return elseBody.execute(frame);
         }
     }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/NotNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/NotNode.java
@@ -16,9 +16,6 @@
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;
 import org.jruby.truffle.language.RubyNode;
 
-/**
- * Cast to boolean and negate, as {@code BasicObject#!}.
- */
 public class NotNode extends RubyNode {
 
     @Child private BooleanCastNode child;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/OrNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/OrNode.java
@@ -17,30 +17,32 @@
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;
 import org.jruby.truffle.language.RubyNode;
 
-/**
- * Represents a Ruby {@code or} or {@code ||} expression.
- */
 public class OrNode extends RubyNode {
 
     @Child private RubyNode left;
-    @Child private BooleanCastNode leftCast;
     @Child private RubyNode right;
+
+    @Child private BooleanCastNode leftCast;
+
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
     public OrNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {
         super(context, sourceSection);
         this.left = left;
-        leftCast = BooleanCastNodeGen.create(context, sourceSection, null);
         this.right = right;
+        leftCast = BooleanCastNodeGen.create(context, sourceSection, null);
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
         final Object leftValue = left.execute(frame);
-        if (conditionProfile.profile(leftCast.executeBoolean(frame, leftValue))) {
+        final boolean leftBoolean = leftCast.executeBoolean(frame, leftValue);
+
+        if (conditionProfile.profile(leftBoolean)) {
             return leftValue;
         } else {
             return right.execute(frame);
         }
     }
+
 }
-Original file line number
+Diff line change
@@ @@ -32,4 +32,5 @@ public Node getCallNode() { @@
         public MaterializedFrame getMaterializedFrame() {
             return materializedFrame;
         }
     }