diff --git a/bench/src/test/scala/datalog/benchmarks/BenchMacro.scala b/bench/src/test/scala/datalog/benchmarks/BenchMacro.scala index 26ae7509..158004c7 100644 --- a/bench/src/test/scala/datalog/benchmarks/BenchMacro.scala +++ b/bench/src/test/scala/datalog/benchmarks/BenchMacro.scala @@ -4,7 +4,7 @@ import java.util.concurrent.TimeUnit import org.openjdk.jmh.annotations.* import org.openjdk.jmh.infra.Blackhole -import test.{SimpleProgram, SimpleMacroCompiler as simple} +import datalog.{SimpleProgram, SimpleMacroCompiler as simple} import scala.compiletime.uninitialized diff --git a/src/test/scala/test/MacroCompilerPrograms.scala b/src/test/scala/test/MacroCompilerPrograms.scala index 72602996..4461cc1a 100644 --- a/src/test/scala/test/MacroCompilerPrograms.scala +++ b/src/test/scala/test/MacroCompilerPrograms.scala @@ -1,4 +1,6 @@ -package test +// If this is in package test, macro execution fails with a ClassNotFoundException +// Reported as https://github.com/lampepfl/dotty/issues/18393 +package datalog import datalog.execution.{ExecutionEngine, SolvableProgram, MacroCompiler} import datalog.dsl.* diff --git a/src/test/scala/test/MacroCompilerTest.scala b/src/test/scala/test/MacroCompilerTest.scala index 9cbd6f52..e2a486ff 100644 --- a/src/test/scala/test/MacroCompilerTest.scala +++ b/src/test/scala/test/MacroCompilerTest.scala @@ -5,6 +5,8 @@ import datalog.dsl.* import datalog.execution.ir.* import datalog.storage.{DefaultStorageManager, StorageManager} +import datalog.SimpleMacroCompiler + object MacroCompilerTest { val simpleCompiled = SimpleMacroCompiler.compile() }