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: c1dc6e517fe1
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b03e121b6d9e
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Mar 18, 2015

  1. [Truffle] Adding raiseIfFrozenSelf to Array#{map!,collect!}.

    @bjfish
    bjfish committed Mar 18, 2015
    Copy the full SHA
    f6e1f92 View commit details

  2. [Truffle] Bulk adding some returnsEnumeratorIfNoBlock to Array methods.

    @bjfish
    bjfish committed Mar 18, 2015
    Copy the full SHA
    dc09be9 View commit details

Commits on Mar 19, 2015

  1. Merge pull request #2722 from bjfish/truffle_array_map_frozen 

    [Truffle] Adding raiseIfFrozenSelf to Array#{map!,collect!}.
    @chrisseaton
    chrisseaton committed Mar 19, 2015
    Copy the full SHA
    b03e121 View commit details
6 changes: 0 additions & 6 deletions spec/truffle/tags/core/array/collect_tags.txt
View file

This file was deleted.

2 changes: 0 additions & 2 deletions spec/truffle/tags/core/array/delete_if_tags.txt
View file

This file was deleted.

4 changes: 0 additions & 4 deletions spec/truffle/tags/core/array/map_tags.txt
View file

This file was deleted.

3 changes: 0 additions & 3 deletions spec/truffle/tags/core/array/reject_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
fails:Array#reject returns an Enumerator if no block given
fails:Array#reject! removes elements for which block is true
fails:Array#reject! properly handles recursive arrays
fails:Array#reject! returns nil when called on an Array emptied with #shift
fails:Array#reject! returns nil if no changes are made
fails:Array#reject! returns an Enumerator if no block given, and the array is frozen
fails:Array#reject! returns an Enumerator if no block given
1 change: 0 additions & 1 deletion spec/truffle/tags/core/array/select_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
fails:Array#select returns an Enumerator if no block given
fails:Array#select! returns nil if no changes were made in the array
fails:Array#select! deletes elements for which the block returns a false value
fails:Array#select! returns an enumerator if no block is given
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1916,7 +1916,7 @@ public Object mapObject(VirtualFrame frame, RubyArray array, RubyProc block) {
}
}

@CoreMethod(names = {"map!", "collect!"}, needsBlock = true, returnsEnumeratorIfNoBlock = true)
@CoreMethod(names = {"map!", "collect!"}, needsBlock = true, returnsEnumeratorIfNoBlock = true, raiseIfFrozenSelf = true)
@ImportGuards(ArrayGuards.class)
public abstract static class MapInPlaceNode extends YieldingCoreMethodNode {

@@ -2789,7 +2789,7 @@ public RubyArray pushObjectObject(RubyArray array, Object value) {

}

@CoreMethod(names = "reject", needsBlock = true)
@CoreMethod(names = "reject", needsBlock = true, returnsEnumeratorIfNoBlock = true)
@ImportGuards(ArrayGuards.class)
public abstract static class RejectNode extends YieldingCoreMethodNode {

@@ -2878,7 +2878,7 @@ public Object selectFixnumInteger(VirtualFrame frame, RubyArray array, RubyProc

}

@CoreMethod(names = { "reject!", "delete_if" }, needsBlock = true, raiseIfFrozenSelf = true)
@CoreMethod(names = { "reject!", "delete_if" }, needsBlock = true, returnsEnumeratorIfNoBlock = true, raiseIfFrozenSelf = true)
@ImportGuards(ArrayGuards.class)
public abstract static class RejectInPlaceNode extends YieldingCoreMethodNode {

@@ -2982,7 +2982,7 @@ public RubyArray replaceObject(RubyArray array, RubyArray other) {

}

@CoreMethod(names = "select", needsBlock = true)
@CoreMethod(names = "select", needsBlock = true, returnsEnumeratorIfNoBlock = true)
@ImportGuards(ArrayGuards.class)
public abstract static class SelectNode extends YieldingCoreMethodNode {