Merge pull request #898 from masamitsu-murase/modify_return_value

Modify handling of NODE_RETURN and NODE_NEXT.

src/codegen.c

@@ -1570,15 +1570,20 @@ codegen(codegen_scope *s, node *tree, int val)
     break;
 
   case NODE_RETURN:
+    if (tree) {
       codegen(s, tree, VAL);
       pop();
+    }
+    else {
+      genop(s, MKOP_A(OP_LOADNIL, cursp()));
+    }
     if (s->loop) {
       genop(s, MKOP_AB(OP_RETURN, cursp(), OP_R_RETURN));
     }
     else {
       genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL);
     }
-    push();
+    if (val) push();
     break;
 
   case NODE_YIELD:
@@ -1630,6 +1635,9 @@ codegen(codegen_scope *s, node *tree, int val)
         codegen(s, tree, VAL);
         pop();
       }
+      else {
+        genop(s, MKOP_A(OP_LOADNIL, cursp()));
+      }
       genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL);
     }
     if (val) push();

test/t/exception.rb

@@ -321,7 +321,7 @@ end
 
 # very deeply recursive function that stil returns albeit very deeply so
 $test_infinite_recursion    = 0
-TEST_INFINITE_RECURSION_MAX = 100000
+TEST_INFINITE_RECURSION_MAX = 1000000
 def test_infinite_recursion
   $test_infinite_recursion += 1
   if $test_infinite_recursion > TEST_INFINITE_RECURSION_MAX