Skip to content

Commit 7742b80

Browse files
eregonjirkamarsik
authored andcommitted
Refactor MatchData#[] specialization for clarity
1 parent 23b756f commit 7742b80

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/main/java/org/truffleruby/core/regexp/MatchDataNodes.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,19 @@ protected RubyArray getIndex(RubyMatchData matchData, int index, int length,
301301

302302
@Specialization(
303303
guards = {
304-
"name != null",
305-
"getRegexp(matchData) == regexp",
306-
"cachedIndex == index" })
307-
protected Object getIndexSymbolSingleMatch(RubyMatchData matchData, RubySymbol index, NotProvided length,
308-
@Cached("index") RubySymbol cachedIndex,
309-
@Cached("getRegexp(matchData)") RubyRegexp regexp,
310-
@Cached("findNameEntry(regexp, index)") NameEntry name,
311-
@Cached("numBackRefs(name)") int backRefs,
312-
@Cached("backRefIndex(name)") int backRefIndex) {
304+
"nameEntry != null",
305+
"getRegexp(matchData) == cachedRegexp",
306+
"symbol == cachedSymbol" })
307+
protected Object getIndexSymbolKnownRegexp(RubyMatchData matchData, RubySymbol symbol, NotProvided length,
308+
@Cached("symbol") RubySymbol cachedSymbol,
309+
@Cached("getRegexp(matchData)") RubyRegexp cachedRegexp,
310+
@Cached("findNameEntry(cachedRegexp, cachedSymbol)") NameEntry nameEntry,
311+
@Cached("numBackRefs(nameEntry)") int backRefs,
312+
@Cached("backRefIndex(nameEntry)") int backRefIndex) {
313313
if (backRefs == 1) {
314314
return executeGetIndex(matchData, backRefIndex, NotProvided.INSTANCE);
315315
} else {
316-
final int i = getBackRef(matchData, regexp, name);
316+
final int i = getBackRef(matchData, cachedRegexp, nameEntry);
317317
return executeGetIndex(matchData, i, NotProvided.INSTANCE);
318318
}
319319
}
@@ -417,13 +417,13 @@ private int getBackRef(RubyMatchData matchData, RubyRegexp regexp, NameEntry nam
417417
}
418418

419419
@TruffleBoundary
420-
protected static int numBackRefs(NameEntry name) {
421-
return name == null ? 0 : name.getBackRefs().length;
420+
protected static int numBackRefs(NameEntry nameEntry) {
421+
return nameEntry == null ? 0 : nameEntry.getBackRefs().length;
422422
}
423423

424424
@TruffleBoundary
425-
protected static int backRefIndex(NameEntry name) {
426-
return name == null ? 0 : name.getBackRefs()[0];
425+
protected static int backRefIndex(NameEntry nameEntry) {
426+
return nameEntry == null ? 0 : nameEntry.getBackRefs()[0];
427427
}
428428

429429
@TruffleBoundary

0 commit comments

Comments
 (0)