jruby · Aug 9, 2017 · Aug 9, 2017
Showing with 14 additions and 3 deletions.

+5 −0 core/src/main/java/org/jruby/ast/CallNode.java

+5 −2 core/src/main/java/org/jruby/ir/IRBuilder.java

+2 −0 core/src/main/java/org/jruby/parser/ParserSupport.java

+2 −1 core/src/main/java/org/jruby/parser/RubyParser.y
diff --git a/core/src/main/java/org/jruby/ast/CallNode.java b/core/src/main/java/org/jruby/ast/CallNode.java
@@ -128,6 +128,11 @@ public Node getReceiverNode() {
         return receiverNode;
     }
 
+    /**
+     * Is this call lazily execute because it was on right hand side of the lonely (&.) operator?
+     *
+     * @return true if so.
+     */
     public boolean isLazy() {
         return isLazy;
     }

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -1061,9 +1061,12 @@ public Operand buildCall(Variable result, CallNode callNode) {
             return result;
         }
 
-        Label lazyLabel = getNewLabel();
-        Label endLabel = getNewLabel();
+        Label lazyLabel = null;
+        Label endLabel = null;
+
         if (callNode.isLazy()) {
+            lazyLabel = getNewLabel();
+            endLabel = getNewLabel();
             addInstr(new BNilInstr(lazyLabel, receiver));
         }
 

diff --git a/core/src/main/java/org/jruby/parser/ParserSupport.java b/core/src/main/java/org/jruby/parser/ParserSupport.java
@@ -117,6 +117,8 @@ public Node arg_concat(ISourcePosition position, Node node1, Node node2) {
         return node2 == null ? node1 : new ArgsCatNode(position, node1, node2);
     }
 
+    // firstNode is ArgsCatNode, SplatNode, ArrayNode, HashNode
+    // secondNode is null or not
     public Node arg_blk_pass(Node firstNode, BlockPassNode secondNode) {
         if (secondNode != null) {
             secondNode.setArgsNode(firstNode);

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -1225,7 +1225,7 @@ opt_call_args   : none
                 }
 
 
-// [!null]
+// [!null] - ArgsCatNode, SplatNode, ArrayNode, HashNode, BlockPassNode
 call_args       : command {
                     $$ = support.newArrayNode(support.getPosition($1), $1);
                 }
@@ -1243,6 +1243,7 @@ call_args       : command {
                 | block_arg {
                 }
 
+// [!null] - ArgsCatNode, SplatNode, ArrayNode, HashNode, BlockPassNode
 command_args    : /* none */ {
                     $$ = Long.valueOf(lexer.getCmdArgumentState().getStack());
                     lexer.getCmdArgumentState().begin();