diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-05-20 12:42:08 -0700 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-05-20 12:42:08 -0700 |
| commit | 779ec153fff82e111a8fdc7a982dbfe76af3a248 (patch) | |
| tree | e0e72627bf54fa495e773798af13654dfe9541b6 /src/compiler | |
| parent | 90e09642675562ddea0aa8181d0b7259ffe21f2d (diff) | |
| parent | 658d90ace0068547d89ed398c6775d8cc8264ee0 (diff) | |
| download | scala-779ec153fff82e111a8fdc7a982dbfe76af3a248.tar.gz scala-779ec153fff82e111a8fdc7a982dbfe76af3a248.tar.bz2 scala-779ec153fff82e111a8fdc7a982dbfe76af3a248.zip | |
Merge pull request #2506 from scalamacros/ticket/7461
c.typeCheck(silent = true) now suppresses ambiguous errors
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/reflect/macros/runtime/Typers.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/reflect/ToolBoxFactory.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/macros/runtime/Typers.scala b/src/compiler/scala/reflect/macros/runtime/Typers.scala index 4d333f180b..a51bee0fe8 100644 --- a/src/compiler/scala/reflect/macros/runtime/Typers.scala +++ b/src/compiler/scala/reflect/macros/runtime/Typers.scala @@ -22,7 +22,7 @@ trait Typers { // typechecking uses silent anyways (e.g. in typedSelect), so you'll only waste your time // I'd advise fixing the root cause: finding why the context is not set to report errors // (also see reflect.runtime.ToolBoxes.typeCheckExpr for a workaround that might work for you) - wrapper(callsiteTyper.silent(_.typed(tree, universe.analyzer.EXPRmode, pt)) match { + wrapper(callsiteTyper.silent(_.typed(tree, universe.analyzer.EXPRmode, pt), reportAmbiguousErrors = false) match { case universe.analyzer.SilentResultValue(result) => macroLogVerbose(result) result diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala index 4b5dcadfa2..64b8870619 100644 --- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala +++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala @@ -166,7 +166,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, analyzer.EXPRmode, pt)) match { + currentTyper.silent(_.typed(expr, analyzer.EXPRmode, pt), reportAmbiguousErrors = false) match { case analyzer.SilentResultValue(result) => trace("success: ")(showAttributed(result, true, true, settings.Yshowsymkinds.value)) result |