Skip to content

JRuby extension: drop old-Joni-version support #76

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
headius merged 4 commits into from
Jan 14, 2024
Merged

JRuby extension: drop old-Joni-version support #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2d5722
JRuby extension: drop old-Joni-version support
olleolleolle Jan 10, 2024
1a51039
RubyStringScanner.java: Drop unused FactoryRegionAdapter
olleolleolle Jan 12, 2024
951c2c8
CI: Use JRuby latest GA release
olleolleolle Jan 12, 2024
ef23309
Merge branch 'master' into jruby-drop-old-joni-support
olleolleolle Jan 13, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- debug
# We need to update 'jruby-XXX' in "if:" too when we update
# this.
- jruby-9.4.1.0
- jruby-9.4.5.0
- truffleruby
- truffleruby-head
include:
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/upload-artifact@v4
if: >-
matrix.os == 'ubuntu-latest' &&
(matrix.ruby == '3.1' || matrix.ruby == 'jruby-9.4.1.0')
(matrix.ruby == '3.1' || matrix.ruby == 'jruby-9.4.5.0')
with:
name: gem-${{ matrix.os }}-${{ matrix.ruby }}
path: pkg/
Expand All @@ -70,7 +70,7 @@ jobs:
if: >-
startsWith(github.ref, 'refs/tags/') &&
matrix.os == 'ubuntu-latest' &&
(matrix.ruby == '3.1' || matrix.ruby == 'jruby-9.4.1.0')
(matrix.ruby == '3.1' || matrix.ruby == 'jruby-9.4.5.0')
run: |
ruby \
-e 'print("## strscan "); \
Expand Down
149 changes: 28 additions & 121 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 @@ -102,99 +102,6 @@ public static RubyClass createScannerClass(final Ruby runtime) {
return scannerClass;
}

// Provided temporarily to bridge the gap between joni 2.1 and 2.2
private static final RegionAdapter REGION_ADAPTER;
static {
RegionAdapter adapter;
try {
Region.class.getMethod("newRegion", int.class, int.class);
// ok, proceed with factory-based adapter
adapter = new FactoryRegionAdapter();
} catch (NoSuchMethodException | SecurityException ex) {
adapter = new OldRegionAdapter();
}
REGION_ADAPTER = adapter;
}

private interface RegionAdapter {
Region newRegion(int beg, int end);
int getBeg(Region region, int index);
int getEnd(Region region, int index);
int setBeg(Region region, int index, int value);
int setEnd(Region region, int index, int value);
int getNumRegs(Region region);
}

private static class OldRegionAdapter implements RegionAdapter {
@Override
@SuppressWarnings("deprecation")
public Region newRegion(int beg, int end) {
return new Region(beg, end);
}

@Override
@SuppressWarnings("deprecation")
public int getBeg(Region region, int index) {
return region.beg[index];
}

@Override
@SuppressWarnings("deprecation")
public int getEnd(Region region, int index) {
return region.end[index];
}

@Override
@SuppressWarnings("deprecation")
public int setBeg(Region region, int index, int value) {
return region.beg[index] = value;
}

@Override
@SuppressWarnings("deprecation")
public int setEnd(Region region, int index, int value) {
return region.end[index] = value;
}

@Override
@SuppressWarnings("deprecation")
public int getNumRegs(Region region) {
return region.numRegs;
}
}

private static class FactoryRegionAdapter implements RegionAdapter {
@Override
public Region newRegion(int beg, int end) {
return Region.newRegion(beg, end);
}

@Override
public int getBeg(Region region, int index) {
return region.getBeg(index);
}

@Override
public int getEnd(Region region, int index) {
return region.getEnd(index);
}

@Override
public int setBeg(Region region, int index, int value) {
return region.setBeg(index, value);
}

@Override
public int setEnd(Region region, int index, int value) {
return region.setEnd(index, value);
}

@Override
public int getNumRegs(Region region) {
return region.getNumRegs();
}
}

private void clearMatched() {
matched = false;
}
Expand Down Expand Up @@ -224,7 +131,7 @@ public IRubyObject initialize(ThreadContext context, IRubyObject string) {
public IRubyObject initialize(ThreadContext context, IRubyObject string, IRubyObject dupOrOpts) {
this.str = string.convertToString();
this.fixedAnchor = ArgsUtil.extractKeywordArg(context, "fixed_anchor", dupOrOpts).isTrue();
this.regs = REGION_ADAPTER.newRegion(0, 0);
this.regs = Region.newRegion(0, 0);

return this;
}
Expand Down Expand Up @@ -392,7 +299,7 @@ private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succp

Region matchRegion = matcher.getRegion();
if (matchRegion == null) {
regs = REGION_ADAPTER.newRegion(matcher.getBegin(), matcher.getEnd());
regs = Region.newRegion(matcher.getBegin(), matcher.getEnd());
} else {
regs = matchRegion;
}
Expand Down Expand Up @@ -438,17 +345,17 @@ private IRubyObject scan(ThreadContext context, IRubyObject regex, boolean succp

private int lastMatchLength() {
if (fixedAnchor) {
return REGION_ADAPTER.getEnd(regs, 0) - prev;
return regs.getEnd(0) - prev;
} else {
return REGION_ADAPTER.getEnd(regs, 0);
return regs.getEnd(0);
}
}

private void succ() {
if (fixedAnchor) {
this.curr = REGION_ADAPTER.getEnd(regs, 0);
this.curr = regs.getEnd(0);
} else {
this.curr += REGION_ADAPTER.getEnd(regs, 0);
this.curr += regs.getEnd(0);
}
}

Expand All @@ -471,9 +378,9 @@ private int restLen() {
// MRI: set_registers
private void setRegisters(int length) {
if (fixedAnchor) {
regs = REGION_ADAPTER.newRegion(curr, curr + length);
regs = Region.newRegion(curr, curr + length);
} else {
regs = REGION_ADAPTER.newRegion(0, length);
regs = Region.newRegion(0, length);
}
}

Expand Down Expand Up @@ -530,9 +437,9 @@ public IRubyObject search_full(ThreadContext context, IRubyObject regex, IRubyOb
// MRI: adjust_register_to_matched
private void adjustRegisters() {
if (fixedAnchor) {
regs = REGION_ADAPTER.newRegion(prev, curr);
regs = Region.newRegion(prev, curr);
} else {
regs = REGION_ADAPTER.newRegion(0, curr - prev);
regs = Region.newRegion(0, curr - prev);
}
}

Expand Down Expand Up @@ -572,8 +479,8 @@ public IRubyObject getchCommon(ThreadContext context) {
adjustRegisters();

return extractRange(runtime,
adjustRegisterPosition(REGION_ADAPTER.getBeg(regs, 0)),
adjustRegisterPosition(REGION_ADAPTER.getEnd(regs, 0)));
adjustRegisterPosition(regs.getBeg(0)),
adjustRegisterPosition(regs.getEnd(0)));
}

@JRubyMethod(name = "get_byte")
Expand All @@ -589,8 +496,8 @@ public IRubyObject get_byte(ThreadContext context) {
adjustRegisters();

return extractRange(context.runtime,
adjustRegisterPosition(REGION_ADAPTER.getBeg(regs, 0)),
adjustRegisterPosition(REGION_ADAPTER.getEnd(regs, 0)));
adjustRegisterPosition(regs.getBeg(0)),
adjustRegisterPosition(regs.getEnd(0)));
}

@JRubyMethod(name = "getbyte")
Expand Down Expand Up @@ -687,15 +594,15 @@ public IRubyObject matched(ThreadContext context) {
check(context);
if (!isMatched()) return context.nil;
return extractRange(context.runtime,
adjustRegisterPosition(REGION_ADAPTER.getBeg(regs, 0)),
adjustRegisterPosition(REGION_ADAPTER.getEnd(regs, 0)));
adjustRegisterPosition(regs.getBeg(0)),
adjustRegisterPosition(regs.getEnd(0)));
}

@JRubyMethod(name = "matched_size")
public IRubyObject matched_size(ThreadContext context) {
check(context);
if (!isMatched()) return context.nil;
return RubyFixnum.newFixnum(context.runtime, REGION_ADAPTER.getEnd(regs, 0) - REGION_ADAPTER.getBeg(regs, 0));
return RubyFixnum.newFixnum(context.runtime, regs.getEnd(0) - regs.getBeg(0));
}

@JRubyMethod(name = "matchedsize")
Expand Down Expand Up @@ -727,16 +634,16 @@ public IRubyObject op_aref(ThreadContext context, IRubyObject idx) {
}

private IRubyObject extractRegion(ThreadContext context, int i) {
int numRegs = REGION_ADAPTER.getNumRegs(regs);
int numRegs = regs.getNumRegs();

if (i < 0) i += numRegs;
if (i < 0 || i >= numRegs || REGION_ADAPTER.getBeg(regs, i) == -1) {
if (i < 0 || i >= numRegs || regs.getBeg(i) == -1) {
return context.nil;
}

return extractRange(context.runtime,
adjustRegisterPosition(REGION_ADAPTER.getBeg(regs, i)),
adjustRegisterPosition(REGION_ADAPTER.getEnd(regs, i)));
adjustRegisterPosition(regs.getBeg(i)),
adjustRegisterPosition(regs.getEnd(i)));
}

@JRubyMethod(name = "pre_match")
Expand All @@ -745,7 +652,7 @@ public IRubyObject pre_match(ThreadContext context) {
if (!isMatched()) {
return context.nil;
}
return extractRange(context.runtime, 0, adjustRegisterPosition(REGION_ADAPTER.getBeg(regs, 0)));
return extractRange(context.runtime, 0, adjustRegisterPosition(regs.getBeg(0)));
}

@JRubyMethod(name = "post_match")
Expand All @@ -757,7 +664,7 @@ public IRubyObject post_match(ThreadContext context) {
}

return extractRange(context.runtime,
adjustRegisterPosition(REGION_ADAPTER.getEnd(regs, 0)),
adjustRegisterPosition(regs.getEnd(0)),
str.getByteList().getRealSize());
}

Expand Down Expand Up @@ -885,7 +792,7 @@ private IRubyObject inspect2() {
@JRubyMethod(name = "size")
public IRubyObject size(ThreadContext context) {
if (!isMatched()) return context.nil;
return context.runtime.newFixnum(REGION_ADAPTER.getNumRegs(regs));
return context.runtime.newFixnum(regs.getNumRegs());
}

@JRubyMethod(name = "captures")
Expand All @@ -897,17 +804,17 @@ public IRubyObject captures(ThreadContext context) {

Ruby runtime = context.runtime;

numRegs = REGION_ADAPTER.getNumRegs(regs);
numRegs = regs.getNumRegs();
newAry = RubyArray.newArray(runtime, numRegs);

for (i = 1; i < numRegs; i++) {
IRubyObject str;
if (REGION_ADAPTER.getBeg(regs, i) == -1) {
if (regs.getBeg(i) == -1) {
str = context.nil;
} else {
str = extractRange(runtime,
adjustRegisterPosition(REGION_ADAPTER.getBeg(regs, i)),
adjustRegisterPosition(REGION_ADAPTER.getEnd(regs, i)));
adjustRegisterPosition(regs.getBeg(i)),
adjustRegisterPosition(regs.getEnd(i)));
}
newAry.push(str);
}
Expand Down