diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-11 13:02:53 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-11 13:02:53 -0700 |
| commit | 751daa9b3825543bd04eaa4eab6438f8410f6040 (patch) | |
| tree | 46d83d8adc9a5916c65a9ae1ca6ab173a2a80d6a /src/compiler/scala/tools/reflect/ToolBoxFactory.scala | |
| parent | 1850ddf380789e364813111282af5ff11e65b52c (diff) | |
| download | scala-751daa9b3825543bd04eaa4eab6438f8410f6040.tar.gz scala-751daa9b3825543bd04eaa4eab6438f8410f6040.tar.bz2 scala-751daa9b3825543bd04eaa4eab6438f8410f6040.zip | |
Started eliminating modes.
Consolidating the scattered typer state in Context, where it's
relatively easy to keep an eye on, rather than threaded throughout
the typer in sneaky/sticky bitmasks. The general pattern will be
what was once an explicitly passed around bit in Mode becomes
an implicitly propagated-as-appropriate bit in Context.
In this commit:
ALTmode becomes context mode "PatternAlternative"
STARmode becomes context mode "StarPatterns"
SUPERCONSTRmode becomes context mode "SuperInit"
Diffstat (limited to 'src/compiler/scala/tools/reflect/ToolBoxFactory.scala')
| -rw-r--r-- | src/compiler/scala/tools/reflect/ToolBoxFactory.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala index 7f7bcd70d2..602982337f 100644 --- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala +++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala @@ -2,7 +2,6 @@ package scala package tools package reflect -import scala.tools.nsc.EXPRmode import scala.tools.nsc.reporters._ import scala.tools.nsc.CompilerCommand import scala.tools.nsc.io.VirtualDirectory @@ -166,7 +165,7 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf => transformDuringTyper(expr, withImplicitViewsDisabled = withImplicitViewsDisabled, withMacrosDisabled = withMacrosDisabled)( (currentTyper, expr) => { trace("typing (implicit views = %s, macros = %s): ".format(!withImplicitViewsDisabled, !withMacrosDisabled))(showAttributed(expr, true, true, settings.Yshowsymkinds.value)) - currentTyper.silent(_.typed(expr, EXPRmode, pt)) match { + currentTyper.silent(_.typed(expr, pt)) match { case analyzer.SilentResultValue(result) => trace("success: ")(showAttributed(result, true, true, settings.Yshowsymkinds.value)) result |