diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-02-01 13:44:17 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-02-01 13:44:17 +0000 |
commit | 589b8a5d536da8c41bcaeee4aff382828fd9253d (patch) | |
tree | b50a560db2e6a68257c6a5d6e6f111a062891b92 /src | |
parent | cd4486aa72ae351bf7dbdb5f430e9672430b0dba (diff) | |
download | scala-589b8a5d536da8c41bcaeee4aff382828fd9253d.tar.gz scala-589b8a5d536da8c41bcaeee4aff382828fd9253d.tar.bz2 scala-589b8a5d536da8c41bcaeee4aff382828fd9253d.zip |
Minor fix for Choice setting plus added some de...
Minor fix for Choice setting plus added some deprecated methods that
should survive till next release. review by extempore
Diffstat (limited to 'src')
3 files changed, 9 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index 3be18bbb08..4c6e14ed6f 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -48,6 +48,11 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter) @deprecated("Use `intp` instead.") def interpreter = intp + @deprecated("Use `intp` instead.") + def interpreter_= (i: Interpreter){ + intp = i + } + /** The context class loader at the time this object was created */ protected val originalClassLoader = Thread.currentThread.getContextClassLoader @@ -687,4 +692,4 @@ object ILoop { Console.println("\nDebug repl exiting.") repl.closeInterpreter() } -}
\ No newline at end of file +} diff --git a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala index 1ee04a4090..3f466780e9 100644 --- a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala @@ -41,5 +41,7 @@ object InteractiveReader { } def apply(): InteractiveReader = SimpleReader() + @deprecated("Use `apply` instead.") + def createDefault(): InteractiveReader = apply() } diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index cfaef4acaf..3a6c1ccaa7 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -550,6 +550,7 @@ class MutableSettings(val errorFn: String => Unit) extends AbsSettings with Scal } def unparse: List[String] = if (value == default) Nil else List(name + ":" + value) + override def tryToSetFromPropertyValue(s: String) = tryToSetColon(s::Nil) withHelpSyntax(name + ":<" + helpArg + ">") } |