summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-02-04 16:14:28 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-02-04 16:14:28 +0000
commit2a1e4cc575a9175efd0b96fc7dc9b789a86e04f0 (patch)
tree2a3c0774b36edc0f6b05a3606160f1c1880cf070 /src
parent1f945242defb20f15edcffb996cab0e7064052dc (diff)
downloadscala-2a1e4cc575a9175efd0b96fc7dc9b789a86e04f0.tar.gz
scala-2a1e4cc575a9175efd0b96fc7dc9b789a86e04f0.tar.bz2
scala-2a1e4cc575a9175efd0b96fc7dc9b789a86e04f0.zip
Fixed #323.
Tweaked whitespace in the test.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/Interpreter.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 907344d352..d12813626e 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -344,12 +344,14 @@ class Interpreter(val settings: Settings, out: PrintWriter) {
case req =>
// For other requests, import each bound variable.
// import them explicitly instead of with _, so that
- // ambiguity errors will not be generated.
+ // ambiguity errors will not be generated. Also, quote
+ // the name of the variable, so that we don't need to
+ // handle quoting keywords separately.
for (imv <- req.boundNames) {
if (currentImps.contains(imv))
addWrapper()
code.append("import ")
- code.append(req.objectName + req.accessPath + "." + imv + ";\n")
+ code.append(req.objectName + req.accessPath + ".`" + imv + "`;\n")
currentImps += imv
}
}