зеркало из https://github.com/github/codeql.git
Merge pull request #14252 from geoffw0/protocol3
Swift: Improve getABaseType implementions
This commit is contained in:
Geoffrey White
GitHub
Коммит
ab6e8b9ecd
|
|
@ -57,7 +57,6 @@ lib/codeql/swift/elements/decl/StructDecl.qll 708711bf4236f32174caa256f3b19e00b6
|
|||
lib/codeql/swift/elements/decl/StructDeclConstructor.qll 653fef1ce7a5924f9db110dfab4ebc191b6688fa14ebeb6cf2a09fe338f00646 c7ed15002c41b7dd11a5dd768e0f6f1fe241c680d155364404c64d6251adee5c
|
||||
lib/codeql/swift/elements/decl/SubscriptDeclConstructor.qll 3a88617b41f96827cb6edd596d6d95ebcf5baf99ba113bdd298276666c6aeadf 166e04fc72507cb27e2c16ad2d5217074f8678d286cb6d0980e5b84125648abe
|
||||
lib/codeql/swift/elements/decl/TopLevelCodeDeclConstructor.qll 6920a4e7aec45ae2a561cef95b9082b861f81c16c259698541f317481645e194 4bd65820b93a5ec7332dd1bbf59326fc19b77e94c122ad65d41393c84e6ac581
|
||||
lib/codeql/swift/elements/decl/TypeAliasDecl.qll 984c5802c35e595388f7652cef1a50fb963b32342ab4f9d813b7200a0e6a37ca 630dc9cbf20603855c599a9f86037ba0d889ad3d2c2b6f9ac17508d398bff9e3
|
||||
lib/codeql/swift/elements/decl/TypeAliasDeclConstructor.qll ba70bb69b3a14283def254cc1859c29963838f624b3f1062a200a8df38f1edd5 96ac51d1b3156d4139e583f7f803e9eb95fe25cc61c12986e1b2972a781f9c8b
|
||||
lib/codeql/swift/elements/expr/AbiSafeConversionExpr.qll 39b856c89b8aff769b75051fd9e319f2d064c602733eaa6fed90d8f626516306 a87738539276438cef63145461adf25309d1938cfac367f53f53d33db9b12844
|
||||
lib/codeql/swift/elements/expr/AbiSafeConversionExprConstructor.qll 7d70e7c47a9919efcb1ebcbf70e69cab1be30dd006297b75f6d72b25ae75502a e7a741c42401963f0c1da414b3ae779adeba091e9b8f56c9abf2a686e3a04d52
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@
|
|||
/lib/codeql/swift/elements/decl/StructDeclConstructor.qll linguist-generated
|
||||
/lib/codeql/swift/elements/decl/SubscriptDeclConstructor.qll linguist-generated
|
||||
/lib/codeql/swift/elements/decl/TopLevelCodeDeclConstructor.qll linguist-generated
|
||||
/lib/codeql/swift/elements/decl/TypeAliasDecl.qll linguist-generated
|
||||
/lib/codeql/swift/elements/decl/TypeAliasDeclConstructor.qll linguist-generated
|
||||
/lib/codeql/swift/elements/expr/AbiSafeConversionExpr.qll linguist-generated
|
||||
/lib/codeql/swift/elements/expr/AbiSafeConversionExprConstructor.qll linguist-generated
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
category: majorAnalysis
|
||||
---
|
||||
|
||||
* The predicates `getABaseType`, `getABaseTypeDecl`, `getADerivedType` and `getADerivedTypeDecl` on `Type` and `TypeDecl` now behave more usefully and consistently. They now explore through type aliases used in base class declarations, and include protocols added in extensions.
|
||||
|
||||
To examine base class declarations at a low level without these enhancements, use `TypeDecl.getInheritedType`.
|
||||
|
||||
`Type.getABaseType` (only) previously resolved a type alias it was called directly on. This behaviour no longer exists. To find any base type of a type that could be an alias, the construct `Type.getUnderlyingType().getABaseType*()` is recommended.
|
||||
|
|
@ -417,14 +417,6 @@ private Element interpretElement0(
|
|||
subtypes = true and
|
||||
declWithMethod.asNominalTypeDecl() = namedTypeDecl.getADerivedTypeDecl*()
|
||||
or
|
||||
// member declared in a type that's extended with a protocol that is the named type
|
||||
exists(ExtensionDecl e |
|
||||
e.getExtendedTypeDecl().getADerivedTypeDecl*() = declWithMethod.asNominalTypeDecl()
|
||||
|
|
||||
subtypes = true and
|
||||
e.getAProtocol() = namedTypeDecl.getADerivedTypeDecl*()
|
||||
)
|
||||
or
|
||||
// member declared directly in the named type (or an extension of it)
|
||||
subtypes = false and
|
||||
declWithMethod.asNominalTypeDecl() = namedTypeDecl
|
||||
|
|
@ -442,14 +434,6 @@ private Element interpretElement0(
|
|||
subtypes = true and
|
||||
declWithField.asNominalTypeDecl() = namedTypeDecl.getADerivedTypeDecl*()
|
||||
or
|
||||
// field declared in a type that's extended with a protocol that is the named type
|
||||
exists(ExtensionDecl e |
|
||||
e.getExtendedTypeDecl().getADerivedTypeDecl*() = declWithField.asNominalTypeDecl()
|
||||
|
|
||||
subtypes = true and
|
||||
e.getAProtocol() = namedTypeDecl.getADerivedTypeDecl*()
|
||||
)
|
||||
or
|
||||
// field declared directly in the named type (or an extension of it)
|
||||
subtypes = false and
|
||||
declWithField.asNominalTypeDecl() = namedTypeDecl
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet cs)
|
|||
// So when the node is a `PostUpdateNode` we allow any sequence of implicit read steps of an appropriate
|
||||
// type to make sure we arrive at the sink with an empty access path.
|
||||
exists(NominalTypeDecl d, Decl cx |
|
||||
node.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr().getType() =
|
||||
node.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr().getType().getUnderlyingType() =
|
||||
d.getType().getABaseType*() and
|
||||
cx.asNominalTypeDecl() = d and
|
||||
cs.getAReadContent().(DataFlow::Content::FieldContent).getField() = cx.getAMember()
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
// generated by codegen/codegen.py, remove this comment if you wish to edit this file
|
||||
private import codeql.swift.generated.decl.TypeAliasDecl
|
||||
|
||||
/**
|
||||
* A declaration of a type alias to another type. For example:
|
||||
* ```
|
||||
* typealias MyInt = Int
|
||||
* ```
|
||||
*/
|
||||
class TypeAliasDecl extends Generated::TypeAliasDecl { }
|
||||
|
|
|
|||
|
|
@ -35,11 +35,24 @@ class TypeDecl extends Generated::TypeDecl {
|
|||
deprecated Type getBaseType(int index) { result = this.getInheritedType(index) }
|
||||
|
||||
/**
|
||||
* Gets any of the base types of this type declaration.
|
||||
* Gets any of the base types of this type declaration. Expands protocols added in
|
||||
* extensions and expands type aliases. For example in the following code, `B` has
|
||||
* base type `A`:
|
||||
* ```
|
||||
* typealias A_alias = A
|
||||
*
|
||||
* class B : A_alias {}
|
||||
* ```
|
||||
*/
|
||||
Type getABaseType() {
|
||||
// TODO generalize this to resolve `TypeAliasDecl`s and consider bases added by extensions
|
||||
result = this.getAnInheritedType()
|
||||
// direct base type
|
||||
result = this.getAnInheritedType().getUnderlyingType()
|
||||
or
|
||||
// protocol added in an extension of the type
|
||||
exists(ExtensionDecl ed |
|
||||
ed.getExtendedTypeDecl() = this and
|
||||
ed.getAProtocol().getType() = result
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -51,7 +64,14 @@ class TypeDecl extends Generated::TypeDecl {
|
|||
}
|
||||
|
||||
/**
|
||||
* Gets the declaration of any of the base types of this type declaration.
|
||||
* Gets the declaration of any of the base types of this type declaration. Expands
|
||||
* protocols added in extensions and expands type aliases. For example in the following
|
||||
* code, `B` has base type `A`.
|
||||
* ```
|
||||
* typealias A_alias = A
|
||||
*
|
||||
* class B : A_alias {}
|
||||
* ```
|
||||
*/
|
||||
TypeDecl getABaseTypeDecl() { result = this.getABaseType().(AnyGenericType).getDeclaration() }
|
||||
|
||||
|
|
@ -63,7 +83,14 @@ class TypeDecl extends Generated::TypeDecl {
|
|||
deprecated TypeDecl getDerivedTypeDecl(int i) { result.getBaseTypeDecl(i) = this }
|
||||
|
||||
/**
|
||||
* Gets the declaration of any type derived from this type declaration.
|
||||
* Gets the declaration of any type derived from this type declaration. Expands protocols
|
||||
* added in extensions and expands type aliases. For example in the following code, `B`
|
||||
* is derived from `A`.
|
||||
* ```
|
||||
* typealias A_alias = A
|
||||
*
|
||||
* class B : A_alias {}
|
||||
* ```
|
||||
*/
|
||||
TypeDecl getADerivedTypeDecl() { result.getABaseTypeDecl() = this }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
private import codeql.swift.generated.type.NominalType
|
||||
private import codeql.swift.elements.decl.NominalTypeDecl
|
||||
private import codeql.swift.elements.type.Type
|
||||
|
||||
class NominalType extends Generated::NominalType {
|
||||
override Type getABaseType() { result = this.getDeclaration().(NominalTypeDecl).getABaseType() }
|
||||
|
||||
NominalType getADerivedType() { result.getABaseType() = this }
|
||||
}
|
||||
/**
|
||||
* A class, struct, enum or protocol.
|
||||
*/
|
||||
class NominalType extends Generated::NominalType { }
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
private import codeql.swift.generated.type.Type
|
||||
private import codeql.swift.elements.type.AnyGenericType
|
||||
|
||||
/**
|
||||
* A Swift type.
|
||||
|
|
@ -42,16 +43,24 @@ class Type extends Generated::Type {
|
|||
Type getUnderlyingType() { result = this }
|
||||
|
||||
/**
|
||||
* Gets any base type of this type. For a `typealias`, this is a base type
|
||||
* of the aliased type. For example in the following code, both `B` and
|
||||
* `B_alias` have base type `A`.
|
||||
* Gets any base type of this type. Expands protocols added in extensions and expands
|
||||
* type aliases. For example in the following code, `B` has base type `A`:
|
||||
* ```
|
||||
* class A {}
|
||||
* typealias A_alias = A
|
||||
*
|
||||
* class B : A {}
|
||||
*
|
||||
* typealias B_alias = B
|
||||
* class B : A_alias {}
|
||||
* ```
|
||||
*/
|
||||
Type getABaseType() { none() }
|
||||
Type getABaseType() { result = this.(AnyGenericType).getDeclaration().getABaseType() }
|
||||
|
||||
/**
|
||||
* Gets a type derived from this type. Expands type aliases, for example in the following
|
||||
* code, `B` derives from type `A`.
|
||||
* ```
|
||||
* typealias A_alias = A
|
||||
*
|
||||
* class B : A_alias {}
|
||||
* ```
|
||||
*/
|
||||
Type getADerivedType() { result.getABaseType() = this }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
private import codeql.swift.elements.type.Type
|
||||
private import codeql.swift.generated.type.TypeAliasType
|
||||
|
||||
/**
|
||||
* A type alias to another type. For example:
|
||||
* ```
|
||||
* typealias MyInt = Int
|
||||
* ```
|
||||
*/
|
||||
class TypeAliasType extends Generated::TypeAliasType {
|
||||
/**
|
||||
* Gets the aliased type of this type alias type.
|
||||
|
|
@ -13,6 +19,4 @@ class TypeAliasType extends Generated::TypeAliasType {
|
|||
Type getAliasedType() { result = this.getDecl().getAliasedType() }
|
||||
|
||||
override Type getUnderlyingType() { result = this.getAliasedType().getUnderlyingType() }
|
||||
|
||||
override Type getABaseType() { result = this.getAliasedType().getABaseType() }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ private class CoreDataStore extends CleartextStorageDatabaseSink {
|
|||
// with `coreDataObj.data` is a sink.
|
||||
// (ideally this would be only members with the `@NSManaged` attribute)
|
||||
exists(NominalType t, Expr e |
|
||||
t.getABaseType*().getUnderlyingType().getName() = "NSManagedObject" and
|
||||
t.getUnderlyingType().getABaseType*().getName() = "NSManagedObject" and
|
||||
this.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr() = e and
|
||||
e.getFullyConverted().getType() = t and
|
||||
not e.(DeclRefExpr).getDecl() instanceof SelfParamDecl
|
||||
|
|
@ -67,7 +67,7 @@ private class RealmStore extends CleartextStorageDatabaseSink instanceof DataFlo
|
|||
// example in `realmObj.data = sensitive` the post-update node corresponding
|
||||
// with `realmObj.data` is a sink.
|
||||
exists(NominalType t, Expr e |
|
||||
t.getABaseType*().getUnderlyingType().getName() = "RealmSwiftObject" and
|
||||
t.getUnderlyingType().getABaseType*().getName() = "RealmSwiftObject" and
|
||||
this.getPreUpdateNode().asExpr() = e and
|
||||
e.getFullyConverted().getType() = t and
|
||||
not e.(DeclRefExpr).getDecl() instanceof SelfParamDecl
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ module CleartextStorageDatabaseConfig implements DataFlow::ConfigSig {
|
|||
// for example in `realmObj.data = sensitive`.
|
||||
isSink(node) and
|
||||
exists(NominalTypeDecl d, Decl cx |
|
||||
d.getType().getABaseType*().getUnderlyingType().getName() =
|
||||
d.getType().getUnderlyingType().getABaseType*().getName() =
|
||||
["NSManagedObject", "RealmSwiftObject"] and
|
||||
cx.asNominalTypeDecl() = d and
|
||||
c.getAReadContent().(DataFlow::Content::FieldContent).getField() = cx.getAMember()
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
| nominaltype.swift:54:6:54:6 | a | A | getFullName:A, getName:A, getUnderlyingType:A |
|
||||
| nominaltype.swift:55:6:55:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias, getUnderlyingType:A |
|
||||
| nominaltype.swift:56:6:56:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias, getUnderlyingType:A? |
|
||||
| nominaltype.swift:57:6:57:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1, getUnderlyingType:B1 |
|
||||
| nominaltype.swift:58:6:58:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2, getUnderlyingType:B2 |
|
||||
| nominaltype.swift:59:6:59:6 | b1_alias | B1_alias | getABaseType:A, getAliasedType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
|
||||
| nominaltype.swift:60:6:60:6 | b2_alias | B2_alias | getABaseType:A_alias, getAliasedType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
|
||||
| nominaltype.swift:61:6:61:6 | p | P | getFullName:P, getName:P, getUnderlyingType:P |
|
||||
| nominaltype.swift:62:6:62:6 | p_alias | P_alias | getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
|
||||
| nominaltype.swift:63:6:63:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1, getUnderlyingType:C1 |
|
||||
| nominaltype.swift:64:6:64:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2, getUnderlyingType:C2 |
|
||||
| nominaltype.swift:65:6:65:6 | c1_alias | C1_alias | getABaseType:P, getAliasedType:C1, getFullName:C1_alias, getName:C1_alias, getUnderlyingType:C1 |
|
||||
| nominaltype.swift:66:6:66:6 | c2_alias | C2_alias | getABaseType:P_alias, getAliasedType:C2, getFullName:C2_alias, getName:C2_alias, getUnderlyingType:C2 |
|
||||
| nominaltype.swift:67:6:67:6 | o | Outer | getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
|
||||
| nominaltype.swift:68:6:68:6 | oi | Outer.Inner | getFullName:Outer.Inner, getName:Inner, getUnderlyingType:Outer.Inner |
|
||||
| nominaltype.swift:69:6:69:6 | oia | Outer.Inner.InnerAlias | getABaseType:FixedWidthInteger, getABaseType:SignedInteger, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getAliasedType:Int, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias, getUnderlyingType:Int |
|
||||
| nominaltype.swift:70:6:70:6 | aa | Any? | getFullName:Any?, getName:Any?, getUnderlyingType:Any? |
|
||||
| nominaltype.swift:71:6:71:6 | p1p2 | P1P2 | getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
|
||||
| nominaltype.swift:72:6:72:6 | boxInt | Box<Int> | getFullName:Box<Int>, getName:Box<Int>, getUnderlyingType:Box<Int> |
|
||||
| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:CVarArg, getABaseType:CodingKeyRepresentable, getABaseType:CustomReflectable, getABaseType:Decodable, getABaseType:Encodable, getABaseType:Equatable, getABaseType:FixedWidthInteger, getABaseType:Hashable, getABaseType:MirrorPath, getABaseType:SIMDScalar, getABaseType:Sendable, getABaseType:SignedInteger, getABaseType:_CustomPlaygroundQuickLookable, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseType:_HasCustomAnyHashableRepresentation, getFullName:Int, getName:Int, getUnderlyingType:Int |
|
||||
| nominaltype.swift:85:6:85:6 | j | Any? | getFullName:Any?, getName:Any?, getUnderlyingType:Any? |
|
||||
| nominaltype.swift:86:6:86:6 | a | A | getFullName:A, getName:A, getUnderlyingType:A |
|
||||
| nominaltype.swift:87:6:87:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias, getUnderlyingType:A |
|
||||
| nominaltype.swift:88:6:88:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias, getUnderlyingType:A? |
|
||||
| nominaltype.swift:89:6:89:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1, getUnderlyingType:B1 |
|
||||
| nominaltype.swift:90:6:90:6 | b2 | B2 | getABaseType:A, getFullName:B2, getName:B2, getUnderlyingType:B2 |
|
||||
| nominaltype.swift:91:6:91:6 | b1_alias | B1_alias | getAliasedType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
|
||||
| nominaltype.swift:92:6:92:6 | b2_alias | B2_alias | getAliasedType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
|
||||
| nominaltype.swift:93:6:93:6 | p | P | getFullName:P, getName:P, getUnderlyingType:P |
|
||||
| nominaltype.swift:94:6:94:6 | p_alias | P_alias | getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
|
||||
| nominaltype.swift:95:6:95:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1, getUnderlyingType:C1 |
|
||||
| nominaltype.swift:96:6:96:6 | c2 | C2 | getABaseType:P, getFullName:C2, getName:C2, getUnderlyingType:C2 |
|
||||
| nominaltype.swift:97:6:97:6 | o | Outer | getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
|
||||
| nominaltype.swift:98:6:98:6 | oi | Outer.Inner | getFullName:Outer.Inner, getName:Inner, getUnderlyingType:Outer.Inner |
|
||||
| nominaltype.swift:99:6:99:6 | oia | Outer.Inner.InnerAlias | getAliasedType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias, getUnderlyingType:A |
|
||||
| nominaltype.swift:100:6:100:6 | p1p2 | P1P2 | getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
|
||||
| nominaltype.swift:101:6:101:6 | boxInt | Box<A> | getFullName:Box<A>, getName:Box<A>, getUnderlyingType:Box<A> |
|
||||
| nominaltype.swift:102:6:102:6 | d1 | D1 | getABaseType:P3, getFullName:D1, getName:D1, getUnderlyingType:D1 |
|
||||
| nominaltype.swift:103:6:103:6 | d2 | D2 | getABaseType:P4, getFullName:D2, getName:D2, getUnderlyingType:D2 |
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ typealias B1_alias = B1
|
|||
|
||||
typealias B2_alias = B2
|
||||
|
||||
// ---
|
||||
|
||||
protocol P {
|
||||
}
|
||||
|
||||
|
|
@ -27,16 +29,16 @@ class C1 : P {
|
|||
class C2 : P_alias {
|
||||
}
|
||||
|
||||
typealias C1_alias = C1
|
||||
|
||||
typealias C2_alias = C2
|
||||
// ---
|
||||
|
||||
class Outer {
|
||||
class Inner {
|
||||
typealias InnerAlias = Int
|
||||
typealias InnerAlias = A
|
||||
}
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
protocol P1 {
|
||||
}
|
||||
|
||||
|
|
@ -45,12 +47,42 @@ protocol P2 {
|
|||
|
||||
typealias P1P2 = P1 & P2
|
||||
|
||||
// ---
|
||||
|
||||
class Box<T> {
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
class D1 {
|
||||
}
|
||||
|
||||
protocol P3 {
|
||||
}
|
||||
|
||||
extension D1 : P3 {
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
class D2 {
|
||||
}
|
||||
|
||||
typealias D2_alias = D2
|
||||
|
||||
protocol P4 {
|
||||
}
|
||||
|
||||
typealias P4_alias = P4
|
||||
|
||||
extension D2 : P4_alias {
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
func test() {
|
||||
var i : Int
|
||||
var j : Any?
|
||||
var a : A
|
||||
var a_alias : A_alias
|
||||
var a_optional_alias : A_optional_alias
|
||||
|
|
@ -62,12 +94,11 @@ func test() {
|
|||
var p_alias : P_alias
|
||||
var c1 : C1
|
||||
var c2 : C2
|
||||
var c1_alias : C1_alias
|
||||
var c2_alias : C2_alias
|
||||
var o : Outer
|
||||
var oi : Outer.Inner
|
||||
var oia : Outer.Inner.InnerAlias
|
||||
var aa : Any?
|
||||
var p1p2 : P1P2
|
||||
var boxInt : Box<Int>
|
||||
var boxInt : Box<A>
|
||||
var d1: D1
|
||||
var d2: D2
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
| nominaltype.swift:54:6:54:6 | a | A | getFullName:A, getName:A |
|
||||
| nominaltype.swift:55:6:55:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias |
|
||||
| nominaltype.swift:56:6:56:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias |
|
||||
| nominaltype.swift:57:6:57:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1 |
|
||||
| nominaltype.swift:58:6:58:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2 |
|
||||
| nominaltype.swift:59:6:59:6 | b1_alias | B1_alias | getAliasedType:B1, getFullName:B1_alias, getName:B1_alias |
|
||||
| nominaltype.swift:60:6:60:6 | b2_alias | B2_alias | getAliasedType:B2, getFullName:B2_alias, getName:B2_alias |
|
||||
| nominaltype.swift:63:6:63:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1 |
|
||||
| nominaltype.swift:64:6:64:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2 |
|
||||
| nominaltype.swift:65:6:65:6 | c1_alias | C1_alias | getAliasedType:C1, getFullName:C1_alias, getName:C1_alias |
|
||||
| nominaltype.swift:66:6:66:6 | c2_alias | C2_alias | getAliasedType:C2, getFullName:C2_alias, getName:C2_alias |
|
||||
| nominaltype.swift:67:6:67:6 | o | Outer | getFullName:Outer, getName:Outer |
|
||||
| nominaltype.swift:68:6:68:6 | oi | Inner | getFullName:Outer.Inner, getName:Inner |
|
||||
| nominaltype.swift:69:6:69:6 | oia | InnerAlias | getAliasedType:Int, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias |
|
||||
| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:CVarArg, getABaseType:CodingKeyRepresentable, getABaseType:CustomReflectable, getABaseType:Decodable, getABaseType:Encodable, getABaseType:Equatable, getABaseType:FixedWidthInteger, getABaseType:Hashable, getABaseType:MirrorPath, getABaseType:SIMDScalar, getABaseType:Sendable, getABaseType:SignedInteger, getABaseType:_CustomPlaygroundQuickLookable, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseType:_HasCustomAnyHashableRepresentation, getABaseTypeDecl:CVarArg, getABaseTypeDecl:CodingKeyRepresentable, getABaseTypeDecl:CustomReflectable, getABaseTypeDecl:Decodable, getABaseTypeDecl:Encodable, getABaseTypeDecl:Equatable, getABaseTypeDecl:FixedWidthInteger, getABaseTypeDecl:Hashable, getABaseTypeDecl:MirrorPath, getABaseTypeDecl:SIMDScalar, getABaseTypeDecl:Sendable, getABaseTypeDecl:SignedInteger, getABaseTypeDecl:_CustomPlaygroundQuickLookable, getABaseTypeDecl:_ExpressibleByBuiltinIntegerLiteral, getABaseTypeDecl:_HasCustomAnyHashableRepresentation, getFullName:Int, getName:Int |
|
||||
| nominaltype.swift:86:6:86:6 | a | A | getFullName:A, getName:A |
|
||||
| nominaltype.swift:87:6:87:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias |
|
||||
| nominaltype.swift:88:6:88:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias |
|
||||
| nominaltype.swift:89:6:89:6 | b1 | B1 | getABaseType:A, getABaseTypeDecl:A, getFullName:B1, getName:B1 |
|
||||
| nominaltype.swift:90:6:90:6 | b2 | B2 | getABaseType:A, getABaseTypeDecl:A, getFullName:B2, getName:B2 |
|
||||
| nominaltype.swift:91:6:91:6 | b1_alias | B1_alias | getAliasedType:B1, getFullName:B1_alias, getName:B1_alias |
|
||||
| nominaltype.swift:92:6:92:6 | b2_alias | B2_alias | getAliasedType:B2, getFullName:B2_alias, getName:B2_alias |
|
||||
| nominaltype.swift:95:6:95:6 | c1 | C1 | getABaseType:P, getABaseTypeDecl:P, getFullName:C1, getName:C1 |
|
||||
| nominaltype.swift:96:6:96:6 | c2 | C2 | getABaseType:P, getABaseTypeDecl:P, getFullName:C2, getName:C2 |
|
||||
| nominaltype.swift:97:6:97:6 | o | Outer | getFullName:Outer, getName:Outer |
|
||||
| nominaltype.swift:98:6:98:6 | oi | Inner | getFullName:Outer.Inner, getName:Inner |
|
||||
| nominaltype.swift:99:6:99:6 | oia | InnerAlias | getAliasedType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias |
|
||||
| nominaltype.swift:102:6:102:6 | d1 | D1 | getABaseType:P3, getABaseTypeDecl:P3, getFullName:D1, getName:D1 |
|
||||
| nominaltype.swift:103:6:103:6 | d2 | D2 | getABaseType:P4, getABaseTypeDecl:P4, getFullName:D2, getName:D2 |
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ string describe(TypeDecl td) {
|
|||
or
|
||||
result = "getAliasedType:" + td.(TypeAliasDecl).getAliasedType().toString()
|
||||
or
|
||||
result = "getABaseType:" + td.(NominalTypeDecl).getABaseType().toString()
|
||||
result = "getABaseType:" + td.getABaseType().toString()
|
||||
or
|
||||
result = "getABaseTypeDecl:" + td.getABaseTypeDecl().toString()
|
||||
}
|
||||
|
||||
from VarDecl v, TypeDecl td
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче