unified: Add getName() convenience predicates

Author: asgerf

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

@@ -239,27 +239,27 @@ private module Input implements InputSig1, InputSig2 {
 
   class Label extends string {
     Label() {
-      any(LabeledStmt l).getLabelNameNode().getValue() = this or
-      any(BreakExpr b).getLabelNameNode().getValue() = this or
-      any(ContinueExpr c).getLabelNameNode().getValue() = this
+      any(LabeledStmt l).getLabelName() = this or
+      any(BreakExpr b).getLabelName() = this or
+      any(ContinueExpr c).getLabelName() = this
     }
 
     string toString() { result = this }
   }
 
   private Label getLabelOfStmt(Stmt s) {
     exists(LabeledStmt l | s = l.getStmt() |
-      result = l.getLabelNameNode().getValue() or
+      result = l.getLabelName() or
       result = getLabelOfStmt(l)
     )
   }
 
   predicate hasLabel(Ast::AstNode n, Label l) {
     l = getLabelOfStmt(n)
     or
-    l = n.(BreakExpr).getLabelNameNode().getValue()
+    l = n.(BreakExpr).getLabelName()
     or
-    l = n.(ContinueExpr).getLabelNameNode().getValue()
+    l = n.(ContinueExpr).getLabelName()
   }
 
   class CallableContext = Void;

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

@@ -65,6 +65,81 @@ module Unified {
     }
   }
 
+  class AccessorDeclaration extends G::AccessorDeclaration {
+    /** Gets the name of this accessor. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class Argument extends G::Argument {
+    /** Gets the name of this argument. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class AssociatedTypeDeclaration extends G::AssociatedTypeDeclaration {
+    /** Gets the name of this associated type. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class BreakExpr extends G::BreakExpr {
+    /** Gets the label name targeted by this break. */
+    string getLabelName() { result = this.getLabelNameNode().getValue() }
+  }
+
+  class ClassLikeDeclaration extends G::ClassLikeDeclaration {
+    /** Gets the name of this declaration. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class ConstructorDeclaration extends G::ConstructorDeclaration {
+    /** Gets the name of this constructor. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class ContinueExpr extends G::ContinueExpr {
+    /** Gets the label name targeted by this continue. */
+    string getLabelName() { result = this.getLabelNameNode().getValue() }
+  }
+
+  class FunctionDeclaration extends G::FunctionDeclaration {
+    /** Gets the name of this function. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class LabeledStmt extends G::LabeledStmt {
+    /** Gets the label name of this statement. */
+    string getLabelName() { result = this.getLabelNameNode().getValue() }
+  }
+
+  class MemberAccessExpr extends G::MemberAccessExpr {
+    /** Gets the member name of this access. */
+    string getMemberName() { result = this.getMemberNameNode().getValue() }
+  }
+
+  class NamedPattern extends G::NamedPattern {
+    /** Gets the name bound by this pattern. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class OperatorSyntaxDeclaration extends G::OperatorSyntaxDeclaration {
+    /** Gets the name of this operator. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class Parameter extends G::Parameter {
+    /** Gets the external name of this parameter. */
+    string getExternalName() { result = this.getExternalNameNode().getValue() }
+  }
+
+  class TypeAliasDeclaration extends G::TypeAliasDeclaration {
+    /** Gets the name of this type alias. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
+  class TypeParameter extends G::TypeParameter {
+    /** Gets the name of this type parameter. */
+    string getName() { result = this.getNameNode().getValue() }
+  }
+
   /** A binary expression. */
   class BinaryExpr extends G::BinaryExpr {
     /** Gets an operand of this binary expression. */
@@ -77,7 +152,7 @@ module Unified {
     Expr getNamedArgument(string name) {
       exists(Argument arg |
         arg = this.getAnArgument() and
-        arg.getNameNode().getValue() = name and
+        arg.getName() = name and
         result = arg.getValue()
       )
     }

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

@@ -81,7 +81,7 @@ class SwiftPackageTarget extends ModuleScopeRepr, CallExpr {
 
   SwiftPackageTarget() {
     this.getFile().getBaseName() = "Package.swift" and
-    this.getCallee().(MemberAccessExpr).getMemberNameNode().getValue() = targetKind and
+    this.getCallee().(MemberAccessExpr).getMemberName() = targetKind and
     targetKind =
       [
         "target", "executableTarget", "testTarget", "systemLibrary", "binaryTarget", "plugin",

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

@@ -163,7 +163,7 @@ private NameBindingNode getNodeFromUncertainScope(AstNode n) { result.isLocalNam
 predicate readStep(NameBindingNode node1, string name, NameBindingNode node2) {
   exists(MemberAccessExpr expr |
     node1 = getNodeFromRef(expr.getBase()) and
-    name = expr.getMemberNameNode().getValue() and
+    name = expr.getMemberName() and
     node2 = getNodeFromRef(expr)
   )
   or

unified/ql/lib/utils/test/TestUtils.qll

@@ -4,9 +4,9 @@ private import codeql.unified.internal.StaticNameBinding
 
 private string deriveClassName(ClassLikeDeclaration cls) {
   not exists(cls.getParent().getEnclosingClass()) and
-  result = cls.getNameNode().getValue()
+  result = cls.getName()
   or
-  result = deriveClassName(cls.getParent().getEnclosingClass()) + "." + cls.getNameNode().getValue()
+  result = deriveClassName(cls.getParent().getEnclosingClass()) + "." + cls.getName()
 }
 
 private string defaultName(NameDeclaration decl) {

unified/ql/test/library-tests/BasicTest/test.ql

@@ -2,9 +2,7 @@ import unified
 
 query predicate nameNode(NameNode node, string value) { value = node.getValue() }
 
-query predicate namedPattern(NamedPattern node, string value) {
-  value = node.getNameNode().getValue()
-}
+query predicate namedPattern(NamedPattern node, string value) { value = node.getName() }
 
 query predicate unsupported(UnsupportedNode node, string value) { value = node.getValue() }