Unified: Add Member.getNameNode

Author: hvitved

unified/extractor/ast_types.yml

@@ -80,17 +80,20 @@ supertypes:
       body?: block
   # A member is anything that can appear in the body of a class-like declaration
   member:
-    - constructor_declaration
-    - destructor_declaration
-    - function_declaration
-    - variable_declaration
-    - accessor_declaration
-    - initializer_declaration
-    - class_like_declaration
-    - type_alias_declaration
-    - associated_type_declaration
-    - unsupported_node
-    - unhandled_node
+    subtypes:
+      - constructor_declaration
+      - destructor_declaration
+      - function_declaration
+      - variable_declaration
+      - accessor_declaration
+      - initializer_declaration
+      - class_like_declaration
+      - type_alias_declaration
+      - associated_type_declaration
+      - unsupported_node
+      - unhandled_node
+    fields:
+      name_node: identifier
   type_constraint:
     - equality_type_constraint
     - bound_type_constraint

unified/ql/lib/codeql/unified/internal/Ast.qll

@@ -113,7 +113,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `name_node`. */
-    final F::Identifier getNameNode() { unified_accessor_declaration_def(this, _, result) }
+    final override F::Identifier getNameNode() { unified_accessor_declaration_def(this, _, result) }
 
     /** Gets the node corresponding to the field `parameter`. */
     final override F::Parameter getParameter(int i) {
@@ -200,7 +200,9 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `name_node`. */
-    final F::Identifier getNameNode() { unified_associated_type_declaration_def(this, result) }
+    final override F::Identifier getNameNode() {
+      unified_associated_type_declaration_def(this, result)
+    }
 
     /** Gets a field or child node of this node. */
     final override F::AstNode getAFieldOrChild() {
@@ -427,7 +429,9 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `name_node`. */
-    final F::Identifier getNameNode() { unified_class_like_declaration_name_node(this, result) }
+    final override F::Identifier getNameNode() {
+      unified_class_like_declaration_name_node(this, result)
+    }
 
     /** Gets the node corresponding to the field `type_constraint`. */
     final F::TypeConstraint getTypeConstraint(int i) {
@@ -501,7 +505,9 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `name_node`. */
-    final F::Identifier getNameNode() { unified_constructor_declaration_name_node(this, result) }
+    final override F::Identifier getNameNode() {
+      unified_constructor_declaration_name_node(this, result)
+    }
 
     /** Gets the node corresponding to the field `parameter`. */
     final override F::Parameter getParameter(int i) {
@@ -704,7 +710,7 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `name_node`. */
-    final F::Identifier getNameNode() { unified_function_declaration_def(this, result) }
+    final override F::Identifier getNameNode() { unified_function_declaration_def(this, result) }
 
     /** Gets the node corresponding to the field `parameter`. */
     final override F::Parameter getParameter(int i) {
@@ -979,7 +985,10 @@ module Unified {
     final override F::AstNode getAFieldOrChild() { unified_map_literal_element(this, _, result) }
   }
 
-  class Member extends @unified_member, F::AstNode { }
+  class Member extends @unified_member, F::AstNode {
+    /** Gets the node corresponding to the field `name_node`. */
+    F::Identifier getNameNode() { none() }
+  }
 
   /** A class representing `member_access_expr` nodes. */
   class MemberAccessExpr extends @unified_member_access_expr, F::Expr {
@@ -1341,7 +1350,9 @@ module Unified {
     final F::Modifier getAModifier() { result = this.getModifier(_) }
 
     /** Gets the node corresponding to the field `name_node`. */
-    final F::Identifier getNameNode() { unified_type_alias_declaration_def(this, result, _) }
+    final override F::Identifier getNameNode() {
+      unified_type_alias_declaration_def(this, result, _)
+    }
 
     /** Gets the node corresponding to the field `type`. */
     final F::Expr getType() { unified_type_alias_declaration_def(this, _, result) }

unified/ql/lib/codeql/unified/internal/FacadeAst.qll

@@ -193,7 +193,7 @@ module Unified {
 
   class VariableDeclaration extends G::VariableDeclaration {
     /** Gets the name node of this variable declaration, if any. */
-    Identifier getNameNode() { result = this.getPattern() }
+    override Identifier getNameNode() { result = this.getPattern() }
 
     /** Gets the name of the variable being declared, if any. */
     string getName() { result = this.getNameNode().getValue() }