Skip to content

Commit f8c9446

Browse files
committed
Fixes
1 parent 8cce99e commit f8c9446

19 files changed

+43
-43
lines changed

src/main/java/org/truffleruby/core/rope/Rope.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@ public byte get(int index) {
158158
return getByteSlow(index);
159159
}
160160

161+
/** This is designed to not have any side effects - compare to {@link #getJavaString} - but this makes it
162+
* inefficient - for debugging only */
161163
@Override
162164
public String toString() {
163-
// This is designed to not have any side effects - compare to getString
164165
return RopeOperations.decode(encoding, RopeOperations.flattenBytes(this));
165166
}
166167

167-
/** Should only be used by the parser */
168-
public final String normaliseAndGetJavaString() {
169-
// This will have side effects such as flattening a ConcatString
168+
/** Should only be used by the parser - it has side effects */
169+
public final String getJavaString() {
170170
return RopeOperations.decodeRope(this);
171171
}
172172

src/main/java/org/truffleruby/interop/PolyglotNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected Object evalFile(Object fileName, NotProvided id,
111111
throw new RaiseException(
112112
getContext(),
113113
coreExceptions().argumentError(
114-
"Could not find language of file " + strings.getJavaString(fileName),
114+
"Could not find language of file " + path,
115115
this));
116116
}
117117
source = Source.newBuilder(language, file).build();

src/main/java/org/truffleruby/parser/ast/ClassVarAsgnParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ClassVarAsgnParseNode extends AssignableParseNode implements INameN
4747
public ClassVarAsgnParseNode(SourceIndexLength position, Rope name, ParseNode valueNode) {
4848
super(position, valueNode);
4949

50-
this.name = name.normaliseAndGetJavaString();
50+
this.name = name.getJavaString();
5151
}
5252

5353
@Override

src/main/java/org/truffleruby/parser/ast/ClassVarParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ClassVarParseNode extends ParseNode implements INameNode, SideEffec
4343
private String name;
4444

4545
public ClassVarParseNode(SourceIndexLength position, Rope name) {
46-
this(position, name.normaliseAndGetJavaString());
46+
this(position, name.getJavaString());
4747
}
4848

4949
public ClassVarParseNode(SourceIndexLength position, String name) {

src/main/java/org/truffleruby/parser/ast/Colon3ParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class Colon3ParseNode extends ParseNode implements INameNode {
4545

4646
public Colon3ParseNode(SourceIndexLength position, Rope name) {
4747
super(position);
48-
this.name = name.normaliseAndGetJavaString();
48+
this.name = name.getJavaString();
4949
}
5050

5151
@Override

src/main/java/org/truffleruby/parser/ast/ConstDeclParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ConstDeclParseNode(SourceIndexLength position, Rope name, INameNode const
4848
super(position, valueNode);
4949

5050
assert constNode != null || (name != null && !name.isEmpty());
51-
this.name = name == null ? null : name.normaliseAndGetJavaString();
51+
this.name = name == null ? null : name.getJavaString();
5252
this.constNode = constNode;
5353
}
5454

src/main/java/org/truffleruby/parser/ast/ConstParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ConstParseNode extends ParseNode implements INameNode {
4343
private String name;
4444

4545
public ConstParseNode(SourceIndexLength position, Rope name) {
46-
this(position, name.normaliseAndGetJavaString());
46+
this(position, name.getJavaString());
4747
}
4848

4949
public ConstParseNode(SourceIndexLength position, String name) {

src/main/java/org/truffleruby/parser/ast/GlobalAsgnParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class GlobalAsgnParseNode extends AssignableParseNode implements INameNod
4747
public GlobalAsgnParseNode(SourceIndexLength position, Rope name, ParseNode valueNode) {
4848
super(position, valueNode);
4949

50-
this.name = name.normaliseAndGetJavaString();
50+
this.name = name.getJavaString();
5151
}
5252

5353
@Override

src/main/java/org/truffleruby/parser/ast/GlobalVarParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class GlobalVarParseNode extends ParseNode implements INameNode {
4343
private String name;
4444

4545
public GlobalVarParseNode(SourceIndexLength position, Rope name) {
46-
this(position, name.normaliseAndGetJavaString());
46+
this(position, name.getJavaString());
4747
}
4848

4949
public GlobalVarParseNode(SourceIndexLength position, String name) {

src/main/java/org/truffleruby/parser/ast/InstAsgnParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class InstAsgnParseNode extends AssignableParseNode implements INameNode
4848
public InstAsgnParseNode(SourceIndexLength position, Rope name, ParseNode valueNode) {
4949
super(position, valueNode);
5050

51-
this.name = name.normaliseAndGetJavaString();
51+
this.name = name.getJavaString();
5252
}
5353

5454
@Override

0 commit comments

Comments
 (0)