Skip to content

Commit 8726165

Browse files
committed
Rename class FrozenStringLiterals to ImmutableStrings
1 parent 241afc9 commit 8726165

File tree

8 files changed

+17
-18
lines changed

8 files changed

+17
-18
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
import org.truffleruby.core.regexp.RegexpTable;
8888
import org.truffleruby.core.regexp.RubyMatchData;
8989
import org.truffleruby.core.regexp.RubyRegexp;
90+
import org.truffleruby.core.string.ImmutableStrings;
9091
import org.truffleruby.core.string.PathToTStringCache;
9192
import org.truffleruby.core.string.TStringCache;
9293
import org.truffleruby.core.string.CoreStrings;
93-
import org.truffleruby.core.string.FrozenStringLiterals;
9494
import org.truffleruby.core.string.RubyString;
9595
import org.truffleruby.core.string.StringUtils;
9696
import org.truffleruby.core.string.TStringWithEncoding;
@@ -272,7 +272,7 @@ private RubyThread getOrCreateForeignThread(RubyContext context, Thread thread)
272272
public final RegexpTable regexpTable;
273273
public final SymbolTable symbolTable;
274274
public final KeywordArgumentsDescriptorManager keywordArgumentsDescriptorManager = new KeywordArgumentsDescriptorManager();
275-
public final FrozenStringLiterals frozenStringLiterals;
275+
public final ImmutableStrings immutableStrings;
276276

277277
// GR-44025: We store the cleanerThread explicitly here to make it a clear image building failure if it would still be set.
278278
public Thread cleanerThread = null;
@@ -385,7 +385,7 @@ public RubyLanguage() {
385385
tstringCache = new TStringCache(coreSymbols);
386386
symbolTable = new SymbolTable(tstringCache, coreSymbols);
387387
regexpTable = new RegexpTable();
388-
frozenStringLiterals = new FrozenStringLiterals(tstringCache);
388+
immutableStrings = new ImmutableStrings(tstringCache);
389389
}
390390

391391
public RubyThread getCurrentThread() {
@@ -878,12 +878,12 @@ public AllocationReporter getAllocationReporter() {
878878
}
879879

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

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

889889
public long getNextObjectID() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.graalvm.shadowed.org.jcodings.specific.UTF32LEEncoding;
2929
import org.graalvm.shadowed.org.jcodings.specific.UTF8Encoding;
3030
import org.truffleruby.RubyLanguage;
31-
import org.truffleruby.core.string.FrozenStringLiterals;
31+
import org.truffleruby.core.string.ImmutableStrings;
3232
import org.truffleruby.core.string.ImmutableRubyString;
3333
import org.truffleruby.core.string.StringOperations;
3434
import org.truffleruby.core.string.TStringConstants;
@@ -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 = FrozenStringLiterals.createStringAndCacheLater(tstring, US_ASCII);
116+
final ImmutableRubyString name = ImmutableStrings.createStringAndCacheLater(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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.truffleruby.RubyContext;
2222
import org.truffleruby.core.kernel.KernelNodes;
2323
import org.truffleruby.core.klass.RubyClass;
24-
import org.truffleruby.core.string.FrozenStringLiterals;
24+
import org.truffleruby.core.string.ImmutableStrings;
2525
import org.truffleruby.core.string.ImmutableRubyString;
2626
import org.truffleruby.language.ImmutableRubyObjectNotCopyable;
2727
import org.truffleruby.core.string.TStringConstants;
@@ -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-
FrozenStringLiterals.createStringAndCacheLater(TStringConstants.US_ASCII, this));
82+
ImmutableStrings.createStringAndCacheLater(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 = FrozenStringLiterals.createStringAndCacheLater(
24+
public static final ImmutableRubyString EMPTY_US_ASCII = ImmutableStrings.createStringAndCacheLater(
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 FrozenStringLiterals.createStringAndCacheLater(tstring, encoding);
53+
return ImmutableStrings.createStringAndCacheLater(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
@@ -44,7 +44,7 @@
4444
import java.util.Objects;
4545

4646
/** All ImmutableRubyString are interned and must be created through
47-
* {@link FrozenStringLiterals#getFrozenStringLiteral}. */
47+
* {@link ImmutableStrings#getFrozenStringLiteral}. */
4848
@ExportLibrary(InteropLibrary.class)
4949
public final class ImmutableRubyString extends ImmutableRubyObjectCopyable
5050
implements TruffleObject, DetailedInspectingSupport {

src/main/java/org/truffleruby/core/string/FrozenStringLiterals.java renamed to src/main/java/org/truffleruby/core/string/ImmutableStrings.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import java.util.Collection;
2222
import java.util.List;
2323

24-
// TODO: should rename to ImmutableStrings
25-
public final class FrozenStringLiterals {
24+
public final class ImmutableStrings {
2625

2726
private static final List<ImmutableRubyString> STRINGS_TO_CACHE = new ArrayList<>();
2827

2928
private final TStringCache tstringCache;
3029
private final WeakValueCache<TStringWithEncoding, ImmutableRubyString> values = new WeakValueCache<>();
3130

32-
public FrozenStringLiterals(TStringCache tStringCache) {
31+
public ImmutableStrings(TStringCache tStringCache) {
3332
this.tstringCache = tStringCache;
3433
for (ImmutableRubyString name : STRINGS_TO_CACHE) {
3534
addFrozenStringToCache(name);
@@ -89,7 +88,7 @@ private void addFrozenStringToCache(ImmutableRubyString string) {
8988
final ImmutableRubyString existing = values.addInCacheIfAbsent(tstringWithEncoding, string);
9089
if (existing != string) {
9190
throw CompilerDirectives
92-
.shouldNotReachHere("Duplicate ImmutableRubyString in FrozenStringLiterals: " + existing);
91+
.shouldNotReachHere("Duplicate ImmutableRubyString in ImmutableStrings: " + existing);
9392
}
9493
}
9594

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.frozenStringLiterals.allFrozenStrings());
118+
roots.addAll(language.immutableStrings.allFrozenStrings());
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 frozenString = language.frozenStringLiterals.getFrozenStringLiteral(bytes, encoding);
3256+
ImmutableRubyString frozenString = language.immutableStrings.getFrozenStringLiteral(bytes, encoding);
32573257
rubyNode = new FrozenStringLiteralNode(frozenString, FrozenStrings.EXPRESSION);
32583258
}
32593259

0 commit comments

Comments
 (0)