summaryrefslogtreecommitdiff
path: root/test/files/run/macro-openmacros/Impls_Macros_1.scala
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/run/macro-openmacros/Impls_Macros_1.scala')
-rw-r--r--test/files/run/macro-openmacros/Impls_Macros_1.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/run/macro-openmacros/Impls_Macros_1.scala b/test/files/run/macro-openmacros/Impls_Macros_1.scala
index 9fd658656e..ffeccce1e8 100644
--- a/test/files/run/macro-openmacros/Impls_Macros_1.scala
+++ b/test/files/run/macro-openmacros/Impls_Macros_1.scala
@@ -5,7 +5,7 @@ object Macros {
// we're macros, so we can reflect against our source path
// so we don't need any partests to clean up after us!
val c.CompilationUnit(file, _, _) = c.enclosingUnit
- val dir = file.getParentFile
+ val dir = file.getCanonicalFile.getParentFile
def normalizePaths(s: String) = {
val base = (dir.getCanonicalPath + java.io.File.separator).replace('\\', '/')
var regex = """\Q%s\E""" format base
@@ -13,12 +13,12 @@ object Macros {
if (isWin) regex = "(?i)" + regex
s.replace('\\', '/').replaceAll(regex, "")
}
-
- import c.mirror._
- val next = if (c.enclosingMacros.length < 3) Expr[Unit](Select(Ident(staticModule("Macros")), newTermName("foo"))) else c.literalUnit
+
+ import c.universe._
+ val next = if (c.enclosingMacros.length < 3) c.Expr[Unit](Select(Ident(c.mirror.staticModule("Macros")), newTermName("foo"))) else c.literalUnit
c.reify {
- println(c.literal(normalizePaths(c.enclosingMacros.toString)).eval)
- next.eval
+ println(c.literal(normalizePaths(c.enclosingMacros.toString)).splice)
+ next.splice
}
}