diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-10 17:17:58 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-11 20:07:24 -0700 |
commit | 48cc8b47fcadaa187026ca0422178c9094e4b412 (patch) | |
tree | 32f3cce4559030e3088741390024c19eb5110bbe /src/repl/scala/tools/nsc/interpreter/InteractiveReader.scala | |
parent | 1b6297f642877dcc7edcd704a5d3cf99a12e54b8 (diff) | |
download | scala-48cc8b47fcadaa187026ca0422178c9094e4b412.tar.gz scala-48cc8b47fcadaa187026ca0422178c9094e4b412.tar.bz2 scala-48cc8b47fcadaa187026ca0422178c9094e4b412.zip |
Modularized the repl.
Following in the footsteps of scaladoc and interactive.
The interpreter sources move into src/repl, and are given
a separate build target. As with the others, at present
they are still packaged into scala-compiler.jar.
A summary of changes:
- repl requires use of ReplGlobal (this was already implied)
- macro code's repl-specific classloader hack pulled into overridable
method and overridden in ReplGlobal
- removed -Ygen-javap option to eliminate backend's dependency on javap
- removed -Yrepl-debug option (can still be enabled with -Dscala.repl.debug)
- pushed javap code into src/repl so javax.tools dependency can bee
weakened to the repl only
- removed some "show pickled" related code which hasn't worked right
in a while and isn't the right way to do it anymore anyway. Will
return to fix showPickled and provide it with some tests.
Diffstat (limited to 'src/repl/scala/tools/nsc/interpreter/InteractiveReader.scala')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/InteractiveReader.scala | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/repl/scala/tools/nsc/interpreter/InteractiveReader.scala new file mode 100644 index 0000000000..28ddf2939c --- /dev/null +++ b/src/repl/scala/tools/nsc/interpreter/InteractiveReader.scala @@ -0,0 +1,49 @@ +/* NSC -- new Scala compiler + * Copyright 2005-2013 LAMP/EPFL + * @author Stepan Koltsov + */ + +package scala.tools.nsc +package interpreter + +import java.io.IOException +import session.History +import InteractiveReader._ +import Properties.isMac + +/** Reads lines from an input stream */ +trait InteractiveReader { + val interactive: Boolean + + def reset(): Unit + def history: History + def completion: Completion + def redrawLine(): Unit + + def readYesOrNo(prompt: String, alt: => Boolean): Boolean = readOneKey(prompt) match { + case 'y' => true + case 'n' => false + case _ => alt + } + + protected def readOneLine(prompt: String): String + protected def readOneKey(prompt: String): Int + + def readLine(prompt: String): String = + // hack necessary for OSX jvm suspension because read calls are not restarted after SIGTSTP + if (isMac) restartSysCalls(readOneLine(prompt), reset()) + else readOneLine(prompt) +} + +object InteractiveReader { + val msgEINTR = "Interrupted system call" + def restartSysCalls[R](body: => R, reset: => Unit): R = + try body catch { + case e: IOException if e.getMessage == msgEINTR => reset ; body + } + + def apply(): InteractiveReader = SimpleReader() + @deprecated("Use `apply` instead.", "2.9.0") + def createDefault(): InteractiveReader = apply() // used by sbt +} + |