summaryrefslogtreecommitdiff
path: root/src/compiler/scala/reflect/macros
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-01-03 02:31:39 -0800
committerJason Zaugg <jzaugg@gmail.com>2014-01-03 02:31:39 -0800
commit718b26baa6113bef9ce3ebc7c439e099615db78d (patch)
tree91b1cb0bc479cf43a25febacb8740c72826126d2 /src/compiler/scala/reflect/macros
parent5c9b070fcf64fa17870248b7f856c4e7520f865f (diff)
parentf417380637428d8a57c38d2305c9cf09fd7d6366 (diff)
downloadscala-718b26baa6113bef9ce3ebc7c439e099615db78d.tar.gz
scala-718b26baa6113bef9ce3ebc7c439e099615db78d.tar.bz2
scala-718b26baa6113bef9ce3ebc7c439e099615db78d.zip
Merge pull request #3254 from xeno-by/topic/typeCheck
typeCheck => typecheck
Diffstat (limited to 'src/compiler/scala/reflect/macros')
-rw-r--r--src/compiler/scala/reflect/macros/contexts/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/macros/contexts/Typers.scala b/src/compiler/scala/reflect/macros/contexts/Typers.scala
index 4fa7603305..85204d0f1b 100644
--- a/src/compiler/scala/reflect/macros/contexts/Typers.scala
+++ b/src/compiler/scala/reflect/macros/contexts/Typers.scala
@@ -13,7 +13,7 @@ trait Typers {
/**
* @see [[scala.tools.reflect.ToolBox.typeCheck]]
*/
- def typeCheck(tree: Tree, pt: Type = universe.WildcardType, silent: Boolean = false, withImplicitViewsDisabled: Boolean = false, withMacrosDisabled: Boolean = false): Tree = {
+ def typecheck(tree: Tree, pt: Type = universe.WildcardType, silent: Boolean = false, withImplicitViewsDisabled: Boolean = false, withMacrosDisabled: Boolean = false): Tree = {
macroLogVerbose("typechecking %s with expected type %s, implicit views = %s, macros = %s".format(tree, pt, !withImplicitViewsDisabled, !withMacrosDisabled))
val context = callsiteTyper.context
val wrapper1 = if (!withImplicitViewsDisabled) (context.withImplicitsEnabled[Tree] _) else (context.withImplicitsDisabled[Tree] _)