[Truffle] Try moving Kernel#loop to Rubinius.

jruby · Apr 22, 2015 · bae615c · bae615c
1 parent 5385f46
commit bae615c
Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/spec/truffle/tags/core/kernel/loop_tags.txt b/spec/truffle/tags/core/kernel/loop_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1163,30 +1163,6 @@ public RubyArray localVariables() {
 
     }
 
-    @CoreMethod(names = "loop", isModuleFunction = true, returnsEnumeratorIfNoBlock = true)
-    public abstract static class LoopNode extends CoreMethodNode {
-
-        @Child private WhileNode whileNode;
-
-        public LoopNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-            whileNode = WhileNode.createWhile(context, sourceSection,
-                    new BooleanLiteralNode(context, sourceSection, true),
-                    new YieldNode(context, getSourceSection(), new RubyNode[]{}, false)
-            );
-        }
-
-        public LoopNode(LoopNode prev) {
-            super(prev);
-            whileNode = prev.whileNode;
-        }
-
-        @Specialization
-        public Object loop(VirtualFrame frame) {
-            return whileNode.execute(frame);
-        }
-    }
-
     @CoreMethod(names = "__method__", needsSelf = false)
     public abstract static class MethodNameNode extends CoreMethodNode {
 

diff --git a/truffle/src/main/ruby/core/rubinius/common/kernel.rb b/truffle/src/main/ruby/core/rubinius/common/kernel.rb
@@ -228,4 +228,16 @@ def tap
     self
   end
 
+  def loop
+    return to_enum(:loop) unless block_given?
+
+    begin
+      while true
+        yield
+      end
+    rescue StopIteration
+    end
+  end
+  module_function :loop
+
 end