Skip to content

Commit 4f39cb6

Browse files
geoffw0geoffw0
committed
ed test
1 parent ef8a997 commit 4f39cb6

File tree

3 files changed

+37
-47
lines changed

3 files changed

+37
-47
lines changed

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

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
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 |
1+
| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:FixedWidthInteger, getABaseType:SignedInteger, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getFullName:Int, getName:Int, getUnderlyingType:Int |
2+
| nominaltype.swift:85:6:85:6 | j | Any? | getFullName:Any?, getName:Any?, getUnderlyingType:Any? |
3+
| nominaltype.swift:86:6:86:6 | a | A | getFullName:A, getName:A, getUnderlyingType:A |
4+
| nominaltype.swift:87:6:87:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias, getUnderlyingType:A |
5+
| nominaltype.swift:88:6:88:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias, getUnderlyingType:A? |
6+
| nominaltype.swift:89:6:89:6 | b1 | B1 | getABaseType:A, getFullName:B1, getName:B1, getUnderlyingType:B1 |
7+
| nominaltype.swift:90:6:90:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2, getUnderlyingType:B2 |
8+
| nominaltype.swift:91:6:91:6 | b1_alias | B1_alias | getABaseType:A, getAliasedType:B1, getFullName:B1_alias, getName:B1_alias, getUnderlyingType:B1 |
9+
| nominaltype.swift:92:6:92:6 | b2_alias | B2_alias | getABaseType:A_alias, getAliasedType:B2, getFullName:B2_alias, getName:B2_alias, getUnderlyingType:B2 |
10+
| nominaltype.swift:93:6:93:6 | p | P | getFullName:P, getName:P, getUnderlyingType:P |
11+
| nominaltype.swift:94:6:94:6 | p_alias | P_alias | getFullName:P_alias, getName:P_alias, getUnderlyingType:P_alias |
12+
| nominaltype.swift:95:6:95:6 | c1 | C1 | getABaseType:P, getFullName:C1, getName:C1, getUnderlyingType:C1 |
13+
| nominaltype.swift:96:6:96:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2, getUnderlyingType:C2 |
14+
| nominaltype.swift:97:6:97:6 | o | Outer | getFullName:Outer, getName:Outer, getUnderlyingType:Outer |
15+
| nominaltype.swift:98:6:98:6 | oi | Outer.Inner | getFullName:Outer.Inner, getName:Inner, getUnderlyingType:Outer.Inner |
16+
| nominaltype.swift:99:6:99:6 | oia | Outer.Inner.InnerAlias | getAliasedType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias, getUnderlyingType:A |
17+
| nominaltype.swift:100:6:100:6 | p1p2 | P1P2 | getFullName:P1P2, getName:P1P2, getUnderlyingType:P1P2 |
18+
| nominaltype.swift:101:6:101:6 | boxInt | Box<A> | getFullName:Box<A>, getName:Box<A>, getUnderlyingType:Box<A> |
19+
| nominaltype.swift:102:6:102:6 | d1 | D1 | getFullName:D1, getName:D1, getUnderlyingType:D1 |
20+
| nominaltype.swift:103:6:103:6 | d2 | D2 | getFullName:D2, getName:D2, getUnderlyingType:D2 |

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ class C1 : P {
2929
class C2 : P_alias {
3030
}
3131

32-
typealias C1_alias = C1
33-
34-
typealias C2_alias = C2
35-
3632
// ---
3733

3834
class Outer {
@@ -79,7 +75,7 @@ protocol P4 {
7975

8076
typealias P4_alias = P4
8177

82-
extension D2_alias : P4_alias {
78+
extension D2 : P4_alias {
8379
}
8480

8581
// ---
@@ -98,13 +94,11 @@ func test() {
9894
var p_alias : P_alias
9995
var c1 : C1
10096
var c2 : C2
101-
var c1_alias : C1_alias
102-
var c2_alias : C2_alias
10397
var o : Outer
10498
var oi : Outer.Inner
10599
var oia : Outer.Inner.InnerAlias
106100
var p1p2 : P1P2
107101
var boxInt : Box<A>
108102
var d1: D1
109-
var d2: D2_alias
103+
var d2: D2
110104
}

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
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 |
1+
| nominaltype.swift:84:6:84:6 | i | Int | getABaseType:FixedWidthInteger, getABaseType:SignedInteger, getABaseType:_ExpressibleByBuiltinIntegerLiteral, getABaseTypeDecl:FixedWidthInteger, getABaseTypeDecl:SignedInteger, getABaseTypeDecl:_ExpressibleByBuiltinIntegerLiteral, getFullName:Int, getName:Int |
2+
| nominaltype.swift:86:6:86:6 | a | A | getFullName:A, getName:A |
3+
| nominaltype.swift:87:6:87:6 | a_alias | A_alias | getAliasedType:A, getFullName:A_alias, getName:A_alias |
4+
| nominaltype.swift:88:6:88:6 | a_optional_alias | A_optional_alias | getAliasedType:A?, getFullName:A_optional_alias, getName:A_optional_alias |
5+
| nominaltype.swift:89:6:89:6 | b1 | B1 | getABaseType:A, getABaseTypeDecl:A, getFullName:B1, getName:B1 |
6+
| nominaltype.swift:90:6:90:6 | b2 | B2 | getABaseType:A_alias, getFullName:B2, getName:B2 |
7+
| nominaltype.swift:91:6:91:6 | b1_alias | B1_alias | getAliasedType:B1, getFullName:B1_alias, getName:B1_alias |
8+
| nominaltype.swift:92:6:92:6 | b2_alias | B2_alias | getAliasedType:B2, getFullName:B2_alias, getName:B2_alias |
9+
| nominaltype.swift:95:6:95:6 | c1 | C1 | getABaseType:P, getABaseTypeDecl:P, getFullName:C1, getName:C1 |
10+
| nominaltype.swift:96:6:96:6 | c2 | C2 | getABaseType:P_alias, getFullName:C2, getName:C2 |
11+
| nominaltype.swift:97:6:97:6 | o | Outer | getFullName:Outer, getName:Outer |
12+
| nominaltype.swift:98:6:98:6 | oi | Inner | getFullName:Outer.Inner, getName:Inner |
13+
| nominaltype.swift:99:6:99:6 | oia | InnerAlias | getAliasedType:A, getFullName:Outer.Inner.InnerAlias, getName:InnerAlias |
14+
| nominaltype.swift:102:6:102:6 | d1 | D1 | getFullName:D1, getName:D1 |
15+
| nominaltype.swift:103:6:103:6 | d2 | D2 | getFullName:D2, getName:D2 |

0 commit comments

Comments
 (0)