diff options
| author | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2009-02-02 11:52:05 +0000 |
|---|---|---|
| committer | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2009-02-02 11:52:05 +0000 |
| commit | 011d39a3b3144ac7cff865a4d9f197cfb122101e (patch) | |
| tree | c99a7edd0f211a14d8234d35c16dacb4d53254a2 /src | |
| parent | 68389103114d3a87ca82d87685903af1d3dbe9ac (diff) | |
| download | scala-011d39a3b3144ac7cff865a4d9f197cfb122101e.tar.gz scala-011d39a3b3144ac7cff865a4d9f197cfb122101e.tar.bz2 scala-011d39a3b3144ac7cff865a4d9f197cfb122101e.zip | |
Applied patch from #1684.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Interpreter.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/NameTransformer.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala index c68e8458ff..78aea71925 100644 --- a/src/compiler/scala/tools/nsc/Interpreter.scala +++ b/src/compiler/scala/tools/nsc/Interpreter.scala @@ -625,7 +625,7 @@ class Interpreter(val settings: Settings, out: PrintWriter) { " { val tmp = scala.runtime.ScalaRunTime.stringOf(" + req.fullPath(vname) + "); " + - " (if(tmp.contains('\\n')) \"\\n\" else \"\") + tmp + \"\\n\"} ") + " (if(tmp.toSeq.contains('\\n')) \"\\n\" else \"\") + tmp + \"\\n\"} ") } } } diff --git a/src/compiler/scala/tools/nsc/util/NameTransformer.scala b/src/compiler/scala/tools/nsc/util/NameTransformer.scala index 8e5c3d2e01..8a97afdbe2 100644 --- a/src/compiler/scala/tools/nsc/util/NameTransformer.scala +++ b/src/compiler/scala/tools/nsc/util/NameTransformer.scala @@ -59,7 +59,7 @@ object NameTransformer { } buf.append(op2code(c)) /* Handle glyphs that are not valid Java/JVM identifiers */ - } else if (!Character.isJavaLetterOrDigit(c)) { + } else if (!Character.isJavaIdentifierPart(c)) { if (buf eq null) { buf = new StringBuilder() buf.append(name.substring(0, i)) |