diff options
author | Ismael Juma <ismael@juma.me.uk> | 2011-08-31 10:43:05 +0100 |
---|---|---|
committer | Ismael Juma <ismael@juma.me.uk> | 2011-08-31 10:43:05 +0100 |
commit | 483f724d6229b33179d9cf41dd4e3fd17aa54aee (patch) | |
tree | a000112fbcc4f2a157e981963e2800beb43d1aee /repl/src/main | |
parent | 10697402648696827fe0782b031456e38657a9bb (diff) | |
download | spark-483f724d6229b33179d9cf41dd4e3fd17aa54aee.tar.gz spark-483f724d6229b33179d9cf41dd4e3fd17aa54aee.tar.bz2 spark-483f724d6229b33179d9cf41dd4e3fd17aa54aee.zip |
Upgrade to Scala 2.9.1.
Interestingly, the version in Maven is 2.9.1, but SBT outputs file to the 2.9.1.final
directory inside target.
A couple of small changes in SparkIMain were also required.
All tests pass and ./spark-shell launches successfully.
Diffstat (limited to 'repl/src/main')
-rw-r--r-- | repl/src/main/scala/spark/repl/SparkIMain.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/repl/src/main/scala/spark/repl/SparkIMain.scala b/repl/src/main/scala/spark/repl/SparkIMain.scala index fb4b9f9b40..43b6a6c950 100644 --- a/repl/src/main/scala/spark/repl/SparkIMain.scala +++ b/repl/src/main/scala/spark/repl/SparkIMain.scala @@ -356,7 +356,7 @@ class SparkIMain(val settings: Settings, protected val out: PrintWriter) extends private def mostRecentlyHandledTree: Option[Tree] = { prevRequests.reverse foreach { req => req.handlers.reverse foreach { - case x: MemberDefHandler if x.definesValue && !isInternalVarName(x.name) => return Some(x.member) + case x: MemberDefHandler if x.definesValue && !isInternalVarName(x.name.toString) => return Some(x.member) case _ => () } } @@ -1023,7 +1023,7 @@ class SparkIMain(val settings: Settings, protected val out: PrintWriter) extends protected def onlyTerms(xs: List[Name]) = xs collect { case x: TermName => x } protected def onlyTypes(xs: List[Name]) = xs collect { case x: TypeName => x } - def definedTerms = onlyTerms(allDefinedNames) filterNot isInternalVarName + def definedTerms = onlyTerms(allDefinedNames) filterNot (x => isInternalVarName(x.toString)) def definedTypes = onlyTypes(allDefinedNames) def definedSymbols = prevRequests.toSet flatMap ((x: Request) => x.definedSymbols.values) |