Fix key, value in membership and some-in

Signed-off-by: Anand Krishnamoorthi <anakrish@microsoft.com>
This commit is contained in:
Anand Krishnamoorthi
2023-02-20 07:57:30 -08:00
committed by Anand Krishnamoorthi
parent 3549931342
commit eded43bdc6
10 changed files with 60 additions and 74 deletions

View File

@@ -29,7 +29,7 @@ cases:
expr:
var: y
bodies: []
- note: case2-array
rego: |
package test
@@ -56,7 +56,7 @@ cases:
var: y
- number: 5
bodies: []
- note: case3-compr
rego: |
package test
@@ -92,7 +92,7 @@ cases:
set:
- number: 5
bodies: []
- note: case4-array
rego: |
package test
@@ -119,14 +119,14 @@ cases:
rhs:
var: y
- inexpr:
key:
value:
number: 5
collection:
set:
- number: 5
- number: 6
- number: 6
bodies: []
- note: case5-array
rego: |
package test
@@ -159,7 +159,7 @@ cases:
rhs:
var: y
- inexpr:
key:
value:
number: 5
collection:
set:
@@ -206,4 +206,3 @@ cases:
set:
- number: 5
bodies: []

View File

@@ -24,7 +24,7 @@ cases:
op: "="
value:
inexpr:
key:
value:
number: 5
collection:
array:
@@ -40,9 +40,9 @@ cases:
op: "="
value:
inexpr:
key:
value:
inexpr:
key:
value:
number: 5
collection:
array:

View File

@@ -39,7 +39,7 @@ cases:
op: "="
value:
inexpr:
key:
value:
inexpr:
key:
number: 0
@@ -50,4 +50,3 @@ cases:
collection:
var: d
bodies: []

View File

@@ -153,11 +153,11 @@ cases:
string: q
- key:
inexpr:
key:
value:
string: r
collection:
string: d
value:
string: e
bodies: []

View File

@@ -29,7 +29,7 @@ cases:
expr:
var: y
bodies: []
- note: case2-set
rego: |
package test
@@ -56,7 +56,7 @@ cases:
var: y
- number: 5
bodies: []
- note: case3-compr
rego: |
package test
@@ -92,7 +92,7 @@ cases:
set:
- number: 5
bodies: []
- note: case4-set
rego: |
package test
@@ -119,14 +119,14 @@ cases:
rhs:
var: y
- inexpr:
key:
value:
number: 5
collection:
set:
- number: 5
- number: 6
- number: 6
bodies: []
- note: case5-set
rego: |
package test
@@ -159,7 +159,7 @@ cases:
rhs:
var: y
- inexpr:
key:
value:
number: 5
collection:
set:
@@ -206,4 +206,3 @@ cases:
set:
- number: 5
bodies: []

View File

@@ -34,7 +34,7 @@ cases:
- span: some a in {1}
literal:
some-decl:
key:
value:
var: a
collection:
set:
@@ -140,8 +140,8 @@ cases:
y = a
}
error: expecting `}` while parsing query
- note: multi-line-parsed as membership
- note: multi-line-parsed-as-membership
rego: |
package test
import future.keywords.in
@@ -165,7 +165,7 @@ cases:
assign:
op: :=
value:
number: 5
number: 5
bodies: []
- spec:
head:
@@ -189,7 +189,7 @@ cases:
expr:
inexpr:
span: b in {4, 5}
key:
value:
var: b
collection:
set:
@@ -221,6 +221,3 @@ cases:
var: y
rhs:
var: a

View File

@@ -226,8 +226,8 @@ fn match_expr_impl(e: &Expr, v: &Value) -> Result<()> {
collection,
} => {
match_span_opt(span, &v["inexpr"]["span"])?;
match_expr(key, &v["inexpr"]["key"])?;
match_expr_opt(span, value, &v["inexpr"]["value"])?;
match_expr_opt(span, key, &v["inexpr"]["key"])?;
match_expr(value, &v["inexpr"]["value"])?;
match_expr(collection, &v["inexpr"]["collection"])
}
}
@@ -494,8 +494,8 @@ fn match_literal(l: &Literal, v: &Value) -> Result<()> {
} => {
let v = &v["some-decl"];
match_span_opt(span, &v["span"])?;
match_expr(key, &v["key"])?;
match_expr_opt(span, value, &v["value"])?;
match_expr(value, &v["value"])?;
match_expr_opt(span, key, &v["key"])?;
match_expr(collection, &v["collection"])
}
Literal::Expr { expr, .. } => match_expr(expr, &v["expr"]),