summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-10-19 16:52:42 +0000
committermichelou <michelou@epfl.ch>2007-10-19 16:52:42 +0000
commit333e924d5c27dd5e60d4b8c214fed538e55bc8be (patch)
treebcf352dea9c809a2d456c742328596099bf648ba
parent5a17de87ec2ae9dd2f9840dd5ac188630b20a675 (diff)
downloadscala-333e924d5c27dd5e60d4b8c214fed538e55bc8be.tar.gz
scala-333e924d5c27dd5e60d4b8c214fed538e55bc8be.tar.bz2
scala-333e924d5c27dd5e60d4b8c214fed538e55bc8be.zip
now compiles on Java 6
-rw-r--r--src/compiler/scala/tools/nsc/symtab/GenerateIdeMaps.scala13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/GenerateIdeMaps.scala b/src/compiler/scala/tools/nsc/symtab/GenerateIdeMaps.scala
index 0aa900529a..9f83e655e4 100644
--- a/src/compiler/scala/tools/nsc/symtab/GenerateIdeMaps.scala
+++ b/src/compiler/scala/tools/nsc/symtab/GenerateIdeMaps.scala
@@ -1,4 +1,11 @@
-package scala.tools.nsc.symtab;
+/* NSC -- new Scala compiler
+ * Copyright 2005-2007 LAMP/EPFL
+ * @author Martin Odersky
+ */
+// $Id: $
+
+package scala.tools.nsc.symtab
+
import scala.tools.nsc.io.{PlainFile,AbstractFile}
import scala.tools.nsc.util._
import java.io._
@@ -10,7 +17,7 @@ abstract class GenerateIdeMaps extends SubComponent {
val phaseName = "gen-ide-map"
def newPhase(prev: Phase): StdPhase = new GenIdeMapPhase(prev)
import global._
- private def assert(b : Boolean) : Unit = {
+ private def assert(b: Boolean) {
if (!b) {
assert(true)
throw new AssertionError
@@ -409,7 +416,7 @@ abstract class GenerateIdeMaps extends SubComponent {
if (isRoot(sym.owner)) {
return sym.name.toString
} else if (sym.owner != NoSymbol) return sym2url(sym.owner) + "." + sym.name.toString
- Console.println("XXX: " + sym + " " + sym.moduleClass + " " + sym.isPackage + " " + sym.owner)
+ scala.Console.println("XXX: " + sym + " " + sym.moduleClass + " " + sym.isPackage + " " + sym.owner)
return sym.name.toString
}
return sym2url(sym.linkedModuleOfClass)