diff options
| -rw-r--r-- | sources/scala/tools/util/AbstractFileReader.java | 4 | ||||
| -rw-r--r-- | sources/scalac/symtab/classfile/ClassfileParser.java | 8 | ||||
| -rw-r--r-- | sources/scalac/symtab/classfile/Signatures.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sources/scala/tools/util/AbstractFileReader.java b/sources/scala/tools/util/AbstractFileReader.java index 51e814241e..f9b1cb4e25 100644 --- a/sources/scala/tools/util/AbstractFileReader.java +++ b/sources/scala/tools/util/AbstractFileReader.java @@ -22,14 +22,14 @@ public class AbstractFileReader { /** the file path name */ - public final String path; + public final AbstractFile file; /** constructor */ public AbstractFileReader(AbstractFile f) throws IOException { buf = f.read(); bp = 0; - path = f.getPath(); + file = f; } /** return byte at offset 'pos' diff --git a/sources/scalac/symtab/classfile/ClassfileParser.java b/sources/scalac/symtab/classfile/ClassfileParser.java index f4dc500f19..235e350903 100644 --- a/sources/scalac/symtab/classfile/ClassfileParser.java +++ b/sources/scalac/symtab/classfile/ClassfileParser.java @@ -77,7 +77,7 @@ public class ClassfileParser implements ClassfileConstants { try { int magic = in.nextInt(); if (magic != JAVA_MAGIC) - throw new IOException("class file '" + in.path + "' " + throw new IOException("class file '" + in.file + "' " + "has wrong magic number 0x" + Integer.toHexString(magic) + ", should be 0x" + Integer.toHexString(JAVA_MAGIC)); int minorVersion = in.nextChar(); @@ -85,7 +85,7 @@ public class ClassfileParser implements ClassfileConstants { if ((majorVersion < JAVA_MAJOR_VERSION) || ((majorVersion == JAVA_MAJOR_VERSION) && (minorVersion < JAVA_MINOR_VERSION))) - throw new IOException("class file '" + in.path + "' " + throw new IOException("class file '" + in.file + "' " + "has unknown version " + majorVersion + "." + minorVersion + ", should be less than " @@ -96,12 +96,12 @@ public class ClassfileParser implements ClassfileConstants { int flags = in.nextChar(); Symbol clasz = pool.getClass(in.nextChar()); if (c != clasz) - throw new IOException("class file '" + in.path + "' " + throw new IOException("class file '" + in.file + "' " + "contains wrong class " + clasz.staticType()); new ClassfileParser(global, in, c, make, pool).parse(flags); } catch (RuntimeException e) { if (global.debug) e.printStackTrace(); - throw new IOException("class file '" + in.path + "' is broken"); + throw new IOException("class file '" + in.file + "' is broken"); } } diff --git a/sources/scalac/symtab/classfile/Signatures.java b/sources/scalac/symtab/classfile/Signatures.java index 80ee491571..102bce1a64 100644 --- a/sources/scalac/symtab/classfile/Signatures.java +++ b/sources/scalac/symtab/classfile/Signatures.java @@ -168,7 +168,7 @@ public class Signatures { /** Signals the given error. */ private void error(String error) { - global.error("class file '" + in.path + "': " + error); + global.error("class file '" + in.file + "': " + error); } //######################################################################## |