diff options
| -rw-r--r-- | sources/scalac/ast/TreeGen.java | 2 | ||||
| -rw-r--r-- | sources/scalac/util/Name.java | 4 | ||||
| -rw-r--r-- | sources/scalac/util/Names.java | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java index c118b22899..f18aa78d6d 100644 --- a/sources/scalac/ast/TreeGen.java +++ b/sources/scalac/ast/TreeGen.java @@ -73,7 +73,7 @@ public class TreeGen implements Kinds, Modifiers { /** Create a dummy symbol to be used for templates. */ public Symbol localDummy(int pos, Symbol owner) { - return new TermSymbol(pos, Name.EMPTY, owner, 0) + return new TermSymbol(pos, Names.EMPTY, owner, 0) .setInfo(Type.NoType); } diff --git a/sources/scalac/util/Name.java b/sources/scalac/util/Name.java index 0978c7589d..efe35a488b 100644 --- a/sources/scalac/util/Name.java +++ b/sources/scalac/util/Name.java @@ -75,10 +75,6 @@ public final class Name { return i == len; } -/** the empty name - */ - public static final Name EMPTY = fromString(""); - /** create a term name from the bytes in cs[offset..offset+len-1]. * assume that bytes are in ascii format. */ diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java index 9e338d9d4d..809aa1b104 100644 --- a/sources/scalac/util/Names.java +++ b/sources/scalac/util/Names.java @@ -10,7 +10,7 @@ package scalac.util; public class Names { public static final Name ERROR = Name.ERROR; - public static final Name EMPTY = Name.EMPTY; + public static final Name EMPTY = Name.fromString(""); public static final Name WILDCARD = Name.fromString("_"); public static final Name COMPOUND_NAME = Name.fromString("<ct>"); public static final Name ANON_CLASS_NAME = Name.fromString("$anon"); |