ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update REPL code to use our own version of JLineReader, which fixes #89.

Browse source 
I'm not entirely sure why this broke in the jump from Scala 2.9.0.1 to
2.9.1 -- maybe something about name resolution changed?
This commit is contained in:
Matei Zaharia 2011-11-07 20:16:25 -08:00
parent 3fad5e580f
commit 63da22c025
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
repl/src/main/scala/spark/repl/SparkILoop.scala
View file

@ -802,13 +802,13 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master:
def chooseReader(settings: Settings): InteractiveReader = {
if (settings.Xnojline.value || Properties.isEmacsShell)
SimpleReader()
else try JLineReader(
else try SparkJLineReader(
if (settings.noCompletion.value) NoCompletion
else new JLineCompletion(intp)
else new SparkJLineCompletion(intp)
)
catch {
case ex @ (_: Exception | _: NoClassDefFoundError) =>
echo("Failed to created JLineReader: " + ex + "\nFalling back to SimpleReader.")
echo("Failed to created SparkJLineReader: " + ex + "\nFalling back to SimpleReader.")
SimpleReader()
}
}
@ -985,7 +985,7 @@ object SparkILoop {
repl.settings = new Settings(echo)
repl.settings.embeddedDefaults[T]
repl.createInterpreter()
repl.in = JLineReader(repl)
repl.in = SparkJLineReader(repl)
// rebind exit so people don't accidentally call sys.exit by way of predef
repl.quietRun("""def exit = println("Type :quit to resume program execution.")""")

2
repl/src/main/scala/spark/repl/SparkJLineCompletion.scala
View file

@ -15,7 +15,7 @@ import collection.mutable.ListBuffer
// REPL completor - queries supplied interpreter for valid
// completions based on current contents of buffer.
class JLineCompletion(val intp: SparkIMain) extends Completion with CompletionOutput {
class SparkJLineCompletion(val intp: SparkIMain) extends Completion with CompletionOutput {
val global: intp.global.type = intp.global
import global._
import definitions.{ PredefModule, RootClass, AnyClass, AnyRefClass, ScalaPackage, JavaLangPackage }

6
repl/src/main/scala/spark/repl/SparkJLineReader.scala
View file

@ -73,7 +73,7 @@ class SparkJLineReader(val completion: Completion) extends InteractiveReader {
def readOneKey(prompt: String) = consoleReader readOneKey prompt
}
object JLineReader {
def apply(intp: SparkIMain): JLineReader = apply(new JLineCompletion(intp))
def apply(comp: Completion): JLineReader = new JLineReader(comp)
object SparkJLineReader {
def apply(intp: SparkIMain): SparkJLineReader = apply(new SparkJLineCompletion(intp))
def apply(comp: Completion): SparkJLineReader = new SparkJLineReader(comp)
}