diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 11:57:05 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 11:57:05 -0700 |
commit | 71ddc4f78623ee70798b5ab409bfd72648f92568 (patch) | |
tree | 3f21582f3f29bc3fbfdda916b856846da98840dc /src | |
parent | 63f0d54d96c348babf5bcbe9d407705d469e87f5 (diff) | |
parent | 6db8a523e32c093c70b27797628bacbda78b81bb (diff) | |
download | scala-71ddc4f78623ee70798b5ab409bfd72648f92568.tar.gz scala-71ddc4f78623ee70798b5ab409bfd72648f92568.tar.bz2 scala-71ddc4f78623ee70798b5ab409bfd72648f92568.zip |
Merge pull request #2841 from gourlaysama/wip/t6507
SI-6507 do not call .toString on REPL results when :silent is on.
Diffstat (limited to 'src')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IMain.scala | 2 | ||||
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index e288739e77..ae318697ec 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -830,6 +830,8 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set def imports = importedSymbols def value = Some(handlers.last) filter (h => h.definesValue) map (h => definedSymbols(h.definesTerm.get)) getOrElse NoSymbol + val printResults = IMain.this.printResults + val lineRep = new ReadEvalPrint() private var _originalLine: String = null diff --git a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala index c6f0cca481..085a7c6065 100644 --- a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala +++ b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala @@ -107,7 +107,7 @@ trait MemberHandlers { override def resultExtractionCode(req: Request): String = { val isInternal = isUserVarName(name) && req.lookupTypeOf(name) == "Unit" - if (!mods.isPublic || isInternal) "" + if (!mods.isPublic || isInternal || !req.printResults) "" else { // if this is a lazy val we avoid evaluating it here val resultString = @@ -151,11 +151,11 @@ trait MemberHandlers { """val %s = %s""".format(name, lhs) /** Print out lhs instead of the generated varName */ - override def resultExtractionCode(req: Request) = { + override def resultExtractionCode(req: Request) = if (req.printResults) { val lhsType = string2code(req lookupTypeOf name) val res = string2code(req fullPath name) """ + "%s: %s = " + %s + "\n" """.format(string2code(lhs.toString), lhsType, res) + "\n" - } + } else "" } class ModuleHandler(module: ModuleDef) extends MemberDefHandler(module) { |