Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e909e2dc5c2a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fed361beaeea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 26, 2015

  1. Copy the full SHA
    b64b785 View commit details
  2. Copy the full SHA
    fed361b View commit details
Showing with 23 additions and 23 deletions.
  1. +23 −23 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
Original file line number Diff line number Diff line change
@@ -2086,70 +2086,70 @@ public InjectNode(RubyContext context, SourceSection sourceSection) {
}

@Specialization(guards = { "isEmptyArray(array)", "wasProvided(initial)" })
public Object injectEmptyArray(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
public Object injectEmptyArray(VirtualFrame frame, RubyArray array, Object initial, NotProvided unused, RubyProc block) {
return initial;
}

@Specialization(guards = { "isEmptyArray(array)", "wasNotProvided(initial)" })
public Object injectEmptyArrayNoInitial(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
@Specialization(guards = "isEmptyArray(array)")
public Object injectEmptyArrayNoInitial(VirtualFrame frame, RubyArray array, NotProvided initial, NotProvided unused, RubyProc block) {
return nil();
}

@Specialization(guards = { "isIntArray(array)", "!isEmptyArray(array)", "wasProvided(initial)" })
public Object injectIntegerFixnum(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
public Object injectIntegerFixnum(VirtualFrame frame, RubyArray array, Object initial, NotProvided unused, RubyProc block) {
return injectHelper(frame, ArrayMirror.reflect((int[]) ArrayNodes.getStore(array)), array, initial, block, 0);
}

@Specialization(guards = { "isIntArray(array)", "!isEmptyArray(array)", "wasNotProvided(initial)" })
public Object injectIntegerFixnumNoInitial(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
@Specialization(guards = { "isIntArray(array)", "!isEmptyArray(array)" })
public Object injectIntegerFixnumNoInitial(VirtualFrame frame, RubyArray array, NotProvided initial, NotProvided unused, RubyProc block) {
final ArrayMirror mirror = ArrayMirror.reflect((int[]) ArrayNodes.getStore(array));

return injectHelper(frame, mirror, array, mirror.get(0), block, 1);
}

@Specialization(guards = { "isLongArray(array)", "!isEmptyArray(array)", "wasProvided(initial)" })
public Object injectLongFixnum(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
public Object injectLongFixnum(VirtualFrame frame, RubyArray array, Object initial, NotProvided unused, RubyProc block) {
return injectHelper(frame, ArrayMirror.reflect((long[]) ArrayNodes.getStore(array)), array, initial, block, 0);
}

@Specialization(guards = { "isLongArray(array)", "!isEmptyArray(array)", "wasNotProvided(initial)" })
public Object injectLongFixnumNoInitial(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
@Specialization(guards = { "isLongArray(array)", "!isEmptyArray(array)" })
public Object injectLongFixnumNoInitial(VirtualFrame frame, RubyArray array, NotProvided initial, NotProvided unused, RubyProc block) {
final ArrayMirror mirror = ArrayMirror.reflect((long[]) ArrayNodes.getStore(array));

return injectHelper(frame, mirror, array, mirror.get(0), block, 1);
}

@Specialization(guards = { "isDoubleArray(array)", "!isEmptyArray(array)", "wasProvided(initial)" })
public Object injectFloat(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
public Object injectFloat(VirtualFrame frame, RubyArray array, Object initial, NotProvided unused, RubyProc block) {
return injectHelper(frame, ArrayMirror.reflect((double[]) ArrayNodes.getStore(array)), array, initial, block, 0);
}

@Specialization(guards = { "isDoubleArray(array)", "!isEmptyArray(array)", "wasNotProvided(initial)" })
public Object injectFloatNoInitial(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
@Specialization(guards = { "isDoubleArray(array)", "!isEmptyArray(array)" })
public Object injectFloatNoInitial(VirtualFrame frame, RubyArray array, NotProvided initial, NotProvided unused, RubyProc block) {
final ArrayMirror mirror = ArrayMirror.reflect((double[]) ArrayNodes.getStore(array));

return injectHelper(frame, mirror, array, mirror.get(0), block, 1);
}

@Specialization(guards = { "isObjectArray(array)", "!isEmptyArray(array)", "wasProvided(initial)" })
public Object injectObject(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
public Object injectObject(VirtualFrame frame, RubyArray array, Object initial, NotProvided unused, RubyProc block) {
return injectHelper(frame, ArrayMirror.reflect((Object[]) ArrayNodes.getStore(array)), array, initial, block, 0);
}

@Specialization(guards = { "isObjectArray(array)", "!isEmptyArray(array)", "wasNotProvided(initial)" })
public Object injectObjectNoInitial(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
@Specialization(guards = { "isObjectArray(array)", "!isEmptyArray(array)" })
public Object injectObjectNoInitial(VirtualFrame frame, RubyArray array, NotProvided initial, NotProvided unused, RubyProc block) {
final ArrayMirror mirror = ArrayMirror.reflect((Object[]) ArrayNodes.getStore(array));

return injectHelper(frame, mirror, array, mirror.get(0), block, 1);
}

@Specialization(guards = { "isNullArray(array)", "wasProvided(initial)" })
public Object injectNull(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
public Object injectNull(VirtualFrame frame, RubyArray array, Object initial, NotProvided unused, RubyProc block) {
return initial;
}

@Specialization(guards = { "isNullArray(array)", "wasNotProvided(initial)" })
public Object injectNullNoInitial(VirtualFrame frame, RubyArray array, Object initial, NotProvided ignored, RubyProc block) {
@Specialization(guards = "isNullArray(array)")
public Object injectNullNoInitial(VirtualFrame frame, RubyArray array, NotProvided initial, NotProvided unused, RubyProc block) {
return nil();
}

@@ -2159,7 +2159,7 @@ public Object injectSymbolEmptyArray(VirtualFrame frame, RubyArray array, Object
}

@Specialization(guards = { "isRubySymbol(symbol)", "isEmptyArray(array)" })
public Object injectSymbolEmptyArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided ignored, NotProvided block) {
public Object injectSymbolEmptyArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided unused, NotProvided block) {
return nil();
}

@@ -2169,7 +2169,7 @@ public Object injectSymbolIntArray(VirtualFrame frame, RubyArray array, Object i
}

@Specialization(guards = { "isRubySymbol(symbol)", "isIntArray(array)", "!isEmptyArray(array)" })
public Object injectSymbolIntArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided ignored, NotProvided block) {
public Object injectSymbolIntArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided unused, NotProvided block) {
final ArrayMirror mirror = ArrayMirror.reflect((int[]) ArrayNodes.getStore(array));

return injectSymbolHelper(frame, mirror, array, mirror.get(0), symbol, 1);
@@ -2181,7 +2181,7 @@ public Object injectSymbolLongArray(VirtualFrame frame, RubyArray array, Object
}

@Specialization(guards = { "isRubySymbol(symbol)", "isLongArray(array)", "!isEmptyArray(array)" })
public Object injectSymbolLongArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided ignored, NotProvided block) {
public Object injectSymbolLongArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided unused, NotProvided block) {
final ArrayMirror mirror = ArrayMirror.reflect((long[]) ArrayNodes.getStore(array));

return injectSymbolHelper(frame, mirror, array, mirror.get(0), symbol, 1);
@@ -2193,7 +2193,7 @@ public Object injectSymbolDoubleArray(VirtualFrame frame, RubyArray array, Objec
}

@Specialization(guards = { "isRubySymbol(symbol)", "isDoubleArray(array)", "!isEmptyArray(array)" })
public Object injectSymbolDoubleArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided ignored, NotProvided block) {
public Object injectSymbolDoubleArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided unused, NotProvided block) {
final ArrayMirror mirror = ArrayMirror.reflect((double[]) ArrayNodes.getStore(array));

return injectSymbolHelper(frame, mirror, array, mirror.get(0), symbol, 1);
@@ -2205,7 +2205,7 @@ public Object injectSymbolObjectArray(VirtualFrame frame, RubyArray array, Objec
}

@Specialization(guards = { "isRubySymbol(symbol)", "isObjectArray(array)", "!isEmptyArray(array)" })
public Object injectSymbolObjectArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided ignored, NotProvided block) {
public Object injectSymbolObjectArray(VirtualFrame frame, RubyArray array, RubyBasicObject symbol, NotProvided unused, NotProvided block) {
final ArrayMirror mirror = ArrayMirror.reflect((Object[]) ArrayNodes.getStore(array));

return injectSymbolHelper(frame, mirror, array, mirror.get(0), symbol, 1);