Skip to content

Commit aa6d7c0

Browse files
committed
Swift: Add some more diverse test cases.
1 parent 9588e68 commit aa6d7c0

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@
1111
| nominaltype.swift:64:6:64:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2, getUnderlyingType:C2 |
1212
| nominaltype.swift:65:6:65:6 | c1_alias | C1_alias | getABaseType:P, getAliasedType:C1, getName:C1_alias, getUnderlyingType:C1 |
1313
| nominaltype.swift:66:6:66:6 | c2_alias | C2_alias | getABaseType:P_alias, getAliasedType:C2, getName:C2_alias, getUnderlyingType:C2 |
14+
| nominaltype.swift:67:6:67:6 | o | Outer | getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
15+
| nominaltype.swift:68:6:68:6 | oi | Outer.Inner | getFullName:Outer.Inner, getName:Outer.Inner, getUnderlyingType:Outer.Inner |
16+
| nominaltype.swift:69:6:69:6 | oia | Outer.Inner.InnerAlias | getABaseType:FixedWidthInteger, getABaseType:SignedInteger, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getAliasedType:Int, getName:Outer.Inner.InnerAlias, getUnderlyingType:Int |
17+
| nominaltype.swift:70:6:70:6 | aa | Any? | getName:Any?, getUnderlyingType:Any? |
18+
| nominaltype.swift:71:6:71:6 | p1p2 | P1P2 | getName:P1P2, getUnderlyingType:P1P2 |
19+
| nominaltype.swift:72:6:72:6 | boxInt | Box<Int> | getName:Box<Int>, getUnderlyingType:Box<Int> |

swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.swift

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ typealias C1_alias = C1
3131

3232
typealias C2_alias = C2
3333

34+
class Outer {
35+
class Inner {
36+
typealias InnerAlias = Int
37+
}
38+
}
3439

40+
protocol P1 {
41+
}
3542

43+
protocol P2 {
44+
}
3645

46+
typealias P1P2 = P1 & P2
3747

38-
39-
40-
41-
42-
43-
44-
45-
46-
47-
48-
49-
48+
class Box<T> {
49+
}
5050

5151

5252

@@ -64,4 +64,10 @@ func test() {
6464
var c2 : C2
6565
var c1_alias : C1_alias
6666
var c2_alias : C2_alias
67+
var o : Outer
68+
var oi : Outer.Inner
69+
var oia : Outer.Inner.InnerAlias
70+
var aa : Any?
71+
var p1p2 : P1P2
72+
var boxInt : Box<Int>
6773
}

swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@
99
| nominaltype.swift:64:6:64:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2 |
1010
| nominaltype.swift:65:6:65:6 | c1_alias | C1_alias | getAliasedType:C1, getFullName:C1_alias, getName:C1_alias |
1111
| nominaltype.swift:66:6:66:6 | c2_alias | C2_alias | getAliasedType:C2, getFullName:C2_alias, getName:C2_alias |
12+
| nominaltype.swift:67:6:67:6 | o | Outer | getFullName:Outer, getName:Outer |
13+
| nominaltype.swift:68:6:68:6 | oi | Inner | getFullName:Outer.Inner, getName:Inner |
14+
| nominaltype.swift:69:6:69:6 | oia | InnerAlias | getAliasedType:Int, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias |

0 commit comments

Comments
 (0)