From 391c8150f5dd70149fe7f9775cb0dcdda3a0c693 Mon Sep 17 00:00:00 2001 From: Erik Krogh Kristensen Date: Thu, 27 May 2021 22:26:14 +0000 Subject: [PATCH] make the test pass an auto-format check --- ql/test/printAst/Foo.qll | 2 +- ql/test/printAst/printAst.expected | 62 +++++++++++++++++++++++------- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/ql/test/printAst/Foo.qll b/ql/test/printAst/Foo.qll index ffb28163ebc..de9ecbe1133 100644 --- a/ql/test/printAst/Foo.qll +++ b/ql/test/printAst/Foo.qll @@ -21,5 +21,5 @@ predicate calls(Foo f) { or f = any(Foo f) or - ((((any())))) + 2 = 1 + (2 + (3 + 4)) } diff --git a/ql/test/printAst/printAst.expected b/ql/test/printAst/printAst.expected index 3e0e78d3b74..03a0abda214 100644 --- a/ql/test/printAst/printAst.expected +++ b/ql/test/printAst/printAst.expected @@ -83,8 +83,8 @@ nodes | Foo.qll:14:3:20:13 | Disjunction | semmle.order | 38 | | Foo.qll:14:3:22:16 | Disjunction | semmle.label | [Disjunction] Disjunction | | Foo.qll:14:3:22:16 | Disjunction | semmle.order | 38 | -| Foo.qll:14:3:24:15 | Disjunction | semmle.label | [Disjunction] Disjunction | -| Foo.qll:14:3:24:15 | Disjunction | semmle.order | 38 | +| Foo.qll:14:3:24:23 | Disjunction | semmle.label | [Disjunction] Disjunction | +| Foo.qll:14:3:24:23 | Disjunction | semmle.order | 38 | | Foo.qll:14:9:14:9 | Identifier | semmle.label | [Identifier] Identifier | | Foo.qll:14:9:14:9 | Identifier | semmle.order | 44 | | Foo.qll:16:3:16:7 | String | semmle.label | [String] String | @@ -141,12 +141,30 @@ nodes | Foo.qll:22:11:22:13 | TypeExpr | semmle.order | 70 | | Foo.qll:22:11:22:15 | VarDecl | semmle.label | [VarDecl] VarDecl | | Foo.qll:22:11:22:15 | VarDecl | semmle.order | 70 | -| Foo.qll:24:7:24:11 | AnyCall | semmle.label | [AnyCall] AnyCall | -| Foo.qll:24:7:24:11 | AnyCall | semmle.order | 72 | +| Foo.qll:24:3:24:3 | Integer | semmle.label | [Integer] Integer | +| Foo.qll:24:3:24:3 | Integer | semmle.order | 72 | +| Foo.qll:24:3:24:23 | ComparisonFormula | semmle.label | [ComparisonFormula] ComparisonFormula | +| Foo.qll:24:3:24:23 | ComparisonFormula | semmle.order | 72 | +| Foo.qll:24:5:24:5 | ComparisonOp | semmle.label | [ComparisonOp] ComparisonOp | +| Foo.qll:24:5:24:5 | ComparisonOp | semmle.order | 74 | +| Foo.qll:24:7:24:7 | Integer | semmle.label | [Integer] Integer | +| Foo.qll:24:7:24:7 | Integer | semmle.order | 75 | +| Foo.qll:24:7:24:23 | AddExpr | semmle.label | [AddExpr] AddExpr | +| Foo.qll:24:7:24:23 | AddExpr | semmle.order | 75 | +| Foo.qll:24:12:24:12 | Integer | semmle.label | [Integer] Integer | +| Foo.qll:24:12:24:12 | Integer | semmle.order | 77 | +| Foo.qll:24:12:24:22 | AddExpr | semmle.label | [AddExpr] AddExpr | +| Foo.qll:24:12:24:22 | AddExpr | semmle.order | 77 | +| Foo.qll:24:17:24:17 | Integer | semmle.label | [Integer] Integer | +| Foo.qll:24:17:24:17 | Integer | semmle.order | 79 | +| Foo.qll:24:17:24:21 | AddExpr | semmle.label | [AddExpr] AddExpr | +| Foo.qll:24:17:24:21 | AddExpr | semmle.order | 79 | +| Foo.qll:24:21:24:21 | Integer | semmle.label | [Integer] Integer | +| Foo.qll:24:21:24:21 | Integer | semmle.order | 81 | | printAst.ql:1:1:1:28 | Import | semmle.label | [Import] Import | -| printAst.ql:1:1:1:28 | Import | semmle.order | 73 | +| printAst.ql:1:1:1:28 | Import | semmle.order | 82 | | printAst.ql:1:1:1:29 | TopLevel | semmle.label | [TopLevel] TopLevel | -| printAst.ql:1:1:1:29 | TopLevel | semmle.order | 73 | +| printAst.ql:1:1:1:29 | TopLevel | semmle.order | 82 | edges | Foo.qll:1:1:25:2 | TopLevel | Foo.qll:1:1:1:17 | Import | semmle.label | 1 | | Foo.qll:1:1:25:2 | TopLevel | Foo.qll:1:1:1:17 | Import | semmle.order | 1 | @@ -218,8 +236,8 @@ edges | Foo.qll:10:69:10:84 | MemberCall | Foo.qll:10:69:10:73 | Identifier | semmle.order | 33 | | Foo.qll:13:1:25:1 | ClasslessPredicate | Foo.qll:13:17:13:21 | VarDecl | semmle.label | 1 | | Foo.qll:13:1:25:1 | ClasslessPredicate | Foo.qll:13:17:13:21 | VarDecl | semmle.order | 36 | -| Foo.qll:13:1:25:1 | ClasslessPredicate | Foo.qll:14:3:24:15 | Disjunction | semmle.label | 2 | -| Foo.qll:13:1:25:1 | ClasslessPredicate | Foo.qll:14:3:24:15 | Disjunction | semmle.order | 38 | +| Foo.qll:13:1:25:1 | ClasslessPredicate | Foo.qll:14:3:24:23 | Disjunction | semmle.label | 2 | +| Foo.qll:13:1:25:1 | ClasslessPredicate | Foo.qll:14:3:24:23 | Disjunction | semmle.order | 38 | | Foo.qll:13:17:13:21 | VarDecl | Foo.qll:13:17:13:19 | TypeExpr | semmle.label | 1 | | Foo.qll:13:17:13:21 | VarDecl | Foo.qll:13:17:13:19 | TypeExpr | semmle.order | 36 | | Foo.qll:14:3:14:10 | PredicateCall | Foo.qll:14:9:14:9 | Identifier | semmle.label | 1 | @@ -240,10 +258,10 @@ edges | Foo.qll:14:3:22:16 | Disjunction | Foo.qll:14:3:20:13 | Disjunction | semmle.order | 38 | | Foo.qll:14:3:22:16 | Disjunction | Foo.qll:22:3:22:16 | ComparisonFormula | semmle.label | 2 | | Foo.qll:14:3:22:16 | Disjunction | Foo.qll:22:3:22:16 | ComparisonFormula | semmle.order | 66 | -| Foo.qll:14:3:24:15 | Disjunction | Foo.qll:14:3:22:16 | Disjunction | semmle.label | 1 | -| Foo.qll:14:3:24:15 | Disjunction | Foo.qll:14:3:22:16 | Disjunction | semmle.order | 38 | -| Foo.qll:14:3:24:15 | Disjunction | Foo.qll:24:7:24:11 | AnyCall | semmle.label | 2 | -| Foo.qll:14:3:24:15 | Disjunction | Foo.qll:24:7:24:11 | AnyCall | semmle.order | 72 | +| Foo.qll:14:3:24:23 | Disjunction | Foo.qll:14:3:22:16 | Disjunction | semmle.label | 1 | +| Foo.qll:14:3:24:23 | Disjunction | Foo.qll:14:3:22:16 | Disjunction | semmle.order | 38 | +| Foo.qll:14:3:24:23 | Disjunction | Foo.qll:24:3:24:23 | ComparisonFormula | semmle.label | 2 | +| Foo.qll:14:3:24:23 | Disjunction | Foo.qll:24:3:24:23 | ComparisonFormula | semmle.order | 72 | | Foo.qll:16:3:16:29 | ComparisonFormula | Foo.qll:16:3:16:7 | String | semmle.label | 1 | | Foo.qll:16:3:16:29 | ComparisonFormula | Foo.qll:16:3:16:7 | String | semmle.order | 45 | | Foo.qll:16:3:16:29 | ComparisonFormula | Foo.qll:16:9:16:9 | ComparisonOp | semmle.label | 2 | @@ -290,7 +308,25 @@ edges | Foo.qll:22:7:22:16 | Aggregate[any] | Foo.qll:22:11:22:15 | VarDecl | semmle.order | 70 | | Foo.qll:22:11:22:15 | VarDecl | Foo.qll:22:11:22:13 | TypeExpr | semmle.label | 1 | | Foo.qll:22:11:22:15 | VarDecl | Foo.qll:22:11:22:13 | TypeExpr | semmle.order | 70 | +| Foo.qll:24:3:24:23 | ComparisonFormula | Foo.qll:24:3:24:3 | Integer | semmle.label | 1 | +| Foo.qll:24:3:24:23 | ComparisonFormula | Foo.qll:24:3:24:3 | Integer | semmle.order | 72 | +| Foo.qll:24:3:24:23 | ComparisonFormula | Foo.qll:24:5:24:5 | ComparisonOp | semmle.label | 2 | +| Foo.qll:24:3:24:23 | ComparisonFormula | Foo.qll:24:5:24:5 | ComparisonOp | semmle.order | 74 | +| Foo.qll:24:3:24:23 | ComparisonFormula | Foo.qll:24:7:24:23 | AddExpr | semmle.label | 3 | +| Foo.qll:24:3:24:23 | ComparisonFormula | Foo.qll:24:7:24:23 | AddExpr | semmle.order | 75 | +| Foo.qll:24:7:24:23 | AddExpr | Foo.qll:24:7:24:7 | Integer | semmle.label | 1 | +| Foo.qll:24:7:24:23 | AddExpr | Foo.qll:24:7:24:7 | Integer | semmle.order | 75 | +| Foo.qll:24:7:24:23 | AddExpr | Foo.qll:24:12:24:22 | AddExpr | semmle.label | 2 | +| Foo.qll:24:7:24:23 | AddExpr | Foo.qll:24:12:24:22 | AddExpr | semmle.order | 77 | +| Foo.qll:24:12:24:22 | AddExpr | Foo.qll:24:12:24:12 | Integer | semmle.label | 1 | +| Foo.qll:24:12:24:22 | AddExpr | Foo.qll:24:12:24:12 | Integer | semmle.order | 77 | +| Foo.qll:24:12:24:22 | AddExpr | Foo.qll:24:17:24:21 | AddExpr | semmle.label | 2 | +| Foo.qll:24:12:24:22 | AddExpr | Foo.qll:24:17:24:21 | AddExpr | semmle.order | 79 | +| Foo.qll:24:17:24:21 | AddExpr | Foo.qll:24:17:24:17 | Integer | semmle.label | 1 | +| Foo.qll:24:17:24:21 | AddExpr | Foo.qll:24:17:24:17 | Integer | semmle.order | 79 | +| Foo.qll:24:17:24:21 | AddExpr | Foo.qll:24:21:24:21 | Integer | semmle.label | 2 | +| Foo.qll:24:17:24:21 | AddExpr | Foo.qll:24:21:24:21 | Integer | semmle.order | 81 | | printAst.ql:1:1:1:29 | TopLevel | printAst.ql:1:1:1:28 | Import | semmle.label | 1 | -| printAst.ql:1:1:1:29 | TopLevel | printAst.ql:1:1:1:28 | Import | semmle.order | 73 | +| printAst.ql:1:1:1:29 | TopLevel | printAst.ql:1:1:1:28 | Import | semmle.order | 82 | graphProperties | semmle.graphKind | tree |