Merge pull request #6809 from dotty-staging/fix-inner-object-macro-implimentation

Fix inner object macro implementations

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -143,7 +143,7 @@ object Splicer {
       loadModule(fn.moduleClass)
 
     protected def interpretNew(fn: Symbol, args: => List[Result])(implicit env: Env): Object = {
-      val clazz = loadClass(fn.owner.fullName)
+      val clazz = loadClass(fn.owner.fullName.toString)
       val constr = clazz.getConstructor(paramsSig(fn): _*)
       constr.newInstance(args: _*).asInstanceOf[Object]
     }
@@ -154,11 +154,16 @@ object Splicer {
     private def loadModule(sym: Symbol): Object = {
       if (sym.owner.is(Package)) {
         // is top level object
-        val moduleClass = loadClass(sym.fullName)
+        val moduleClass = loadClass(sym.fullName.toString)
         moduleClass.getField(str.MODULE_INSTANCE_FIELD).get(null)
       } else {
         // nested object in an object
-        val clazz = loadClass(sym.fullNameSeparated(FlatName))
+        val className = {
+          val pack = sym.topLevelClass.owner
+          if (pack == defn.RootPackage || pack == defn.EmptyPackageClass) sym.flatName.toString
+          else pack.showFullName + "." + sym.flatName
+        }
+        val clazz = loadClass(className)
         clazz.getConstructor().newInstance().asInstanceOf[Object]
       }
     }
@@ -168,8 +173,8 @@ object Splicer {
       lineClassloader.loadClass(moduleClass.name.firstPart.toString)
     }
 
-    private def loadClass(name: Name): Class[_] = {
-      try classLoader.loadClass(name.toString)
+    private def loadClass(name: String): Class[_] = {
+      try classLoader.loadClass(name)
       catch {
         case _: ClassNotFoundException =>
           val msg = s"Could not find class $name in classpath$extraMsg"

tests/pos-macros/i6803b/Macro_1.scala

@@ -0,0 +1,17 @@
+package blah
+
+import scala.language.implicitConversions
+import scala.quoted._
+import scala.quoted.autolift._
+
+object AsObject {
+  final class LineNo(val lineNo: Int)
+  object LineNo {
+    def unsafe(i: Int): LineNo = new LineNo(i)
+    inline delegate x for LineNo = ${impl}
+    private def impl given (qctx: QuoteContext): Expr[LineNo] = {
+      import qctx.tasty._
+      '{unsafe(${rootPosition.startLine})}
+    }
+  }
+}

tests/pos-macros/i6803b/Test_2.scala

@@ -0,0 +1,11 @@
+import blah._
+
+object Test {
+  def main(args: Array[String]): Unit = {
+
+    def testO(): Unit = {
+      import AsObject.LineNo
+      the[LineNo] given LineNo.x
+    }
+  }
+}

tests/run-macros/inline-case-objects.check

@@ -3,4 +3,4 @@ scala.None$
 Bar$
 Bar.Baz$
 foo.Bar$
-Bar.Baz$
+foo.Bar.Baz$

tests/run-macros/inline-macro-inner-object.check

@@ -0,0 +1,3 @@
+A.f
+A.B.f
+A.B.C.f

tests/run-macros/inline-macro-inner-object/Macro_1.scala

@@ -0,0 +1,22 @@
+package blah
+
+import scala.quoted._
+
+object A {
+  inline def f: Unit = ${impl}
+  private def impl given (qctx: QuoteContext): Expr[Unit] = {
+    '{println("A.f")}
+  }
+  object B {
+    inline def f: Unit = ${impl}
+    private def impl given (qctx: QuoteContext): Expr[Unit] = {
+      '{println("A.B.f")}
+    }
+    object C {
+      inline def f: Unit = ${impl}
+      private def impl given (qctx: QuoteContext): Expr[Unit] = {
+        '{println("A.B.C.f")}
+      }
+    }
+  }
+}

tests/run-macros/inline-macro-inner-object/Test_2.scala

@@ -0,0 +1,9 @@
+import blah._
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    A.f
+    A.B.f
+    A.B.C.f
+  }
+}