Merge branch 'topic/remove_selector_pattern_binding' into 'master'

Remove selector pattern binding

Closes #596

See merge request eng/libadalang/langkit-query-language!611

Author: Killian Perlin

lkql/build/railroad-diagrams/selector_call.svg

@@ -145,7 +145,6 @@ grammar lkql_grammar {
     )
     selector_call <- SelectorCall(
         Identifier(or(@Identifier("any") | @Identifier("all")))
-        ?pick(id "@")
         value_expr
     )
     objectlit <- ObjectLiteral("{" list*(object_assoc, ",") "}")
@@ -1139,9 +1138,6 @@ class SelectorCall: LkqlNode {
     @parse_field
     quantifier: Identifier
     @parse_field
-    @nullable
-    binding: Identifier
-    @parse_field
     selector_call: Expr
 
     |" Return the selector's quantifier name.
@@ -1151,9 +1147,6 @@ class SelectorCall: LkqlNode {
     fun quantifier_name(): String =
         if node.quantifier.is_null then "all" else node.quantifier.text
 
-    |" Return the binding name associated with this selector call, if any.
-    @exported
-    fun binding_name(): Identifier = node.binding
 }
 
 |" Wrapper for a SubBlockLiteral token.

lkql/lkql.lkt

@@ -1,15 +1,21 @@
+import stdlib
+
 fun check_instantiations(node, n : int) =
     |" Return true if node has a chain of at least n instantiations
     n == 0 or
     match node
-    | GenericPackageInstantiation =>
-        node.f_generic_pkg_name?.p_referenced_decl() is
-        *(any c@children: GenericInstantiation)
-        when [x for x in c if check_instantiations(x, n - 1)]
-    | GenericSubpInstantiation =>
-        node.f_generic_subp_name?.p_referenced_decl() is
-        *(any c@children: GenericInstantiation)
-        when [x for x in c if check_instantiations(x, n - 1)]
+    | GenericPackageInstantiation => {
+            val c =
+                from node.f_generic_pkg_name?.p_referenced_decl()
+                select GenericInstantiation;
+            stdlib.any([x for x in c if check_instantiations(x, n - 1)])
+        }
+    | GenericSubpInstantiation => {
+            val c =
+                from node.f_generic_subp_name?.p_referenced_decl()
+                select GenericInstantiation;
+            stdlib.any([x for x in c if check_instantiations(x, n - 1)])
+        }
     | * => false
 
 @check(message="deeply nested instantiation",

lkql_checker/share/lkql/deeply_nested_instantiations.lkql

@@ -257,12 +257,6 @@ public Void visit(Liblkqllang.ParameterDecl parameterDecl) {
      */
     @Override
     public Void visit(Liblkqllang.SelectorCall selectorCall) {
-        final Liblkqllang.Identifier binding = selectorCall.fBinding();
-        if (!binding.isNone()) {
-            final String symbol = binding.getText();
-            checkDuplicateBindings(symbol, binding);
-            this.scriptFramesBuilder.addBinding(symbol);
-        }
         selectorCall.fSelectorCall().accept(this);
         return null;
     }

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

@@ -1590,9 +1590,6 @@ public LKQLNode visit(Liblkqllang.SelectorCall selectorCall) {
             quantifier = SelectorCall.Quantifier.ALL;
         }
 
-        final Liblkqllang.Identifier bindingBase = selectorCall.fBinding();
-        final String binding = bindingBase.isNone() ? null : bindingBase.getText();
-
         final Liblkqllang.Expr selectorExprBase = selectorCall.fSelectorCall();
         final Expr selectorExpr;
         final ArgList args;
@@ -1606,15 +1603,9 @@ public LKQLNode visit(Liblkqllang.SelectorCall selectorCall) {
 
         // Get the slot for the binding
         final int bindingSlot;
-        if (binding != null) {
-            this.frames.declareBinding(binding);
-            bindingSlot = this.frames.getBinding(binding);
-        } else {
-            bindingSlot = -1;
-        }
 
         // Return the new node
-        return new SelectorCall(loc(selectorCall), quantifier, bindingSlot, selectorExpr, args);
+        return new SelectorCall(loc(selectorCall), quantifier, selectorExpr, args);
     }
 
     // --- Node patterns

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

@@ -13,17 +13,12 @@
 import com.adacore.lkql_jit.nodes.arguments.NamedArg;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.adacore.lkql_jit.runtime.values.LKQLSelector;
-import com.adacore.lkql_jit.runtime.values.interfaces.Iterator;
-import com.adacore.lkql_jit.runtime.values.lists.LKQLList;
 import com.adacore.lkql_jit.runtime.values.lists.LKQLSelectorList;
 import com.adacore.lkql_jit.utils.Constants;
 import com.adacore.lkql_jit.utils.LKQLTypesHelper;
-import com.adacore.lkql_jit.utils.functions.FrameUtils;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * This node represents the call of a selector in the LKQL language.
@@ -37,9 +32,6 @@ public final class SelectorCall extends LKQLNode {
     /** The quantifier for the selector call. */
     private final Quantifier quantifier;
 
-    /** The slot to put the binding value in, might be -1 if there is no binding. */
-    private final int bindingSlot;
-
     // ----- Children -----
 
     /** The selector to call. */
@@ -59,20 +51,17 @@ public final class SelectorCall extends LKQLNode {
      *
      * @param location The location of the node in the source.
      * @param quantifier The quantifier for the selector.
-     * @param bindingSlot The slot of the binding.
      * @param selectorExpr The selector expression.
      * @param args The arguments for the call.
      */
     public SelectorCall(
         SourceSection location,
         Quantifier quantifier,
-        int bindingSlot,
         Expr selectorExpr,
         ArgList args
     ) {
         super(location);
         this.quantifier = quantifier;
-        this.bindingSlot = bindingSlot;
         this.selectorExpr = selectorExpr;
         this.args = args;
     }
@@ -109,11 +98,6 @@ public boolean executeVerification(VirtualFrame frame, Object node, Pattern patt
             isValid = this.isAny(frame, selectorListValue, pattern);
         }
 
-        // Do the bindings
-        if (this.bindingSlot > -1) {
-            this.doBinding(frame, selectorListValue, pattern);
-        }
-
         // Return the result
         return isValid;
     }
@@ -233,61 +217,6 @@ private boolean isAny(VirtualFrame frame, LKQLSelectorList selectorListValue, Pa
         return false;
     }
 
-    /**
-     * Get the list value filtered with the given pattern.
-     *
-     * @param frame The frame to execute in.
-     * @param selectorListValue The selector list value to filter.
-     * @param pattern The pattern for the filtering.
-     * @return The list value
-     */
-    private LKQLList getFilteredList(
-        VirtualFrame frame,
-        LKQLSelectorList selectorListValue,
-        Pattern pattern
-    ) {
-        // Prepare the result
-        List<Object> resList = new ArrayList<>();
-
-        // Iterate on nodes
-        Iterator iterator = selectorListValue.iterator();
-        while (iterator.hasNext()) {
-            Object value = iterator.next();
-            if (pattern.executeValue(frame, value)) {
-                resList.add(value);
-            }
-        }
-
-        // Return the result
-        return new LKQLList(resList.toArray(new Object[0]));
-    }
-
-    /**
-     * Do the binding process.
-     *
-     * @param frame The frame to execute in.
-     * @param selectorListValue The selector list to bind.
-     * @param pattern The pattern to filter the list.
-     */
-    private void doBinding(
-        VirtualFrame frame,
-        LKQLSelectorList selectorListValue,
-        Pattern pattern
-    ) {
-        LKQLList listValue = this.getFilteredList(frame, selectorListValue, pattern);
-        this.doBinding(frame, listValue);
-    }
-
-    /**
-     * Do the binding with the already computed list.
-     *
-     * @param frame The frame to execute in.
-     * @param listValue The list bind.
-     */
-    private void doBinding(VirtualFrame frame, LKQLList listValue) {
-        FrameUtils.writeLocal(frame, this.bindingSlot, listValue);
-    }
-
     // ----- Override methods -----
 
     /**
@@ -297,8 +226,8 @@ private void doBinding(VirtualFrame frame, LKQLList listValue) {
     public String toString(int indentLevel) {
         return this.nodeRepresentation(
                 indentLevel,
-                new String[] { "quantifier", "slot" },
-                new Object[] { this.quantifier, this.bindingSlot }
+                new String[] { "quantifier" },
+                new Object[] { this.quantifier }
             );
     }
 

lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SelectorCall.java

@@ -1,3 +1,3 @@
-val withAspect = select ObjectDecl(any cs @ children: AspectAssoc)
-                    when cs.length == 1
+val withAspect = select node @ ObjectDecl
+	when (from node select AspectAssoc).length == 1
 print (withAspect)

testsuite/tests/interpreter/full_pattern_binding_query_0/script.lkql

@@ -44,7 +44,6 @@ FunDecl
 |  |  |  |  |  |  |  |  SelectorCall
 |  |  |  |  |  |  |  |  |f_quantifier:
 |  |  |  |  |  |  |  |  |  Identifier: any
-|  |  |  |  |  |  |  |  |f_binding: <null>
 |  |  |  |  |  |  |  |  |f_selector_call:
 |  |  |  |  |  |  |  |  |  Identifier: children
 |  |  |  |  |  |  |  |f_pattern_detail_delimiter:

testsuite/tests/parser/annotated_fun/test.out

@@ -1 +1 @@
-all c@children(min_depth=1, max_depth=3)
+all children(min_depth=1, max_depth=3)

testsuite/tests/parser/full_selector_call/input

@@ -1,8 +1,6 @@
 SelectorCall
 |f_quantifier:
 |  Identifier: all
-|f_binding:
-|  Identifier: c
 |f_selector_call:
 |  FunCall
 |  |f_name: