Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Array inject accept strings #3425

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Array inject accept strings #3425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a3f5c
Allow Array#inject to accept string in addition to symbol
wasabigeek Feb 1, 2024
707c9de
Add specs for inject
wasabigeek Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions spec/ruby/core/enumerable/shared/inject.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-).should == 4
end

it "can take a string as the second argument" do
EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, "-").should == 4
end

it "ignores the block if two arguments" do
-> {
EnumerableSpecs::Numerous.new(1, 2, 3).send(@method, 10, :-) { raise "we never get here"}.should == 4
Expand All @@ -41,6 +45,10 @@
EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, :-).should == 4
end

it "can take a string argument" do
EnumerableSpecs::Numerous.new(10, 1, 2, 3).send(@method, "-").should == 4
end

it "without argument takes a block with an accumulator (with first element as initial value) and the current element. Value of block becomes new accumulator" do
a = []
EnumerableSpecs::Numerous.new.send(@method) { |memo, i| a << [memo, i]; i }
Expand Down
124 changes: 104 additions & 20 deletions src/main/java/org/truffleruby/core/array/ArrayNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,27 +1305,30 @@ private static final class State {

// Uses block and no Symbol

@Specialization(guards = { "isEmptyArray(array)", "wasProvided(initialOrSymbol)" })
Object injectEmptyArray(RubyArray array, Object initialOrSymbol, NotProvided symbol, RubyProc block) {
return initialOrSymbol;
@Specialization(guards = { "isEmptyArray(array)", "wasProvided(initialOrSymbolOrString)" })
Object injectEmptyArray(
RubyArray array, Object initialOrSymbolOrString, NotProvided symbolOrString, RubyProc block) {
return initialOrSymbolOrString;
}

@Specialization(guards = { "isEmptyArray(array)" })
Object injectEmptyArrayNoInitial(
RubyArray array, NotProvided initialOrSymbol, NotProvided symbol, RubyProc block) {
RubyArray array, NotProvided initialOrSymbolOrString, NotProvided symbolOrString, RubyProc block) {
return nil;
}

@Specialization(guards = { "!isEmptyArray(array)", "wasProvided(initialOrSymbol)" })
Object injectWithInitial(RubyArray array, Object initialOrSymbol, NotProvided symbol, RubyProc block,
@Specialization(guards = { "!isEmptyArray(array)", "wasProvided(initialOrSymbolOrString)" })
Object injectWithInitial(
RubyArray array, Object initialOrSymbolOrString, NotProvided symbolOrString, RubyProc block,
@Cached @Shared ArrayEachIteratorNode iteratorNode) {
return injectBlockHelper(array, block, initialOrSymbol, 0, iteratorNode);
return injectBlockHelper(array, block, initialOrSymbolOrString, 0, iteratorNode);
}

@Specialization(
guards = { "!isEmptyArray(array)" },
limit = "storageStrategyLimit()")
Object injectNoInitial(RubyArray array, NotProvided initialOrSymbol, NotProvided symbol, RubyProc block,
Object injectNoInitial(
RubyArray array, NotProvided initialOrSymbolOrString, NotProvided symbolOrString, RubyProc block,
@Bind("array.getStore()") Object store,
@CachedLibrary("store") ArrayStoreLibrary stores,
@Cached @Shared ArrayEachIteratorNode iteratorNode) {
Expand Down Expand Up @@ -1353,23 +1356,28 @@ public void accept(Node node, CallBlockNode yieldNode, RubyArray array, Object s

@Specialization(guards = { "isEmptyArray(array)" })
Object injectSymbolEmptyArrayNoInitial(
RubyArray array, RubySymbol initialOrSymbol, NotProvided symbol, Nil block) {
RubyArray array, RubySymbol initialOrSymbolOrString, NotProvided symbolOrString, Nil block) {
return nil;
}

@Specialization(
guards = {
"isEmptyArray(array)",
"wasProvided(initialOrSymbol)" })
Object injectSymbolEmptyArray(RubyArray array, Object initialOrSymbol, RubySymbol symbol, Nil block) {
return initialOrSymbol;
"wasProvided(initialOrSymbolOrString)" })
Object injectSymbolEmptyArray(
RubyArray array, Object initialOrSymbolOrString, RubySymbol symbolOrString, Nil block) {
return initialOrSymbolOrString;
}

@Specialization(
guards = { "!isEmptyArray(array)" },
limit = "storageStrategyLimit()")
Object injectSymbolNoInitial(
VirtualFrame frame, RubyArray array, RubySymbol initialOrSymbol, NotProvided symbol, Nil block,
VirtualFrame frame,
RubyArray array,
RubySymbol initialOrSymbolOrString,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

symbol or method

NotProvided symbolOrString,
Nil block,
@Bind("array.getStore()") Object store,
@CachedLibrary("store") ArrayStoreLibrary stores,
@Cached @Shared IntValueProfile arraySizeProfile,
Expand All @@ -1378,7 +1386,7 @@ Object injectSymbolNoInitial(
return injectSymbolHelper(
frame,
array,
toJavaString.execute(this, initialOrSymbol),
toJavaString.execute(this, initialOrSymbolOrString),
stores,
store,
stores.read(store, 0),
Expand All @@ -1390,10 +1398,14 @@ Object injectSymbolNoInitial(
@Specialization(
guards = {
"!isEmptyArray(array)",
"wasProvided(initialOrSymbol)" },
"wasProvided(initialOrSymbolOrString)" },
limit = "storageStrategyLimit()")
Object injectSymbolWithInitial(
VirtualFrame frame, RubyArray array, Object initialOrSymbol, RubySymbol symbol, Nil block,
VirtualFrame frame,
RubyArray array,
Object initialOrSymbolOrString,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Object initialOrSymbolOrString,
Object initial,

RubySymbol symbolOrString,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RubySymbol symbolOrString,
RubySymbol symbol,

(or method)

Nil block,
@Bind("array.getStore()") Object store,
@CachedLibrary("store") ArrayStoreLibrary stores,
@Cached @Shared IntValueProfile arraySizeProfile,
Expand All @@ -1402,23 +1414,95 @@ Object injectSymbolWithInitial(
return injectSymbolHelper(
frame,
array,
toJavaString.execute(this, symbol),
toJavaString.execute(this, symbolOrString),
stores,
store,
initialOrSymbol,
initialOrSymbolOrString,
0,
arraySizeProfile,
loopProfile);
}

private Object injectSymbolHelper(VirtualFrame frame, RubyArray array, String symbol,
// Uses String and no block

@Specialization(guards = { "isEmptyArray(array)" })
Object injectStringEmptyArrayNoInitial(
RubyArray array, RubyString initialOrSymbolOrString, NotProvided symbolOrString, Nil block) {
return nil;
}

@Specialization(
guards = {
"isEmptyArray(array)",
"wasProvided(initialOrSymbolOrString)" })
Object injectStringEmptyArray(
RubyArray array, Object initialOrSymbolOrString, RubyString symbolOrString, Nil block) {
return initialOrSymbolOrString;
}

@Specialization(
guards = { "!isEmptyArray(array)" },
limit = "storageStrategyLimit()")
Object injectStringNoInitial(
VirtualFrame frame,
RubyArray array,
RubyString initialOrSymbolOrString,
NotProvided symbolOrString,
Nil block,
@Bind("array.getStore()") Object store,
@CachedLibrary("store") ArrayStoreLibrary stores,
@Cached @Shared IntValueProfile arraySizeProfile,
@Cached @Exclusive LoopConditionProfile loopProfile,
@Cached @Shared ToJavaStringNode toJavaString) {
return injectSymbolHelper(
frame,
array,
toJavaString.execute(this, initialOrSymbolOrString),
stores,
store,
stores.read(store, 0),
1,
arraySizeProfile,
loopProfile);
}

@Specialization(
guards = {
"!isEmptyArray(array)",
"wasProvided(initialOrSymbolOrString)" },
limit = "storageStrategyLimit()")
Object injectSymbolWithInitial(
VirtualFrame frame,
RubyArray array,
Object initialOrSymbolOrString,
RubyString symbolOrString,
Nil block,
@Bind("array.getStore()") Object store,
@CachedLibrary("store") ArrayStoreLibrary stores,
@Cached @Shared IntValueProfile arraySizeProfile,
@Cached @Exclusive LoopConditionProfile loopProfile,
@Cached @Shared ToJavaStringNode toJavaString) {
return injectSymbolHelper(
frame,
array,
toJavaString.execute(this, symbolOrString),
stores,
store,
initialOrSymbolOrString,
0,
arraySizeProfile,
loopProfile);
}

private Object injectSymbolHelper(VirtualFrame frame, RubyArray array, String symbolOrString,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private Object injectSymbolHelper(VirtualFrame frame, RubyArray array, String symbolOrString,
private Object injectSymbolHelper(VirtualFrame frame, RubyArray array, String method,

ArrayStoreLibrary stores, Object store, Object initial, int start,
IntValueProfile arraySizeProfile, LoopConditionProfile loopProfile) {
Object accumulator = initial;
int n = start;
try {
for (; loopProfile.inject(n < arraySizeProfile.profile(array.size)); n++) {
accumulator = dispatch.callWithFrame(PUBLIC, frame, accumulator, symbol, stores.read(store, n));
accumulator = dispatch.callWithFrame(PUBLIC, frame, accumulator, symbolOrString,
stores.read(store, n));
TruffleSafepoint.poll(this);
}
} finally {
Expand Down