summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-07-25 13:41:39 +0000
committerMartin Odersky <odersky@gmail.com>2007-07-25 13:41:39 +0000
commitfd3697ed00c1bb3f454869627176bb388aecf9ee (patch)
treee6377b748501fb9f60a632807f26708f75b00f51
parente175239fd3b8a5f6276ece0c23622c7142b1fcb8 (diff)
downloadscala-fd3697ed00c1bb3f454869627176bb388aecf9ee.tar.gz
scala-fd3697ed00c1bb3f454869627176bb388aecf9ee.tar.bz2
scala-fd3697ed00c1bb3f454869627176bb388aecf9ee.zip
fixed porblems intoduced by 12401 that caused s...
fixed porblems intoduced by 12401 that caused scalatst to fail.
-rw-r--r--src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 78ee6f07c5..b0411d97ab 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -75,7 +75,7 @@ abstract class ClassfileParser {
case ms: ModuleSymbol =>
ms.moduleClass.asInstanceOf[ClassSymbol].classFile = file
case _ =>
- Console.println("Skipping class: " + root + ": " + root.getClass)
+ println("Skipping class: " + root + ": " + root.getClass)
}
this.in = new AbstractFileReader(file)
@@ -516,7 +516,7 @@ abstract class ClassfileParser {
}
val t = appliedType(classSym.typeConstructor, eparams.map(_.tpe))
val res = existentialAbstraction(eparams, t)
- if (settings.verbose.value) println("raw type " + classSym + " -> " + res)
+ if (settings.debug.value) println("raw type " + classSym + " -> " + res)
res
}
accept(';')
@@ -536,7 +536,7 @@ abstract class ClassfileParser {
clazz.tpe
} else
sig2type(tparams)
- MethodType(paramtypes.toList, restype)
+ JavaMethodType(paramtypes.toList, restype)
case 'T' =>
val n = subName(';'.==).toTypeName
index += 1
@@ -614,7 +614,7 @@ abstract class ClassfileParser {
val c = pool.getConstant(in.nextChar)
val c1 = convertTo(c, symtype)
if (c1 ne null) sym.setInfo(mkConstantType(c1))
- else Console.println("failure to convert " + c + " to " + symtype); //debug
+ else println("failure to convert " + c + " to " + symtype); //debug
case nme.InnerClassesATTR =>
if (!isScala) parseInnerClasses() else in.skip(attrLen)
case nme.ScalaSignatureATTR =>