Extract typecheck to Compat since it was renamed in 2.10

makkarpov · Apr 24, 2016 · 281b8c9 · 281b8c9
1 parent 1ce8840
commit 281b8c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -14,7 +14,7 @@ val common = Seq(
   version <<= version in LocalRootProject,
 
   crossPaths := true,
-  scalaVersion := "2.11.7",
+  scalaVersion := "2.10.4",
   crossScalaVersions := Seq("2.10.4", "2.11.7"),
   scalacOptions ++= Seq( "-Xfatal-warnings", "-feature", "-deprecation" ),
 

diff --git a/scalingua/src/main/scala-2.10/ru/makkarpov/scalingua/Compat.scala b/scalingua/src/main/scala-2.10/ru/makkarpov/scalingua/Compat.scala
@@ -20,4 +20,5 @@ object Compat {
   type Context = scala.reflect.macros.Context
   def prettyPrint(c: Context)(e: c.Tree): String = c.universe.show(e)
   def termName(c: Context)(s: String): c.TermName = c.universe.newTermName(c.fresh(s))
+  def typecheck(c: Context)(e: c.Tree): c.Tree = c.typeCheck(e)
 }
diff --git a/scalingua/src/main/scala-2.11/ru/makkarpov/scalingua/Compat.scala b/scalingua/src/main/scala-2.11/ru/makkarpov/scalingua/Compat.scala
@@ -24,4 +24,5 @@ object Compat {
   type Context = whitebox.Context
   def prettyPrint(c: Context)(e: c.Tree): String = c.universe.showCode(e)
   def termName(c: Context)(s: String): c.TermName = c.universe.TermName(c.freshName(s))
+  def typecheck(c: Context)(e: c.Tree): c.Tree = c.typecheck(e)
 }
diff --git a/scalingua/src/main/scala/ru/makkarpov/scalingua/Macros.scala b/scalingua/src/main/scala/ru/makkarpov/scalingua/Macros.scala
@@ -171,7 +171,7 @@ object Macros {
     // Find a variable that represents plural number and strip `.nVar`s, if any.
     val (filteredArgs, nVar) = {
       val intVars = args.indices.filter { i =>
-        val tpe = c.typecheck(args(i)).tpe
+        val tpe = typecheck(c)(args(i)).tpe
         (tpe <:< typeOf[Int]) || (tpe <:< typeOf[Long])
       }
 
@@ -200,7 +200,7 @@ object Macros {
 
       for {
         arg <- args
-        tpe = c.typecheck(arg).tpe
+        tpe = typecheck(c)(arg).tpe
       } if (tpe <:< weakTypeOf[Suffix]) {
         val rawSuffix =
           if (tpe <:< weakTypeOf[Suffix.S]) "s"