[Truffle] fix Range#map when composed of ints

it was iterating indexes instead of the actual numbers
jruby · Sep 10, 2015 · 9ad3caa · 9ad3caa
1 parent 11fad6e
commit 9ad3caa
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
@@ -42,17 +42,11 @@ public CollectNode(RubyContext context, SourceSection sourceSection) {
         @Specialization(guards = { "isIntegerFixnumRange(range)", "isRubyProc(block)" })
         public DynamicObject collect(VirtualFrame frame, DynamicObject range, DynamicObject block) {
             final int begin = Layouts.INTEGER_FIXNUM_RANGE.getBegin(range);
-            int result;
-            if (Layouts.INTEGER_FIXNUM_RANGE.getExcludedEnd(range)) {
-                result = Layouts.INTEGER_FIXNUM_RANGE.getEnd(range);
-            } else {
-                result = Layouts.INTEGER_FIXNUM_RANGE.getEnd(range) + 1;
-            }
-            final int exclusiveEnd = result;
-            final int length = exclusiveEnd - begin;
+            final int end = Layouts.INTEGER_FIXNUM_RANGE.getEnd(range);
+            final boolean excludedEnd = Layouts.INTEGER_FIXNUM_RANGE.getExcludedEnd(range);
+            final int length = (excludedEnd ? end : end + 1) - begin;
 
             Object store = arrayBuilder.start(length);
-
             int count = 0;
 
             try {
@@ -61,7 +55,7 @@ public DynamicObject collect(VirtualFrame frame, DynamicObject range, DynamicObj
                         count++;
                     }
 
-                    store = arrayBuilder.appendValue(store, n, yield(frame, block, n));
+                    store = arrayBuilder.appendValue(store, n, yield(frame, block, begin + n));
                 }
             } finally {
                 if (CompilerDirectives.inInterpreter()) {