-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Truffle] Implemented the
string_splice
primitive for rope buffers.
This is necessary for methods like String#[]= to work well with rope buffers.
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
Showing
2 changed files
with
43 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1505,7 +1505,7 @@ public Object spliceAppend(DynamicObject string, DynamicObject other, int splice | |
return string; | ||
} | ||
|
||
@Specialization(guards = { "!indexAtEitherBounds(string, spliceByteIndex)", "isRubyString(other)", "isRubyEncoding(rubyEncoding)" }) | ||
@Specialization(guards = { "!indexAtEitherBounds(string, spliceByteIndex)", "isRubyString(other)", "isRubyEncoding(rubyEncoding)", "!isRopeBuffer(string)" }) | ||
public DynamicObject splice(DynamicObject string, DynamicObject other, int spliceByteIndex, int byteCountToReplace, DynamicObject rubyEncoding) { | ||
if (leftMakeSubstringNode == null) { | ||
CompilerDirectives.transferToInterpreter(); | ||
|
@@ -1542,6 +1542,39 @@ public DynamicObject splice(DynamicObject string, DynamicObject other, int splic | |
return string; | ||
} | ||
|
||
@Specialization(guards = { "!indexAtEitherBounds(string, spliceByteIndex)", "isRubyString(other)", "isRubyEncoding(rubyEncoding)", "isRopeBuffer(string)" }) | ||
public DynamicObject spliceBuffer(DynamicObject string, DynamicObject other, int spliceByteIndex, int byteCountToReplace, DynamicObject rubyEncoding, | ||
@Cached("createBinaryProfile()") ConditionProfile sameCodeRangeProfile, | ||
@Cached("createBinaryProfile()") ConditionProfile brokenCodeRangeProfile) { | ||
final Encoding encoding = EncodingOperations.getEncoding(rubyEncoding); | ||
final RopeBuffer source = (RopeBuffer) rope(string); | ||
final Rope insert = rope(other); | ||
final int rightSideStartingIndex = spliceByteIndex + byteCountToReplace; | ||
|
||
final ByteList byteList = new ByteList(source.byteLength() + insert.byteLength() - byteCountToReplace); | ||
|
||
byteList.append(source.getByteList(), 0, spliceByteIndex); | ||
|
||
for (int i = 0; i < insert.byteLength(); i++) { | ||
byteList.append(insert.getBytes()[i]); | ||
} | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
nirvdrum
Author
Contributor
|
||
|
||
byteList.append(source.getByteList(), rightSideStartingIndex, source.byteLength() - rightSideStartingIndex); | ||
byteList.setEncoding(encoding); | ||
|
||
// NB: The character count is only accurate for single byte-optimizable strings. Rope buffers are not supported | ||
// in general use. If we want to allow for wide characters we would need to recalculate the length doing a | ||
// full scan. | ||
final Rope buffer = new RopeBuffer(byteList, | ||
RopeNodes.MakeConcatNode.commonCodeRange(source.getCodeRange(), insert.getCodeRange(), sameCodeRangeProfile, brokenCodeRangeProfile), | ||
source.isSingleByteOptimizable() && insert.isSingleByteOptimizable(), | ||
source.characterLength() + insert.characterLength() - byteCountToReplace); | ||
|
||
StringOperations.setRope(string, buffer); | ||
|
||
return string; | ||
} | ||
|
||
protected boolean indexAtStartBound(int index) { | ||
return index == 0; | ||
} | ||
|
@@ -1557,6 +1590,12 @@ protected boolean indexAtEitherBounds(DynamicObject string, int index) { | |
|
||
return indexAtStartBound(index) || indexAtEndBound(string, index); | ||
} | ||
|
||
protected boolean isRopeBuffer(DynamicObject string) { | ||
assert RubyGuards.isRubyString(string); | ||
|
||
return rope(string) instanceof RopeBuffer; | ||
} | ||
} | ||
|
||
@RubiniusPrimitive(name = "string_to_inum") | ||
|
Why a loop instead of the 3-args version of
append
?