Skip to content

Commit c46dbdc

Browse files
committed
Polish a bit method and parameter names in ImmutableStrings
@wip
1 parent 7fa0692 commit c46dbdc

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

src/main/java/org/truffleruby/RubyLanguage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -878,12 +878,12 @@ public AllocationReporter getAllocationReporter() {
878878
}
879879

880880
public ImmutableRubyString getImmutableString(TruffleString tstring, RubyEncoding encoding) {
881-
return immutableStrings.getImmutableString(tstring, encoding);
881+
return immutableStrings.get(tstring, encoding);
882882
}
883883

884884
public ImmutableRubyString getImmutableString(InternalByteArray byteArray, boolean isImmutable,
885885
RubyEncoding encoding) {
886-
return immutableStrings.getImmutableString(byteArray, isImmutable, encoding);
886+
return immutableStrings.get(byteArray, isImmutable, encoding);
887887
}
888888

889889
public long getNextObjectID() {

src/main/java/org/truffleruby/core/encoding/Encodings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private static RubyEncoding[] initializeRubyEncodings() {
113113
if (tstring == null) {
114114
throw CompilerDirectives.shouldNotReachHere("no TStringConstants for " + encoding);
115115
}
116-
final ImmutableRubyString name = ImmutableStrings.createStringAndCacheLater(tstring, US_ASCII);
116+
final ImmutableRubyString name = ImmutableStrings.createAndCacheLater(tstring, US_ASCII);
117117
rubyEncoding = new RubyEncoding(encoding, name, index);
118118
}
119119
encodings[index] = rubyEncoding;

src/main/java/org/truffleruby/core/encoding/RubyEncoding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public RubyEncoding(int index) {
7979
this.jcoding = Objects.requireNonNull(USASCIIEncoding.INSTANCE);
8080
this.tencoding = Objects.requireNonNull(TruffleString.Encoding.US_ASCII);
8181
this.name = Objects.requireNonNull(
82-
ImmutableStrings.createStringAndCacheLater(TStringConstants.US_ASCII, this));
82+
ImmutableStrings.createAndCacheLater(TStringConstants.US_ASCII, this));
8383
this.index = index;
8484

8585
var jcoding = this.jcoding;

src/main/java/org/truffleruby/core/string/FrozenStrings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public final class FrozenStrings {
2121

2222
static final List<TruffleString> TSTRINGS = new ArrayList<>();
2323

24-
public static final ImmutableRubyString EMPTY_US_ASCII = ImmutableStrings.createStringAndCacheLater(
24+
public static final ImmutableRubyString EMPTY_US_ASCII = ImmutableStrings.createAndCacheLater(
2525
TStringConstants.EMPTY_US_ASCII,
2626
Encodings.US_ASCII);
2727

@@ -50,7 +50,7 @@ private static ImmutableRubyString createFrozenStaticString(String string, RubyE
5050
// defined?(...) returns frozen strings with a binary encoding
5151
var tstring = TStringUtils.fromJavaString(string, encoding);
5252
TSTRINGS.add(tstring);
53-
return ImmutableStrings.createStringAndCacheLater(tstring, encoding);
53+
return ImmutableStrings.createAndCacheLater(tstring, encoding);
5454
}
5555

5656
}

src/main/java/org/truffleruby/core/string/ImmutableRubyString.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
import java.util.Objects;
4545

46-
/** All ImmutableRubyString are interned and must be created through {@link ImmutableStrings#getImmutableString}. */
46+
/** All ImmutableRubyString are interned and must be created through {@link ImmutableStrings#get}. */
4747
@ExportLibrary(InteropLibrary.class)
4848
public final class ImmutableRubyString extends ImmutableRubyObjectCopyable
4949
implements TruffleObject, DetailedInspectingSupport {

src/main/java/org/truffleruby/core/string/ImmutableStrings.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ public final class ImmutableStrings {
3131
public ImmutableStrings(TStringCache tStringCache) {
3232
this.tstringCache = tStringCache;
3333
for (ImmutableRubyString name : STRINGS_TO_CACHE) {
34-
addImmutableStringToCache(name);
34+
addToCache(name);
3535
}
3636
}
3737

3838
@TruffleBoundary
39-
public ImmutableRubyString getImmutableString(TruffleString tstring, RubyEncoding encoding) {
40-
return getImmutableString(
39+
public ImmutableRubyString get(TruffleString tstring, RubyEncoding encoding) {
40+
return get(
4141
tstring.getInternalByteArrayUncached(encoding.tencoding),
4242
TStringUtils.hasImmutableInternalByteArray(tstring),
4343
encoding);
4444
}
4545

4646
@TruffleBoundary
47-
public ImmutableRubyString getImmutableString(InternalByteArray byteArray, boolean isImmutable,
47+
public ImmutableRubyString get(InternalByteArray byteArray, boolean isLookupKeyImmutable,
4848
RubyEncoding encoding) {
4949
// Ensure all ImmutableRubyString have a TruffleString from the TStringCache
50-
var cachedTString = tstringCache.getTString(byteArray, isImmutable, encoding);
50+
var cachedTString = tstringCache.getTString(byteArray, isLookupKeyImmutable, encoding);
5151
var tstringWithEncoding = new TStringWithEncoding(cachedTString, encoding);
5252

5353
final ImmutableRubyString string = values.get(tstringWithEncoding);
@@ -59,7 +59,7 @@ public ImmutableRubyString getImmutableString(InternalByteArray byteArray, boole
5959
}
6060

6161
@TruffleBoundary
62-
public ImmutableRubyString getImmutableString(byte[] bytes, RubyEncoding encoding) {
62+
public ImmutableRubyString get(byte[] bytes, RubyEncoding encoding) {
6363
// Ensure all ImmutableRubyString have a TruffleString from the TStringCache
6464
var cachedTString = tstringCache.getTString(bytes, encoding);
6565
var tstringWithEncoding = new TStringWithEncoding(cachedTString, encoding);
@@ -72,15 +72,15 @@ public ImmutableRubyString getImmutableString(byte[] bytes, RubyEncoding encodin
7272
}
7373
}
7474

75-
public static ImmutableRubyString createStringAndCacheLater(TruffleString name,
75+
public static ImmutableRubyString createAndCacheLater(TruffleString name,
7676
RubyEncoding encoding) {
7777
final ImmutableRubyString string = new ImmutableRubyString(name, encoding);
7878
assert !STRINGS_TO_CACHE.contains(string);
7979
STRINGS_TO_CACHE.add(string);
8080
return string;
8181
}
8282

83-
private void addImmutableStringToCache(ImmutableRubyString string) {
83+
private void addToCache(ImmutableRubyString string) {
8484
var encoding = string.getEncodingUncached();
8585
var cachedTString = tstringCache.getTString(string.tstring, encoding);
8686
assert cachedTString == string.tstring;
@@ -93,7 +93,7 @@ private void addImmutableStringToCache(ImmutableRubyString string) {
9393
}
9494

9595
@TruffleBoundary
96-
public Collection<ImmutableRubyString> allImmutableStrings() {
96+
public Collection<ImmutableRubyString> all() {
9797
return values.values();
9898
}
9999

src/main/java/org/truffleruby/language/objects/ObjectGraph.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void run(RubyThread rubyThread, Node currentNode) {
115115
public static void visitContextRoots(RubyContext context, Set<Object> roots) {
116116
final RubyLanguage language = context.getLanguageSlow();
117117
roots.addAll(language.symbolTable.allSymbols());
118-
roots.addAll(language.immutableStrings.allImmutableStrings());
118+
roots.addAll(language.immutableStrings.all());
119119

120120
// We do not want to expose the global object
121121
roots.addAll(context.getCoreLibrary().globalVariables.objectGraphValues());

src/main/java/org/truffleruby/parser/YARPTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3253,7 +3253,7 @@ public RubyNode visitStringNode(Nodes.StringNode node) {
32533253
final TruffleString cachedTString = language.tstringCache.getTString(bytes, encoding);
32543254
rubyNode = new StringLiteralNode(cachedTString, encoding);
32553255
} else {
3256-
ImmutableRubyString immutableString = language.immutableStrings.getImmutableString(bytes, encoding);
3256+
ImmutableRubyString immutableString = language.immutableStrings.get(bytes, encoding);
32573257
rubyNode = new FrozenStringLiteralNode(immutableString, FrozenStrings.EXPRESSION);
32583258
}
32593259

0 commit comments

Comments
 (0)