diff options
author | Martin Odersky <odersky@gmail.com> | 2008-08-11 16:39:06 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2008-08-11 16:39:06 +0000 |
commit | d5c8ea4d007e10a127886ba33912bcda2e505054 (patch) | |
tree | bd01436c7c1db6b8713dea1a1f6c0fff50e3c8fb | |
parent | 021fa2b31d07b327dd106a1d01f37b332f140a5d (diff) | |
download | scala-d5c8ea4d007e10a127886ba33912bcda2e505054.tar.gz scala-d5c8ea4d007e10a127886ba33912bcda2e505054.tar.bz2 scala-d5c8ea4d007e10a127886ba33912bcda2e505054.zip |
fixed #1150
-rwxr-xr-x | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 3 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 000a90cb5b..2eb5611265 100755 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -847,8 +847,7 @@ trait JavaParsers extends JavaScanners { case Ident(name) => name.toTypeName case Select(_, name) => name.toTypeName } - val importJavaLang = Import(javaDot(nme.lang), List((nme.WILDCARD, null))) - val buf = new ListBuffer[Tree]+importJavaLang + val buf = new ListBuffer[Tree] while (in.token == IMPORT) buf ++= importDecl() while (in.token != EOF && in.token != RBRACE) { diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index a87dda4447..61a8533abd 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -42,10 +42,12 @@ trait Contexts { self: Analyzer => if (!settings.noimports.value) { assert(isDefinitionsInitialized) imps += JavaLangPackage - assert(ScalaPackage ne null, "Scala package is null") - imps += ScalaPackage - if (!(treeInfo.isPredefUnit(unit.body) || treeInfo.containsLeadingPredefImport(List(unit.body)))) - imps += PredefModule + if (!unit.isJava) { + assert(ScalaPackage ne null, "Scala package is null") + imps += ScalaPackage + if (!(treeInfo.isPredefUnit(unit.body) || treeInfo.containsLeadingPredefImport(List(unit.body)))) + imps += PredefModule + } } imps.toList } |