Merge pull request #184 from adelbertc/macro-import

Fully qualify values in CodecJson.derive macro
argonaut-io · Jul 6, 2015 · c38a3d9 · c38a3d9
2 parents 4f13900 + 31c1bec
commit c38a3d9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/scala/argonaut/internal/Macros.scala b/src/main/scala/argonaut/internal/Macros.scala
@@ -11,7 +11,7 @@ object Macros extends MacrosCompat {
     val encode = materializeEncodeImpl[T](c)
     val decode = materializeDecodeImpl[T](c)
     c.Expr[CodecJson[T]](q"""
-    CodecJson.derived[$tpe]($encode, $decode)
+    _root_.argonaut.CodecJson.derived[$tpe]($encode, $decode)
     """)
   }
 
@@ -38,7 +38,7 @@ object Macros extends MacrosCompat {
         }
         val methodName = createTermName(c)("jencode" + (fieldCount.toString) + "L")
         val expr = c.Expr[EncodeJson[T]]{q"""
-          EncodeJson.$methodName[$tpe, ..$fieldTypes](toEncode => (..$invocations))(..$decodedNames)
+          _root_.argonaut.EncodeJson.$methodName[$tpe, ..$fieldTypes](toEncode => (..$invocations))(..$decodedNames)
         """}
         //println(expr)
         expr
@@ -74,12 +74,12 @@ object Macros extends MacrosCompat {
         }
         val methodName = createTermName(c)("jdecode" + (fieldCount.toString) + "L")
         val expr = c.Expr[DecodeJson[T]]{q"""
-          DecodeJson.$methodName[..$fieldTypes, $tpe]((..$functionParameters) => new $tpe(..$parameters))(..$decodedNames)
+          _root_.argonaut.DecodeJson.$methodName[..$fieldTypes, $tpe]((..$functionParameters) => new $tpe(..$parameters))(..$decodedNames)
         """}
         //println(expr)
         expr
       }
       case None => c.abort(c.enclosingPosition, "Could not identify primary constructor for " + tpe)
     }
   }
-}
+}