Skip to content

Commit 7fa0692

Browse files
andrykonchinandrykonchin
committed
Rename methods of class ImmutableStrings to get rid of "frozen" term
1 parent 8726165 commit 7fa0692

File tree

12 files changed

+25
-26
lines changed

12 files changed

+25
-26
lines changed

‎src/main/java/org/truffleruby/RubyContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ public GlobalVariableStorage getGlobalVariableStorage(int index) {
765765
}
766766

767767
public void initializeMainScriptName(String mainScriptName) {
768-
ImmutableRubyString mainScriptString = language.getFrozenStringLiteral(TStringUtils.utf8TString(mainScriptName),
768+
ImmutableRubyString mainScriptString = language.getImmutableString(TStringUtils.utf8TString(mainScriptName),
769769
Encodings.UTF_8);
770770

771771
int index = language.getGlobalVariableIndex("$0");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -877,13 +877,13 @@ public AllocationReporter getAllocationReporter() {
877877
return allocationReporter;
878878
}
879879

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

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

889889
public long getNextObjectID() {

‎src/main/java/org/truffleruby/core/CoreLibrary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ private void setConstant(RubyModule module, String name, Object value) {
728728
}
729729

730730
private ImmutableRubyString frozenUSASCIIString(String string) {
731-
return language.getFrozenStringLiteral(TStringUtils.usAsciiString(string), Encodings.US_ASCII);
731+
return language.getImmutableString(TStringUtils.usAsciiString(string), Encodings.US_ASCII);
732732
}
733733

734734
private RubyClass defineClass(String name) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private static Encoding createDummyEncoding() {
134134
@TruffleBoundary
135135
public static RubyEncoding newRubyEncoding(RubyLanguage language, Encoding encoding, int index, byte[] name) {
136136
var tstring = TStringUtils.fromByteArray(name, Encodings.US_ASCII);
137-
final ImmutableRubyString string = language.getFrozenStringLiteral(tstring, Encodings.US_ASCII);
137+
final ImmutableRubyString string = language.getImmutableString(tstring, Encodings.US_ASCII);
138138

139139
return new RubyEncoding(encoding, string, index);
140140
}

‎src/main/java/org/truffleruby/core/module/ModuleFields.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ public void setFullName(String name) {
787787
private void setName(String name) {
788788
this.name = name;
789789
if (hasPartialName()) {
790-
this.rubyStringName = languageForSetName.getFrozenStringLiteral(TStringUtils.utf8TString(name),
790+
this.rubyStringName = languageForSetName.getImmutableString(TStringUtils.utf8TString(name),
791791
Encodings.UTF_8);
792792
} else {
793793
this.rubyStringName = null;

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

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

4444
import java.util.Objects;
4545

46-
/** All ImmutableRubyString are interned and must be created through
47-
* {@link ImmutableStrings#getFrozenStringLiteral}. */
46+
/** All ImmutableRubyString are interned and must be created through {@link ImmutableStrings#getImmutableString}. */
4847
@ExportLibrary(InteropLibrary.class)
4948
public final class ImmutableRubyString extends ImmutableRubyObjectCopyable
5049
implements TruffleObject, DetailedInspectingSupport {

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

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

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

4646
@TruffleBoundary
47-
public ImmutableRubyString getFrozenStringLiteral(InternalByteArray byteArray, boolean isImmutable,
47+
public ImmutableRubyString getImmutableString(InternalByteArray byteArray, boolean isImmutable,
4848
RubyEncoding encoding) {
4949
// Ensure all ImmutableRubyString have a TruffleString from the TStringCache
5050
var cachedTString = tstringCache.getTString(byteArray, isImmutable, encoding);
@@ -59,7 +59,7 @@ public ImmutableRubyString getFrozenStringLiteral(InternalByteArray byteArray, b
5959
}
6060

6161
@TruffleBoundary
62-
public ImmutableRubyString getFrozenStringLiteral(byte[] bytes, RubyEncoding encoding) {
62+
public ImmutableRubyString getImmutableString(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);
@@ -80,7 +80,7 @@ public static ImmutableRubyString createStringAndCacheLater(TruffleString name,
8080
return string;
8181
}
8282

83-
private void addFrozenStringToCache(ImmutableRubyString string) {
83+
private void addImmutableStringToCache(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 addFrozenStringToCache(ImmutableRubyString string) {
9393
}
9494

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

‎src/main/java/org/truffleruby/core/string/StringNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4404,7 +4404,7 @@ ImmutableRubyString internString(RubyString string,
44044404
@Cached TruffleString.GetInternalByteArrayNode getInternalByteArrayNode) {
44054405
var encoding = libString.getEncoding(this, string);
44064406
var byteArray = getInternalByteArrayNode.execute(string.tstring, encoding.tencoding);
4407-
return getLanguage().getFrozenStringLiteral(byteArray,
4407+
return getLanguage().getImmutableString(byteArray,
44084408
TStringUtils.hasImmutableInternalByteArray(string.tstring), encoding);
44094409
}
44104410
}

‎src/main/java/org/truffleruby/core/symbol/RubySymbol.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public String toString() {
103103

104104
public ImmutableRubyString getName(RubyLanguage language) {
105105
if (name == null) {
106-
name = language.getFrozenStringLiteral(tstring, encoding);
106+
name = language.getImmutableString(tstring, encoding);
107107
}
108108
return name;
109109
}

‎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.allFrozenStrings());
118+
roots.addAll(language.immutableStrings.allImmutableStrings());
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ public RubyNode visitCallNode(Nodes.CallNode node) {
663663
if (node.receiver instanceof Nodes.StringNode stringNode &&
664664
(methodName.equals("freeze") || methodName.equals("-@") || methodName.equals("dedup"))) {
665665
final TruffleString tstring = TStringUtils.fromByteArray(stringNode.unescaped, sourceEncoding);
666-
final ImmutableRubyString frozenString = language.getFrozenStringLiteral(tstring, sourceEncoding);
666+
final ImmutableRubyString frozenString = language.getImmutableString(tstring, sourceEncoding);
667667
final RubyNode rubyNode = new FrozenStringLiteralNode(frozenString, FrozenStrings.METHOD);
668668

669669
return assignPositionAndFlags(node, rubyNode);
@@ -1598,7 +1598,7 @@ public RubyNode visitEmbeddedStatementsNode(Nodes.EmbeddedStatementsNode node) {
15981598
if (node.statements == null) {
15991599
// empty interpolation expression, e.g. in "a #{} b"
16001600
RubyNode rubyNode = new ObjectLiteralNode(
1601-
language.getFrozenStringLiteral(sourceEncoding.tencoding.getEmpty(), sourceEncoding));
1601+
language.getImmutableString(sourceEncoding.tencoding.getEmpty(), sourceEncoding));
16021602
return assignPositionAndFlags(node, rubyNode);
16031603
}
16041604

@@ -1952,7 +1952,7 @@ public RubyNode visitHashNode(Nodes.HashNode node) {
19521952

19531953
// String literals in a key position become frozen
19541954
if (keyNode instanceof StringLiteralNode stringNode) {
1955-
var frozenString = language.getFrozenStringLiteral(stringNode.getTString(),
1955+
var frozenString = language.getImmutableString(stringNode.getTString(),
19561956
stringNode.getEncoding());
19571957
keyNode = new FrozenStringLiteralNode(frozenString, FrozenStrings.EXPRESSION);
19581958
}
@@ -3253,8 +3253,8 @@ 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.immutableStrings.getFrozenStringLiteral(bytes, encoding);
3257-
rubyNode = new FrozenStringLiteralNode(frozenString, FrozenStrings.EXPRESSION);
3256+
ImmutableRubyString immutableString = language.immutableStrings.getImmutableString(bytes, encoding);
3257+
rubyNode = new FrozenStringLiteralNode(immutableString, FrozenStrings.EXPRESSION);
32583258
}
32593259

32603260
return assignPositionAndFlags(node, rubyNode);

‎src/main/java/org/truffleruby/platform/DefaultNativeConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected static RubyBignum newBignum(String value) {
5656
protected static ImmutableRubyString string(RubyContext context, String value) {
5757
return context
5858
.getLanguageSlow()
59-
.getFrozenStringLiteral(TStringUtils.utf8TString(value), Encodings.UTF_8);
59+
.getImmutableString(TStringUtils.utf8TString(value), Encodings.UTF_8);
6060
}
6161

6262
}

0 commit comments

Comments
 (0)