diff options
author | Simon Ochsenreither <simon@ochsenreither.de> | 2014-11-29 04:05:10 +0100 |
---|---|---|
committer | Simon Ochsenreither <simon@ochsenreither.de> | 2015-03-26 03:15:07 +0100 |
commit | 86999ed76b5d9df51c337c5e33fe265e04d8f39c (patch) | |
tree | f09526ab3075b9c5e9552eb1e564984a64b7df28 /src/repl/scala/tools/nsc/interpreter/IMain.scala | |
parent | e5bfc1c097e8dea9e0643e4a43743196209e9ba8 (diff) | |
download | scala-86999ed76b5d9df51c337c5e33fe265e04d8f39c.tar.gz scala-86999ed76b5d9df51c337c5e33fe265e04d8f39c.tar.bz2 scala-86999ed76b5d9df51c337c5e33fe265e04d8f39c.zip |
new{Term,Type}Name→{Term,Type}Name, tpename/nme→{type,term}Names
Diffstat (limited to 'src/repl/scala/tools/nsc/interpreter/IMain.scala')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IMain.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index 0347622cf4..c281126d5f 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -309,7 +309,7 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set def shift[T](op: => T): T = exitingFlatten(op) } - def originalPath(name: String): String = originalPath(name: TermName) + def originalPath(name: String): String = originalPath(TermName(name)) def originalPath(name: Name): String = typerOp path name def originalPath(sym: Symbol): String = typerOp path sym def flatPath(sym: Symbol): String = flatOp shift sym.javaClassName @@ -1106,8 +1106,8 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set def tryTwice(op: => Symbol): Symbol = exitingTyper(op) orElse exitingFlatten(op) def symbolOfIdent(id: String): Symbol = symbolOfType(id) orElse symbolOfTerm(id) - def symbolOfType(id: String): Symbol = tryTwice(replScope lookup (id: TypeName)) - def symbolOfTerm(id: String): Symbol = tryTwice(replScope lookup (id: TermName)) + def symbolOfType(id: String): Symbol = tryTwice(replScope lookup TypeName(id)) + def symbolOfTerm(id: String): Symbol = tryTwice(replScope lookup TermName(id)) def symbolOfName(id: Name): Symbol = replScope lookup id def runtimeClassAndTypeOfTerm(id: String): Option[(JClass, Type)] = { |