PS: Repair tests and accept test changes in syntax tests.

MathiasVP · MathiasVP · commit 655d80ee7b63 · 2025-03-27T16:01:39.000Z
diff --git a/powershell/ql/test/TestUtilities/InlineFlowTestUtil.qll b/powershell/ql/test/TestUtilities/InlineFlowTestUtil.qll
@@ -6,19 +6,19 @@ import powershell
 import semmle.code.powershell.dataflow.DataFlow
 
 predicate defaultSource(DataFlow::Node src) {
-  src.asStmt().getStmt().(Cmd).getCommandName() = ["Source", "Taint"]
+  src.asExpr().getExpr().(CmdCall).getName() = ["Source", "Taint"]
   or
   src.asParameter().getName().matches(["Source%", "Taint%"])
 }
 
 predicate defaultSink(DataFlow::Node sink) {
-  exists(Cmd cmd | cmd.getCommandName() = "Sink" | sink.asExpr().getExpr() = cmd.getAnArgument())
+  exists(CmdCall cmd | cmd.getName() = "Sink" | sink.asExpr().getExpr() = cmd.getAnArgument())
 }
 
 string getSourceArgString(DataFlow::Node src) {
   defaultSource(src) and
   (
-    src.asStmt().getStmt().(Cmd).getAnArgument().(StringConstExpr).getValue().getValue() = result
+    src.asExpr().getExpr().(CmdCall).getAnArgument().(StringConstExpr).getValue().getValue() = result
     or
     src.asParameter().getName().regexpCapture(["Source(.+)", "Taint(.+)"], 1) = result
   )
diff --git a/powershell/ql/test/library-tests/ast/Arrays/arrays.expected b/powershell/ql/test/library-tests/ast/Arrays/arrays.expected
@@ -1,23 +1,23 @@
 arrayExpr
-| Arrays.ps1:11:11:11:25 | @(...) | Arrays.ps1:11:13:11:24 | {...} |
-| Arrays.ps1:14:41:14:44 | @(...) | Arrays.ps1:0:0:0:0 | {...} |
+| Arrays.ps1:11:11:11:24 | @(...) | Arrays.ps1:11:13:11:23 | {...} |
+| Arrays.ps1:14:41:14:43 | @(...) | Arrays.ps1:0:0:0:-1 | {...} |
 arrayLiteral
-| Arrays.ps1:1:11:1:37 | ...,... | 0 | Arrays.ps1:1:11:1:12 | 1 |
-| Arrays.ps1:1:11:1:37 | ...,... | 1 | Arrays.ps1:1:13:1:14 | 2 |
-| Arrays.ps1:1:11:1:37 | ...,... | 2 | Arrays.ps1:1:15:1:18 | a |
-| Arrays.ps1:1:11:1:37 | ...,... | 3 | Arrays.ps1:1:19:1:24 | true |
-| Arrays.ps1:1:11:1:37 | ...,... | 4 | Arrays.ps1:1:25:1:31 | false |
-| Arrays.ps1:1:11:1:37 | ...,... | 5 | Arrays.ps1:1:32:1:37 | null |
-| Arrays.ps1:5:34:5:37 | ...,... | 0 | Arrays.ps1:5:34:5:35 | 2 |
-| Arrays.ps1:5:34:5:37 | ...,... | 1 | Arrays.ps1:5:36:5:37 | 2 |
-| Arrays.ps1:6:9:6:12 | ...,... | 0 | Arrays.ps1:6:9:6:10 | 0 |
-| Arrays.ps1:6:9:6:12 | ...,... | 1 | Arrays.ps1:6:11:6:12 | 0 |
-| Arrays.ps1:7:9:7:12 | ...,... | 0 | Arrays.ps1:7:9:7:10 | 1 |
-| Arrays.ps1:7:9:7:12 | ...,... | 1 | Arrays.ps1:7:11:7:12 | 0 |
-| Arrays.ps1:8:9:8:12 | ...,... | 0 | Arrays.ps1:8:9:8:10 | 0 |
-| Arrays.ps1:8:9:8:12 | ...,... | 1 | Arrays.ps1:8:11:8:12 | 1 |
-| Arrays.ps1:9:9:9:12 | ...,... | 0 | Arrays.ps1:9:9:9:10 | 1 |
-| Arrays.ps1:9:9:9:12 | ...,... | 1 | Arrays.ps1:9:11:9:12 | 1 |
-| Arrays.ps1:11:13:11:24 | ...,... | 0 | Arrays.ps1:11:13:11:16 | a |
-| Arrays.ps1:11:13:11:24 | ...,... | 1 | Arrays.ps1:11:17:11:20 | b |
-| Arrays.ps1:11:13:11:24 | ...,... | 2 | Arrays.ps1:11:21:11:24 | c |
+| Arrays.ps1:1:11:1:36 | ...,... | 0 | Arrays.ps1:1:11:1:11 | 1 |
+| Arrays.ps1:1:11:1:36 | ...,... | 1 | Arrays.ps1:1:13:1:13 | 2 |
+| Arrays.ps1:1:11:1:36 | ...,... | 2 | Arrays.ps1:1:15:1:17 | a |
+| Arrays.ps1:1:11:1:36 | ...,... | 3 | Arrays.ps1:1:19:1:23 | true |
+| Arrays.ps1:1:11:1:36 | ...,... | 4 | Arrays.ps1:1:25:1:30 | false |
+| Arrays.ps1:1:11:1:36 | ...,... | 5 | Arrays.ps1:1:32:1:36 | null |
+| Arrays.ps1:5:34:5:36 | ...,... | 0 | Arrays.ps1:5:34:5:34 | 2 |
+| Arrays.ps1:5:34:5:36 | ...,... | 1 | Arrays.ps1:5:36:5:36 | 2 |
+| Arrays.ps1:6:9:6:11 | ...,... | 0 | Arrays.ps1:6:9:6:9 | 0 |
+| Arrays.ps1:6:9:6:11 | ...,... | 1 | Arrays.ps1:6:11:6:11 | 0 |
+| Arrays.ps1:7:9:7:11 | ...,... | 0 | Arrays.ps1:7:9:7:9 | 1 |
+| Arrays.ps1:7:9:7:11 | ...,... | 1 | Arrays.ps1:7:11:7:11 | 0 |
+| Arrays.ps1:8:9:8:11 | ...,... | 0 | Arrays.ps1:8:9:8:9 | 0 |
+| Arrays.ps1:8:9:8:11 | ...,... | 1 | Arrays.ps1:8:11:8:11 | 1 |
+| Arrays.ps1:9:9:9:11 | ...,... | 0 | Arrays.ps1:9:9:9:9 | 1 |
+| Arrays.ps1:9:9:9:11 | ...,... | 1 | Arrays.ps1:9:11:9:11 | 1 |
+| Arrays.ps1:11:13:11:23 | ...,... | 0 | Arrays.ps1:11:13:11:15 | a |
+| Arrays.ps1:11:13:11:23 | ...,... | 1 | Arrays.ps1:11:17:11:19 | b |
+| Arrays.ps1:11:13:11:23 | ...,... | 2 | Arrays.ps1:11:21:11:23 | c |
diff --git a/powershell/ql/test/library-tests/ast/Arrays/arrays.ql b/powershell/ql/test/library-tests/ast/Arrays/arrays.ql
@@ -3,5 +3,5 @@ import powershell
 query predicate arrayExpr(ArrayExpr arrayExpr, StmtBlock subExpr) { subExpr = arrayExpr.getStmtBlock() }
 
 query predicate arrayLiteral(ArrayLiteral arrayLiteral, int i, Expr e) {
-    e = arrayLiteral.getElement(i)
+    e = arrayLiteral.getExpr(i)
 }
diff --git a/powershell/ql/test/library-tests/ast/Blocks/blocks.expected b/powershell/ql/test/library-tests/ast/Blocks/blocks.expected
@@ -1 +1,2 @@
-| ParamBlock.ps1:2:1:5:2 | param(...) | 0 | ParamBlock.ps1:3:5:4:23 | Parameter |
+| ParamBlock.ps1:1:1:5:1 | {...} | 0 | ParamBlock.ps1:1:1:5:1 | Parameter |
+| ParamBlock.ps1:1:1:5:1 | {...} | 1 | ParamBlock.ps1:1:1:5:1 | [synth] pipeline |
diff --git a/powershell/ql/test/library-tests/ast/Blocks/blocks.ql b/powershell/ql/test/library-tests/ast/Blocks/blocks.ql
@@ -1,5 +1,5 @@
 import powershell
 
-query predicate paramBlockHasParam(ParamBlock block, int i, Parameter p) {
+query predicate paramBlockHasParam(ScriptBlock block, int i, Parameter p) {
     p = block.getParameter(i)
 }
diff --git a/powershell/ql/test/library-tests/ast/Expressions/expressions.expected b/powershell/ql/test/library-tests/ast/Expressions/expressions.expected
@@ -1,19 +1,15 @@
 binaryExpr
-| BinaryExpression.ps1:3:11:3:24 | ...+... | BinaryExpression.ps1:3:11:3:16 | val1 | BinaryExpression.ps1:3:19:3:24 | val2 |
-| TernaryExpression.ps1:1:9:1:16 | ... -gt ... | TernaryExpression.ps1:1:9:1:10 | 6 | TernaryExpression.ps1:1:15:1:16 | 7 |
+| BinaryExpression.ps1:3:11:3:23 | ...+... | BinaryExpression.ps1:3:11:3:15 | val1 | BinaryExpression.ps1:3:19:3:23 | val2 |
+| TernaryExpression.ps1:1:9:1:15 | ... -gt ... | TernaryExpression.ps1:1:9:1:9 | 6 | TernaryExpression.ps1:1:15:1:15 | 7 |
 cmdExpr
-| BinaryExpression.ps1:1:9:1:10 | 1 | BinaryExpression.ps1:1:9:1:10 | 1 |
-| BinaryExpression.ps1:2:9:2:10 | 2 | BinaryExpression.ps1:2:9:2:10 | 2 |
-| BinaryExpression.ps1:3:11:3:24 | ...+... | BinaryExpression.ps1:3:11:3:24 | ...+... |
-| BinaryExpression.ps1:4:1:4:8 | result | BinaryExpression.ps1:4:1:4:8 | result |
-| ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name | ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name |
-| ExpandableString.ps1:1:23:1:38 | Now | ExpandableString.ps1:1:23:1:38 | Now |
-| SubExpression.ps1:1:1:1:24 | call to AddDays | SubExpression.ps1:1:1:1:24 | call to AddDays |
-| SubExpression.ps1:2:1:2:22 | call to AddDays | SubExpression.ps1:2:1:2:22 | call to AddDays |
-| TernaryExpression.ps1:1:8:1:23 | ...?...:... | TernaryExpression.ps1:1:8:1:23 | ...?...:... |
-| TernaryExpression.ps1:1:9:1:16 | ... -gt ... | TernaryExpression.ps1:1:9:1:16 | ... -gt ... |
+| BinaryExpression.ps1:4:1:4:7 | [Stmt] result | BinaryExpression.ps1:4:1:4:7 | result |
+| ExpandableString.ps1:1:1:1:39 | [Stmt] Date: $([DateTime]::Now)\nName: $name | ExpandableString.ps1:1:1:1:39 | Date: $([DateTime]::Now)\nName: $name |
+| ExpandableString.ps1:1:23:1:37 | [Stmt] Now | ExpandableString.ps1:1:23:1:37 | Now |
+| SubExpression.ps1:1:1:1:23 | [Stmt] Call to AddDays | SubExpression.ps1:1:1:1:23 | Call to AddDays |
+| SubExpression.ps1:1:3:1:10 | [Stmt] Call to Get-Date | SubExpression.ps1:1:3:1:10 | Call to Get-Date |
+| SubExpression.ps1:2:1:2:21 | [Stmt] Call to AddDays | SubExpression.ps1:2:1:2:21 | Call to AddDays |
+| SubExpression.ps1:2:3:2:10 | [Stmt] Call to Get-Date | SubExpression.ps1:2:3:2:10 | Call to Get-Date |
 invokeMemoryExpression
-| SubExpression.ps1:1:1:1:24 | call to AddDays | SubExpression.ps1:1:1:1:12 | $(...) | 0 | SubExpression.ps1:1:21:1:23 | 10 |
+| SubExpression.ps1:1:1:1:23 | Call to AddDays | SubExpression.ps1:1:1:1:11 | $(...) | 0 | SubExpression.ps1:1:21:1:22 | 10 |
 expandableString
-| ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name | 0 | ExpandableString.ps1:1:8:1:13 | name |
-| ExpandableString.ps1:1:1:1:40 | Date: $([DateTime]::Now)\nName: $name | 1 | ExpandableString.ps1:1:21:1:39 | $(...) |
+| ExpandableString.ps1:1:1:1:39 | Date: $([DateTime]::Now)\nName: $name | 1 | ExpandableString.ps1:1:21:1:38 | $(...) |
diff --git a/powershell/ql/test/library-tests/ast/Expressions/expressions.ql b/powershell/ql/test/library-tests/ast/Expressions/expressions.ql
@@ -5,8 +5,8 @@ query predicate binaryExpr(BinaryExpr e, Expr e1, Expr e2) {
     e2 = e.getRight()
 }
 
-query predicate cmdExpr(CmdExpr cmd, Expr e) {
-    e = cmd.getExpr()
+query predicate cmdExpr(ExprStmt exprStmt, Expr e) {
+    e = exprStmt.getExpr()
 }
 
 query predicate invokeMemoryExpression(InvokeMemberExpr invoke, Expr e, int i, Expr arg) {
diff --git a/powershell/ql/test/library-tests/ast/Loops/loops.expected b/powershell/ql/test/library-tests/ast/Loops/loops.expected
@@ -1,6 +1,6 @@
 doUntil
-| DoUntil.ps1:1:1:7:19 | DoUntil | DoUntil.ps1:7:10:7:18 | ... -le ... | DoUntil.ps1:2:1:7:2 | {...} |
+| DoUntil.ps1:1:1:7:18 | do...until... | DoUntil.ps1:7:10:7:17 | ... -le ... | DoUntil.ps1:2:1:7:1 | {...} |
 doWhile
-| DoWhile.ps1:1:1:7:19 | DoWhile | DoWhile.ps1:7:10:7:18 | ... -le ... | DoWhile.ps1:2:1:7:2 | {...} |
+| DoWhile.ps1:1:1:7:18 | do...while... | DoWhile.ps1:7:10:7:17 | ... -le ... | DoWhile.ps1:2:1:7:1 | {...} |
 while
-| While.ps1:2:1:13:2 | while(...) {...} | While.ps1:2:8:2:18 | ... -le ... | While.ps1:3:1:13:2 | {...} |
+| While.ps1:2:1:13:1 | while(...) {...} | While.ps1:2:8:2:17 | ... -le ... | While.ps1:3:1:13:1 | {...} |
diff --git a/powershell/ql/test/library-tests/ast/Loops/loops.ql b/powershell/ql/test/library-tests/ast/Loops/loops.ql
@@ -1,16 +1,16 @@
 import powershell
 
-query predicate doUntil(DoUntilStmt s, PipelineBase e, StmtBlock body) {
+query predicate doUntil(DoUntilStmt s, Expr e, StmtBlock body) {
   e = s.getCondition() and
   body = s.getBody()
 }
 
-query predicate doWhile(DoWhileStmt s, PipelineBase e, StmtBlock body) {
+query predicate doWhile(DoWhileStmt s, Expr e, StmtBlock body) {
   e = s.getCondition() and
   body = s.getBody()
 }
 
-query predicate while(WhileStmt s, PipelineBase e, StmtBlock body) {
+query predicate while(WhileStmt s, Expr e, StmtBlock body) {
   e = s.getCondition() and
   body = s.getBody()
 }
diff --git a/powershell/ql/test/library-tests/ast/Redirections/redirections.expected b/powershell/ql/test/library-tests/ast/Redirections/redirections.expected
@@ -1,2 +1,2 @@
-| FileRedirection.ps1:3:3:3:7 | MergingRedirection |
-| FileRedirection.ps1:3:8:3:20 | FileRedirection |
+| FileRedirection.ps1:3:3:3:6 | MergingRedirection |
+| FileRedirection.ps1:3:8:3:19 | FileRedirection |
diff --git a/powershell/ql/test/library-tests/ast/Statements/statements.expected b/powershell/ql/test/library-tests/ast/Statements/statements.expected
@@ -1,24 +1,25 @@
-| ExitStatement.ps1:1:1:1:8 | exit ... |
-| ExitStatement.ps1:1:6:1:8 | -1 |
-| IfStatement.ps1:1:1:1:7 | ...=... |
-| IfStatement.ps1:1:6:1:7 | 4 |
-| IfStatement.ps1:3:1:8:2 | if (...) {...} else {...} |
-| IfStatement.ps1:3:5:3:13 | ... -ge ... |
-| IfStatement.ps1:4:2:4:36 | $x is greater than or equal to 3 |
-| IfStatement.ps1:7:2:7:21 | $x is less than 3 |
-| TrapStatement.ps1:1:1:4:2 | TrapTest |
-| TrapStatement.ps1:2:5:2:26 | TrapStatement at: TrapStatement.ps1:2:5:2:26 |
-| TrapStatement.ps1:2:11:2:25 | Error found. |
-| TrapStatement.ps1:3:5:3:19 | call to nonsenseString |
-| TrapStatement.ps1:6:1:6:9 | call to TrapTest |
-| Try.ps1:1:1:13:2 | try {...} |
-| Try.ps1:2:4:2:95 | ...=... |
-| Try.ps1:2:17:2:95 | call to New-Object |
-| Try.ps1:2:69:2:94 | ...,... |
-| Try.ps1:3:5:3:21 | throw ... |
-| Try.ps1:3:11:3:21 | Exception |
-| Try.ps1:6:5:6:64 | Unable to download MyDoc.doc from http://www.contoso.com. |
-| Try.ps1:9:5:9:52 | An error occurred that could not be resolved. |
-| Try.ps1:12:5:12:37 | The finally block is executed. |
-| UseProcessBlockForPipelineCommand.ps1:1:1:11:2 | Get-Number |
-| UseProcessBlockForPipelineCommand.ps1:10:5:10:12 | Number |
+| ExitStatement.ps1:1:1:1:7 | exit ... |
+| IfStatement.ps1:1:1:1:6 | ...=... |
+| IfStatement.ps1:3:1:8:1 | [Stmt] if (...) {...} else {...} |
+| IfStatement.ps1:3:15:5:1 | {...} |
+| IfStatement.ps1:4:2:4:35 | [Stmt] $x is greater than or equal to 3 |
+| IfStatement.ps1:6:6:8:1 | {...} |
+| IfStatement.ps1:7:2:7:20 | [Stmt] $x is less than 3 |
+| TrapStatement.ps1:1:1:4:1 | def of TrapTest |
+| TrapStatement.ps1:2:5:2:25 | trap {...} |
+| TrapStatement.ps1:2:10:2:25 | {...} |
+| TrapStatement.ps1:2:11:2:24 | [Stmt] Error found. |
+| TrapStatement.ps1:3:5:3:18 | [Stmt] Call to nonsenseString |
+| TrapStatement.ps1:6:1:6:8 | [Stmt] Call to TrapTest |
+| Try.ps1:1:1:13:1 | try {...} |
+| Try.ps1:1:5:4:1 | {...} |
+| Try.ps1:2:4:2:94 | ...=... |
+| Try.ps1:3:5:3:20 | throw ... |
+| Try.ps1:5:57:7:1 | {...} |
+| Try.ps1:6:5:6:63 | [Stmt] Unable to download MyDoc.doc from http://www.contoso.com. |
+| Try.ps1:8:7:10:1 | {...} |
+| Try.ps1:9:5:9:51 | [Stmt] An error occurred that could not be resolved. |
+| Try.ps1:11:9:13:1 | {...} |
+| Try.ps1:12:5:12:36 | [Stmt] The finally block is executed. |
+| UseProcessBlockForPipelineCommand.ps1:1:1:11:1 | def of Get-Number |
+| UseProcessBlockForPipelineCommand.ps1:10:5:10:11 | [Stmt] Number |
diff --git a/powershell/ql/test/library-tests/ast/parent.expected b/powershell/ql/test/library-tests/ast/parent.expected

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,19 @@ import powershell`
`6`	`6`	`import semmle.code.powershell.dataflow.DataFlow`
`7`	`7`
`8`	`8`	`predicate defaultSource(DataFlow::Node src) {`
`9`		`- src.asStmt().getStmt().(Cmd).getCommandName() = ["Source", "Taint"]`
	`9`	`+ src.asExpr().getExpr().(CmdCall).getName() = ["Source", "Taint"]`
`10`	`10`	`or`
`11`	`11`	`src.asParameter().getName().matches(["Source%", "Taint%"])`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`predicate defaultSink(DataFlow::Node sink) {`
`15`		`- exists(Cmd cmd \| cmd.getCommandName() = "Sink" \| sink.asExpr().getExpr() = cmd.getAnArgument())`
	`15`	`+ exists(CmdCall cmd \| cmd.getName() = "Sink" \| sink.asExpr().getExpr() = cmd.getAnArgument())`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`string getSourceArgString(DataFlow::Node src) {`
`19`	`19`	`defaultSource(src) and`
`20`	`20`	`(`
`21`		`- src.asStmt().getStmt().(Cmd).getAnArgument().(StringConstExpr).getValue().getValue() = result`
	`21`	`+ src.asExpr().getExpr().(CmdCall).getAnArgument().(StringConstExpr).getValue().getValue() = result`
`22`	`22`	`or`
`23`	`23`	`src.asParameter().getName().regexpCapture(["Source(.+)", "Taint(.+)"], 1) = result`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ import powershell`
`3`	`3`	`query predicate arrayExpr(ArrayExpr arrayExpr, StmtBlock subExpr) { subExpr = arrayExpr.getStmtBlock() }`
`4`	`4`
`5`	`5`	`query predicate arrayLiteral(ArrayLiteral arrayLiteral, int i, Expr e) {`
`6`		`- e = arrayLiteral.getElement(i)`
	`6`	`+ e = arrayLiteral.getExpr(i)`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-\| ParamBlock.ps1:2:1:5:2 \| param(...) \| 0 \| ParamBlock.ps1:3:5:4:23 \| Parameter \|`
	`1`	`+\| ParamBlock.ps1:1:1:5:1 \| {...} \| 0 \| ParamBlock.ps1:1:1:5:1 \| Parameter \|`
	`2`	`+\| ParamBlock.ps1:1:1:5:1 \| {...} \| 1 \| ParamBlock.ps1:1:1:5:1 \| [synth] pipeline \|`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import powershell`
`2`	`2`
`3`		`-query predicate paramBlockHasParam(ParamBlock block, int i, Parameter p) {`
	`3`	`+query predicate paramBlockHasParam(ScriptBlock block, int i, Parameter p) {`
`4`	`4`	`p = block.getParameter(i)`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ query predicate binaryExpr(BinaryExpr e, Expr e1, Expr e2) {`
`5`	`5`	`e2 = e.getRight()`
`6`	`6`	`}`
`7`	`7`
`8`		`-query predicate cmdExpr(CmdExpr cmd, Expr e) {`
`9`		`- e = cmd.getExpr()`
	`8`	`+query predicate cmdExpr(ExprStmt exprStmt, Expr e) {`
	`9`	`+ e = exprStmt.getExpr()`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`query predicate invokeMemoryExpression(InvokeMemberExpr invoke, Expr e, int i, Expr arg) {`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`import powershell`
`2`	`2`
`3`		`-query predicate doUntil(DoUntilStmt s, PipelineBase e, StmtBlock body) {`
	`3`	`+query predicate doUntil(DoUntilStmt s, Expr e, StmtBlock body) {`
`4`	`4`	`e = s.getCondition() and`
`5`	`5`	`body = s.getBody()`
`6`	`6`	`}`
`7`	`7`
`8`		`-query predicate doWhile(DoWhileStmt s, PipelineBase e, StmtBlock body) {`
	`8`	`+query predicate doWhile(DoWhileStmt s, Expr e, StmtBlock body) {`
`9`	`9`	`e = s.getCondition() and`
`10`	`10`	`body = s.getBody()`
`11`	`11`	`}`
`12`	`12`
`13`		`-query predicate while(WhileStmt s, PipelineBase e, StmtBlock body) {`
	`13`	`+query predicate while(WhileStmt s, Expr e, StmtBlock body) {`
`14`	`14`	`e = s.getCondition() and`
`15`	`15`	`body = s.getBody()`
`16`	`16`	`}`