diff options
author | Martin Odersky <odersky@gmail.com> | 2003-10-31 14:48:50 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2003-10-31 14:48:50 +0000 |
commit | e1389174dece282a6c73ddefb5df1f6560a10644 (patch) | |
tree | 4af02c6bf2b7e90549d158fe851127a89f3224d0 /sources | |
parent | 999b43195544490b58ea222c0b17064dd6c41e49 (diff) | |
download | scala-e1389174dece282a6c73ddefb5df1f6560a10644.tar.gz scala-e1389174dece282a6c73ddefb5df1f6560a10644.tar.bz2 scala-e1389174dece282a6c73ddefb5df1f6560a10644.zip |
*** empty log message ***
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scala/tools/scaladoc/SymbolTablePrinter.java | 2 | ||||
-rw-r--r-- | sources/scalac/symtab/classfile/UnPickle.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java index e8b4090e0a..72fd773519 100644 --- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java +++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java @@ -577,7 +577,7 @@ public class SymbolTablePrinter extends scalac.symtab.SymbolTablePrinter { * * @param prefix */ - public Type getTypeToPrintForPrefix0(Ty*pe prefix) { + public Type getTypeToPrintForPrefix0(Type prefix) { if (!global.debug) { if (prefix.symbol().kind == Kinds.NONE) return null; if (prefix.symbol().isRoot()) return null; diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java index 68c2a99177..e4413be233 100644 --- a/sources/scalac/symtab/classfile/UnPickle.java +++ b/sources/scalac/symtab/classfile/UnPickle.java @@ -481,10 +481,11 @@ public class UnPickle implements Kinds, Modifiers, EntryTags, TypeTags { return new Float(Double.longBitsToDouble(readNumberRef())); case UnboxedType(BOOLEAN): return new Boolean(readNumberRef() == 0 ? false : true); - case UnboxedType(STRING): - return readNameRef().toString(); default: - return new ApplicationError("bad constant base type: " + base); + if (base.symbol() == Global.instance.definitions.JAVA_STRING_CLASS) + return readNameRef().toString(); + else + throw new ApplicationError("bad constant base type: " + base); } } |