Skip to content

[JRuby] Optimize scan(): Use strBL.getBegin() + curr instead of currPtr() #109

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

Merged
kou merged 1 commit into from
Oct 16, 2024
Merged

[JRuby] Optimize scan(): Use strBL.getBegin() + curr instead of currPtr() #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,20 +263,18 @@ private IRubyObject extractBegLen(Ruby runtime, int beg, int len) {
private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succptr, boolean getstr, boolean headonly) {
final Ruby runtime = context.runtime;
check(context);

ByteList strBL = str.getByteList();
int strBeg = strBL.getBegin();

clearMatched();

if (restLen() < 0) {
return context.nil;
}

ByteList strBL = str.getByteList();
int currPtr = strBL.getBegin() + curr;

if (regex instanceof RubyRegexp) {
pattern = ((RubyRegexp) regex).preparePattern(str);

int currPtr = currPtr();
int range = currPtr + restLen();

Matcher matcher = pattern.matcher(strBL.getUnsafeBytes(), matchTarget(), range);
Expand Down Expand Up @@ -311,12 +309,12 @@ private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succp
int patternSize = patternBL.realSize();

if (headonly) {
if (ByteList.memcmp(strBL.unsafeBytes(), strBeg + curr, patternBL.unsafeBytes(), patternBL.begin(), patternSize) != 0) {
if (ByteList.memcmp(strBL.unsafeBytes(), currPtr, patternBL.unsafeBytes(), patternBL.begin(), patternSize) != 0) {
return context.nil;
}
setRegisters(patternSize);
} else {
int pos = StringSupport.index(strBL, patternBL, strBeg + curr, patternEnc);
int pos = StringSupport.index(strBL, patternBL, currPtr, patternEnc);
if (pos == -1) {
return context.nil;
}
Expand Down