summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2005-02-08 13:38:47 +0000
committerpaltherr <paltherr@epfl.ch>2005-02-08 13:38:47 +0000
commit8c930dea2f059de36f948a10cc70c2efb66cf91b (patch)
treea49d7151874dd4d8c5df7270b883c0bccbfa0a0f
parent8281ca399369d9fcef3c17a66eb5b666f549eb36 (diff)
downloadscala-8c930dea2f059de36f948a10cc70c2efb66cf91b.tar.gz
scala-8c930dea2f059de36f948a10cc70c2efb66cf91b.tar.bz2
scala-8c930dea2f059de36f948a10cc70c2efb66cf91b.zip
- Fixed "path" into "file"
-rwxr-xr-xsources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index ee16209bdb..3964a18427 100755
--- a/sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -57,7 +57,7 @@ abstract class ClassfileParser {
} catch {
case e: RuntimeException =>
if (settings.debug.value) e.printStackTrace();
- throw new IOException("class file '" + in.path + "' is broken")
+ throw new IOException("class file '" + in.file + "' is broken")
}
busy = false
}
@@ -65,7 +65,7 @@ abstract class ClassfileParser {
private def parseHeader: unit = {
val 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));
val minorVersion = in.nextChar();
@@ -73,7 +73,7 @@ abstract class ClassfileParser {
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 at least "
@@ -221,7 +221,7 @@ abstract class ClassfileParser {
if ((sflags & DEFERRED) != 0) sflags = sflags & ~DEFERRED | ABSTRACT;
val c = pool.getClassSymbol(in.nextChar());
if (c != clazz)
- throw new IOException("class file '" + in.path + "' contains wrong " + clazz);
+ throw new IOException("class file '" + in.file + "' contains wrong " + clazz);
val superType = pool.getSuperClass(in.nextChar()).tpe;
val ifaceCount = in.nextChar();
val parents = superType ::