diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-10 12:13:53 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-10 12:13:53 -0800 |
| commit | 4fb23290035a54e34836ac7459afbc384292d7fa (patch) | |
| tree | 370172bb130563e78ec15a07d04dc6c936078df3 /src/compiler | |
| parent | 5616005c831dabd80900a736d1479d17a906f27b (diff) | |
| parent | 90c87fc266ec45e8970f6ea0f00d375b63afd35d (diff) | |
| download | scala-4fb23290035a54e34836ac7459afbc384292d7fa.tar.gz scala-4fb23290035a54e34836ac7459afbc384292d7fa.tar.bz2 scala-4fb23290035a54e34836ac7459afbc384292d7fa.zip | |
Merge pull request #1699 from retronym/ticket/6549
SI-6549 Improve escaping in REPL codegen.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala index 12fb8f1507..67519cf90c 100644 --- a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala +++ b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala @@ -120,7 +120,7 @@ trait MemberHandlers { if (replProps.vids) """" + " @ " + "%%8x".format(System.identityHashCode(%s)) + " """.trim.format(req fullPath name) else "" - """ + "%s%s: %s = " + %s""".format(prettyName, vidString, string2code(req typeOf name), resultString) + """ + "%s%s: %s = " + %s""".format(string2code(prettyName), vidString, string2code(req typeOf name), resultString) } } } @@ -147,8 +147,7 @@ trait MemberHandlers { override def resultExtractionCode(req: Request) = { val lhsType = string2code(req lookupTypeOf name) val res = string2code(req fullPath name) - - """ + "%s: %s = " + %s + "\n" """.format(lhs, lhsType, res) + "\n" + """ + "%s: %s = " + %s + "\n" """.format(string2code(lhs.toString), lhsType, res) + "\n" } } |