Improve LLIR testing and fix a problem in paths

Author: LPTK

hkmc2DiffTests/src/test/scala/hkmc2/LlirDiffMaker.scala

@@ -41,12 +41,14 @@ abstract class LlirDiffMaker extends BbmlDiffMaker:
     try { op(p) } finally { p.close() }
 
   given Elaborator.Ctx = curCtx
-
-  var freshId = FreshInt()
-  var ctx = codegen.llir.Ctx.empty
-  val scope = Scope.empty
-  val wholeProg = ListBuffer.empty[Program]
-
+  
+  object Llir: // Avoid polluting the namespace
+    val freshId = FreshInt()
+    var ctx = codegen.llir.Ctx.empty
+    val scope = Scope.empty
+    val wholeProg = ListBuffer.empty[Program]
+  import Llir.*
+  
   def mkWholeProgram: Program =
     if wholeProg.length == 0 then
       throw new Exception("No program to make")
@@ -81,11 +83,7 @@ abstract class LlirDiffMaker extends BbmlDiffMaker:
               output(s"\n$name:")
               output(cpp.toDocument.toString)
             val rPath = os.Path(rootPath)
-            val auxPath =  
-              if rPath.last =/= "shared" then 
-                rPath/"hkmc2"/"shared"/"src"/"test"/"mlscript-compile"/"cpp"
-              else
-                rPath/"src"/"test"/"mlscript-compile"/"cpp"
+            val auxPath = rPath/"hkmc2"/"shared"/"src"/"test"/"mlscript-compile"/"cpp"
             if write.isDefined then
               printToFile(java.io.File((auxPath / s"${write.get}").toString)):
                 p => p.println(cpp.toDocument.toString)

hkmc2DiffTests/src/test/scala/hkmc2/Watcher.scala

@@ -89,15 +89,16 @@ class Watcher(dirs: Ls[File]):
       val path = os.Path(file.pathAsString)
       val basePath = path.segments.drop(dirPaths.head.segmentCount).toList.init
       val relativeName = basePath.map(_ + "/").mkString + path.baseName
-      val preludePath = os.pwd/os.up/"hkmc2"/"shared"/"src"/"test"/"mlscript"/"decls"/"Prelude.mls"
-      val predefPath = os.pwd/os.up/"hkmc2"/"shared"/"src"/"test"/"mlscript-compile"/"Predef.mls"
+      val rootPath = os.pwd/os.up
+      val preludePath = rootPath/"hkmc2"/"shared"/"src"/"test"/"mlscript"/"decls"/"Prelude.mls"
+      val predefPath = rootPath/"hkmc2"/"shared"/"src"/"test"/"mlscript-compile"/"Predef.mls"
       val isModuleFile = path.segments.contains("mlscript-compile")
       if isModuleFile
       then
         given Config = Config.default
         MLsCompiler(preludePath, outputConsumer => outputConsumer(System.out.println)).compileModule(path)
       else
-        val dm = new MainDiffMaker((dirPaths.head/os.up).toString, path, preludePath, predefPath, relativeName):
+        val dm = new MainDiffMaker(rootPath.toString, path, preludePath, predefPath, relativeName):
           override def unhandled(blockLineNum: Int, exc: Throwable): Unit =
             exc.printStackTrace()
             super.unhandled(blockLineNum, exc)