diff options
Diffstat (limited to 'sources/scalac')
| -rw-r--r-- | sources/scalac/symtab/classfile/CLRClassParser.java | 2 | ||||
| -rw-r--r-- | sources/scalac/transformer/matching/RightTracerInScala.java | 2 | ||||
| -rw-r--r-- | sources/scalac/typechecker/RefCheck.java | 2 | ||||
| -rw-r--r-- | sources/scalac/util/Name.java | 6 |
4 files changed, 3 insertions, 9 deletions
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java index ac5c5ea313..61ac4c83e7 100644 --- a/sources/scalac/symtab/classfile/CLRClassParser.java +++ b/sources/scalac/symtab/classfile/CLRClassParser.java @@ -146,7 +146,7 @@ public class CLRClassParser extends SymbolLoader { mtype = methodType(setter, getCLSType(importer.VOID)); if (mtype == null) continue; - n = n.append(Names._EQ); + n = Name.fromString(n.toString() + Names._EQ); mods = translateAttributes(setter); method = owner.newMethod(Position.NOPOS, mods, n); setParamOwners(mtype, method); diff --git a/sources/scalac/transformer/matching/RightTracerInScala.java b/sources/scalac/transformer/matching/RightTracerInScala.java index 9d6c70e378..c285c42c76 100644 --- a/sources/scalac/transformer/matching/RightTracerInScala.java +++ b/sources/scalac/transformer/matching/RightTracerInScala.java @@ -292,7 +292,7 @@ public class RightTracerInScala extends TracerInScala { this.helpMap2.put( key, helpMap.get( key )); // "freshening" by appending string ( a bit dangerous ) Symbol newSym = key.cloneSymbol().setOwner( owner /*funSym*/ ); - newSym.name = key.name.append( Name.fromString("%") ); + newSym.name = Name.fromString( key.name + "%" ); freshenMap.put( key, newSym ); helpMap3.put( newSym, helpMap.get( key )); //System.out.println( "key: "+ key + " key.owner:"+key.owner()); diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java index 0c17fc4a89..b77d96563e 100644 --- a/sources/scalac/typechecker/RefCheck.java +++ b/sources/scalac/typechecker/RefCheck.java @@ -554,7 +554,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { Tree ddef = gen.DefDef(sym, body); // def m_eq(m: T): Unit = { m$ = m } - Name m_eqname = name.append(Names._EQ); + Name m_eqname = Name.fromString(name.toString() + Names._EQ); Symbol m_eq = sym.owner().newMethodOrFunction( tree.pos, PRIVATE | SYNTHETIC, m_eqname); Symbol m_eqarg = m_eq.newVParam(tree.pos, SYNTHETIC, name, sym.type()); diff --git a/sources/scalac/util/Name.java b/sources/scalac/util/Name.java index 96d674e5c4..6a8c8e2c6f 100644 --- a/sources/scalac/util/Name.java +++ b/sources/scalac/util/Name.java @@ -125,12 +125,6 @@ public final class Name { return string.lastIndexOf(c); } -/** returns the concatenation of this name and n - */ - public Name append(Name n) { - return fromString(string + n.string); - } - /** is this name a variable identifier? */ public boolean isVariable() { |