Skip to content

Commit 8da615f

Browse files
andrykonchinandrykonchin
committed
Rename ToStringNode and ReadStringNode
1 parent a65bde3 commit 8da615f

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎src/main/java/org/truffleruby/core/format/convert/ToStringNode.java renamed to ‎src/main/java/org/truffleruby/core/format/convert/ToStringOrDefaultValueNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.truffleruby.language.dispatch.DispatchConfiguration.PRIVATE_RETURN_MISSING;
3636

3737
@NodeChild("value")
38-
public abstract class ToStringNode extends FormatNode {
38+
public abstract class ToStringOrDefaultValueNode extends FormatNode {
3939

4040
protected final boolean convertNumbersToStrings;
4141
private final String conversionMethod;
@@ -47,15 +47,15 @@ public abstract class ToStringNode extends FormatNode {
4747
@Child private DispatchNode toSNode;
4848
@Child private KernelNodes.ToSNode inspectNode;
4949

50-
public ToStringNode(
50+
public ToStringOrDefaultValueNode(
5151
boolean convertNumbersToStrings,
5252
String conversionMethod,
5353
boolean inspectOnConversionFailure,
5454
Object valueOnNil) {
5555
this(convertNumbersToStrings, conversionMethod, inspectOnConversionFailure, valueOnNil, false);
5656
}
5757

58-
public ToStringNode(
58+
public ToStringOrDefaultValueNode(
5959
boolean convertNumbersToStrings,
6060
String conversionMethod,
6161
boolean inspectOnConversionFailure,

‎src/main/java/org/truffleruby/core/format/pack/SimplePackTreeBuilder.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.truffleruby.core.format.read.SourceNode;
3737
import org.truffleruby.core.format.read.array.ReadDoubleNodeGen;
3838
import org.truffleruby.core.format.read.array.ReadLongOrBigIntegerNodeGen;
39-
import org.truffleruby.core.format.read.array.ReadStringNodeGen;
39+
import org.truffleruby.core.format.read.array.ReadStringOrDefaultValueNodeGen;
4040
import org.truffleruby.core.format.read.array.ReadValueNodeGen;
4141
import org.truffleruby.core.format.write.bytes.WriteBERNodeGen;
4242
import org.truffleruby.core.format.write.bytes.WriteBase64StringNodeGen;
@@ -154,7 +154,7 @@ public void uuString(int count) {
154154
appendNode(WriteUUStringNodeGen.create(
155155
starLength.getLength(),
156156
starLength.isStar(),
157-
ReadStringNodeGen.create(
157+
ReadStringOrDefaultValueNodeGen.create(
158158
false,
159159
"to_str",
160160
false,
@@ -180,7 +180,7 @@ public void mimeString(int count) {
180180

181181
appendNode(WriteMIMEStringNodeGen.create(
182182
length,
183-
ReadStringNodeGen.create(
183+
ReadStringOrDefaultValueNodeGen.create(
184184
true,
185185
"to_s",
186186
true,
@@ -197,7 +197,7 @@ public void base64String(int count) {
197197
appendNode(WriteBase64StringNodeGen.create(
198198
starLength.getLength(),
199199
starLength.isStar(),
200-
ReadStringNodeGen.create(
200+
ReadStringOrDefaultValueNodeGen.create(
201201
false,
202202
"to_str",
203203
false,
@@ -383,7 +383,7 @@ private void binaryString(byte padding, boolean padOnNull, boolean appendNull, i
383383
padding,
384384
takeAll,
385385
appendNull,
386-
ReadStringNodeGen.create(
386+
ReadStringOrDefaultValueNodeGen.create(
387387
false,
388388
"to_str",
389389
false,
@@ -399,7 +399,7 @@ private void bitString(ByteOrder byteOrder, int count) {
399399
byteOrder,
400400
starLength.isStar(),
401401
starLength.getLength(),
402-
ReadStringNodeGen.create(
402+
ReadStringOrDefaultValueNodeGen.create(
403403
false,
404404
"to_str",
405405
false,
@@ -421,7 +421,7 @@ private void hexString(ByteOrder byteOrder, int count) {
421421
appendNode(WriteHexStringNodeGen.create(
422422
byteOrder,
423423
length,
424-
ReadStringNodeGen.create(
424+
ReadStringOrDefaultValueNodeGen.create(
425425
false,
426426
"to_str",
427427
false,

‎src/main/java/org/truffleruby/core/format/printf/PrintfSimpleTreeBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.truffleruby.core.format.SharedTreeBuilder;
2323
import org.truffleruby.core.format.convert.ToNumberWithCoercionNodeGen;
2424
import org.truffleruby.core.format.convert.ToIntegerNodeGen;
25-
import org.truffleruby.core.format.convert.ToStringNodeGen;
25+
import org.truffleruby.core.format.convert.ToStringOrDefaultValueNodeGen;
2626
import org.truffleruby.core.format.format.FormatAFloatNodeGen;
2727
import org.truffleruby.core.format.format.FormatCharacterNodeGen;
2828
import org.truffleruby.core.format.format.FormatEFloatNodeGen;
@@ -34,7 +34,7 @@
3434
import org.truffleruby.core.format.read.array.ReadArgumentIndexValueNodeGen;
3535
import org.truffleruby.core.format.read.array.ReadHashValueNodeGen;
3636
import org.truffleruby.core.format.read.array.ReadIntegerNodeGen;
37-
import org.truffleruby.core.format.read.array.ReadStringNodeGen;
37+
import org.truffleruby.core.format.read.array.ReadStringOrDefaultValueNodeGen;
3838
import org.truffleruby.core.format.read.array.ReadValueNodeGen;
3939
import org.truffleruby.core.format.write.bytes.WriteBytesNodeGen;
4040
import org.truffleruby.core.format.write.bytes.WritePaddedBytesNodeGen;
@@ -232,15 +232,15 @@ private void buildTree() {
232232
final FormatNode conversionNode;
233233

234234
if (config.getAbsoluteArgumentIndex() == null && config.getNamesBytes() == null) {
235-
conversionNode = ReadStringNodeGen
235+
conversionNode = ReadStringOrDefaultValueNodeGen
236236
.create(
237237
true,
238238
conversionMethodName,
239239
false,
240240
EMPTY_STRING,
241241
new SourceNode());
242242
} else {
243-
conversionNode = ToStringNodeGen
243+
conversionNode = ToStringOrDefaultValueNodeGen
244244
.create(true, conversionMethodName, false, EMPTY_STRING, valueNode);
245245
}
246246

‎src/main/java/org/truffleruby/core/format/rbsprintf/RBSprintfSimpleTreeBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.truffleruby.core.format.SharedTreeBuilder;
2020
import org.truffleruby.core.format.convert.ToNumberWithCoercionNodeGen;
2121
import org.truffleruby.core.format.convert.ToIntegerNodeGen;
22-
import org.truffleruby.core.format.convert.ToStringNodeGen;
22+
import org.truffleruby.core.format.convert.ToStringOrDefaultValueNodeGen;
2323
import org.truffleruby.core.format.format.FormatAFloatNodeGen;
2424
import org.truffleruby.core.format.format.FormatCharacterNodeGen;
2525
import org.truffleruby.core.format.format.FormatEFloatNodeGen;
@@ -32,7 +32,7 @@
3232
import org.truffleruby.core.format.read.SourceNode;
3333
import org.truffleruby.core.format.read.array.ReadArgumentIndexValueNodeGen;
3434
import org.truffleruby.core.format.read.array.ReadIntegerNodeGen;
35-
import org.truffleruby.core.format.read.array.ReadStringNodeGen;
35+
import org.truffleruby.core.format.read.array.ReadStringOrDefaultValueNodeGen;
3636
import org.truffleruby.core.format.read.array.ReadCStringNodeGen;
3737
import org.truffleruby.core.format.read.array.ReadCValueNodeGen;
3838
import org.truffleruby.core.format.read.array.ReadValueNodeGen;
@@ -278,7 +278,7 @@ private void buildTree() {
278278
final FormatNode conversionNode;
279279
if (config.getFormatArgumentType() == FormatArgumentType.VALUE) {
280280
if (config.getAbsoluteArgumentIndex() == null) {
281-
conversionNode = ReadStringNodeGen
281+
conversionNode = ReadStringOrDefaultValueNodeGen
282282
.create(
283283
true,
284284
conversionMethodName,
@@ -287,11 +287,11 @@ private void buildTree() {
287287
config.isPlus(),
288288
new SourceNode());
289289
} else {
290-
conversionNode = ToStringNodeGen.create(true, conversionMethodName, false, EMPTY_STRING,
290+
conversionNode = ToStringOrDefaultValueNodeGen.create(true, conversionMethodName, false, EMPTY_STRING,
291291
config.isPlus(), valueNode);
292292
}
293293
} else {
294-
conversionNode = ToStringNodeGen
294+
conversionNode = ToStringOrDefaultValueNodeGen
295295
.create(
296296
true,
297297
conversionMethodName,

‎src/main/java/org/truffleruby/core/format/read/array/ReadStringNode.java renamed to ‎src/main/java/org/truffleruby/core/format/read/array/ReadStringOrDefaultValueNode.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.truffleruby.core.array.library.ArrayStoreLibrary;
1414
import org.truffleruby.core.format.FormatNode;
1515
import org.truffleruby.core.format.LiteralFormatNode;
16-
import org.truffleruby.core.format.convert.ToStringNode;
17-
import org.truffleruby.core.format.convert.ToStringNodeGen;
16+
import org.truffleruby.core.format.convert.ToStringOrDefaultValueNode;
17+
import org.truffleruby.core.format.convert.ToStringOrDefaultValueNodeGen;
1818
import org.truffleruby.core.format.read.SourceNode;
1919
import org.truffleruby.core.format.write.bytes.WriteByteNodeGen;
2020

@@ -27,25 +27,25 @@
2727

2828
@NodeChild(value = "source", type = SourceNode.class)
2929
@ImportStatic(ArrayGuards.class)
30-
public abstract class ReadStringNode extends FormatNode {
30+
public abstract class ReadStringOrDefaultValueNode extends FormatNode {
3131

3232
private final boolean convertNumbersToStrings;
3333
private final String conversionMethod;
3434
private final boolean inspectOnConversionFailure;
3535
private final Object valueOnNil;
3636
private final boolean specialClassBehaviour;
3737

38-
@Child private ToStringNode toStringNode;
38+
@Child private ToStringOrDefaultValueNode toStringOrDefaultValueNode;
3939

40-
public ReadStringNode(
40+
public ReadStringOrDefaultValueNode(
4141
boolean convertNumbersToStrings,
4242
String conversionMethod,
4343
boolean inspectOnConversionFailure,
4444
Object valueOnNil) {
4545
this(convertNumbersToStrings, conversionMethod, inspectOnConversionFailure, valueOnNil, false);
4646
}
4747

48-
public ReadStringNode(
48+
public ReadStringOrDefaultValueNode(
4949
boolean convertNumbersToStrings,
5050
String conversionMethod,
5151
boolean inspectOnConversionFailure,
@@ -65,9 +65,9 @@ Object read(VirtualFrame frame, Object source,
6565
}
6666

6767
private Object readAndConvert(Object value) {
68-
if (toStringNode == null) {
68+
if (toStringOrDefaultValueNode == null) {
6969
CompilerDirectives.transferToInterpreterAndInvalidate();
70-
toStringNode = insert(ToStringNodeGen.create(
70+
toStringOrDefaultValueNode = insert(ToStringOrDefaultValueNodeGen.create(
7171
convertNumbersToStrings,
7272
conversionMethod,
7373
inspectOnConversionFailure,
@@ -76,7 +76,7 @@ private Object readAndConvert(Object value) {
7676
WriteByteNodeGen.create(new LiteralFormatNode((byte) 0))));
7777
}
7878

79-
return toStringNode.executeToString(value);
79+
return toStringOrDefaultValueNode.executeToString(value);
8080
}
8181

8282
}

0 commit comments

Comments
 (0)