diff options
author | Den Shabalin <den.shabalin@gmail.com> | 2013-08-08 18:53:18 +0200 |
---|---|---|
committer | Den Shabalin <den.shabalin@gmail.com> | 2013-08-14 11:45:47 +0200 |
commit | d7ad291a0f93004fe9dc38f2414b77276f148c5c (patch) | |
tree | 296de641d8488ad31fa0adf7104f6bcaa67e76ad /src/repl/scala/tools/nsc/interpreter/package.scala | |
parent | a06a771dea3ade03c85fb3835632a8bc54392d5e (diff) | |
download | scala-d7ad291a0f93004fe9dc38f2414b77276f148c5c.tar.gz scala-d7ad291a0f93004fe9dc38f2414b77276f148c5c.tar.bz2 scala-d7ad291a0f93004fe9dc38f2414b77276f148c5c.zip |
refactor repl to use new new parser entry point
This commit refactors repl to use `parseStats` entry point and
streamlines hacky error handling that was previously used to
encode errors that happen during parsing.
Diffstat (limited to 'src/repl/scala/tools/nsc/interpreter/package.scala')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/package.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/package.scala b/src/repl/scala/tools/nsc/interpreter/package.scala index f82c38f5e7..5dc9b65436 100644 --- a/src/repl/scala/tools/nsc/interpreter/package.scala +++ b/src/repl/scala/tools/nsc/interpreter/package.scala @@ -145,8 +145,8 @@ package object interpreter extends ReplConfig with ReplStrings { case sym: TypeSymbol => Some(sym) case _ => None } - (typeFromTypeString orElse typeFromNameTreatedAsTerm orElse typeFromFullName orElse typeOfTerm) foreach { sym => - val (kind, tpe) = exitingTyper { + (typeFromTypeString orElse typeFromNameTreatedAsTerm orElse typeFromFullName orElse typeOfTerm) foreach { sym => + val (kind, tpe) = exitingTyper { val tpe = sym.tpeHK (intp.global.inferKind(NoPrefix)(tpe, sym.owner), tpe) } |