diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-07-04 10:05:39 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-07-04 10:05:39 +0000 |
| commit | f90c462b42b7587a9ac0f53a66e235b1b27e28c8 (patch) | |
| tree | 675e133d72d172e7ecbc745b31f7ffdaff28e447 | |
| parent | 9b3c49a171ae32c5f2471dbf7f4b622d6ad42798 (diff) | |
| download | scala-f90c462b42b7587a9ac0f53a66e235b1b27e28c8.tar.gz scala-f90c462b42b7587a9ac0f53a66e235b1b27e28c8.tar.bz2 scala-f90c462b42b7587a9ac0f53a66e235b1b27e28c8.zip | |
quick fix to get the build going again on Java 1.5
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala index a54513c9ab..e284b816fd 100644 --- a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala +++ b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala @@ -83,7 +83,8 @@ trait ScratchPadMaker { self: Global => case PackageDef(_, _) => super.traverse(tree) case ModuleDef(_, name, Template(_, _, body)) => - if (objectName.isEmpty) objectName = tree.symbol.fullName + if (objectName.length == 0 /* objectName.isEmpty does not compile on Java 5 due to ambiguous implicit conversions: augmentString, stringToTermName */) + objectName = tree.symbol.fullName body foreach traverseStat case _ => } |