jruby · Jun 16, 2015 · Jun 16, 2015 · Jun 16, 2015 · Jun 16, 2015
diff --git a/spec/ruby/language/next_spec.rb b/spec/ruby/language/next_spec.rb
@@ -106,6 +106,16 @@ def self.enclosing_method
   end
 end
 
+describe "The next statement" do
+  describe "in a method" do
+    it "is invalid and raises a SyntaxError" do
+      lambda {
+        eval("def m; next; end")
+      }.should raise_error(SyntaxError)
+    end
+  end
+end
+
 describe "The next statement" do
   before :each do
     ScratchPad.record []
@@ -309,7 +319,7 @@ def self.enclosing_method
 
       ScratchPad.recorded.should == [:begin, :ensure, :begin, :ensure]
     end
- end
+  end
 end
 
 describe "Assignment via next" do

diff --git a/spec/ruby/language/redo_spec.rb b/spec/ruby/language/redo_spec.rb
@@ -55,4 +55,12 @@
     end
     list.should == [1,10,100,1,10,100,2,20,200,3,30,300]
   end
+
+  describe "in a method" do
+    it "is invalid and raises a SyntaxError" do
+      lambda {
+        eval("def m; redo; end")
+      }.should raise_error(SyntaxError)
+    end
+  end
 end
diff --git a/spec/tags/ruby/language/next_tags.txt b/spec/tags/ruby/language/next_tags.txt
@@ -0,0 +1 @@
+fails:The next statement in a method is invalid and raises a SyntaxError
diff --git a/spec/tags/ruby/language/redo_tags.txt b/spec/tags/ruby/language/redo_tags.txt
@@ -0,0 +1 @@
+fails:The redo statement in a method is invalid and raises a SyntaxError
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.joni.NameEntry;
 import org.joni.Regex;
 import org.joni.Syntax;
@@ -67,6 +68,7 @@
 import org.jruby.truffle.runtime.LexicalScope;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.array.ArrayUtils;
+import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.CoreLibrary;
 import org.jruby.truffle.runtime.core.RubyEncoding;
 import org.jruby.truffle.runtime.core.RubyRegexp;
@@ -2213,7 +2215,11 @@ public RubyNode visitNewlineNode(org.jruby.ast.NewlineNode node) {
     public RubyNode visitNextNode(org.jruby.ast.NextNode node) {
         final SourceSection sourceSection = translate(node.getPosition());
 
-        RubyNode resultNode;
+        if (!environment.isBlock() && !translatingWhile) {
+            throw new RaiseException(context.getCoreLibrary().syntaxError("Invalid next", currentNode));
+        }
+
+        final RubyNode resultNode;
 
         final boolean t = translatingNextExpression;
         translatingNextExpression = true;
@@ -2458,6 +2464,10 @@ private RubyNode translateRationalComplex(SourceSection sourceSection, String na
 
     @Override
     public RubyNode visitRedoNode(org.jruby.ast.RedoNode node) {
+        if (!environment.isBlock() && !translatingWhile) {
+            throw new RaiseException(context.getCoreLibrary().syntaxError("Invalid redo", currentNode));
+        }
+
         return new RedoNode(context, translate(node.getPosition()));
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:The next statement in a method is invalid and raises a SyntaxError
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:The redo statement in a method is invalid and raises a SyntaxError