diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scalac/backend/Primitives.java | 8 | ||||
| -rw-r--r-- | sources/scalac/symtab/SymbolNameWriter.java | 20 | ||||
| -rw-r--r-- | sources/scalac/transformer/AddInterfacesPhase.java | 4 | ||||
| -rw-r--r-- | sources/scalac/util/SourceRepresentation.java | 4 |
4 files changed, 20 insertions, 16 deletions
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java index ccc5d46baf..690fc0ad43 100644 --- a/sources/scalac/backend/Primitives.java +++ b/sources/scalac/backend/Primitives.java @@ -1249,17 +1249,13 @@ public class Primitives { clasz == definitions.ANYREF_CLASS) return getJREClassName(definitions.OBJECT_CLASS); String suffix = clasz.isModuleClass() && !clasz.isJava() ? "$" : ""; - String name = jreNameWriter.toString(clasz, suffix); - jreNameWriter.setStringBuffer(null); - return name; + return jreNameWriter.toString(clasz, suffix); } /** Return the CLR name of given class. */ public String getCLRClassName(Symbol clasz) { assert clasz.isClassType(): Debug.show(clasz); - String name = clrNameWriter.toString(clasz); - clrNameWriter.setStringBuffer(null); - return name; + return clrNameWriter.toString(clasz); } //######################################################################## diff --git a/sources/scalac/symtab/SymbolNameWriter.java b/sources/scalac/symtab/SymbolNameWriter.java index d9edc856ba..bd4b17c906 100644 --- a/sources/scalac/symtab/SymbolNameWriter.java +++ b/sources/scalac/symtab/SymbolNameWriter.java @@ -188,22 +188,34 @@ public class SymbolNameWriter { /** Returns the string formed by the symbol. */ public String toString(Symbol symbol) { - return appendSymbol(symbol).toString(); + assert buffer == null; + String string = appendSymbol(symbol).toString(); + setStringBuffer(null); + return string; } /** Returns the string formed by the prefix and symbol. */ public String toString(String prefix, Symbol symbol) { - return appendSymbol(prefix, symbol).toString(); + assert buffer == null; + String string = appendSymbol(prefix, symbol).toString(); + setStringBuffer(null); + return string; } /** Returns the string formed by the symbol and suffix. */ public String toString(Symbol symbol, String suffix) { - return appendSymbol(symbol, suffix).toString(); + assert buffer == null; + String string = appendSymbol(symbol, suffix).toString(); + setStringBuffer(null); + return string; } /** Returns the string formed by the prefix, symbol and suffix. */ public String toString(String prefix, Symbol symbol, String suffix) { - return appendSymbol(prefix, symbol, suffix).toString(); + assert buffer == null; + String string = appendSymbol(prefix, symbol, suffix).toString(); + setStringBuffer(null); + return string; } //######################################################################## diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java index f00143073d..b04b80dd1a 100644 --- a/sources/scalac/transformer/AddInterfacesPhase.java +++ b/sources/scalac/transformer/AddInterfacesPhase.java @@ -144,9 +144,7 @@ public class AddInterfacesPhase extends Phase { .setAllSeparators('$') .setRootSeparator('\0'); protected Name uniqueName(Symbol sym) { - Name name = - Name.fromString(uniqueNameWriter.toString(sym)); - uniqueNameWriter.setStringBuffer(null); + Name name = Name.fromString(uniqueNameWriter.toString(sym)); return sym.name.isTypeName() ? name.toTypeName() : name; } diff --git a/sources/scalac/util/SourceRepresentation.java b/sources/scalac/util/SourceRepresentation.java index e9c0164cd3..83c1372769 100644 --- a/sources/scalac/util/SourceRepresentation.java +++ b/sources/scalac/util/SourceRepresentation.java @@ -221,9 +221,7 @@ public final class SourceRepresentation { */ public static String externalizeFileName(Symbol clasz, String suffix) { assert clasz.isClassType(): Debug.show(clasz); - String name = fileNameWriter.toString(clasz, suffix); - fileNameWriter.setStringBuffer(null); - return name; + return fileNameWriter.toString(clasz, suffix); } } |