Skip to content

Commit d80cf42

Browse files
jketemajketema
committed
Swift: Update test results for IfConfigDecl no longer being extracted
1 parent 566265b commit d80cf42

5 files changed

Lines changed: 15 additions & 31 deletions

File tree

‎swift/ql/test/extractor-tests/declarations/all.expected‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,6 @@
264264
| declarations.swift:155:1:155:28 | { ... } | |
265265
| declarations.swift:155:5:155:5 | d | |
266266
| declarations.swift:157:1:180:1 | ifConfig() | |
267-
| declarations.swift:158:3:166:3 | #if ... | |
268-
| declarations.swift:168:3:171:3 | #if ... | |
269-
| declarations.swift:173:3:179:3 | #if ... | |
270267
| declarations.swift:182:1:182:10 | B | |
271268
| declarations.swift:182:7:182:7 | B.deinit() | |
272269
| declarations.swift:182:7:182:7 | B.init() | |

‎swift/ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
| if_config.swift:1:1:10:1 | #if ... | getModule: | file://:0:0:0:0 | if_config | getNumberOfMembers: | 0 | getNumberOfActiveElements: | 3 |

‎swift/ql/test/extractor-tests/generated/decl/IfConfigDecl/IfConfigDecl_getActiveElement.expected‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
| if_config.swift:1:1:10:1 | #if ... | 0 | if_config.swift:8:1:8:16 | { ... } |
2-
| if_config.swift:1:1:10:1 | #if ... | 1 | if_config.swift:8:5:8:5 | baz |
3-
| if_config.swift:1:1:10:1 | #if ... | 2 | if_config.swift:9:1:9:12 | { ... } |

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

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3109,16 +3109,13 @@ cfg.swift:
31093109
# 467| [NamedFunction] testIfConfig()
31103110
# 467| InterfaceType = () -> ()
31113111
# 467| getBody(): [BraceStmt] { ... }
3112-
# 468| getElement(0): [IfConfigDecl] #if ...
3113-
# 472| getElement(1): [IntegerLiteralExpr] 3
3114-
# 473| getElement(2): [IntegerLiteralExpr] 4
3115-
# 476| getElement(3): [IntegerLiteralExpr] 5
3116-
# 478| getElement(4): [IfConfigDecl] #if ...
3117-
# 483| getElement(5): [IntegerLiteralExpr] 8
3118-
# 485| getElement(6): [IfConfigDecl] #if ...
3119-
# 489| getElement(7): [IntegerLiteralExpr] 11
3120-
# 490| getElement(8): [IntegerLiteralExpr] 12
3121-
# 493| getElement(9): [IntegerLiteralExpr] 13
3112+
# 472| getElement(0): [IntegerLiteralExpr] 3
3113+
# 473| getElement(1): [IntegerLiteralExpr] 4
3114+
# 476| getElement(2): [IntegerLiteralExpr] 5
3115+
# 483| getElement(3): [IntegerLiteralExpr] 8
3116+
# 489| getElement(4): [IntegerLiteralExpr] 11
3117+
# 490| getElement(5): [IntegerLiteralExpr] 12
3118+
# 493| getElement(6): [IntegerLiteralExpr] 13
31223119
# 496| [NamedFunction] testAvailable()
31233120
# 496| InterfaceType = () -> Int
31243121
# 496| getBody(): [BraceStmt] { ... }
@@ -4587,14 +4584,11 @@ declarations.swift:
45874584
# 157| [NamedFunction] ifConfig()
45884585
# 157| InterfaceType = () -> ()
45894586
# 157| getBody(): [BraceStmt] { ... }
4590-
# 158| getElement(0): [IfConfigDecl] #if ...
4591-
# 163| getElement(1): [IntegerLiteralExpr] 4
4592-
# 164| getElement(2): [IntegerLiteralExpr] 5
4593-
# 165| getElement(3): [IntegerLiteralExpr] 6
4594-
# 168| getElement(4): [IfConfigDecl] #if ...
4595-
# 173| getElement(5): [IfConfigDecl] #if ...
4596-
# 174| getElement(6): [IntegerLiteralExpr] 9
4597-
# 175| getElement(7): [IntegerLiteralExpr] 10
4587+
# 163| getElement(0): [IntegerLiteralExpr] 4
4588+
# 164| getElement(1): [IntegerLiteralExpr] 5
4589+
# 165| getElement(2): [IntegerLiteralExpr] 6
4590+
# 174| getElement(3): [IntegerLiteralExpr] 9
4591+
# 175| getElement(4): [IntegerLiteralExpr] 10
45984592
# 182| [ClassDecl] B
45994593
# 182| getMember(0): [Deinitializer] B.deinit()
46004594
# 182| InterfaceType = (B) -> () -> ()

‎swift/ql/test/library-tests/controlflow/graph/Cfg.expected‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,14 +1902,11 @@
19021902
| cfg.swift:464:39:464:39 | kpGet_mayB_x | cfg.swift:464:39:464:39 | (KeyPath<A, Int?>) ... | |
19031903
| cfg.swift:467:1:494:1 | enter testIfConfig() | cfg.swift:467:1:494:1 | testIfConfig() | |
19041904
| cfg.swift:467:1:494:1 | exit testIfConfig() (normal) | cfg.swift:467:1:494:1 | exit testIfConfig() | |
1905-
| cfg.swift:467:1:494:1 | testIfConfig() | cfg.swift:468:1:474:1 | #if ... | |
1906-
| cfg.swift:468:1:474:1 | #if ... | cfg.swift:472:3:472:3 | 3 | |
1905+
| cfg.swift:467:1:494:1 | testIfConfig() | cfg.swift:472:3:472:3 | 3 | |
19071906
| cfg.swift:472:3:472:3 | 3 | cfg.swift:473:3:473:3 | 4 | |
19081907
| cfg.swift:473:3:473:3 | 4 | cfg.swift:476:3:476:3 | 5 | |
1909-
| cfg.swift:476:3:476:3 | 5 | cfg.swift:478:1:481:1 | #if ... | |
1910-
| cfg.swift:478:1:481:1 | #if ... | cfg.swift:483:3:483:3 | 8 | |
1911-
| cfg.swift:483:3:483:3 | 8 | cfg.swift:485:1:491:1 | #if ... | |
1912-
| cfg.swift:485:1:491:1 | #if ... | cfg.swift:489:3:489:3 | 11 | |
1908+
| cfg.swift:476:3:476:3 | 5 | cfg.swift:483:3:483:3 | 8 | |
1909+
| cfg.swift:483:3:483:3 | 8 | cfg.swift:489:3:489:3 | 11 | |
19131910
| cfg.swift:489:3:489:3 | 11 | cfg.swift:490:3:490:3 | 12 | |
19141911
| cfg.swift:490:3:490:3 | 12 | cfg.swift:493:3:493:3 | 13 | |
19151912
| cfg.swift:493:3:493:3 | 13 | cfg.swift:467:1:494:1 | exit testIfConfig() (normal) | |

0 commit comments

Comments
 (0)