Swift: move getName to Callable (hand-written)

d10c · d10c · commit 535daf39b70d · 2022-12-14T14:29:13.000-05:00
Now that getStaticTarget returns a Callable.
diff --git a/swift/ql/lib/codeql/swift/elements/Callable.qll b/swift/ql/lib/codeql/swift/elements/Callable.qll
@@ -1,4 +1,19 @@
 private import codeql.swift.generated.Callable
 private import codeql.swift.elements.AstNode
+private import codeql.swift.elements.decl.Decl
 
-class Callable extends Generated::Callable, AstNode { }
+class Callable extends Generated::Callable, AstNode {
+  /**
+   * Holds if this Callable is a function named `funcName`.
+   */
+  predicate hasName(string funcName) { this.getName() = funcName }
+
+  /**
+   * Holds if this Callable is a function named `funcName` defined in a module
+   * called `moduleName`.
+   */
+  predicate hasName(string moduleName, string funcName) {
+    this.hasName(funcName) and
+    this.(Decl).getModule().getFullName() = moduleName
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/elements/decl/AbstractFunctionDecl.qll b/swift/ql/lib/codeql/swift/elements/decl/AbstractFunctionDecl.qll
@@ -1,16 +1,12 @@
 private import codeql.swift.generated.decl.AbstractFunctionDecl
 private import codeql.swift.elements.decl.MethodDecl
+private import codeql.swift.elements.Callable
 
 /**
  * A function.
  */
-class AbstractFunctionDecl extends Generated::AbstractFunctionDecl {
+class AbstractFunctionDecl extends Generated::AbstractFunctionDecl, Callable {
   override string toString() { result = this.getName() }
-
-  /**
-   * Holds if this function is called `funcName`.
-   */
-  predicate hasName(string funcName) { this.getName() = funcName }
 }
 
 /**
diff --git a/swift/schema.py b/swift/schema.py
@@ -177,12 +177,13 @@ class ParamDecl(VarDecl):
     """)
 
 class Callable(Element):
+    name: optional[string] | doc("name of this Callable")
     self_param: optional[ParamDecl] | child
     params: list[ParamDecl] | child
     body: optional["BraceStmt"] | child | desc("The body is absent within protocol declarations.")
 
 class AbstractFunctionDecl(GenericContext, ValueDecl, Callable):
-    name: string | doc("name of this function")
+    pass
 
 class EnumElementDecl(ValueDecl):
     name: string
