Fixes for Enumerator#with_index #550

adambeynon · adambeynon · commit f151e851003b · 2014-11-01T15:57:29.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@
 
 *   Add initial support for Module#autoload.
 
+*   Fix `Enumerator#with_index`.
+
 ## 0.6.2 2014-04-25
 
 *   Added Range#size
diff --git a/opal/corelib/enumerator.rb b/opal/corelib/enumerator.rb
@@ -59,7 +59,7 @@ def with_index(offset = 0, &block)
     return enum_for :with_index, offset unless block
 
     %x{
-      var result
+      var result, index = 0;
 
       self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
@@ -78,6 +78,8 @@ def with_index(offset = 0, &block)
       if (result !== undefined) {
         return result;
       }
+
+      return nil;
     }
   end
 
diff --git a/spec/filters/bugs/enumerator.rb b/spec/filters/bugs/enumerator.rb
@@ -1,3 +1,10 @@
 opal_filter "Enumerator" do
   fails "Enumerator#each requires multiple arguments" # arity issue
+
+  fails "Enumerator#with_index returns the object being enumerated when given a block"
+  fails "Enumerator#with_index numbers indices from the given index when given an offset but no block"
+  fails "Enumerator#with_index numbers indices from the given index when given an offset and block"
+  fails "Enumerator#with_index converts non-numeric arguments to Integer via #to_int"
+  fails "Enumerator#with_index coerces the given numeric argument to an Integer"
+  fails "Enumerator#with_index accepts negative argument"
 end
diff --git a/spec/rubyspecs b/spec/rubyspecs
@@ -36,6 +36,7 @@ corelib/core/enumerator/each_spec
 corelib/core/enumerator/new_spec
 corelib/core/enumerator/next_spec
 corelib/core/enumerator/rewind_spec
+corelib/core/enumerator/with_index_spec
 
 corelib/core/kernel/comparison_spec
 corelib/core/kernel/eql_spec

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ def with_index(offset = 0, &block)`
`59`	`59`	`return enum_for :with_index, offset unless block`
`60`	`60`
`61`	`61`	`%x{`
`62`		`- var result`
	`62`	`+ var result, index = 0;`
`63`	`63`
`64`	`64`	`self.$each.$$p = function() {`
`65`	`65`	var param = #{Opal.destructure(`arguments`)},
`@@ -78,6 +78,8 @@ def with_index(offset = 0, &block)`
`78`	`78`	`if (result !== undefined) {`
`79`	`79`	`return result;`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+ return nil;`
`81`	`83`	`}`
`82`	`84`	`end`
`83`	`85`