Merge branch 'topic/lkql_jit_values' into 'master'

Rework the LKQL JIT value representations Closes #71 See merge request eng/libadalang/langkit-query-language!121
AdaCore · Dec 4, 2023 · 23e012a · 23e012a
2 parents def6b44 + 8601955
commit 23e012a
Show file tree

Hide file tree

Showing 175 changed files with 4,254 additions and 2,449 deletions.
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java
@@ -23,13 +23,14 @@
 package com.adacore.lkql_jit;
 
 import com.adacore.libadalang.Libadalang;
+import com.adacore.lkql_jit.built_ins.BuiltInFunctionValue;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.declarations.FunctionDeclaration;
 import com.adacore.lkql_jit.runtime.GlobalScope;
-import com.adacore.lkql_jit.runtime.built_ins.BuiltInFunctionValue;
-import com.adacore.lkql_jit.runtime.values.ObjectValue;
 import com.adacore.lkql_jit.utils.Constants;
 import com.adacore.lkql_jit.utils.LKQLConfigFileResult;
+import com.adacore.lkql_jit.utils.checkers.BaseChecker;
+import com.adacore.lkql_jit.utils.checkers.NodeChecker;
+import com.adacore.lkql_jit.utils.checkers.UnitChecker;
 import com.adacore.lkql_jit.utils.functions.ArrayUtils;
 import com.adacore.lkql_jit.utils.functions.CheckerUtils;
 import com.adacore.lkql_jit.utils.functions.ParsingUtils;
@@ -116,16 +117,16 @@ public final class LKQLContext {
     private Map<String, Map<String, Object>> allRulesArgs = null;
 
     /** The filtered node checkers cache. */
-    private ObjectValue[] filteredAllNodeCheckers = null;
+    private NodeChecker[] filteredAllNodeCheckers = null;
 
     /** The filtered node checkers for Ada code only. */
-    private ObjectValue[] filteredAdaNodeCheckers = null;
+    private NodeChecker[] filteredAdaNodeCheckers = null;
 
     /** The filtered node checkers for SPARK code only. */
-    private ObjectValue[] filteredSparkNodeCheckers = null;
+    private NodeChecker[] filteredSparkNodeCheckers = null;
 
     /** The filtered unit checkers cache. */
-    private ObjectValue[] filteredUnitCheckers = null;
+    private UnitChecker[] filteredUnitCheckers = null;
 
     /** Whether there is at least one rule that needs to follow generic instantiations. */
     private boolean needsToFollowInstantiations = false;
@@ -789,7 +790,7 @@ public Object getRuleArg(String ruleName, String argName) {
      * @return The node checkers array filtered according to options.
      */
     @CompilerDirectives.TruffleBoundary
-    public ObjectValue[] getAllNodeCheckers() {
+    public NodeChecker[] getAllNodeCheckers() {
         if (this.filteredAllNodeCheckers == null) {
             this.initCheckerCaches();
         }
@@ -801,7 +802,7 @@ public ObjectValue[] getAllNodeCheckers() {
      *
      * @return The node checkers array for Ada code only.
      */
-    public ObjectValue[] getAdaNodeCheckers() {
+    public NodeChecker[] getAdaNodeCheckers() {
         if (this.filteredAdaNodeCheckers == null) {
             this.initCheckerCaches();
         }
@@ -813,7 +814,7 @@ public ObjectValue[] getAdaNodeCheckers() {
      *
      * @return The node checkers array for SPARK code only.
      */
-    public ObjectValue[] getSparkNodeCheckers() {
+    public NodeChecker[] getSparkNodeCheckers() {
         if (this.filteredSparkNodeCheckers == null) {
             this.initCheckerCaches();
         }
@@ -826,7 +827,7 @@ public ObjectValue[] getSparkNodeCheckers() {
      * @return The list for unit checkers filtered according to options.
      */
     @CompilerDirectives.TruffleBoundary
-    public ObjectValue[] getUnitCheckersFiltered() {
+    public UnitChecker[] getUnitCheckersFiltered() {
         if (this.filteredUnitCheckers == null) {
             this.initCheckerCaches();
         }
@@ -837,56 +838,57 @@ public ObjectValue[] getUnitCheckersFiltered() {
     @CompilerDirectives.TruffleBoundary
     private void initCheckerCaches() {
         // Prepare the working variables
-        final List<ObjectValue> allNodeCheckers = new ArrayList<>();
-        final List<ObjectValue> adaNodeCheckers = new ArrayList<>();
-        final List<ObjectValue> sparkNodeCheckers = new ArrayList<>();
-        final List<ObjectValue> unitCheckers = new ArrayList<>();
-        final Map<String, ObjectValue> allCheckers = this.global.getCheckers();
+        final List<NodeChecker> allNodeCheckers = new ArrayList<>();
+        final List<NodeChecker> adaNodeCheckers = new ArrayList<>();
+        final List<NodeChecker> sparkNodeCheckers = new ArrayList<>();
+        final List<UnitChecker> unitCheckers = new ArrayList<>();
+        final Map<String, BaseChecker> allCheckers = this.global.getCheckers();
 
         // Get the command line required rules
         final List<String> allRules = this.getAllRules();
         final List<String> adaRules = this.getAdaRules();
         final List<String> sparkRules = this.getSparkRules();
 
         // Lambda to dispatch checkers in the correct lists
-        final BiConsumer<ObjectValue, List<ObjectValue>> dispatchChecker =
+        final BiConsumer<BaseChecker, List<NodeChecker>> dispatchChecker =
                 (checker, nodeCheckers) -> {
-                    if (checker.get("mode") == FunctionDeclaration.CheckerMode.NODE) {
-                        nodeCheckers.add(checker);
-                        if ((boolean) checker.get("follow_generic_instantiations")) {
+                    if (checker instanceof NodeChecker nodeChecker) {
+                        nodeCheckers.add(nodeChecker);
+                        if (nodeChecker.isFollowGenericInstantiations()) {
                             needsToFollowInstantiations = true;
                         }
                     } else {
-                        unitCheckers.add(checker);
+                        UnitChecker unitChecker = (UnitChecker) checker;
+                        unitCheckers.add(unitChecker);
                     }
                 };
 
         // Lambda to get the checker object value from the rule name
-        final Function<String, ObjectValue> getAssociatedChecker =
+        final Function<String, BaseChecker> getAssociatedChecker =
                 (ruleName) -> {
                     // Get the checker from the given rule name
-                    ObjectValue res = null;
+                    BaseChecker checker;
                     final String aliasResolved = this.getRuleFromAlias(ruleName);
                     if (aliasResolved != null) {
-                        res = new ObjectValue(allCheckers.get(aliasResolved));
-                        res.set("alias", ruleName);
+                        checker = allCheckers.get(aliasResolved).copy();
+                        checker.setAlias(ruleName);
                     } else {
-                        res = allCheckers.get(ruleName);
+                        checker = allCheckers.get(ruleName);
                     }
 
                     // Verify that the checker is not null
-                    if (res == null) {
+                    if (checker == null) {
                         throw LKQLRuntimeException.fromMessage(
                                 "Could not find any rule named " + ruleName);
                     }
 
                     // Return the result
-                    return res;
+                    return checker;
                 };
 
         // If there is no wanted rule, run them all (if the appropriate option is set)
         if (allRules.size() == 0 && this.env.getOptions().get(LKQLLanguage.fallbackToAllRules)) {
-            for (ObjectValue checker : allCheckers.values()) {
+            for (BaseChecker checker : allCheckers.values()) {
                 dispatchChecker.accept(checker, allNodeCheckers);
             }
         }
@@ -905,10 +907,10 @@ private void initCheckerCaches() {
         }
 
         // Set the checker caches
-        this.filteredAllNodeCheckers = allNodeCheckers.toArray(new ObjectValue[0]);
-        this.filteredAdaNodeCheckers = adaNodeCheckers.toArray(new ObjectValue[0]);
-        this.filteredSparkNodeCheckers = sparkNodeCheckers.toArray(new ObjectValue[0]);
-        this.filteredUnitCheckers = unitCheckers.toArray(new ObjectValue[0]);
+        this.filteredAllNodeCheckers = allNodeCheckers.toArray(new NodeChecker[0]);
+        this.filteredAdaNodeCheckers = adaNodeCheckers.toArray(new NodeChecker[0]);
+        this.filteredSparkNodeCheckers = sparkNodeCheckers.toArray(new NodeChecker[0]);
+        this.filteredUnitCheckers = unitCheckers.toArray(new UnitChecker[0]);
     }
 
     /**

diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLLanguage.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLLanguage.java
@@ -23,13 +23,13 @@
 package com.adacore.lkql_jit;
 
 import com.adacore.liblkqllang.Liblkqllang;
+import com.adacore.lkql_jit.built_ins.BuiltInFactory;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.langkit_translator.LangkitTranslator;
 import com.adacore.lkql_jit.nodes.LKQLNode;
 import com.adacore.lkql_jit.nodes.TopLevelList;
 import com.adacore.lkql_jit.nodes.root_nodes.TopLevelRootNode;
 import com.adacore.lkql_jit.runtime.GlobalScope;
-import com.adacore.lkql_jit.runtime.built_ins.BuiltInFactory;
 import com.adacore.lkql_jit.utils.Constants;
 import com.adacore.lkql_jit.utils.enums.DiagnosticOutputMode;
 import com.oracle.truffle.api.CallTarget;

diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java
@@ -23,9 +23,11 @@
 package com.adacore.lkql_jit;
 
 import com.adacore.libadalang.Libadalang;
-import com.adacore.lkql_jit.runtime.values.*;
-import com.adacore.lkql_jit.runtime.values.interfaces.Iterable;
-import com.adacore.lkql_jit.runtime.values.interfaces.*;
+import com.adacore.lkql_jit.built_ins.values.*;
+import com.adacore.lkql_jit.built_ins.values.interfaces.Iterable;
+import com.adacore.lkql_jit.built_ins.values.interfaces.*;
+import com.adacore.lkql_jit.built_ins.values.lists.LKQLLazyList;
+import com.adacore.lkql_jit.built_ins.values.lists.LKQLList;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.ImplicitCast;
 import com.oracle.truffle.api.dsl.TypeCast;
@@ -39,27 +41,25 @@
  * @author Hugo GUERRIER
  */
 @TypeSystem({
-    UnitValue.class,
+    LKQLUnit.class,
     long.class,
     BigInteger.class,
     String.class,
-    Pattern.class,
-    FunctionValue.class,
-    PropertyRefValue.class,
-    SelectorValue.class,
-    TupleValue.class,
-    ListValue.class,
-    LazyListValue.class,
-    SelectorListValue.class,
-    LazyCollection.class,
+    LKQLPattern.class,
+    LKQLFunction.class,
+    LKQLSelector.class,
+    LKQLProperty.class,
+    LKQLTuple.class,
+    LKQLList.class,
+    LKQLLazyList.class,
     Indexable.class,
     Iterable.class,
     Libadalang.AdaNode.class,
     Libadalang.Token.class,
     Libadalang.AnalysisUnit.class,
     boolean.class,
-    ObjectValue.class,
-    NamespaceValue.class,
+    LKQLNamespace.class,
+    LKQLObject.class,
     Nullish.class,
     LKQLValue.class,
 })
@@ -73,9 +73,9 @@ public abstract class LKQLTypeSystem {
      * @param value The value to test.
      * @return True if the value is unit, false else.
      */
-    @TypeCheck(UnitValue.class)
-    public static boolean isUnit(Object value) {
-        return value == UnitValue.getInstance();
+    @TypeCheck(LKQLUnit.class)
+    public static boolean isUnit(final Object value) {
+        return value == LKQLUnit.INSTANCE;
     }
 
     /**
@@ -84,9 +84,9 @@ public static boolean isUnit(Object value) {
      * @param value The value to cast.
      * @return The unit value.
      */
-    @TypeCast(UnitValue.class)
-    public static UnitValue asUnit(Object value) {
-        return UnitValue.getInstance();
+    @TypeCast(LKQLUnit.class)
+    public static LKQLUnit asUnit(@SuppressWarnings("unused") final Object value) {
+        return LKQLUnit.INSTANCE;
     }
 
     // ----- Nullish values -----
@@ -98,8 +98,8 @@ public static UnitValue asUnit(Object value) {
      * @return True if the value si nullish, false else.
      */
     @TypeCheck(Nullish.class)
-    public static boolean isNullish(Object value) {
-        return value == UnitValue.getInstance() || value == NodeNull.getInstance();
+    public static boolean isNullish(final Object value) {
+        return value == LKQLUnit.INSTANCE || value == LKQLNull.INSTANCE;
     }
 
     // ----- Boolean value methods -----
@@ -156,7 +156,7 @@ public static BigInteger longToBigInteger(long value) {
      */
     @TypeCheck(Libadalang.AdaNode.class)
     public static boolean isAdaNode(Object nodeObject) {
-        return nodeObject instanceof Libadalang.AdaNode || nodeObject instanceof DepthNode;
+        return nodeObject instanceof Libadalang.AdaNode || nodeObject instanceof LKQLDepthNode;
     }
 
     /**
@@ -173,11 +173,11 @@ public static Libadalang.AdaNode asAdaNode(Object nodeObject) {
         }
 
         // If the value is a depth node
-        else if (nodeObject instanceof DepthNode depthNode) {
+        else if (nodeObject instanceof LKQLDepthNode depthNode) {
             return depthNode.getNode();
         }
 
         // Return the default value
-        return NodeNull.getInstance();
+        return LKQLNull.INSTANCE;
     }
 }
diff --git a/...jit/runtime/built_ins/BuiltInFactory.java → ...re/lkql_jit/built_ins/BuiltInFactory.java b/...jit/runtime/built_ins/BuiltInFactory.java → ...re/lkql_jit/built_ins/BuiltInFactory.java
@@ -20,13 +20,13 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.runtime.built_ins;
+package com.adacore.lkql_jit.built_ins;
 
+import com.adacore.lkql_jit.built_ins.functions.*;
+import com.adacore.lkql_jit.built_ins.methods.*;
+import com.adacore.lkql_jit.built_ins.selectors.*;
 import com.adacore.lkql_jit.langkit_translator.passes.framing_utils.ScriptFramesBuilder;
 import com.adacore.lkql_jit.runtime.GlobalScope;
-import com.adacore.lkql_jit.runtime.built_ins.functions.*;
-import com.adacore.lkql_jit.runtime.built_ins.methods.*;
-import com.adacore.lkql_jit.runtime.built_ins.selectors.*;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...ntime/built_ins/BuiltInFunctionValue.java → ...l_jit/built_ins/BuiltInFunctionValue.java b/...ntime/built_ins/BuiltInFunctionValue.java → ...l_jit/built_ins/BuiltInFunctionValue.java
@@ -20,21 +20,21 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.runtime.built_ins;
+package com.adacore.lkql_jit.built_ins;
 
+import com.adacore.lkql_jit.built_ins.values.LKQLFunction;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.adacore.lkql_jit.nodes.expressions.FunCall;
 import com.adacore.lkql_jit.nodes.root_nodes.FunctionRootNode;
 import com.adacore.lkql_jit.runtime.Closure;
-import com.adacore.lkql_jit.runtime.values.FunctionValue;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
  * This class represents the base of a built-in function value.
  *
  * @author Hugo GUERRIER
  */
-public final class BuiltInFunctionValue extends FunctionValue {
+public final class BuiltInFunctionValue extends LKQLFunction {
 
     // ----- Attributes -----
 

diff --git a/...ntime/built_ins/BuiltInSelectorValue.java → ...l_jit/built_ins/BuiltInSelectorValue.java b/...ntime/built_ins/BuiltInSelectorValue.java → ...l_jit/built_ins/BuiltInSelectorValue.java
@@ -20,19 +20,19 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.runtime.built_ins;
+package com.adacore.lkql_jit.built_ins;
 
+import com.adacore.lkql_jit.built_ins.values.LKQLSelector;
 import com.adacore.lkql_jit.nodes.declarations.selector.SelectorArm;
 import com.adacore.lkql_jit.nodes.root_nodes.SelectorRootNode;
 import com.adacore.lkql_jit.runtime.Closure;
-import com.adacore.lkql_jit.runtime.values.SelectorValue;
 
 /**
  * This class represents the base of the built-in selector values.
  *
  * @author Hugo GUERRIER
  */
-public class BuiltInSelectorValue extends SelectorValue {
+public class BuiltInSelectorValue extends LKQLSelector {
 
     // ----- Constructors -----
 

diff --git a/...untime/built_ins/BuiltinFunctionBody.java → ...ql_jit/built_ins/BuiltinFunctionBody.java b/...untime/built_ins/BuiltinFunctionBody.java → ...ql_jit/built_ins/BuiltinFunctionBody.java
@@ -20,7 +20,7 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.runtime.built_ins;
+package com.adacore.lkql_jit.built_ins;
 
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.adacore.lkql_jit.nodes.expressions.FunCall;

diff --git a/...built_ins/functions/BaseNameFunction.java → ...built_ins/functions/BaseNameFunction.java b/...built_ins/functions/BaseNameFunction.java → ...built_ins/functions/BaseNameFunction.java
@@ -20,13 +20,13 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.runtime.built_ins.functions;
+package com.adacore.lkql_jit.built_ins.functions;
 
 import com.adacore.lkql_jit.LKQLTypeSystemGen;
+import com.adacore.lkql_jit.built_ins.BuiltInFunctionValue;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.adacore.lkql_jit.nodes.expressions.FunCall;
-import com.adacore.lkql_jit.runtime.built_ins.BuiltInFunctionValue;
 import com.adacore.lkql_jit.utils.LKQLTypesHelper;
 import com.adacore.lkql_jit.utils.functions.FileUtils;
 import com.oracle.truffle.api.frame.VirtualFrame;