Swift: replace non-genereated Base suffixes

This is the effect of running
```
find swift/ql/lib/codeql/swift/elements -type f | xargs sed -ri 's/\b([A-Z]\w+)Base\b/Generated::\1/g'
```
followed by reformatting.

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/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/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/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/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/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/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/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/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/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/TypeDecl.qll

@@ -3,7 +3,7 @@ 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/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/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/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/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/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/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/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/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/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" }
 }

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.EnumIsCaseExpr
 
-class EnumIsCaseExpr extends EnumIsCaseExprBase {
+class EnumIsCaseExpr extends Generated::EnumIsCaseExpr {
   override string toString() { result = "... is " + this.getElement().toString() }
 }

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.ExplicitCastExpr
 
-class ExplicitCastExpr extends ExplicitCastExprBase {
+class ExplicitCastExpr extends Generated::ExplicitCastExpr {
   override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
   override string toString() { result = "(" + this.getType() + ") ..." }

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.Expr
 
-class Expr extends ExprBase {
+class Expr extends Generated::Expr {
   final override Expr getResolveStep() { this.convertsFrom(result) }
 
   predicate convertsFrom(Expr e) { none() } // overridden by subclasses

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.expr.IdentityExpr
 
-class IdentityExpr extends IdentityExprBase {
+class IdentityExpr extends Generated::IdentityExpr {
   override predicate convertsFrom(Expr e) { e = getImmediateSubExpr() }
 }

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.IfExpr
 
-class IfExpr extends IfExprBase {
+class IfExpr extends Generated::IfExpr {
   Expr getBranch(boolean b) {
     b = true and
     result = this.getThenExpr()

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.ImplicitConversionExpr
 
-class ImplicitConversionExpr extends ImplicitConversionExprBase {
+class ImplicitConversionExpr extends Generated::ImplicitConversionExpr {
   override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
   override string toString() { result = "(" + this.getType().toString() + ") ..." }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ private import codeql.swift.elements.decl.AbstractFunctionDecl
 private import codeql.swift.generated.Raw
 private import codeql.swift.generated.Synth
 
-class MethodRefExpr extends MethodRefExprBase {
+class MethodRefExpr extends Generated::MethodRefExpr {
   override string toString() { result = "." + this.getMember().toString() }
 
   override Expr getImmediateBase() {

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

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

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

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

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.ObjectLiteralExpr
 
-class ObjectLiteralExpr extends ObjectLiteralExprBase {
+class ObjectLiteralExpr extends Generated::ObjectLiteralExpr {
   override string toString() {
     result = "#...(...)" // TOOD: We can improve this once we extract the kind
   }

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.OneWayExpr
 
-class OneWayExpr extends OneWayExprBase {
+class OneWayExpr extends Generated::OneWayExpr {
   override predicate convertsFrom(Expr e) { e = this.getImmediateSubExpr() }
 
   override string toString() { result = this.getSubExpr().toString() }

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.PrefixUnaryExpr
 private import codeql.swift.elements.expr.Expr
 
-class PrefixUnaryExpr extends PrefixUnaryExprBase {
+class PrefixUnaryExpr extends Generated::PrefixUnaryExpr {
   Expr getOperand() { result = this.getAnArgument().getExpr() }
 }

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

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

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.RegexLiteralExpr
 
-class RegexLiteralExpr extends RegexLiteralExprBase {
+class RegexLiteralExpr extends Generated::RegexLiteralExpr {
   override string toString() {
     result = "..." // TODO: We can improve this once we extract the regex
   }

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

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

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.SubscriptExpr
 
-class SubscriptExpr extends SubscriptExprBase {
+class SubscriptExpr extends Generated::SubscriptExpr {
   Argument getFirstArgument() {
     exists(int i |
       result = this.getArgument(i) and

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

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

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

@@ -8,4 +8,4 @@ private import codeql.swift.generated.expr.TapExpr
  * 2. Execute `e.getBody()` which potentially modifies the local variable.
  * 3. Return the value of the local variable.
  */
-class TapExpr extends TapExprBase { }
+class TapExpr extends Generated::TapExpr { }

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

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

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.TupleElementExpr
 
-class TupleElementExpr extends TupleElementExprBase {
+class TupleElementExpr extends Generated::TupleElementExpr {
   override string toString() {
     result = "." + this.getIndex() // TODO: Can be improved once we extract the name
   }

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

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

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

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

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

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.expr.UnresolvedDeclRefExpr
 
-class UnresolvedDeclRefExpr extends UnresolvedDeclRefExprBase {
+class UnresolvedDeclRefExpr extends Generated::UnresolvedDeclRefExpr {
   override string toString() {
     result = getName() + " (unresolved)"
     or

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

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

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

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

swift/ql/lib/codeql/swift/elements/pattern/AnyPattern.qll

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

swift/ql/lib/codeql/swift/elements/pattern/BindingPattern.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.pattern.BindingPattern
 
-class BindingPattern extends BindingPatternBase {
+class BindingPattern extends Generated::BindingPattern {
   override string toString() { result = "let ..." }
 }

swift/ql/lib/codeql/swift/elements/pattern/BoolPattern.qll

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

swift/ql/lib/codeql/swift/elements/pattern/EnumElementPattern.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.pattern.EnumElementPattern
 
-class EnumElementPattern extends EnumElementPatternBase {
+class EnumElementPattern extends Generated::EnumElementPattern {
   override string toString() {
     if this.hasSubPattern()
     then result = "." + this.getElement().toString() + "(...)"

swift/ql/lib/codeql/swift/elements/pattern/ExprPattern.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.pattern.ExprPattern
 
-class ExprPattern extends ExprPatternBase {
+class ExprPattern extends Generated::ExprPattern {
   override string toString() { result = "=~ ..." }
 }

swift/ql/lib/codeql/swift/elements/pattern/IsPattern.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.pattern.IsPattern
 
-class IsPattern extends IsPatternBase {
+class IsPattern extends Generated::IsPattern {
   override string toString() { result = "... is ..." }
 }

swift/ql/lib/codeql/swift/elements/pattern/NamedPattern.qll

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

swift/ql/lib/codeql/swift/elements/pattern/OptionalSomePattern.qll

@@ -1,5 +1,5 @@
 private import codeql.swift.generated.pattern.OptionalSomePattern
 
-class OptionalSomePattern extends OptionalSomePatternBase {
+class OptionalSomePattern extends Generated::OptionalSomePattern {
   override string toString() { result = "let ...?" }
 }

swift/ql/lib/codeql/swift/elements/pattern/ParenPattern.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.pattern.ParenPattern
 
-class ParenPattern extends ParenPatternBase {
+class ParenPattern extends Generated::ParenPattern {
   final override Pattern getResolveStep() { result = getImmediateSubPattern() }
 
   override string toString() { result = "(...)" }

swift/ql/lib/codeql/swift/elements/pattern/TuplePattern.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.pattern.TuplePattern
 
-class TuplePattern extends TuplePatternBase {
+class TuplePattern extends Generated::TuplePattern {
   Pattern getFirstElement() { result = this.getElement(0) }
 
   Pattern getLastElement() {

swift/ql/lib/codeql/swift/elements/pattern/TypedPattern.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.pattern.TypedPattern
 
-class TypedPattern extends TypedPatternBase {
+class TypedPattern extends Generated::TypedPattern {
   override string toString() {
     if exists(this.getSubPattern()) then result = "... as ..." else result = "is ..."
   }