missed plugin commits

DFiantHDL · May 6, 2024 · 100149a · 100149a
1 parent 9a0f04c
commit 100149a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugin/src/main/scala/plugin/CommonPhase.scala b/plugin/src/main/scala/plugin/CommonPhase.scala
@@ -334,7 +334,7 @@ abstract class CommonPhase extends PluginPhase:
     inlineAnnotSym = requiredClass("scala.inline")
     constModTpe = requiredClassRef("dfhdl.core.ISCONST").appliedTo(ConstantType(Constant(true)))
     contextFunctionSym = defn.FunctionSymbol(1, isContextual = true)
-    genDesignParamSym = requiredMethod("dfhdl.core.__For_Plugin.genDesignParam")
+    genDesignParamSym = requiredMethod("dfhdl.core.r__For_Plugin.genDesignParam")
     if (debugFilter(tree.source.path.toString))
       println(
         s"""===============================================================

diff --git a/plugin/src/main/scala/plugin/CustomControlPhase.scala b/plugin/src/main/scala/plugin/CustomControlPhase.scala
@@ -465,7 +465,7 @@ class CustomControlPhase(setting: Setting) extends CommonPhase:
         mkNone
 
   object FromCore:
-    private val fullPath = "dfhdl.core.__For_Plugin"
+    private val fullPath = "dfhdl.core.r__For_Plugin"
     def selectMethod(methodName: String)(using Context): Tree =
       ref(requiredMethod(s"$fullPath.$methodName"))
     def structToDFVal(retTpe: Type, productTree: Tree)(using Context): Tree =
@@ -961,8 +961,8 @@ class CustomControlPhase(setting: Setting) extends CommonPhase:
     super.prepareForUnit(tree)
     ignoreIfs.clear()
     replaceIfs.clear()
-    fromBooleanSym = requiredMethod("dfhdl.core.__For_Plugin.fromBoolean")
-    toFunc1Sym = requiredMethod("dfhdl.core.__For_Plugin.toFunc1")
+    fromBooleanSym = requiredMethod("dfhdl.core.r__For_Plugin.fromBoolean")
+    toFunc1Sym = requiredMethod("dfhdl.core.r__For_Plugin.toFunc1")
     fromBranchesSym = requiredMethod("dfhdl.core.DFIf.fromBranches")
     fromCasesSym = requiredMethod("dfhdl.core.DFMatch.fromCases")
     dfValClsRef = requiredClassRef("dfhdl.core.DFVal")

diff --git a/plugin/src/main/scala/plugin/DesignDefsPhase.scala b/plugin/src/main/scala/plugin/DesignDefsPhase.scala
@@ -122,8 +122,8 @@ class DesignDefsPhase(setting: Setting) extends CommonPhase:
     ctx
 
   override def prepareForUnit(tree: Tree)(using Context): Context =
-    designFromDefSym = requiredMethod("dfhdl.core.__For_Plugin.designFromDef")
-    designFromDefGetInputSym = requiredMethod("dfhdl.core.__For_Plugin.designFromDefGetInput")
+    designFromDefSym = requiredMethod("dfhdl.core.r__For_Plugin.designFromDef")
+    designFromDefGetInputSym = requiredMethod("dfhdl.core.r__For_Plugin.designFromDefGetInput")
     super.prepareForUnit(tree)
     ctx
 end DesignDefsPhase