Merge pull request #167 from rise-lang/macro-replacement-dpia

build.sbt

@@ -17,7 +17,7 @@ lazy val commonSettings = Seq(
 
 lazy val riseAndShine = (project in file("."))
   .aggregate(executor, CUexecutor)
-  .dependsOn(meta, riseAndShineMacros, arithExpr, executor, CUexecutor, elevate)
+  .dependsOn(meta, arithExpr, executor, CUexecutor, elevate)
   .settings(
     name          := "riseAndShine",
     version       := "1.0",
@@ -50,7 +50,16 @@ lazy val riseAndShine = (project in file("."))
 lazy val generateRISEPrimitives = taskKey[Unit]("Generate RISE Primitives")
 
 generateRISEPrimitives := {
-  runner.value.run("meta.RisePrimitiveGenerator",
+  runner.value.run("meta.generator.RisePrimitives",
+    (dependencyClasspath in Compile).value.files,
+    Seq((scalaSource in Compile).value.getAbsolutePath),
+    streams.value.log).failed foreach (sys error _.getMessage)
+}
+
+lazy val generateDPIAPrimitives = taskKey[Unit]("Generate DPIA Primitives")
+
+generateDPIAPrimitives := {
+  runner.value.run("meta.generator.DPIAPrimitives",
     (dependencyClasspath in Compile).value.files,
     Seq((scalaSource in Compile).value.getAbsolutePath),
     streams.value.log).failed foreach (sys error _.getMessage)
@@ -67,14 +76,6 @@ lazy val meta = (project in file("meta"))
     libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.10",
   )
 
-lazy val riseAndShineMacros = (project in file("macros"))
-  .settings(
-    name := "riseAndShineMacros",
-    version := "1.0",
-    commonSettings,
-    libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
-  )
-
 lazy val arithExpr  = project in file("lib/arithexpr")
 
 lazy val executor   = project in file("lib/executor")