summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-03-31 19:26:37 +0000
committerPaul Phillips <paulp@improving.org>2011-03-31 19:26:37 +0000
commit40263b7fa68b6dfa50b4f9a8e72726182243f3af (patch)
treeba812c5c5dc09fa5a14bd911a12a24ddbec29ab9
parent661ce2922df999d70da29ee3910bf2dcf851eb66 (diff)
downloadscala-40263b7fa68b6dfa50b4f9a8e72726182243f3af.tar.gz
scala-40263b7fa68b6dfa50b4f9a8e72726182243f3af.tar.bz2
scala-40263b7fa68b6dfa50b4f9a8e72726182243f3af.zip
Fix for a little breakage which crept into powe...
Fix for a little breakage which crept into power mode. This is why real things with real types are better than generating code and remembering to update your strings. No review.
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/ILoop.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index 787502498a..30c2c86d88 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -354,7 +354,6 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
if (line == "") "Cleared wrapper."
else "Set wrapper to '" + line + "'"
}
- private def pathToPhased = intp.pathToTerm("power") + ".phased"
private def phaseCommand(name: String): Result = {
// This line crashes us in TreeGen:
//
@@ -385,7 +384,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
if (what.isEmpty || !phased.set(what))
"'" + name + "' does not appear to represent a valid phase."
else {
- intp.setExecutionWrapper(pathToPhased)
+ intp.setExecutionWrapper("phased.atCurrent")
val activeMessage =
if (what.toString.length == name.length) "" + what
else "%s (%s)".format(what, name)