Swift: Merge FloatingPointType.qll into NumericOrCharType.qll, because it is a numeric type and other stuff like CharacterType is there.

Author: geoffw0

swift/ql/lib/codeql/swift/elements/type/FloatingPointType.qll

@@ -1,5 +1,16 @@
 private import swift
 
+/**
+ * A floating-point type. This includes the `Float` type, the `Double`, and
+ * builtin floating-point types.
+ */
+class FloatingPointType extends Type {
+  FloatingPointType() {
+    this.getName() = ["Float", "Double"] or
+    this instanceof BuiltinFloatType
+  }
+}
+
 /** The `Character` type. */
 class CharacterType extends StructType {
   CharacterType() { this.getName() = "Character" }

swift/ql/lib/codeql/swift/elements/type/NumericOrCharType.qll

@@ -10,6 +10,5 @@ import codeql.swift.elements.expr.InitializerCallExpr
 import codeql.swift.elements.expr.SelfRefExpr
 import codeql.swift.elements.decl.MethodDecl
 import codeql.swift.elements.decl.ClassOrStructDecl
-import codeql.swift.elements.type.FloatingPointType
 import codeql.swift.elements.type.NumericOrCharType
 import codeql.swift.Unit