Skip to content

Commit ef8a997

Browse files
geoffw0geoffw0
committed
Swift: Extend the test.
1 parent 998237e commit ef8a997

File tree

4 files changed

+82
-37
lines changed

4 files changed

+82
-37
lines changed

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

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
| nominaltype.swift:54:6:54:6 | a | A | getFullName:A, getName:A, getUnderlyingType:A |
2-
| nominaltype.swift:55:6:55:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias, getUnderlyingType:A |
3-
| nominaltype.swift:56:6:56:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias, getUnderlyingType:A? |
4-
| nominaltype.swift:57:6:57:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1, getUnderlyingType:B1 |
5-
| nominaltype.swift:58:6:58:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2, getUnderlyingType:B2 |
6-
| nominaltype.swift:59:6:59:6 | b1_alias | B1_alias | getABaseType:A, getAliasedType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
7-
| nominaltype.swift:60:6:60:6 | b2_alias | B2_alias | getABaseType:A_alias, getAliasedType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
8-
| nominaltype.swift:61:6:61:6 | p | P | getFullName:P, getName:P, getUnderlyingType:P |
9-
| nominaltype.swift:62:6:62:6 | p_alias | P_alias | getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
10-
| nominaltype.swift:63:6:63:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1, getUnderlyingType:C1 |
11-
| nominaltype.swift:64:6:64:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2, getUnderlyingType:C2 |
12-
| nominaltype.swift:65:6:65:6 | c1_alias | C1_alias | getABaseType:P, getAliasedType:C1, getFullName:C1_alias, getName:C1_alias, getUnderlyingType:C1 |
13-
| nominaltype.swift:66:6:66:6 | c2_alias | C2_alias | getABaseType:P_alias, getAliasedType:C2, getFullName:C2_alias, 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:Inner, getUnderlyingType:Outer.Inner |
16-
| 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 |
17-
| nominaltype.swift:70:6:70:6 | aa | Any? | getFullName:Any?, getName:Any?, getUnderlyingType:Any? |
18-
| nominaltype.swift:71:6:71:6 | p1p2 | P1P2 | getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
19-
| nominaltype.swift:72:6:72:6 | boxInt | Box<Int> | getFullName:Box<Int>, getName:Box<Int>, getUnderlyingType:Box<Int> |
1+
| nominaltype.swift:88:6:88:6 | i | Int | getABaseType:FixedWidthInteger, getABaseType:SignedInteger, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getFullName:Int, getName:Int, getUnderlyingType:Int |
2+
| nominaltype.swift:89:6:89:6 | j | Any? | getFullName:Any?, getName:Any?, getUnderlyingType:Any? |
3+
| nominaltype.swift:90:6:90:6 | a | A | getFullName:A, getName:A, getUnderlyingType:A |
4+
| nominaltype.swift:91:6:91:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias, getUnderlyingType:A |
5+
| nominaltype.swift:92:6:92:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias, getUnderlyingType:A? |
6+
| nominaltype.swift:93:6:93:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1, getUnderlyingType:B1 |
7+
| nominaltype.swift:94:6:94:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2, getUnderlyingType:B2 |
8+
| nominaltype.swift:95:6:95:6 | b1_alias | B1_alias | getABaseType:A, getAliasedType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
9+
| nominaltype.swift:96:6:96:6 | b2_alias | B2_alias | getABaseType:A_alias, getAliasedType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
10+
| nominaltype.swift:97:6:97:6 | p | P | getFullName:P, getName:P, getUnderlyingType:P |
11+
| nominaltype.swift:98:6:98:6 | p_alias | P_alias | getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
12+
| nominaltype.swift:99:6:99:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1, getUnderlyingType:C1 |
13+
| nominaltype.swift:100:6:100:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2, getUnderlyingType:C2 |
14+
| nominaltype.swift:101:6:101:6 | c1_alias | C1_alias | getABaseType:P, getAliasedType:C1, getFullName:C1_alias, getName:C1_alias, getUnderlyingType:C1 |
15+
| nominaltype.swift:102:6:102:6 | c2_alias | C2_alias | getABaseType:P_alias, getAliasedType:C2, getFullName:C2_alias, getName:C2_alias, getUnderlyingType:C2 |
16+
| nominaltype.swift:103:6:103:6 | o | Outer | getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
17+
| nominaltype.swift:104:6:104:6 | oi | Outer.Inner | getFullName:Outer.Inner, getName:Inner, getUnderlyingType:Outer.Inner |
18+
| nominaltype.swift:105:6:105:6 | oia | Outer.Inner.InnerAlias | getAliasedType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias, getUnderlyingType:A |
19+
| nominaltype.swift:106:6:106:6 | p1p2 | P1P2 | getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
20+
| nominaltype.swift:107:6:107:6 | boxInt | Box<A> | getFullName:Box<A>, getName:Box<A>, getUnderlyingType:Box<A> |
21+
| nominaltype.swift:108:6:108:6 | d1 | D1 | getFullName:D1, getName:D1, getUnderlyingType:D1 |
22+
| nominaltype.swift:109:6:109:6 | d2 | D2_alias | getAliasedType:D2, getFullName:D2_alias, getName:D2_alias, getUnderlyingType:D2 |

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

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ typealias B1_alias = B1
1616

1717
typealias B2_alias = B2
1818

19+
// ---
20+
1921
protocol P {
2022
}
2123

@@ -31,12 +33,16 @@ typealias C1_alias = C1
3133

3234
typealias C2_alias = C2
3335

36+
// ---
37+
3438
class Outer {
3539
class Inner {
36-
typealias InnerAlias = Int
40+
typealias InnerAlias = A
3741
}
3842
}
3943

44+
// ---
45+
4046
protocol P1 {
4147
}
4248

@@ -45,12 +51,42 @@ protocol P2 {
4551

4652
typealias P1P2 = P1 & P2
4753

54+
// ---
55+
4856
class Box<T> {
4957
}
5058

59+
// ---
60+
61+
class D1 {
62+
}
63+
64+
protocol P3 {
65+
}
66+
67+
extension D1 : P3 {
68+
}
69+
70+
// ---
71+
72+
class D2 {
73+
}
74+
75+
typealias D2_alias = D2
76+
77+
protocol P4 {
78+
}
79+
80+
typealias P4_alias = P4
81+
82+
extension D2_alias : P4_alias {
83+
}
5184

85+
// ---
5286

5387
func test() {
88+
var i : Int
89+
var j : Any?
5490
var a : A
5591
var a_alias : A_alias
5692
var a_optional_alias : A_optional_alias
@@ -67,7 +103,8 @@ func test() {
67103
var o : Outer
68104
var oi : Outer.Inner
69105
var oia : Outer.Inner.InnerAlias
70-
var aa : Any?
71106
var p1p2 : P1P2
72-
var boxInt : Box<Int>
107+
var boxInt : Box<A>
108+
var d1: D1
109+
var d2: D2_alias
73110
}

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

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
| nominaltype.swift:54:6:54:6 | a | A | getFullName:A, getName:A |
2-
| nominaltype.swift:55:6:55:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias |
3-
| nominaltype.swift:56:6:56:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias |
4-
| nominaltype.swift:57:6:57:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1 |
5-
| nominaltype.swift:58:6:58:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2 |
6-
| nominaltype.swift:59:6:59:6 | b1_alias | B1_alias | getAliasedType:B1, getFullName:B1_alias, getName:B1_alias |
7-
| nominaltype.swift:60:6:60:6 | b2_alias | B2_alias | getAliasedType:B2, getFullName:B2_alias, getName:B2_alias |
8-
| nominaltype.swift:63:6:63:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1 |
9-
| nominaltype.swift:64:6:64:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2 |
10-
| nominaltype.swift:65:6:65:6 | c1_alias | C1_alias | getAliasedType:C1, getFullName:C1_alias, getName:C1_alias |
11-
| 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 |
1+
| nominaltype.swift:88:6:88:6 | i | Int | getABaseType:FixedWidthInteger, getABaseType:SignedInteger, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseTypeDecl:FixedWidthInteger, getABaseTypeDecl:SignedInteger, getABaseTypeDecl:_ExpressibleByBuiltinIntegerLiteral, getFullName:Int, getName:Int |
2+
| nominaltype.swift:90:6:90:6 | a | A | getFullName:A, getName:A |
3+
| nominaltype.swift:91:6:91:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias |
4+
| nominaltype.swift:92:6:92:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias |
5+
| nominaltype.swift:93:6:93:6 | b1 | B1 | getABaseType:A, getABaseTypeDecl:A, getFullName:B1, getName:B1 |
6+
| nominaltype.swift:94:6:94:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2 |
7+
| nominaltype.swift:95:6:95:6 | b1_alias | B1_alias | getAliasedType:B1, getFullName:B1_alias, getName:B1_alias |
8+
| nominaltype.swift:96:6:96:6 | b2_alias | B2_alias | getAliasedType:B2, getFullName:B2_alias, getName:B2_alias |
9+
| nominaltype.swift:99:6:99:6 | c1 | C1 | getABaseType:P, getABaseTypeDecl:P, getFullName:C1, getName:C1 |
10+
| nominaltype.swift:100:6:100:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2 |
11+
| nominaltype.swift:101:6:101:6 | c1_alias | C1_alias | getAliasedType:C1, getFullName:C1_alias, getName:C1_alias |
12+
| nominaltype.swift:102:6:102:6 | c2_alias | C2_alias | getAliasedType:C2, getFullName:C2_alias, getName:C2_alias |
13+
| nominaltype.swift:103:6:103:6 | o | Outer | getFullName:Outer, getName:Outer |
14+
| nominaltype.swift:104:6:104:6 | oi | Inner | getFullName:Outer.Inner, getName:Inner |
15+
| nominaltype.swift:105:6:105:6 | oia | InnerAlias | getAliasedType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias |
16+
| nominaltype.swift:108:6:108:6 | d1 | D1 | getFullName:D1, getName:D1 |
17+
| nominaltype.swift:109:6:109:6 | d2 | D2_alias | getAliasedType:D2, getFullName:D2_alias, getName:D2_alias |

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ string describe(TypeDecl td) {
77
or
88
result = "getAliasedType:" + td.(TypeAliasDecl).getAliasedType().toString()
99
or
10-
result = "getABaseType:" + td.(NominalTypeDecl).getABaseType().toString()
10+
result = "getABaseType:" + td.getABaseType().toString()
11+
or
12+
result = "getABaseTypeDecl:" + td.getABaseTypeDecl().toString()
1113
}
1214

1315
from VarDecl v, TypeDecl td

0 commit comments

Comments
 (0)