Merge pull request #10869 from github/redsun82/swift-no-base-suffix

Swift: replace `Base` suffix with `Generated::` module

swift/codegen/generators/qlgen.py

@@ -157,10 +157,10 @@ def get_types_used_by(cls: ql.Class) -> typing.Iterable[str]:
 
 
 def get_classes_used_by(cls: ql.Class) -> typing.List[str]:
-    return sorted(set(t for t in get_types_used_by(cls) if t[0].isupper()))
+    return sorted(set(t for t in get_types_used_by(cls) if t[0].isupper() and t != cls.name))
 
 
-_generated_stub_re = re.compile(r"\n*private import .*\n+class \w+ extends \w+ \{[ \n]?\}", re.MULTILINE)
+_generated_stub_re = re.compile(r"\n*private import .*\n+class \w+ extends Generated::\w+ \{[ \n]?\}", re.MULTILINE)
 
 
 def _is_generated_stub(file: pathlib.Path) -> bool:

swift/codegen/templates/ql_class.mustache

@@ -5,69 +5,71 @@ private import codeql.swift.generated.Raw
 import {{.}}
 {{/imports}}
 
-class {{name}}Base extends Synth::T{{name}}{{#bases}}, {{.}}{{/bases}} {
-  {{#root}}
-  string toString() { none() } // overridden by subclasses
+module Generated {
+  class {{name}} extends Synth::T{{name}}{{#bases}}, {{.}}{{/bases}} {
+    {{#root}}
+    string toString() { none() } // overridden by subclasses
 
-  string getAPrimaryQlClass() { none() } // overridden by subclasses
+    string getAPrimaryQlClass() { none() } // overridden by subclasses
 
-  final string getPrimaryQlClasses() { result = concat(this.getAPrimaryQlClass(), ",") }
+    final string getPrimaryQlClasses() { result = concat(this.getAPrimaryQlClass(), ",") }
 
-  {{name}}Base getResolveStep() { none() } // overridden by subclasses
+    {{name}} getResolveStep() { none() } // overridden by subclasses
 
-  final {{name}}Base resolve() {
-    not exists(getResolveStep()) and result = this
-    or
-    result = getResolveStep().resolve()
+    final {{name}} resolve() {
+      not exists(getResolveStep()) and result = this
+      or
+      result = getResolveStep().resolve()
+    }
+    {{/root}}
+    {{#final}}
+    override string getAPrimaryQlClass() { result = "{{name}}" }
+    {{/final}}
+    {{#properties}}
+
+    {{#type_is_class}}
+    {{type}} getImmediate{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
+      {{^ipa}}
+      result = Synth::convert{{type}}FromRaw(Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
+      {{/ipa}}
+      {{#ipa}}
+      none()
+      {{/ipa}}
+    }
+
+    final {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
+      result = getImmediate{{singular}}({{#is_repeated}}index{{/is_repeated}}).resolve()
+    }
+
+    {{/type_is_class}}
+    {{^type_is_class}}
+    {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
+      {{^ipa}}
+      {{^is_predicate}}result = {{/is_predicate}}Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
+      {{/ipa}}
+      {{#ipa}}
+      none()
+      {{/ipa}}
+    }
+
+    {{/type_is_class}}
+    {{#is_optional}}
+    final predicate has{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
+      exists({{getter}}({{#is_repeated}}index{{/is_repeated}}))
+    }
+    {{/is_optional}}
+    {{#is_repeated}}
+
+    final {{type}} {{indefinite_getter}}() {
+      result = {{getter}}(_)
+    }
+    {{^is_optional}}
+
+    final int getNumberOf{{plural}}() {
+      result = count({{indefinite_getter}}())
+    }
+    {{/is_optional}}
+    {{/is_repeated}}
+    {{/properties}}
   }
-  {{/root}}
-  {{#final}}
-  override string getAPrimaryQlClass() { result = "{{name}}" }
-  {{/final}}
-  {{#properties}}
-
-  {{#type_is_class}}
-  {{type}} getImmediate{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
-    {{^ipa}}
-    result = Synth::convert{{type}}FromRaw(Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
-    {{/ipa}}
-    {{#ipa}}
-    none()
-    {{/ipa}}
-  }
-
-  final {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
-    result = getImmediate{{singular}}({{#is_repeated}}index{{/is_repeated}}).resolve()
-  }
-
-  {{/type_is_class}}
-  {{^type_is_class}}
-  {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
-    {{^ipa}}
-    {{^is_predicate}}result = {{/is_predicate}}Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
-    {{/ipa}}
-    {{#ipa}}
-    none()
-    {{/ipa}}
-  }
-
-  {{/type_is_class}}
-  {{#is_optional}}
-  final predicate has{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
-    exists({{getter}}({{#is_repeated}}index{{/is_repeated}}))
-  }
-  {{/is_optional}}
-  {{#is_repeated}}
-
-  final {{type}} {{indefinite_getter}}() {
-    result = {{getter}}(_)
-  }
-  {{^is_optional}}
-
-  final int getNumberOf{{plural}}() {
-    result = count({{indefinite_getter}}())
-  }
-  {{/is_optional}}
-  {{/is_repeated}}
-  {{/properties}}
 }

swift/codegen/templates/ql_stub.mustache

@@ -1,4 +1,4 @@
 // generated by {{generator}}, remove this comment if you wish to edit this file
 private import {{base_import}}
 
-class {{name}} extends {{name}}Base {}
+class {{name}} extends Generated::{{name}} {}

swift/codegen/test/test_qlgen.py

@@ -425,7 +425,7 @@ def test_non_empty_cleanup(opts, generate, renderer):
     test_c = opts.ql_test_output / "B.txt"
     write(ql_a)
     write(ql_b)
-    write(stub_a, "// generated\nprivate import bla\n\nclass foo extends bar {\n}\n")
+    write(stub_a, "// generated\nprivate import bla\n\nclass foo extends Generated::bar {\n}\n")
     write(stub_b, "bar\n")
     write(test_a)
     write(test_b)
@@ -437,7 +437,7 @@ def test_non_empty_cleanup(opts, generate, renderer):
 
 def test_modified_stub_still_generated(qlgen_opts, renderer):
     stub = qlgen_opts.ql_stub_output / "A.qll"
-    write(stub, "// generated\nprivate import bla\n\nclass foo extends bar, baz {\n}\n")
+    write(stub, "// generated\nprivate import bla\n\nclass foo extends Generated::bar, baz {\n}\n")
     with pytest.raises(qlgen.ModifiedStubMarkedAsGeneratedError):
         run_generation(qlgen.generate, qlgen_opts, renderer)
 
@@ -445,7 +445,8 @@ def test_modified_stub_still_generated(qlgen_opts, renderer):
 def test_extended_stub_still_generated(qlgen_opts, renderer):
     stub = qlgen_opts.ql_stub_output / "A.qll"
     write(stub,
-          "// generated\nprivate import bla\n\nclass foo extends bar {\n}\n\nclass other {\n  other() { none() }\n}")
+          "// generated\nprivate import bla\n\nclass foo extends Generated::bar {\n}\n\n"
+          "class other {\n  other() { none() }\n}")
     with pytest.raises(qlgen.ModifiedStubMarkedAsGeneratedError):
         run_generation(qlgen.generate, qlgen_opts, renderer)
 

swift/ql/lib/codeql/swift/elements/AstNode.qll

@@ -23,7 +23,7 @@ private module Cached {
   }
 }
 
-class AstNode extends AstNodeBase {
+class AstNode extends Generated::AstNode {
   final AbstractFunctionDecl getEnclosingFunction() { result = Cached::getEnclosingFunction(this) }
 
   final Decl getEnclosingDecl() { result = Cached::getEnclosingDecl(this) }

swift/ql/lib/codeql/swift/elements/Callable.qll

@@ -1,4 +1,4 @@
 private import codeql.swift.generated.Callable
 private import codeql.swift.elements.AstNode
 
-class Callable extends CallableBase, AstNode { }
+class Callable extends Generated::Callable, AstNode { }

swift/ql/lib/codeql/swift/elements/Comment.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.Comment
 
-class Comment extends CommentBase {
+class Comment extends Generated::Comment {
   /** toString */
   override string toString() { result = this.getText() }
 }

swift/ql/lib/codeql/swift/elements/DbFile.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.DbFile
 
-class DbFile extends DbFileBase { }
+class DbFile extends Generated::DbFile { }

swift/ql/lib/codeql/swift/elements/DbLocation.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.DbLocation
 
-class DbLocation extends DbLocationBase { }
+class DbLocation extends Generated::DbLocation { }

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.Element
 
-class Element extends ElementBase {
+class Element extends Generated::Element {
   private predicate resolvesFrom(Element e) { e.getResolveStep() = this }
 
   override string toString() { result = this.getPrimaryQlClasses() }

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.File
 
-class File extends FileBase {
+class File extends Generated::File {
   /** toString */
   override string toString() { result = this.getAbsolutePath() }
 

swift/ql/lib/codeql/swift/elements/Locatable.qll

@@ -2,12 +2,13 @@ private import codeql.swift.generated.Locatable
 private import codeql.swift.elements.File
 private import codeql.swift.elements.UnknownLocation
 
-class Locatable extends LocatableBase {
+class Locatable extends Generated::Locatable {
   pragma[nomagic]
   override Location getImmediateLocation() {
-    result = LocatableBase.super.getImmediateLocation()
+    result = Generated::Locatable.super.getImmediateLocation()
     or
-    not exists(LocatableBase.super.getImmediateLocation()) and result instanceof UnknownLocation
+    not exists(Generated::Locatable.super.getImmediateLocation()) and
+    result instanceof UnknownLocation
   }
 
   /**

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

@@ -3,7 +3,7 @@ private import codeql.swift.generated.Location
 /**
  * A location of a program element.
  */
-class Location extends LocationBase {
+class Location extends Generated::Location {
   /**
    * Holds if this location is described by `path`, `startLine`, `startColumn`, `endLine` and `endColumn`.
    */

swift/ql/lib/codeql/swift/elements/UnknownFile.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.UnknownFile
 
-class UnknownFile extends UnknownFileBase {
+class UnknownFile extends Generated::UnknownFile {
   override string getName() { result = "" }
 }

swift/ql/lib/codeql/swift/elements/UnknownLocation.qll

@@ -5,7 +5,7 @@ private import codeql.swift.elements.File
 /**
  * A `Location` that is given to something that is not associated with any position in the source code.
  */
-class UnknownLocation extends UnknownLocationBase {
+class UnknownLocation extends Generated::UnknownLocation {
   override File getImmediateFile() { result instanceof UnknownFile }
 
   override int getStartLine() { result = 0 }

swift/ql/lib/codeql/swift/elements/UnresolvedElement.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.UnresolvedElement
 
-class UnresolvedElement extends UnresolvedElementBase { }
+class UnresolvedElement extends Generated::UnresolvedElement { }

swift/ql/lib/codeql/swift/elements/decl/AbstractFunctionDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.AbstractFunctionDecl
 
-class AbstractFunctionDecl extends AbstractFunctionDeclBase {
+class AbstractFunctionDecl extends Generated::AbstractFunctionDecl {
   override string toString() { result = this.getName() }
 }

swift/ql/lib/codeql/swift/elements/decl/AbstractStorageDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.AbstractStorageDecl
 
-class AbstractStorageDecl extends AbstractStorageDeclBase { }
+class AbstractStorageDecl extends Generated::AbstractStorageDecl { }

swift/ql/lib/codeql/swift/elements/decl/AbstractTypeParamDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.AbstractTypeParamDecl
 
-class AbstractTypeParamDecl extends AbstractTypeParamDeclBase { }
+class AbstractTypeParamDecl extends Generated::AbstractTypeParamDecl { }

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

@@ -10,7 +10,7 @@ private predicate isKnownAccessorKind(AccessorDecl decl, string kind) {
   decl.isDidSet() and kind = "didSet"
 }
 
-class AccessorDecl extends AccessorDeclBase {
+class AccessorDecl extends Generated::AccessorDecl {
   predicate isPropertyObserver() {
     this instanceof WillSetObserver or this instanceof DidSetObserver
   }

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

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.AssociatedTypeDecl
 
-class AssociatedTypeDecl extends AssociatedTypeDeclBase { }
+class AssociatedTypeDecl extends Generated::AssociatedTypeDecl { }

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

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ClassDecl
 
-class ClassDecl extends ClassDeclBase { }
+class ClassDecl extends Generated::ClassDecl { }

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

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ConcreteFuncDecl
 
-class ConcreteFuncDecl extends ConcreteFuncDeclBase { }
+class ConcreteFuncDecl extends Generated::ConcreteFuncDecl { }

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

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ConcreteVarDecl
 
-class ConcreteVarDecl extends ConcreteVarDeclBase { }
+class ConcreteVarDecl extends Generated::ConcreteVarDecl { }

swift/ql/lib/codeql/swift/elements/decl/ConstructorDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ConstructorDecl
 
-class ConstructorDecl extends ConstructorDeclBase { }
+class ConstructorDecl extends Generated::ConstructorDecl { }

swift/ql/lib/codeql/swift/elements/decl/Decl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.Decl
 
-class Decl extends DeclBase { }
+class Decl extends Generated::Decl { }

swift/ql/lib/codeql/swift/elements/decl/DestructorDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.DestructorDecl
 
-class DestructorDecl extends DestructorDeclBase { }
+class DestructorDecl extends Generated::DestructorDecl { }

swift/ql/lib/codeql/swift/elements/decl/EnumCaseDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.EnumCaseDecl
 
-class EnumCaseDecl extends EnumCaseDeclBase {
+class EnumCaseDecl extends Generated::EnumCaseDecl {
   override string toString() { result = "case ..." }
 }

swift/ql/lib/codeql/swift/elements/decl/EnumDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.EnumDecl
 
-class EnumDecl extends EnumDeclBase { }
+class EnumDecl extends Generated::EnumDecl { }

swift/ql/lib/codeql/swift/elements/decl/EnumElementDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.EnumElementDecl
 
-class EnumElementDecl extends EnumElementDeclBase {
+class EnumElementDecl extends Generated::EnumElementDecl {
   override string toString() { result = this.getName() }
 }

swift/ql/lib/codeql/swift/elements/decl/ExtensionDecl.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.decl.ExtensionDecl
 
-class ExtensionDecl extends ExtensionDeclBase {
+class ExtensionDecl extends Generated::ExtensionDecl {
   override string toString() {
     result = "extension" // TODO: Once we extract the name of this one we can provide a better `toString`.
   }

swift/ql/lib/codeql/swift/elements/decl/FuncDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.FuncDecl
 
-class FuncDecl extends FuncDeclBase { }
+class FuncDecl extends Generated::FuncDecl { }

swift/ql/lib/codeql/swift/elements/decl/GenericContext.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.GenericContext
 
-class GenericContext extends GenericContextBase { }
+class GenericContext extends Generated::GenericContext { }

swift/ql/lib/codeql/swift/elements/decl/GenericTypeDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.GenericTypeDecl
 
-class GenericTypeDecl extends GenericTypeDeclBase { }
+class GenericTypeDecl extends Generated::GenericTypeDecl { }

swift/ql/lib/codeql/swift/elements/decl/GenericTypeParamDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.GenericTypeParamDecl
 
-class GenericTypeParamDecl extends GenericTypeParamDeclBase { }
+class GenericTypeParamDecl extends Generated::GenericTypeParamDecl { }

swift/ql/lib/codeql/swift/elements/decl/IfConfigDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.IfConfigDecl
 
-class IfConfigDecl extends IfConfigDeclBase {
+class IfConfigDecl extends Generated::IfConfigDecl {
   override string toString() { result = "#if ..." }
 }

swift/ql/lib/codeql/swift/elements/decl/ImportDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.ImportDecl
 
-class ImportDecl extends ImportDeclBase {
+class ImportDecl extends Generated::ImportDecl {
   override string toString() { result = "import ..." }
 }

swift/ql/lib/codeql/swift/elements/decl/InfixOperatorDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.InfixOperatorDecl
 
-class InfixOperatorDecl extends InfixOperatorDeclBase { }
+class InfixOperatorDecl extends Generated::InfixOperatorDecl { }

swift/ql/lib/codeql/swift/elements/decl/IterableDeclContext.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.IterableDeclContext
 
-class IterableDeclContext extends IterableDeclContextBase { }
+class IterableDeclContext extends Generated::IterableDeclContext { }

swift/ql/lib/codeql/swift/elements/decl/MissingMemberDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.MissingMemberDecl
 
-class MissingMemberDecl extends MissingMemberDeclBase { }
+class MissingMemberDecl extends Generated::MissingMemberDecl { }

swift/ql/lib/codeql/swift/elements/decl/ModuleDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ModuleDecl
 
-class ModuleDecl extends ModuleDeclBase { }
+class ModuleDecl extends Generated::ModuleDecl { }

swift/ql/lib/codeql/swift/elements/decl/NominalTypeDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.NominalTypeDecl
 
-class NominalTypeDecl extends NominalTypeDeclBase { }
+class NominalTypeDecl extends Generated::NominalTypeDecl { }

swift/ql/lib/codeql/swift/elements/decl/OpaqueTypeDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.OpaqueTypeDecl
 
-class OpaqueTypeDecl extends OpaqueTypeDeclBase { }
+class OpaqueTypeDecl extends Generated::OpaqueTypeDecl { }

swift/ql/lib/codeql/swift/elements/decl/OperatorDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.OperatorDecl
 
-class OperatorDecl extends OperatorDeclBase {
+class OperatorDecl extends Generated::OperatorDecl {
   override string toString() { result = this.getName() }
 }

swift/ql/lib/codeql/swift/elements/decl/ParamDecl.qll

@@ -1,7 +1,7 @@
 private import codeql.swift.generated.decl.ParamDecl
 private import codeql.swift.elements.Callable
 
-class ParamDecl extends ParamDeclBase {
+class ParamDecl extends Generated::ParamDecl {
   /** Gets the function which declares this parameter. */
   Callable getDeclaringFunction() { result.getAParam() = this }
 

swift/ql/lib/codeql/swift/elements/decl/PatternBindingDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.PatternBindingDecl
 
-class PatternBindingDecl extends PatternBindingDeclBase {
+class PatternBindingDecl extends Generated::PatternBindingDecl {
   override string toString() { result = "var ... = ..." }
 }

swift/ql/lib/codeql/swift/elements/decl/PostfixOperatorDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.PostfixOperatorDecl
 
-class PostfixOperatorDecl extends PostfixOperatorDeclBase { }
+class PostfixOperatorDecl extends Generated::PostfixOperatorDecl { }

swift/ql/lib/codeql/swift/elements/decl/PoundDiagnosticDecl.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.decl.PoundDiagnosticDecl
 
-class PoundDiagnosticDecl extends PoundDiagnosticDeclBase {
+class PoundDiagnosticDecl extends Generated::PoundDiagnosticDecl {
   override string toString() {
     result = "#..." // TODO: Once we extract whether this is an error or a warning we can improve this.
   }

swift/ql/lib/codeql/swift/elements/decl/PrecedenceGroupDecl.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.decl.PrecedenceGroupDecl
 
-class PrecedenceGroupDecl extends PrecedenceGroupDeclBase {
+class PrecedenceGroupDecl extends Generated::PrecedenceGroupDecl {
   override string toString() {
     result = "precedencegroup ..." // TODO: Once we extract the name we can improve this.
   }

swift/ql/lib/codeql/swift/elements/decl/PrefixOperatorDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.PrefixOperatorDecl
 
-class PrefixOperatorDecl extends PrefixOperatorDeclBase { }
+class PrefixOperatorDecl extends Generated::PrefixOperatorDecl { }

swift/ql/lib/codeql/swift/elements/decl/ProtocolDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ProtocolDecl
 
-class ProtocolDecl extends ProtocolDeclBase { }
+class ProtocolDecl extends Generated::ProtocolDecl { }

swift/ql/lib/codeql/swift/elements/decl/StructDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.StructDecl
 
-class StructDecl extends StructDeclBase { }
+class StructDecl extends Generated::StructDecl { }

swift/ql/lib/codeql/swift/elements/decl/SubscriptDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.SubscriptDecl
 
-class SubscriptDecl extends SubscriptDeclBase {
+class SubscriptDecl extends Generated::SubscriptDecl {
   override string toString() { result = "subscript ..." }
 }

swift/ql/lib/codeql/swift/elements/decl/TopLevelCodeDecl.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.decl.TopLevelCodeDecl
 
-class TopLevelCodeDecl extends TopLevelCodeDeclBase {
+class TopLevelCodeDecl extends Generated::TopLevelCodeDecl {
   override string toString() { result = this.getBody().toString() }
 }

swift/ql/lib/codeql/swift/elements/decl/TypeAliasDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.TypeAliasDecl
 
-class TypeAliasDecl extends TypeAliasDeclBase { }
+class TypeAliasDecl extends Generated::TypeAliasDecl { }

swift/ql/lib/codeql/swift/elements/decl/TypeDecl.qll

@@ -1,9 +1,8 @@
 private import codeql.swift.generated.decl.TypeDecl
-private import codeql.swift.generated.type.Type
 private import codeql.swift.elements.type.AnyGenericType
 private import swift
 
-class TypeDecl extends TypeDeclBase {
+class TypeDecl extends Generated::TypeDecl {
   override string toString() { result = this.getName() }
 
   TypeDecl getBaseTypeDecl(int i) { result = this.getBaseType(i).(AnyGenericType).getDeclaration() }

swift/ql/lib/codeql/swift/elements/decl/ValueDecl.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.decl.ValueDecl
 
-class ValueDecl extends ValueDeclBase { }
+class ValueDecl extends Generated::ValueDecl { }

swift/ql/lib/codeql/swift/elements/decl/VarDecl.qll

@@ -2,7 +2,7 @@ private import codeql.swift.generated.decl.VarDecl
 private import codeql.swift.elements.expr.DeclRefExpr
 private import codeql.swift.elements.decl.IterableDeclContext
 
-class VarDecl extends VarDeclBase {
+class VarDecl extends Generated::VarDecl {
   override string toString() { result = this.getName() }
 
   DeclRefExpr getAnAccess() { result.getDecl() = this }

swift/ql/lib/codeql/swift/elements/expr/AbstractClosureExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.AbstractClosureExpr
 
-class AbstractClosureExpr extends AbstractClosureExprBase { }
+class AbstractClosureExpr extends Generated::AbstractClosureExpr { }

swift/ql/lib/codeql/swift/elements/expr/AnyHashableErasureExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.AnyHashableErasureExpr
 
-class AnyHashableErasureExpr extends AnyHashableErasureExprBase { }
+class AnyHashableErasureExpr extends Generated::AnyHashableErasureExpr { }

swift/ql/lib/codeql/swift/elements/expr/AnyTryExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.AnyTryExpr
 
-class AnyTryExpr extends AnyTryExprBase { }
+class AnyTryExpr extends Generated::AnyTryExpr { }

swift/ql/lib/codeql/swift/elements/expr/AppliedPropertyWrapperExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.AppliedPropertyWrapperExpr
 
-class AppliedPropertyWrapperExpr extends AppliedPropertyWrapperExprBase { }
+class AppliedPropertyWrapperExpr extends Generated::AppliedPropertyWrapperExpr { }

swift/ql/lib/codeql/swift/elements/expr/ApplyExpr.qll

@@ -4,7 +4,7 @@ private import codeql.swift.elements.expr.DeclRefExpr
 private import codeql.swift.elements.expr.MethodRefExpr
 private import codeql.swift.elements.expr.ConstructorRefCallExpr
 
-class ApplyExpr extends ApplyExprBase {
+class ApplyExpr extends Generated::ApplyExpr {
   AbstractFunctionDecl getStaticTarget() {
     exists(Expr f |
       f = this.getFunction() and

swift/ql/lib/codeql/swift/elements/expr/ArchetypeToSuperExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ArchetypeToSuperExpr
 
-class ArchetypeToSuperExpr extends ArchetypeToSuperExprBase { }
+class ArchetypeToSuperExpr extends Generated::ArchetypeToSuperExpr { }

swift/ql/lib/codeql/swift/elements/expr/Argument.qll

@@ -1,7 +1,7 @@
 private import codeql.swift.generated.expr.Argument
 private import codeql.swift.elements.expr.ApplyExpr
 
-class Argument extends ArgumentBase {
+class Argument extends Generated::Argument {
   override string toString() { result = this.getLabel() + ": " + this.getExpr().toString() }
 
   int getIndex() { any(ApplyExpr apply).getArgument(result) = this }

swift/ql/lib/codeql/swift/elements/expr/ArrayExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.ArrayExpr
 
-class ArrayExpr extends ArrayExprBase {
+class ArrayExpr extends Generated::ArrayExpr {
   override string toString() { result = "[...]" }
 }

swift/ql/lib/codeql/swift/elements/expr/ArrayToPointerExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ArrayToPointerExpr
 
-class ArrayToPointerExpr extends ArrayToPointerExprBase { }
+class ArrayToPointerExpr extends Generated::ArrayToPointerExpr { }

swift/ql/lib/codeql/swift/elements/expr/ArrowExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.ArrowExpr
 
-class ArrowExpr extends ArrowExprBase {
+class ArrowExpr extends Generated::ArrowExpr {
   override string toString() { result = "... -> ..." }
 }

swift/ql/lib/codeql/swift/elements/expr/AssignExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.AssignExpr
 
-class AssignExpr extends AssignExprBase {
+class AssignExpr extends Generated::AssignExpr {
   override string toString() { result = " ... = ..." }
 }

swift/ql/lib/codeql/swift/elements/expr/AutoClosureExpr.qll

@@ -1,7 +1,7 @@
 private import codeql.swift.generated.expr.AutoClosureExpr
 private import codeql.swift.elements.stmt.ReturnStmt
 
-class AutoClosureExpr extends AutoClosureExprBase {
+class AutoClosureExpr extends Generated::AutoClosureExpr {
   /** Gets the implicit return statement generated by this autoclosure expression. */
   ReturnStmt getReturn() { result = unique( | | this.getBody().getAnElement()) }
 

swift/ql/lib/codeql/swift/elements/expr/AwaitExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.AwaitExpr
 
-class AwaitExpr extends AwaitExprBase {
+class AwaitExpr extends Generated::AwaitExpr {
   override string toString() { result = "await ..." }
 }

swift/ql/lib/codeql/swift/elements/expr/BinaryExpr.qll

@@ -1,7 +1,7 @@
 private import codeql.swift.generated.expr.BinaryExpr
 private import codeql.swift.elements.expr.Expr
 
-class BinaryExpr extends BinaryExprBase {
+class BinaryExpr extends Generated::BinaryExpr {
   Expr getLeftOperand() { result = this.getArgument(0).getExpr() }
 
   Expr getRightOperand() { result = this.getArgument(1).getExpr() }

swift/ql/lib/codeql/swift/elements/expr/BindOptionalExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.BindOptionalExpr
 
-class BindOptionalExpr extends BindOptionalExprBase {
+class BindOptionalExpr extends Generated::BindOptionalExpr {
   override string toString() { result = "...?" }
 }

swift/ql/lib/codeql/swift/elements/expr/BooleanLiteralExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.BooleanLiteralExpr
 
-class BooleanLiteralExpr extends BooleanLiteralExprBase {
+class BooleanLiteralExpr extends Generated::BooleanLiteralExpr {
   override string toString() { result = this.getValue().toString() }
 }

swift/ql/lib/codeql/swift/elements/expr/BridgeFromObjCExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.BridgeFromObjCExpr
 
-class BridgeFromObjCExpr extends BridgeFromObjCExprBase { }
+class BridgeFromObjCExpr extends Generated::BridgeFromObjCExpr { }

swift/ql/lib/codeql/swift/elements/expr/BridgeToObjCExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.BridgeToObjCExpr
 
-class BridgeToObjCExpr extends BridgeToObjCExprBase { }
+class BridgeToObjCExpr extends Generated::BridgeToObjCExpr { }

swift/ql/lib/codeql/swift/elements/expr/BuiltinLiteralExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.BuiltinLiteralExpr
 
-class BuiltinLiteralExpr extends BuiltinLiteralExprBase { }
+class BuiltinLiteralExpr extends Generated::BuiltinLiteralExpr { }

swift/ql/lib/codeql/swift/elements/expr/CallExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CallExpr
 
-class CallExpr extends CallExprBase { }
+class CallExpr extends Generated::CallExpr { }

swift/ql/lib/codeql/swift/elements/expr/CaptureListExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.CaptureListExpr
 
-class CaptureListExpr extends CaptureListExprBase {
+class CaptureListExpr extends Generated::CaptureListExpr {
   override string toString() { result = this.getClosureBody().toString() }
 }

swift/ql/lib/codeql/swift/elements/expr/CheckedCastExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CheckedCastExpr
 
-class CheckedCastExpr extends CheckedCastExprBase { }
+class CheckedCastExpr extends Generated::CheckedCastExpr { }

swift/ql/lib/codeql/swift/elements/expr/ClassMetatypeToObjectExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ClassMetatypeToObjectExpr
 
-class ClassMetatypeToObjectExpr extends ClassMetatypeToObjectExprBase { }
+class ClassMetatypeToObjectExpr extends Generated::ClassMetatypeToObjectExpr { }

swift/ql/lib/codeql/swift/elements/expr/ClosureExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.ClosureExpr
 
-class ClosureExpr extends ClosureExprBase {
+class ClosureExpr extends Generated::ClosureExpr {
   override string toString() { result = "{ ... }" }
 }

swift/ql/lib/codeql/swift/elements/expr/CodeCompletionExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CodeCompletionExpr
 
-class CodeCompletionExpr extends CodeCompletionExprBase { }
+class CodeCompletionExpr extends Generated::CodeCompletionExpr { }

swift/ql/lib/codeql/swift/elements/expr/CoerceExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CoerceExpr
 
-class CoerceExpr extends CoerceExprBase { }
+class CoerceExpr extends Generated::CoerceExpr { }

swift/ql/lib/codeql/swift/elements/expr/CollectionExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CollectionExpr
 
-class CollectionExpr extends CollectionExprBase { }
+class CollectionExpr extends Generated::CollectionExpr { }

swift/ql/lib/codeql/swift/elements/expr/CollectionUpcastConversionExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CollectionUpcastConversionExpr
 
-class CollectionUpcastConversionExpr extends CollectionUpcastConversionExprBase { }
+class CollectionUpcastConversionExpr extends Generated::CollectionUpcastConversionExpr { }

swift/ql/lib/codeql/swift/elements/expr/ConditionalBridgeFromObjCExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ConditionalBridgeFromObjCExpr
 
-class ConditionalBridgeFromObjCExpr extends ConditionalBridgeFromObjCExprBase { }
+class ConditionalBridgeFromObjCExpr extends Generated::ConditionalBridgeFromObjCExpr { }

swift/ql/lib/codeql/swift/elements/expr/ConditionalCheckedCastExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ConditionalCheckedCastExpr
 
-class ConditionalCheckedCastExpr extends ConditionalCheckedCastExprBase { }
+class ConditionalCheckedCastExpr extends Generated::ConditionalCheckedCastExpr { }

swift/ql/lib/codeql/swift/elements/expr/ConstructorRefCallExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.ConstructorRefCallExpr
 
-class ConstructorRefCallExpr extends ConstructorRefCallExprBase { }
+class ConstructorRefCallExpr extends Generated::ConstructorRefCallExpr { }

swift/ql/lib/codeql/swift/elements/expr/CovariantFunctionConversionExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CovariantFunctionConversionExpr
 
-class CovariantFunctionConversionExpr extends CovariantFunctionConversionExprBase { }
+class CovariantFunctionConversionExpr extends Generated::CovariantFunctionConversionExpr { }

swift/ql/lib/codeql/swift/elements/expr/CovariantReturnConversionExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.CovariantReturnConversionExpr
 
-class CovariantReturnConversionExpr extends CovariantReturnConversionExprBase { }
+class CovariantReturnConversionExpr extends Generated::CovariantReturnConversionExpr { }

swift/ql/lib/codeql/swift/elements/expr/DeclRefExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.DeclRefExpr
 
-class DeclRefExpr extends DeclRefExprBase {
+class DeclRefExpr extends Generated::DeclRefExpr {
   override string toString() { result = this.getDecl().toString() }
 }

swift/ql/lib/codeql/swift/elements/expr/DefaultArgumentExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.DefaultArgumentExpr
 
-class DefaultArgumentExpr extends DefaultArgumentExprBase {
+class DefaultArgumentExpr extends Generated::DefaultArgumentExpr {
   override string toString() { result = "default " + this.getParamDecl().getName() }
 }

swift/ql/lib/codeql/swift/elements/expr/DerivedToBaseExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.DerivedToBaseExpr
 
-class DerivedToBaseExpr extends DerivedToBaseExprBase { }
+class DerivedToBaseExpr extends Generated::DerivedToBaseExpr { }

swift/ql/lib/codeql/swift/elements/expr/DestructureTupleExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.DestructureTupleExpr
 
-class DestructureTupleExpr extends DestructureTupleExprBase { }
+class DestructureTupleExpr extends Generated::DestructureTupleExpr { }

swift/ql/lib/codeql/swift/elements/expr/DictionaryExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.DictionaryExpr
 
-class DictionaryExpr extends DictionaryExprBase {
+class DictionaryExpr extends Generated::DictionaryExpr {
   override string toString() { result = "[...]" }
 }

swift/ql/lib/codeql/swift/elements/expr/DifferentiableFunctionExpr.qll

@@ -1,4 +1,4 @@
 // generated by codegen/codegen.py, remove this comment if you wish to edit this file
 private import codeql.swift.generated.expr.DifferentiableFunctionExpr
 
-class DifferentiableFunctionExpr extends DifferentiableFunctionExprBase { }
+class DifferentiableFunctionExpr extends Generated::DifferentiableFunctionExpr { }

swift/ql/lib/codeql/swift/elements/expr/DifferentiableFunctionExtractOriginalExpr.qll

@@ -1,4 +1,4 @@
 private import codeql.swift.generated.expr.DifferentiableFunctionExtractOriginalExpr
 
-class DifferentiableFunctionExtractOriginalExpr extends DifferentiableFunctionExtractOriginalExprBase {
+class DifferentiableFunctionExtractOriginalExpr extends Generated::DifferentiableFunctionExtractOriginalExpr {
 }

swift/ql/lib/codeql/swift/elements/expr/DiscardAssignmentExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.DiscardAssignmentExpr
 
-class DiscardAssignmentExpr extends DiscardAssignmentExprBase {
+class DiscardAssignmentExpr extends Generated::DiscardAssignmentExpr {
   override string toString() { result = "_" }
 }

swift/ql/lib/codeql/swift/elements/expr/DotSelfExpr.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.DotSelfExpr
 
-class DotSelfExpr extends DotSelfExprBase {
+class DotSelfExpr extends Generated::DotSelfExpr {
   override string toString() { result = ".self" }
 }