Skip to content

[JRuby] Optimize scan(): Remove duplicate if (restLen() < patternsize()) return context.nil; checks in !headonly. #110

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 19, 2024
Merged

[JRuby] Optimize scan(): Remove duplicate if (restLen() < patternsize()) return context.nil; checks in !headonly. #110

Show file tree
Hide file tree
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
14 changes: 6 additions & 8 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 @@ -265,7 +265,8 @@ private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succp
check(context);
clearMatched();

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

Expand All @@ -275,7 +276,7 @@ private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succp
if (regex instanceof RubyRegexp) {
pattern = ((RubyRegexp) regex).preparePattern(str);

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

Matcher matcher = pattern.matcher(strBL.getUnsafeBytes(), matchTarget(), range);
final int ret;
Expand All @@ -298,17 +299,14 @@ private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succp
if (ret < 0) return context.nil;
} else {
RubyString pattern = regex.convertToString();

Encoding patternEnc = str.checkEncoding(pattern);

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

ByteList patternBL = pattern.getByteList();
int patternSize = patternBL.realSize();

if (headonly) {
if (restLen < pattern.size()) {
return context.nil;
}
if (ByteList.memcmp(strBL.unsafeBytes(), currPtr, patternBL.unsafeBytes(), patternBL.begin(), patternSize) != 0) {
return context.nil;
}
Expand Down
6 changes: 6 additions & 0 deletions test/strscan/test_stringscanner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,9 @@ def test_scan_string
s = create_string_scanner(str, false)
matched = s.scan('str')
assert_equal 'str', matched

s = create_string_scanner("str")
assert_equal nil, s.scan("str\0\0")
end

def test_skip
Expand Down Expand Up @@ -710,6 +713,9 @@ def test_scan_until_string
assert_equal(nil, s.skip_until("Qux"))
assert_equal("\u0000Baz", s.scan_until("Baz"))
assert_equal(11, s.pos)

s = create_string_scanner("str")
assert_equal nil, s.scan_until("str\0\0")
end

def test_skip_until
Expand Down