Merge branch 'main' into qldoc-nodes

Author: erik-krogh

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 = "f95bfc0bc4f2cda7f6f0bf608360fdee7574b003" }
+tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "ef46f6c4c076cc06bb206686794cec26b5c544a7" }
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }

extractor/Cargo.toml

@@ -10,4 +10,4 @@ edition = "2018"
 node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
-tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "f95bfc0bc4f2cda7f6f0bf608360fdee7574b003" }
+tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "ef46f6c4c076cc06bb206686794cec26b5c544a7" }

generator/Cargo.toml

@@ -17,6 +17,7 @@ impl<'a> fmt::Display for TopLevel<'a> {
 
 #[derive(Clone, Eq, PartialEq, Hash)]
 pub struct Class<'a> {
+    pub qldoc: Option<String>,
     pub name: &'a str,
     pub is_abstract: bool,
     pub supertypes: BTreeSet<Type<'a>>,
@@ -26,6 +27,9 @@ pub struct Class<'a> {
 
 impl<'a> fmt::Display for Class<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(qldoc) = &self.qldoc {
+            write!(f, "/** {} */", qldoc)?;
+        }
         if self.is_abstract {
             write!(f, "abstract ")?;
         }
@@ -43,6 +47,7 @@ impl<'a> fmt::Display for Class<'a> {
                 f,
                 "  {}\n",
                 Predicate {
+                    qldoc: None,
                     name: self.name.clone(),
                     overridden: false,
                     return_type: None,
@@ -176,6 +181,7 @@ impl<'a> fmt::Display for Expression<'a> {
 
 #[derive(Clone, Eq, PartialEq, Hash)]
 pub struct Predicate<'a> {
+    pub qldoc: Option<String>,
     pub name: &'a str,
     pub overridden: bool,
     pub return_type: Option<Type<'a>>,
@@ -185,6 +191,9 @@ pub struct Predicate<'a> {
 
 impl<'a> fmt::Display for Predicate<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(qldoc) = &self.qldoc {
+            write!(f, "/** {} */", qldoc)?;
+        }
         if self.overridden {
             write!(f, "override ")?;
         }

generator/src/ql.rs

@@ -29,6 +29,9 @@ pub fn write(language: &Language, classes: &[ql::TopLevel]) -> std::io::Result<(
 fn create_ast_node_class<'a>() -> ql::Class<'a> {
     // Default implementation of `toString` calls `this.getAPrimaryQlClass()`
     let to_string = ql::Predicate {
+        qldoc: Some(String::from(
+            "Gets a string representation of this element.",
+        )),
         name: "toString",
         overridden: false,
         return_type: Some(ql::Type::String),
@@ -42,11 +45,20 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
             )),
         ),
     };
-    let get_location =
-        create_none_predicate("getLocation", false, Some(ql::Type::Normal("Location")));
-    let get_a_field_or_child =
-        create_none_predicate("getAFieldOrChild", false, Some(ql::Type::Normal("AstNode")));
+    let get_location = create_none_predicate(
+        Some(String::from("Gets the location of this element.")),
+        "getLocation",
+        false,
+        Some(ql::Type::Normal("Location")),
+    );
+    let get_a_field_or_child = create_none_predicate(
+        Some(String::from("Gets a field or child node of this node.")),
+        "getAFieldOrChild",
+        false,
+        Some(ql::Type::Normal("AstNode")),
+    );
     let get_parent = ql::Predicate {
+        qldoc: Some(String::from("Gets the parent of this element.")),
         name: "getParent",
         overridden: false,
         return_type: Some(ql::Type::Normal("AstNode")),
@@ -61,6 +73,9 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
         ),
     };
     let get_parent_index = ql::Predicate {
+        qldoc: Some(String::from(
+            "Gets the index of this node among the children of its parent.",
+        )),
         name: "getParentIndex",
         overridden: false,
         return_type: Some(ql::Type::Int),
@@ -75,6 +90,9 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
         ),
     };
     let get_a_primary_ql_class = ql::Predicate {
+        qldoc: Some(String::from(
+            "Gets the name of the primary QL class for this element.",
+        )),
         name: "getAPrimaryQlClass",
         overridden: false,
         return_type: Some(ql::Type::String),
@@ -85,6 +103,7 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
         ),
     };
     ql::Class {
+        qldoc: Some(String::from("The base class for all AST nodes")),
         name: "AstNode",
         is_abstract: false,
         supertypes: vec![ql::Type::AtType("ast_node")].into_iter().collect(),
@@ -103,20 +122,25 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
 fn create_token_class<'a>() -> ql::Class<'a> {
     let tokeninfo_arity = 6;
     let get_value = ql::Predicate {
+        qldoc: Some(String::from("Gets the value of this token.")),
         name: "getValue",
         overridden: false,
         return_type: Some(ql::Type::String),
         formal_parameters: vec![],
         body: create_get_field_expr_for_column_storage("result", "tokeninfo", 3, tokeninfo_arity),
     };
     let get_location = ql::Predicate {
+        qldoc: Some(String::from("Gets the location of this token.")),
         name: "getLocation",
         overridden: true,
         return_type: Some(ql::Type::Normal("Location")),
         formal_parameters: vec![],
         body: create_get_field_expr_for_column_storage("result", "tokeninfo", 4, tokeninfo_arity),
     };
     let to_string = ql::Predicate {
+        qldoc: Some(String::from(
+            "Gets a string representation of this element.",
+        )),
         name: "toString",
         overridden: true,
         return_type: Some(ql::Type::String),
@@ -127,6 +151,7 @@ fn create_token_class<'a>() -> ql::Class<'a> {
         ),
     };
     ql::Class {
+        qldoc: Some(String::from("A token.")),
         name: "Token",
         is_abstract: false,
         supertypes: vec![ql::Type::AtType("token"), ql::Type::Normal("AstNode")]
@@ -148,6 +173,7 @@ fn create_reserved_word_class<'a>() -> ql::Class<'a> {
     let class_name = "ReservedWord";
     let get_a_primary_ql_class = create_get_a_primary_ql_class(&class_name);
     ql::Class {
+        qldoc: Some(String::from("A reserved word.")),
         name: class_name,
         is_abstract: false,
         supertypes: vec![ql::Type::AtType(db_name), ql::Type::Normal("Token")]
@@ -160,11 +186,13 @@ fn create_reserved_word_class<'a>() -> ql::Class<'a> {
 
 /// Creates a predicate whose body is `none()`.
 fn create_none_predicate<'a>(
+    qldoc: Option<String>,
     name: &'a str,
     overridden: bool,
     return_type: Option<ql::Type<'a>>,
 ) -> ql::Predicate<'a> {
     ql::Predicate {
+        qldoc: qldoc,
         name: name,
         overridden,
         return_type,
@@ -177,6 +205,9 @@ fn create_none_predicate<'a>(
 /// name.
 fn create_get_a_primary_ql_class<'a>(class_name: &'a str) -> ql::Predicate<'a> {
     ql::Predicate {
+        qldoc: Some(String::from(
+            "Gets the name of the primary QL class for this element.",
+        )),
         name: "getAPrimaryQlClass",
         overridden: true,
         return_type: Some(ql::Type::String),
@@ -196,6 +227,7 @@ fn create_get_a_primary_ql_class<'a>(class_name: &'a str) -> ql::Predicate<'a> {
 /// `arity` - the total number of columns in the table
 fn create_get_location_predicate<'a>(def_table: &'a str, arity: usize) -> ql::Predicate<'a> {
     ql::Predicate {
+        qldoc: Some(String::from("Gets the location of this element.")),
         name: "getLocation",
         overridden: true,
         return_type: Some(ql::Type::Normal("Location")),
@@ -220,6 +252,7 @@ fn create_get_location_predicate<'a>(def_table: &'a str, arity: usize) -> ql::Pr
 /// `def_table` - the name of the table that defines the entity and its text.
 fn create_get_text_predicate<'a>(def_table: &'a str) -> ql::Predicate<'a> {
     ql::Predicate {
+        qldoc: Some(String::from("Gets the text content of this element.")),
         name: "getText",
         overridden: false,
         return_type: Some(ql::Type::String),
@@ -419,6 +452,10 @@ fn create_field_getters<'a>(
     };
     (
         ql::Predicate {
+            qldoc: field
+                .name
+                .as_ref()
+                .map(|name| format!("Gets the node corresponding to the field `{}`.", name)),
             name: &field.getter_name,
             overridden: false,
             return_type,
@@ -456,6 +493,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                     supertypes.insert(ql::Type::AtType(&node.dbscheme_name));
                     supertypes.insert(ql::Type::Normal("Token"));
                     classes.push(ql::TopLevel::Class(ql::Class {
+                        qldoc: Some(format!("A class representing `{}` tokens.", type_name.kind)),
                         name: &node.ql_class_name,
                         is_abstract: false,
                         supertypes,
@@ -468,6 +506,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                 // It's a tree-sitter supertype node, so we're wrapping a dbscheme
                 // union type.
                 classes.push(ql::TopLevel::Class(ql::Class {
+                    qldoc: None,
                     name: &node.ql_class_name,
                     is_abstract: false,
                     supertypes: vec![
@@ -501,6 +540,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
 
                 let main_class_name = &node.ql_class_name;
                 let mut main_class = ql::Class {
+                    qldoc: Some(format!("A class representing `{}` nodes.", type_name.kind)),
                     name: &main_class_name,
                     is_abstract: false,
                     supertypes: vec![
@@ -543,6 +583,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                     }
 
                     main_class.predicates.push(ql::Predicate {
+                        qldoc: Some(String::from("Gets a field or child node of this node.")),
                         name: "getAFieldOrChild",
                         overridden: true,
                         return_type: Some(ql::Type::Normal("AstNode")),

generator/src/ql_gen.rs

@@ -59,6 +59,15 @@ class AstNode extends TAstNode {
 
   /** Gets the QLDoc comment for this AST node, if any. */
   QLDoc getQLDoc() { none() }
+
+  /**
+   * Gets the predicate that contains this AST node.
+   */
+  pragma[noinline]
+  Predicate getEnclosingPredicate() {
+    not this instanceof Predicate and
+    toGenerated(result) = toGenerated(this).getParent+()
+  }
 }
 
 /** A toplevel QL program, i.e. a file. */
@@ -191,7 +200,14 @@ class Predicate extends TPredicate, AstNode, Declaration {
   /**
    * Gets the number of parameters.
    */
-  int getArity() { result = count(getParameter(_)) }
+  int getArity() {
+    not this.(ClasslessPredicate).getAlias() instanceof PredicateExpr and
+    result = count(getParameter(_))
+    or
+    exists(PredicateExpr alias | alias = this.(ClasslessPredicate).getAlias() |
+      result = alias.getArity()
+    )
+  }
 
   /**
    * Gets the return type (if any) of the predicate.
@@ -1074,6 +1090,21 @@ class Float extends Literal {
   float getValue() { result = lit.getChild().(Generated::Float).getValue().toFloat() }
 }
 
+/** A boolean literal */
+class Boolean extends Literal {
+  Generated::Bool bool;
+
+  Boolean() { lit.getChild() = bool }
+
+  /** Holds if the value is `true` */
+  predicate isTrue() { bool.getChild() instanceof Generated::True }
+
+  /** Holds if the value is `false` */
+  predicate isFalse() { bool.getChild() instanceof Generated::False }
+
+  override string getAPrimaryQlClass() { result = "Boolean" }
+}
+
 /** A comparison symbol, such as `"<"` or `"="`. */
 class ComparisonSymbol extends string {
   ComparisonSymbol() {
@@ -1399,6 +1430,19 @@ class ExprAggregate extends TExprAggregate, Expr {
       pred = indexedMember("getOrderBy", i) and result = this.getOrderBy(i)
     )
   }
+
+  override Type getType() {
+    exists(PrimitiveType prim | prim = result |
+      kind.regexpMatch("(strict)?count|sum|min|max|rank") and
+      result.getName() = "int"
+      or
+      kind.regexpMatch("(strict)?concat") and
+      result.getName() = "string"
+    )
+    or
+    not kind = ["count", "strictcount"] and
+    result = getExpr(0).getType()
+  }
 }
 
 /** An aggregate expression, such as `count` or `sum`. */
@@ -1449,12 +1493,21 @@ class Aggregate extends TAggregate, Expr {
 
   override string getAPrimaryQlClass() { result = "Aggregate[" + kind + "]" }
 
-  override PrimitiveType getType() {
-    kind.regexpMatch("(strict)?count|sum|min|max|rank") and
-    result.getName() = "int"
+  override Type getType() {
+    exists(PrimitiveType prim | prim = result |
+      kind.regexpMatch("(strict)?count|sum|min|max|rank") and
+      result.getName() = "int"
+      or
+      kind.regexpMatch("(strict)?concat") and
+      result.getName() = "string"
+    )
+    or
+    kind = ["any", "min", "max"] and
+    not exists(getExpr(_)) and
+    result = getArgument(0).getTypeExpr().getResolvedType()
     or
-    kind.regexpMatch("(strict)?concat") and
-    result.getName() = "string"
+    not kind = ["count", "strictcount"] and
+    result = getExpr(0).getType()
   }
 
   override AstNode getAChild(string pred) {
@@ -1583,6 +1636,13 @@ class ThisAccess extends Identifier {
   override string getAPrimaryQlClass() { result = "ThisAccess" }
 }
 
+/** A use of `super`. */
+class Super extends TSuper, Expr {
+  Super() { this = TSuper(_) }
+
+  override string getAPrimaryQlClass() { result = "SuperAccess" }
+}
+
 /** An access to `result`. */
 class ResultAccess extends Identifier {
   ResultAccess() { any(Generated::Result r).getParent() = id }

ql/src/codeql_ql/ast/Ast.qll

@@ -25,6 +25,7 @@ newtype TAstNode =
   TExprAggregate(Generated::Aggregate agg) {
     agg.getChild(_) instanceof Generated::ExprAggregateBody
   } or
+  TSuper(Generated::SuperRef sup) or
   TIdentifier(Generated::Variable var) or
   TAsExpr(Generated::AsExpr asExpr) { asExpr.getChild(1) instanceof Generated::VarName } or
   TPredicateCall(Generated::CallOrUnqualAggExpr call) or
@@ -64,7 +65,7 @@ class TBinOpExpr = TAddSubExpr or TMulDivModExpr;
 
 class TExpr =
   TBinOpExpr or TLiteral or TAggregate or TExprAggregate or TIdentifier or TInlineCast or TCall or
-      TUnaryExpr or TExprAnnotation or TDontCare or TRange or TSet or TAsExpr;
+      TUnaryExpr or TExprAnnotation or TDontCare or TRange or TSet or TAsExpr or TSuper;
 
 class TCall = TPredicateCall or TMemberCall or TNoneCall or TAnyCall;
 
@@ -157,6 +158,8 @@ Generated::AstNode toGenerated(AST::AstNode n) {
   n = TNoneCall(result)
   or
   n = TAnyCall(result)
+  or
+  n = TSuper(result)
 }
 
 class TPredicate = TCharPred or TClasslessPredicate or TClassPredicate;