Translate nodes - return

Author: andrykonchin

spec/tags/truffle/parsing/parsing_tags.txt

@@ -59,15 +59,6 @@ fails:Parsing a Complex number (Complex literal `bri` (without real part) where
 fails:Parsing a Complex number (Complex literal in format of a + bi is represented as `a + Complex.convert(0, b)`) case is parsed correctly
 fails:Parsing a Def (Name / Non singleton / in an anonymous module) case is parsed correctly
 fails:Parsing a Def (Name / Singleton / in an anonymous module) case is parsed correctly
-fails:Parsing a Def (Tail expression / with explicit return inside then branch of the `if` operator) case is parsed correctly
-fails:Parsing a Def (Tail expression / with explicit return inside then/else branches of the `if` operator) case is parsed correctly
-fails:Parsing a Def (Tail expression / with explicit return at the end of a sequence of multiple expressions) case is parsed correctly
-fails:Parsing a Def (Tail expression / with explicit return) case is parsed correctly
-fails:Parsing a Def (Tail expression / with explicit return inside then branch of the `unless` operator) case is parsed correctly
-fails:Parsing a Def (Singleton method definition) case is parsed correctly
-fails:Parsing a Def (Method definition with empty body) case is parsed correctly
-fails:Parsing a Def (Method definition with not empty body) case is parsed correctly
-fails:Parsing a Def (Method definition without parameters) case is parsed correctly
 fails:Parsing a defined? (with yield in a method body (defined? yield)) case is parsed correctly
 fails:Parsing a Ensure keyword (ensure in a do/end block) case is parsed correctly
 fails:Parsing a Ensure keyword (ensure in a method) case is parsed correctly
@@ -153,7 +144,6 @@ fails:Parsing a Rescue keyword (modifier / backtrace optimization / enabled / wh
 fails:Parsing a Rescue keyword (with exception and variable) case is parsed correctly
 fails:Parsing a Rescue keyword (with multiple rescue branches) case is parsed correctly
 fails:Parsing a Rescue keyword (without exception but with a variable) case is parsed correctly
-fails:Parsing a Return (return operator at the top level) case is parsed correctly
 fails:Parsing a Return (return operator in a block (with a value)) case is parsed correctly
 fails:Parsing a Return (return operator in a block in a class definition body) case is parsed correctly
 fails:Parsing a Return (return operator in a block in a module definition body) case is parsed correctly

src/main/java/org/truffleruby/parser/YARPTranslator.java

@@ -58,9 +58,12 @@
 import org.truffleruby.language.constants.WriteConstantNode;
 import org.truffleruby.language.control.AndNodeGen;
 import org.truffleruby.language.control.BreakNode;
+import org.truffleruby.language.control.DynamicReturnNode;
 import org.truffleruby.language.control.IfElseNode;
 import org.truffleruby.language.control.IfElseNodeGen;
 import org.truffleruby.language.control.IfNodeGen;
+import org.truffleruby.language.control.InvalidReturnNode;
+import org.truffleruby.language.control.LocalReturnNode;
 import org.truffleruby.language.control.NextNode;
 import org.truffleruby.language.control.NotNodeGen;
 import org.truffleruby.language.control.OrNodeGen;
@@ -1557,7 +1560,25 @@ public RubyNode visitRetryNode(Nodes.RetryNode node) {
     }
 
     public RubyNode visitReturnNode(Nodes.ReturnNode node) {
-        return defaultVisit(node);
+        final RubyNode rubyNode;
+        final RubyNode argumentsNode = translateControlFlowArguments(node.arguments);
+
+        if (environment.isBlock()) {
+            // Lambda behaves a bit differently from block and "return" to a class/module body is correct -
+            // so DynamicReturnNode should be used instead of InvalidReturnNode.
+            // It's handled later and InvalidReturnNode is replaced with DynamicReturnNode in YARPBlockTranslator.
+            final ReturnID returnID = environment.getReturnID();
+            if (returnID == ReturnID.MODULE_BODY) {
+                rubyNode = new InvalidReturnNode(argumentsNode);
+            } else {
+                rubyNode = new DynamicReturnNode(returnID, argumentsNode);
+            }
+        } else {
+            rubyNode = new LocalReturnNode(argumentsNode);
+        }
+
+        assignNodePositionInSource(node, rubyNode);
+        return rubyNode;
     }
 
     public RubyNode visitSelfNode(Nodes.SelfNode node) {