Cleanup Enumerator

opal · Nov 8, 2013 · 82fd939 · 82fd939
1 parent eef232c
commit 82fd939
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/opal/core/enumerator.rb b/opal/core/enumerator.rb
@@ -1,42 +1,6 @@
 class Enumerator
   include Enumerable
 
-  class Yielder
-    def initialize(enumerator, block, to)
-      @enumerator = enumerator
-      @block      = block
-      @to         = to
-    end
-
-    def yield(*values)
-      %x{
-        if ($opal.$yieldX(#@to, values) === $breaker) {
-          throw $breaker;
-        }
-      }
-
-      self
-    end
-
-    alias << yield
-
-    def call
-      %x{
-        try {
-          #@block(self)
-        }
-        catch (e) {
-          if (e === $breaker) {
-            return $breaker.$v;
-          }
-          else {
-            throw e;
-          }
-        }
-      }
-    end
-  end
-
   def initialize(obj = nil, method = :each, *args, &block)
     if block
       @block = block
@@ -51,7 +15,7 @@ def each(&block)
     return enum_for :each unless block_given?
 
     if @block
-      Yielder.new(self, @block, block).call
+      Yielder.new(self, @block).each(&block)
     else
       @object.__send__(@method, *@args, &block)
     end
@@ -70,4 +34,41 @@ def rewind
 
     self
   end
+
+  class Yielder
+    def initialize(enumerator, block)
+      @enumerator = enumerator
+      @block      = block
+    end
+
+    def yield(*values)
+      %x{
+        if ($opal.$yieldX(#@to, values) === $breaker) {
+          throw $breaker;
+        }
+      }
+
+      self
+    end
+
+    alias << yield
+
+    def each(&block)
+      @to = block
+
+      %x{
+        try {
+          #@block(self)
+        }
+        catch (e) {
+          if (e === $breaker) {
+            return $breaker.$v;
+          }
+          else {
+            throw e;
+          }
+        }
+      }
+    end
+  end
 end