resolve merge conflict

the nanopass code was changed to adhere to the new function call
architecture

Author: Killian Perlin

lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/Hierarchy.java

@@ -79,6 +79,7 @@ private void become(int size, boolean[] matrix, HashMap<String, Integer> index)
     /**
      * Computes a hierarchy of currently available classes in the Lkt bindings.
      */
+    @SuppressWarnings("unchecked")
     @TruffleBoundary
     public static Hierarchy initial() {
         // Collect all inital classes
@@ -250,30 +251,4 @@ public void removeAll(Collection<String> classes) {
 
         become(size, matrix, index);
     }
-
-    // Primarily used in testing
-    /** Equality implementation */
-    @TruffleBoundary
-    public boolean equals(Object otherObject) {
-        if (otherObject == null) return false;
-        if (otherObject instanceof Hierarchy other) {
-            if (size != other.size) return false;
-            if (!index.keySet().equals(other.index.keySet())) return false;
-
-            for (var x : index.keySet()) {
-                final var classX = index.get(x);
-                final var otherX = other.index.get(x);
-                for (var y : index.keySet()) {
-                    final var classY = index.get(y);
-                    final var otherY = other.index.get(y);
-                    if (
-                        matrix[classX * size + classY] != other.matrix[otherX * size + otherY]
-                    ) return false;
-                }
-            }
-
-            return true;
-        }
-        return false;
-    }
 }

lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java

@@ -1977,16 +1977,10 @@ public LKQLNode visit(Liblkqllang.PassDecl passDecl) {
         scriptFrames.enterFrame(passDecl);
 
         final int nbFakeArgs = Constants.PASS_FAKE_ARGS.length;
-        final var parameterDeclarations = new ParameterDeclaration[nbFakeArgs];
-        final var readArguments = new ReadArgument[nbFakeArgs];
+        final var readParameters = new ReadParameter[nbFakeArgs];
         for (int i = 0; i < nbFakeArgs; i++) {
             final String argName = Constants.PASS_FAKE_ARGS[i];
-            parameterDeclarations[i] = new ParameterDeclaration(
-                source.createUnavailableSection(),
-                argName,
-                null
-            );
-            readArguments[i] = new ReadArgument(
+            readParameters[i] = new ReadParameter(
                 source.createUnavailableSection(),
                 scriptFrames.getParameter(argName)
             );
@@ -2003,7 +1997,7 @@ public LKQLNode visit(Liblkqllang.PassDecl passDecl) {
             addBlock,
             delBlock,
             rewriteBlock,
-            readArguments[0]
+            readParameters[0]
         );
 
         final var docstring = passDecl.pDoc();
@@ -2012,16 +2006,18 @@ public LKQLNode visit(Liblkqllang.PassDecl passDecl) {
             location,
             scriptFrames.getFrameDescriptor(),
             scriptFrames.getClosureDescriptor(),
-            parameterDeclarations,
+            Constants.PASS_FAKE_ARGS,
+            new Expr[Constants.PASS_FAKE_ARGS.length],
             docstring.isNone() ? "" : parseStringLiteral(docstring),
-            passExpr
+            passExpr,
+            "<anonymous>"
         );
 
         // Cleanup
         inPass = false;
         this.scriptFrames.exitFrame();
 
-        final var functionDecl = new FunctionDeclaration(location, null, name, slot, funExpr);
+        final var functionDecl = new FunctionDeclaration(location, null, slot, funExpr);
 
         return functionDecl;
     }

lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/DynamicConstructorCall.java

@@ -52,7 +52,7 @@ public int arity() {
     public String[] getArgNames() {
         final var argNames = new String[args.getArgs().length];
         for (int i = 0; i < argNames.length; i++) {
-            argNames[i] = ((NamedArg) this.args.getArgs()[i]).getArgName().getName();
+            argNames[i] = this.args.getArgs()[i].getArgStringName();
         }
         return argNames;
     }
@@ -61,7 +61,11 @@ public String[] getArgNames() {
 
     @Override
     public Object executeGeneric(VirtualFrame frame) {
-        return new DynamicAdaNode(nodeKind, this.args.executeArgList(frame), this.getArgNames());
+        final Object[] argVals = new Object[arity()];
+        for (int i = 0; i < arity(); i++) {
+            argVals[i] = args.getArgs()[i].executeGeneric(frame);
+        }
+        return new DynamicAdaNode(nodeKind, argVals, this.getArgNames());
     }
 
     // ----- Override methods -----

lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/pass/PassExpr.java

@@ -8,7 +8,7 @@
 import com.adacore.lkql_jit.LKQLLanguage;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
-import com.adacore.lkql_jit.nodes.expressions.value_read.ReadArgument;
+import com.adacore.lkql_jit.nodes.expressions.value_read.ReadParameter;
 import com.adacore.lkql_jit.runtime.values.DynamicAdaNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -25,7 +25,7 @@
  * A pass expr is the body of the synthesized function and contains
  * all the logic needed to execute a pass.
  */
-@NodeChild(value = "readInput", type = ReadArgument.class)
+@NodeChild(value = "readInput", type = ReadParameter.class)
 public abstract class PassExpr extends Expr {
 
     // This field doesn't need to be a child with regard to execution,

lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/pass/RunPass.java

@@ -55,7 +55,7 @@ public Object executeGeneric(VirtualFrame frame) {
         }
 
         // Setup all units roots
-        final var roots = ctx.getAllUnitsRoots();
+        final var roots = ctx.allUnitsRoots();
         final var units = new Object[roots.length];
         for (int i = 0; i < roots.length; i++) {
             if (ctx.isVerbose()) {