QL: Refactor SignatureExpr

Author: tausbn

ql/Cargo.lock

@@ -10,7 +10,7 @@ edition = "2018"
 flate2 = "1.0"
 node-types = { path = "../node-types" }
 tree-sitter = "0.19"
-tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "f073fca8875e9320142c171caa722544cd531b9d" }
+tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "99f3bc30fa772b07ad19a23799fe7433dc15f765" }
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }

ql/extractor/Cargo.toml

@@ -11,4 +11,4 @@ clap = "2.33"
 node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
-tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "f073fca8875e9320142c171caa722544cd531b9d" }
+tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "99f3bc30fa772b07ad19a23799fe7433dc15f765" }

ql/generator/Cargo.toml

@@ -673,7 +673,7 @@ class TypeExpr extends TType, AstNode {
    * Gets the module of the type, if it exists.
    * E.g. `DataFlow` in `DataFlow::Node`.
    */
-  ModuleExpr getModule() { toQL(result) = type.getChild() }
+  ModuleExpr getModule() { toQL(result) = type.getQualifier() }
 
   /**
    * Gets the type that this type reference refers to.

ql/ql/src/codeql_ql/ast/Ast.qll

@@ -137,13 +137,13 @@ module QL {
     /** Gets the node corresponding to the field `name`. */
     final LiteralId getName() { ql_arityless_predicate_expr_def(this, result) }
 
-    /** Gets the child of this node. */
-    final ModuleExpr getChild() { ql_arityless_predicate_expr_child(this, result) }
+    /** Gets the node corresponding to the field `qualifier`. */
+    final ModuleExpr getQualifier() { ql_arityless_predicate_expr_qualifier(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
       ql_arityless_predicate_expr_def(this, result) or
-      ql_arityless_predicate_expr_child(this, result)
+      ql_arityless_predicate_expr_qualifier(this, result)
     }
   }
 
@@ -1320,20 +1320,15 @@ module QL {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "SignatureExpr" }
 
-    /** Gets the node corresponding to the field `arity`. */
-    final Integer getArity() { ql_signature_expr_arity(this, result) }
+    /** Gets the node corresponding to the field `predicate`. */
+    final PredicateExpr getPredicate() { ql_signature_expr_predicate(this, result) }
 
-    /** Gets the node corresponding to the field `name`. */
-    final SimpleId getName() { ql_signature_expr_def(this, result) }
-
-    /** Gets the node corresponding to the field `qualifier`. */
-    final ModuleExpr getQualifier() { ql_signature_expr_qualifier(this, result) }
+    /** Gets the node corresponding to the field `type_expr`. */
+    final TypeExpr getTypeExpr() { ql_signature_expr_type_expr(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      ql_signature_expr_arity(this, result) or
-      ql_signature_expr_def(this, result) or
-      ql_signature_expr_qualifier(this, result)
+      ql_signature_expr_predicate(this, result) or ql_signature_expr_type_expr(this, result)
     }
   }
 
@@ -1417,12 +1412,17 @@ module QL {
     /** Gets the node corresponding to the field `name`. */
     final ClassName getName() { ql_type_expr_name(this, result) }
 
+    /** Gets the node corresponding to the field `qualifier`. */
+    final ModuleExpr getQualifier() { ql_type_expr_qualifier(this, result) }
+
     /** Gets the child of this node. */
     final AstNode getChild() { ql_type_expr_child(this, result) }
 
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
-      ql_type_expr_name(this, result) or ql_type_expr_child(this, result)
+      ql_type_expr_name(this, result) or
+      ql_type_expr_qualifier(this, result) or
+      ql_type_expr_child(this, result)
     }
   }
 

ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll

@@ -95,9 +95,9 @@ ql_annotation_def(
   int name: @ql_token_annot_name ref
 );
 
-ql_arityless_predicate_expr_child(
+ql_arityless_predicate_expr_qualifier(
   unique int ql_arityless_predicate_expr: @ql_arityless_predicate_expr ref,
-  unique int child: @ql_module_expr ref
+  unique int qualifier: @ql_module_expr ref
 );
 
 ql_arityless_predicate_expr_def(
@@ -886,19 +886,18 @@ ql_set_literal_def(
   unique int id: @ql_set_literal
 );
 
-ql_signature_expr_arity(
+ql_signature_expr_predicate(
   unique int ql_signature_expr: @ql_signature_expr ref,
-  unique int arity: @ql_token_integer ref
+  unique int predicate: @ql_predicate_expr ref
 );
 
-ql_signature_expr_qualifier(
+ql_signature_expr_type_expr(
   unique int ql_signature_expr: @ql_signature_expr ref,
-  unique int qualifier: @ql_module_expr ref
+  unique int type_expr: @ql_type_expr ref
 );
 
 ql_signature_expr_def(
-  unique int id: @ql_signature_expr,
-  int name: @ql_token_simple_id ref
+  unique int id: @ql_signature_expr
 );
 
 ql_special_call_def(
@@ -929,7 +928,12 @@ ql_type_expr_name(
   unique int name: @ql_token_class_name ref
 );
 
-@ql_typeExpr_child_type = @ql_module_expr | @ql_token_dbtype | @ql_token_primitive_type
+ql_type_expr_qualifier(
+  unique int ql_type_expr: @ql_type_expr ref,
+  unique int qualifier: @ql_module_expr ref
+);
+
+@ql_typeExpr_child_type = @ql_token_dbtype | @ql_token_primitive_type
 
 ql_type_expr_child(
   unique int ql_type_expr: @ql_type_expr ref,