Skip to content

Commit 2234070

Browse files
redsun82redsun82
committed
Swift: ...and accept the test
1 parent 3d0d3ec commit 2234070

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎swift/ql/test/library-tests/ast/PrintAst.expected

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ declarations.swift:
220220
# 38| getExpr(): [VarargExpansionExpr] [...]
221221
# 38| getSubExpr(): [ArrayExpr] [...]
222222
# 38| getElement(0): [StringLiteralExpr] some top level statement
223-
# 38| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
223+
# 38| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
224224
# 38| getArgument(1): [Argument] separator: default separator
225225
# 38| getExpr(): [DefaultArgumentExpr] default separator
226226
# 38| getArgument(2): [Argument] terminator: default terminator
@@ -698,7 +698,7 @@ declarations.swift:
698698
# 155| getArgument(0): [Argument] : Derived.Type
699699
# 155| getExpr(): [TypeExpr] Derived.Type
700700
# 155| getTypeRepr(): [TypeRepr] Derived
701-
# 155| getInit(0).getFullyUncoverted(): [InjectIntoOptionalExpr] (Baz?) ...
701+
# 155| getInit(0).getFullyConverted(): [InjectIntoOptionalExpr] (Baz?) ...
702702
# 155| getImmediateSubExpr(): [CoerceExpr] (Baz) ...
703703
# 155| getImmediateSubExpr(): [DerivedToBaseExpr] (Baz) ...
704704
# 155| getPattern(0): [TypedPattern] ... as ...
@@ -810,7 +810,7 @@ expressions.swift:
810810
# 16| getSubExpr(): [MethodRefExpr] .failed
811811
# 16| getBase(): [TypeExpr] AnError.Type
812812
# 16| getTypeRepr(): [TypeRepr] AnError
813-
# 16| getSubExpr().getFullyUncoverted(): [ErasureExpr] (Error) ...
813+
# 16| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
814814
# 20| [TopLevelCodeDecl] { ... }
815815
# 20| getBody(): [BraceStmt] { ... }
816816
# 20| getElement(0): [ForceTryExpr] try! ...
@@ -825,7 +825,7 @@ expressions.swift:
825825
# 21| getFunction(): [DeclRefExpr] failure(_:)
826826
# 21| getArgument(0): [Argument] : 11
827827
# 21| getExpr(): [IntegerLiteralExpr] 11
828-
# 21| getSubExpr().getFullyUncoverted(): [InjectIntoOptionalExpr] (()?) ...
828+
# 21| getSubExpr().getFullyConverted(): [InjectIntoOptionalExpr] (()?) ...
829829
# 23| [ClassDecl] Klass
830830
# 24| getMember(0): [ConstructorDecl] init()
831831
# 24| InterfaceType = (Klass.Type) -> () -> Klass
@@ -870,25 +870,25 @@ expressions.swift:
870870
# 31| getElement(0): [AssignExpr] ... = ...
871871
# 31| getDest(): [DiscardAssignmentExpr] _
872872
# 31| getSource(): [IntegerLiteralExpr] 15
873-
# 31| getSource().getFullyUncoverted(): [IsExpr] ... is ...
873+
# 31| getSource().getFullyConverted(): [IsExpr] ... is ...
874874
# 32| [TopLevelCodeDecl] { ... }
875875
# 32| getBody(): [BraceStmt] { ... }
876876
# 32| getElement(0): [AssignExpr] ... = ...
877877
# 32| getDest(): [DiscardAssignmentExpr] _
878878
# 32| getSource(): [IntegerLiteralExpr] 15
879-
# 32| getSource().getFullyUncoverted(): [CoerceExpr] (Double) ...
879+
# 32| getSource().getFullyConverted(): [CoerceExpr] (Double) ...
880880
# 33| [TopLevelCodeDecl] { ... }
881881
# 33| getBody(): [BraceStmt] { ... }
882882
# 33| getElement(0): [AssignExpr] ... = ...
883883
# 33| getDest(): [DiscardAssignmentExpr] _
884884
# 33| getSource(): [IntegerLiteralExpr] 15
885-
# 33| getSource().getFullyUncoverted(): [ConditionalCheckedCastExpr] (Double?) ...
885+
# 33| getSource().getFullyConverted(): [ConditionalCheckedCastExpr] (Double?) ...
886886
# 34| [TopLevelCodeDecl] { ... }
887887
# 34| getBody(): [BraceStmt] { ... }
888888
# 34| getElement(0): [AssignExpr] ... = ...
889889
# 34| getDest(): [DiscardAssignmentExpr] _
890890
# 34| getSource(): [IntegerLiteralExpr] 15
891-
# 34| getSource().getFullyUncoverted(): [ForcedCheckedCastExpr] (Double) ...
891+
# 34| getSource().getFullyConverted(): [ForcedCheckedCastExpr] (Double) ...
892892
# 35| [TopLevelCodeDecl] { ... }
893893
# 35| getBody(): [BraceStmt] { ... }
894894
# 35| getElement(0): [CallExpr] call to print(_:separator:terminator:)
@@ -900,7 +900,7 @@ expressions.swift:
900900
# 35| getBase(): [DeclRefExpr] d
901901
# 35| getArgument(0): [Argument] : 1
902902
# 35| getExpr(): [StringLiteralExpr] 1
903-
# 35| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
903+
# 35| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
904904
# 35| getArgument(1): [Argument] separator: default separator
905905
# 35| getExpr(): [DefaultArgumentExpr] default separator
906906
# 35| getArgument(2): [Argument] terminator: default terminator
@@ -1039,14 +1039,14 @@ expressions.swift:
10391039
# 59| getArgument(0): [Argument] pointer: &...
10401040
# 59| getExpr(): [InOutExpr] &...
10411041
# 59| getSubExpr(): [DeclRefExpr] myNumber
1042-
# 59| getExpr().getFullyUncoverted(): [InOutToPointerExpr] (UnsafePointer<Int>) ...
1042+
# 59| getExpr().getFullyConverted(): [InOutToPointerExpr] (UnsafePointer<Int>) ...
10431043
# 60| [TopLevelCodeDecl] { ... }
10441044
# 60| getBody(): [BraceStmt] { ... }
10451045
# 60| getElement(0): [CallExpr] call to withUnsafePointer(to:_:)
10461046
# 60| getFunction(): [DeclRefExpr] withUnsafePointer(to:_:)
10471047
# 60| getArgument(0): [Argument] to: myNumber
10481048
# 60| getExpr(): [DeclRefExpr] myNumber
1049-
# 60| getExpr().getFullyUncoverted(): [LoadExpr] (Int) ...
1049+
# 60| getExpr().getFullyConverted(): [LoadExpr] (Int) ...
10501050
# 60| getArgument(1): [Argument] : { ... }
10511051
# 60| getExpr(): [ClosureExpr] { ... }
10521052
# 60| getParam(0): [ParamDecl] $0
@@ -1057,7 +1057,7 @@ expressions.swift:
10571057
# 60| getFunction(): [DeclRefExpr] unsafeFunction(pointer:)
10581058
# 60| getArgument(0): [Argument] pointer: $0
10591059
# 60| getExpr(): [DeclRefExpr] $0
1060-
# 60| getExpr().getFullyUncoverted(): [FunctionConversionExpr] ((UnsafePointer<Int>) throws -> ()) ...
1060+
# 60| getExpr().getFullyConverted(): [FunctionConversionExpr] ((UnsafePointer<Int>) throws -> ()) ...
10611061
# 62| [ClassDecl] FailingToInit
10621062
# 63| getMember(0): [ConstructorDecl] init(x:)
10631063
# 63| InterfaceType = (FailingToInit.Type) -> (Int) -> FailingToInit?
@@ -1168,7 +1168,7 @@ expressions.swift:
11681168
# 84| getDest(): [DiscardAssignmentExpr] _
11691169
# 84| getSource(): [MemberRefExpr] .xx
11701170
# 84| getBase(): [DeclRefExpr] derived
1171-
# 84| getBase().getFullyUncoverted(): [DerivedToBaseExpr] (Base) ...
1171+
# 84| getBase().getFullyConverted(): [DerivedToBaseExpr] (Base) ...
11721172
# 86| [TopLevelCodeDecl] { ... }
11731173
# 86| getBody(): [BraceStmt] { ... }
11741174
# 86| getElement(0): [PatternBindingDecl] var ... = ...
@@ -1227,7 +1227,7 @@ expressions.swift:
12271227
# 93| getTypeRepr(): [TypeRepr] Unmanaged<ToPtr>
12281228
# 93| getArgument(0): [Argument] : opaque
12291229
# 93| getExpr(): [DeclRefExpr] opaque
1230-
# 93| getExpr().getFullyUncoverted(): [PointerToPointerExpr] (UnsafeRawPointer) ...
1230+
# 93| getExpr().getFullyConverted(): [PointerToPointerExpr] (UnsafeRawPointer) ...
12311231
# 95| [StructDecl] HasProperty
12321232
# 96| getMember(0): [PatternBindingDecl] var ... = ...
12331233
# 96| getPattern(0): [TypedPattern] ... as ...
@@ -1372,21 +1372,21 @@ expressions.swift:
13721372
# 132| getElement(1): [PatternBindingDecl] var ... = ...
13731373
# 132| getInit(0): [MemberRefExpr] .settableField
13741374
# 132| getBase(): [DeclRefExpr] hp
1375-
# 132| getInit(0).getFullyUncoverted(): [LoadExpr] (Int) ...
1375+
# 132| getInit(0).getFullyConverted(): [LoadExpr] (Int) ...
13761376
# 132| getPattern(0): [NamedPattern] x
13771377
# 132| getElement(2): [ConcreteVarDecl] x
13781378
# 132| Type = Int
13791379
# 133| getElement(3): [PatternBindingDecl] var ... = ...
13801380
# 133| getInit(0): [MemberRefExpr] .readOnlyField1
13811381
# 133| getBase(): [DeclRefExpr] hp
1382-
# 133| getBase().getFullyUncoverted(): [LoadExpr] (HasProperty) ...
1382+
# 133| getBase().getFullyConverted(): [LoadExpr] (HasProperty) ...
13831383
# 133| getPattern(0): [NamedPattern] y
13841384
# 133| getElement(4): [ConcreteVarDecl] y
13851385
# 133| Type = Int
13861386
# 134| getElement(5): [PatternBindingDecl] var ... = ...
13871387
# 134| getInit(0): [MemberRefExpr] .readOnlyField2
13881388
# 134| getBase(): [DeclRefExpr] hp
1389-
# 134| getBase().getFullyUncoverted(): [LoadExpr] (HasProperty) ...
1389+
# 134| getBase().getFullyConverted(): [LoadExpr] (HasProperty) ...
13901390
# 134| getPattern(0): [NamedPattern] z
13911391
# 134| getElement(6): [ConcreteVarDecl] z
13921392
# 134| Type = Int
@@ -1397,7 +1397,7 @@ expressions.swift:
13971397
# 136| getElement(8): [PatternBindingDecl] var ... = ...
13981398
# 136| getInit(0): [MemberRefExpr] .normalField
13991399
# 136| getBase(): [DeclRefExpr] hp
1400-
# 136| getInit(0).getFullyUncoverted(): [LoadExpr] (Int) ...
1400+
# 136| getInit(0).getFullyConverted(): [LoadExpr] (Int) ...
14011401
# 136| getPattern(0): [NamedPattern] w
14021402
# 136| getElement(9): [ConcreteVarDecl] w
14031403
# 136| Type = Int
@@ -1411,7 +1411,7 @@ expressions.swift:
14111411
# 138| getElement(11): [ReturnStmt] return ...
14121412
# 138| getResult(): [SubscriptExpr] ...[...]
14131413
# 138| getBase(): [DeclRefExpr] hp
1414-
# 138| getBase().getFullyUncoverted(): [LoadExpr] (HasProperty) ...
1414+
# 138| getBase().getFullyConverted(): [LoadExpr] (HasProperty) ...
14151415
# 138| getArgument(0): [Argument] : 3
14161416
# 138| getExpr(): [IntegerLiteralExpr] 3
14171417
# 138| getArgument(1): [Argument] : 4
@@ -1693,7 +1693,7 @@ patterns.swift:
16931693
# 35| getPattern(): [AnyPattern] _
16941694
# 38| getElement(11): [PatternBindingDecl] var ... = ...
16951695
# 38| getInit(0): [StringLiteralExpr] any
1696-
# 38| getInit(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1696+
# 38| getInit(0).getFullyConverted(): [ErasureExpr] (Any) ...
16971697
# 38| getPattern(0): [TypedPattern] ... as ...
16981698
# 38| getSubPattern(): [NamedPattern] a
16991699
# 38| getTypeRepr(): [TypeRepr] Any
@@ -1793,10 +1793,10 @@ statements.swift:
17931793
# 10| getTypeRepr(): [TypeRepr] Int
17941794
# 10| getArgument(0): [Argument] : i
17951795
# 10| getExpr(): [DeclRefExpr] i
1796-
# 10| getExpr().getFullyUncoverted(): [LoadExpr] (Int) ...
1796+
# 10| getExpr().getFullyConverted(): [LoadExpr] (Int) ...
17971797
# 10| getArgument(1): [Argument] : 12
17981798
# 10| getExpr(): [IntegerLiteralExpr] 12
1799-
# 10| getBoolean().getFullyUncoverted(): [ParenExpr] (...)
1799+
# 10| getBoolean().getFullyConverted(): [ParenExpr] (...)
18001800
# 10| getBody(): [BraceStmt] { ... }
18011801
# 11| getElement(0): [AssignExpr] ... = ...
18021802
# 11| getDest(): [DeclRefExpr] i
@@ -1806,7 +1806,7 @@ statements.swift:
18061806
# 11| getTypeRepr(): [TypeRepr] Int
18071807
# 11| getArgument(0): [Argument] : i
18081808
# 11| getExpr(): [DeclRefExpr] i
1809-
# 11| getExpr().getFullyUncoverted(): [LoadExpr] (Int) ...
1809+
# 11| getExpr().getFullyConverted(): [LoadExpr] (Int) ...
18101810
# 11| getArgument(1): [Argument] : 1
18111811
# 11| getExpr(): [IntegerLiteralExpr] 1
18121812
# 14| getElement(4): [AssignExpr] ... = ...
@@ -1819,10 +1819,10 @@ statements.swift:
18191819
# 17| getTypeRepr(): [TypeRepr] Int
18201820
# 17| getArgument(0): [Argument] : i
18211821
# 17| getExpr(): [DeclRefExpr] i
1822-
# 17| getExpr().getFullyUncoverted(): [LoadExpr] (Int) ...
1822+
# 17| getExpr().getFullyConverted(): [LoadExpr] (Int) ...
18231823
# 17| getArgument(1): [Argument] : 12
18241824
# 17| getExpr(): [IntegerLiteralExpr] 12
1825-
# 17| getCondition().getFullyUncoverted(): [ParenExpr] (...)
1825+
# 17| getCondition().getFullyConverted(): [ParenExpr] (...)
18261826
# 15| getBody(): [BraceStmt] { ... }
18271827
# 16| getElement(0): [AssignExpr] ... = ...
18281828
# 16| getDest(): [DeclRefExpr] i
@@ -1832,7 +1832,7 @@ statements.swift:
18321832
# 16| getTypeRepr(): [TypeRepr] Int
18331833
# 16| getArgument(0): [Argument] : i
18341834
# 16| getExpr(): [DeclRefExpr] i
1835-
# 16| getExpr().getFullyUncoverted(): [LoadExpr] (Int) ...
1835+
# 16| getExpr().getFullyConverted(): [LoadExpr] (Int) ...
18361836
# 16| getArgument(1): [Argument] : 1
18371837
# 16| getExpr(): [IntegerLiteralExpr] 1
18381838
# 19| getElement(6): [DoCatchStmt] do { ... } catch { ... }
@@ -1850,7 +1850,7 @@ statements.swift:
18501850
# 22| getExpr(): [VarargExpansionExpr] [...]
18511851
# 22| getSubExpr(): [ArrayExpr] [...]
18521852
# 22| getElement(0): [StringLiteralExpr] error
1853-
# 22| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1853+
# 22| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
18541854
# 22| getArgument(1): [Argument] separator: default separator
18551855
# 22| getExpr(): [DefaultArgumentExpr] default separator
18561856
# 22| getArgument(2): [Argument] terminator: default terminator
@@ -1873,7 +1873,7 @@ statements.swift:
18731873
# 28| getExpr(): [VarargExpansionExpr] [...]
18741874
# 28| getSubExpr(): [ArrayExpr] [...]
18751875
# 28| getElement(0): [StringLiteralExpr] AnError.failed
1876-
# 28| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1876+
# 28| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
18771877
# 28| getArgument(1): [Argument] separator: default separator
18781878
# 28| getExpr(): [DefaultArgumentExpr] default separator
18791879
# 28| getArgument(2): [Argument] terminator: default terminator
@@ -1889,7 +1889,7 @@ statements.swift:
18891889
# 30| getExpr(): [VarargExpansionExpr] [...]
18901890
# 30| getSubExpr(): [ArrayExpr] [...]
18911891
# 30| getElement(0): [StringLiteralExpr] error
1892-
# 30| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1892+
# 30| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
18931893
# 30| getArgument(1): [Argument] separator: default separator
18941894
# 30| getExpr(): [DefaultArgumentExpr] default separator
18951895
# 30| getArgument(2): [Argument] terminator: default terminator
@@ -1927,7 +1927,7 @@ statements.swift:
19271927
# 40| getSubExpr(): [MethodRefExpr] .failed
19281928
# 40| getBase(): [TypeExpr] AnError.Type
19291929
# 40| getTypeRepr(): [TypeRepr] AnError
1930-
# 40| getSubExpr().getFullyUncoverted(): [ErasureExpr] (Error) ...
1930+
# 40| getSubExpr().getFullyConverted(): [ErasureExpr] (Error) ...
19311931
# 44| [TopLevelCodeDecl] { ... }
19321932
# 44| getBody(): [BraceStmt] { ... }
19331933
# 44| getElement(0): [DeferStmt] defer { ... }
@@ -1938,7 +1938,7 @@ statements.swift:
19381938
# 45| getExpr(): [VarargExpansionExpr] [...]
19391939
# 45| getSubExpr(): [ArrayExpr] [...]
19401940
# 45| getElement(0): [StringLiteralExpr] done
1941-
# 45| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1941+
# 45| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
19421942
# 45| getArgument(1): [Argument] separator: default separator
19431943
# 45| getExpr(): [DefaultArgumentExpr] default separator
19441944
# 45| getArgument(2): [Argument] terminator: default terminator
@@ -1953,7 +1953,7 @@ statements.swift:
19531953
# 49| getExpr(): [VarargExpansionExpr] [...]
19541954
# 49| getSubExpr(): [ArrayExpr] [...]
19551955
# 49| getElement(0): [StringLiteralExpr] doing
1956-
# 49| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1956+
# 49| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
19571957
# 49| getArgument(1): [Argument] separator: default separator
19581958
# 49| getExpr(): [DefaultArgumentExpr] default separator
19591959
# 49| getArgument(2): [Argument] terminator: default terminator
@@ -1977,7 +1977,7 @@ statements.swift:
19771977
# 55| getExpr(): [VarargExpansionExpr] [...]
19781978
# 55| getSubExpr(): [ArrayExpr] [...]
19791979
# 55| getElement(0): [StringLiteralExpr] 1
1980-
# 55| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1980+
# 55| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
19811981
# 55| getArgument(1): [Argument] separator: default separator
19821982
# 55| getExpr(): [DefaultArgumentExpr] default separator
19831983
# 55| getArgument(2): [Argument] terminator: default terminator
@@ -1994,7 +1994,7 @@ statements.swift:
19941994
# 58| getExpr(): [VarargExpansionExpr] [...]
19951995
# 58| getSubExpr(): [ArrayExpr] [...]
19961996
# 58| getElement(0): [StringLiteralExpr] 5, 10
1997-
# 58| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
1997+
# 58| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
19981998
# 58| getArgument(1): [Argument] separator: default separator
19991999
# 58| getExpr(): [DefaultArgumentExpr] default separator
20002000
# 58| getArgument(2): [Argument] terminator: default terminator
@@ -2014,7 +2014,7 @@ statements.swift:
20142014
# 61| getExpr(): [VarargExpansionExpr] [...]
20152015
# 61| getSubExpr(): [ArrayExpr] [...]
20162016
# 61| getElement(0): [StringLiteralExpr] default
2017-
# 61| getElement(0).getFullyUncoverted(): [ErasureExpr] (Any) ...
2017+
# 61| getElement(0).getFullyConverted(): [ErasureExpr] (Any) ...
20182018
# 61| getArgument(1): [Argument] separator: default separator
20192019
# 61| getExpr(): [DefaultArgumentExpr] default separator
20202020
# 61| getArgument(2): [Argument] terminator: default terminator
@@ -2025,7 +2025,7 @@ statements.swift:
20252025
# 64| getBody(): [BraceStmt] { ... }
20262026
# 64| getElement(0): [PatternBindingDecl] var ... = ...
20272027
# 64| getInit(0): [IntegerLiteralExpr] 4
2028-
# 64| getInit(0).getFullyUncoverted(): [InjectIntoOptionalExpr] (Int?) ...
2028+
# 64| getInit(0).getFullyConverted(): [InjectIntoOptionalExpr] (Int?) ...
20292029
# 64| getPattern(0): [TypedPattern] ... as ...
20302030
# 64| getSubPattern(): [NamedPattern] x
20312031
# 64| getTypeRepr(): [TypeRepr] Int?

0 commit comments

Comments
 (0)