wip

Author: nicolasstucki

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

@@ -65,16 +65,6 @@ class ReifyQuotes extends MacroTransformWithImplicits {
   import ReifyQuotes._
   import tpd._
 
-  /** Classloader used for loading macros */
-  private[this] var myMacroClassLoader: java.lang.ClassLoader = _
-  private def macroClassLoader(implicit ctx: Context): ClassLoader = {
-    if (myMacroClassLoader == null) {
-      val urls = ctx.settings.classpath.value.split(java.io.File.pathSeparatorChar).map(cp => java.nio.file.Paths.get(cp).toUri.toURL)
-      myMacroClassLoader = new java.net.URLClassLoader(urls, getClass.getClassLoader)
-    }
-    myMacroClassLoader
-  }
-
   override def phaseName: String = ReifyQuotes.name
 
   override def checkPostCondition(tree: Tree)(implicit ctx: Context): Unit = {
@@ -433,11 +423,6 @@ class ReifyQuotes extends MacroTransformWithImplicits {
      *  are in the body of an inline method.
      */
     private def splice(splice: Select)(implicit ctx: Context): Tree = {
-//      println("+++++++++++++++++++++++++++++++++++++++")
-//      println(level)
-//      println(splice)
-//      println()
-//      println()
       if (level > 1) {
         val body1 = nested(isQuote = false).transform(splice.qualifier)
         body1.select(splice.name)
@@ -447,27 +432,24 @@ class ReifyQuotes extends MacroTransformWithImplicits {
         val tpe = outer.embedded.getHoleType(splice)
         val hole = makeHole(body1, quotes, tpe).withSpan(splice.span)
         // We do not place add the inline marker for trees that where lifted as they come from the same file as their
-        // enclosing quote. Any intemediate splice will add it's own Inlined node and cancel it before splicig the lifted tree.
+        // enclosing quote. Any intermediate splice will add it's own Inlined node and cancel it before splicig the lifted tree.
         // Note that lifted trees are not necessarily expressions and that Inlined nodes are expected to be expressions.
         // For example we can have a lifted tree containing the LHS of an assignment (see tests/run-with-compiler/quote-var.scala).
         if (splice.isType || outer.embedded.isLiftedSymbol(splice.qualifier.symbol)) hole
         else Inlined(EmptyTree, Nil, hole).withSpan(splice.span)
       }
-      else if (enclosingInlineds.nonEmpty) { // level 0 in an inlined call
-        val spliceCtx = ctx.outer // drop the last `inlineContext`
-        val pos: SourcePosition = spliceCtx.source.atSpan(enclosingInlineds.head.span)
-        val evaluatedSplice = Splicer.splice(splice.qualifier, pos, macroClassLoader)(spliceCtx).withSpan(splice.span)
-        if (ctx.reporter.hasErrors) splice else transform(evaluatedSplice)
-      }
       else if (!ctx.owner.isInlineMethod) { // level 0 outside an inline method
+        // TODO assert(...)?
         ctx.error(i"splice outside quotes or inline method", splice.sourcePos)
         splice
       }
       else if (Splicer.canBeSpliced(splice.qualifier)) { // level 0 inside an inline definition
+        // TODO remove?
         nested(isQuote = false).split(splice.qualifier) // Just check PCP
         splice
       }
       else { // level 0 inside an inline definition
+        // TODO remove?
         ctx.error(
           "Malformed macro call. The contents of the ~ must call a static method and arguments must be quoted or inline.".stripMargin,
           splice.sourcePos)