Swift: getPrimaryQlClass -> getAPrimaryQlClass

Author: redsun82

swift/codegen/templates/ql_class.mustache

@@ -8,7 +8,9 @@ class {{name}}Base extends {{db_id}}{{#bases}}, {{.}}{{/bases}} {
   {{#root}}
   string toString() { none() } // overridden by subclasses
 
-  string getPrimaryQlClass() { none() } // overridden by subclasses
+  string getAPrimaryQlClass() { none() } // overridden by subclasses
+
+  final string getPrimaryQlClasses() { result = concat(this.getAPrimaryQlClass(), ",") }
 
   {{name}}Base getResolveStep() { none() } // overridden by subclasses
 
@@ -19,7 +21,7 @@ class {{name}}Base extends {{db_id}}{{#bases}}, {{.}}{{/bases}} {
   }
   {{/root}}
   {{#final}}
-  override string getPrimaryQlClass() { result = "{{name}}" }
+  override string getAPrimaryQlClass() { result = "{{name}}" }
   {{/final}}
   {{#properties}}
 

swift/ql/lib/codeql/swift/generated/Element.qll

@@ -2,7 +2,9 @@
 class ElementBase extends @element {
   string toString() { none() } // overridden by subclasses
 
-  string getPrimaryQlClass() { none() } // overridden by subclasses
+  string getAPrimaryQlClass() { none() } // overridden by subclasses
+
+  final string getPrimaryQlClasses() { result = concat(this.getAPrimaryQlClass(), ",") }
 
   ElementBase getResolveStep() { none() } // overridden by subclasses
 

swift/ql/lib/codeql/swift/generated/File.qll

@@ -2,7 +2,7 @@
 import codeql.swift.elements.Element
 
 class FileBase extends @file, Element {
-  override string getPrimaryQlClass() { result = "File" }
+  override string getAPrimaryQlClass() { result = "File" }
 
   string getName() { files(this, result) }
 }

swift/ql/lib/codeql/swift/generated/Location.qll

@@ -3,7 +3,7 @@ import codeql.swift.elements.Element
 import codeql.swift.elements.File
 
 class LocationBase extends @location, Element {
-  override string getPrimaryQlClass() { result = "Location" }
+  override string getAPrimaryQlClass() { result = "Location" }
 
   File getFile() {
     exists(File x |

swift/ql/lib/codeql/swift/generated/UnknownAstNode.qll

@@ -6,7 +6,7 @@ import codeql.swift.elements.stmt.Stmt
 import codeql.swift.elements.typerepr.TypeRepr
 
 class UnknownAstNodeBase extends @unknown_ast_node, Decl, Expr, Pattern, Stmt, TypeRepr {
-  override string getPrimaryQlClass() { result = "UnknownAstNode" }
+  override string getAPrimaryQlClass() { result = "UnknownAstNode" }
 
   string getName() { unknown_ast_nodes(this, result) }
 }

swift/ql/lib/codeql/swift/generated/decl/AccessorDecl.qll

@@ -2,5 +2,5 @@
 import codeql.swift.elements.decl.FuncDecl
 
 class AccessorDeclBase extends @accessor_decl, FuncDecl {
-  override string getPrimaryQlClass() { result = "AccessorDecl" }
+  override string getAPrimaryQlClass() { result = "AccessorDecl" }
 }

swift/ql/lib/codeql/swift/generated/decl/AssociatedTypeDecl.qll

@@ -2,5 +2,5 @@
 import codeql.swift.elements.decl.AbstractTypeParamDecl
 
 class AssociatedTypeDeclBase extends @associated_type_decl, AbstractTypeParamDecl {
-  override string getPrimaryQlClass() { result = "AssociatedTypeDecl" }
+  override string getAPrimaryQlClass() { result = "AssociatedTypeDecl" }
 }

swift/ql/lib/codeql/swift/generated/decl/ClassDecl.qll

@@ -2,5 +2,5 @@
 import codeql.swift.elements.decl.NominalTypeDecl
 
 class ClassDeclBase extends @class_decl, NominalTypeDecl {
-  override string getPrimaryQlClass() { result = "ClassDecl" }
+  override string getAPrimaryQlClass() { result = "ClassDecl" }
 }

swift/ql/lib/codeql/swift/generated/decl/ConcreteFuncDecl.qll

@@ -2,5 +2,5 @@
 import codeql.swift.elements.decl.FuncDecl
 
 class ConcreteFuncDeclBase extends @concrete_func_decl, FuncDecl {
-  override string getPrimaryQlClass() { result = "ConcreteFuncDecl" }
+  override string getAPrimaryQlClass() { result = "ConcreteFuncDecl" }
 }

swift/ql/lib/codeql/swift/generated/decl/ConcreteVarDecl.qll

@@ -2,7 +2,7 @@
 import codeql.swift.elements.decl.VarDecl
 
 class ConcreteVarDeclBase extends @concrete_var_decl, VarDecl {
-  override string getPrimaryQlClass() { result = "ConcreteVarDecl" }
+  override string getAPrimaryQlClass() { result = "ConcreteVarDecl" }
 
   int getIntroducerInt() { concrete_var_decls(this, result) }
 }