aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/frontend/src
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects/frontend/src')
-rw-r--r--subprojects/frontend/src/index.tsx2
-rw-r--r--subprojects/frontend/src/language/problem.grammar10
2 files changed, 5 insertions, 7 deletions
diff --git a/subprojects/frontend/src/index.tsx b/subprojects/frontend/src/index.tsx
index 0616007a..78e469cd 100644
--- a/subprojects/frontend/src/index.tsx
+++ b/subprojects/frontend/src/index.tsx
@@ -37,7 +37,7 @@ pred invalidTaxStatus(Person p) <->
37rule createChild(p, newPerson): 37rule createChild(p, newPerson):
38 may children(p, newPerson), 38 may children(p, newPerson),
39 may !equals(newPerson, newPerson) 39 may !equals(newPerson, newPerson)
40==> new q: newPerson, 40==> new q <: newPerson,
41 children(p, q), 41 children(p, q),
42 taxStatus(q, child). 42 taxStatus(q, child).
43 43
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar
index 58c398a3..f3794e27 100644
--- a/subprojects/frontend/src/language/problem.grammar
+++ b/subprojects/frontend/src/language/problem.grammar
@@ -58,10 +58,8 @@ Conjunction { ("," | Literal)+ }
58OrOp { ";" } 58OrOp { ";" }
59 59
60Literal { 60Literal {
61 Modality? ( 61 Modality? (NotOp | ckw<"count">)? Modality? Atom
62 NotOp? Modality? Atom ((":" | "=") LogicValue)? | 62 ((":=" | "<:") LogicValue | ComparisonOp int)?
63 ckw<"count"> "{" Modality? Atom "}" ComparisonOp int
64 )
65} 63}
66 64
67Atom { RelationName "+"? ParameterList<Argument> } 65Atom { RelationName "+"? ParameterList<Argument> }
@@ -69,7 +67,7 @@ Atom { RelationName "+"? ParameterList<Argument> }
69Consequent { ("," | Action)+ } 67Consequent { ("," | Action)+ }
70 68
71Action { 69Action {
72 ckw<"new"> VariableName (":" VariableName)? | 70 ckw<"new"> VariableName ("<:" VariableName)? |
73 ckw<"delete"> VariableName | 71 ckw<"delete"> VariableName |
74 Literal 72 Literal
75} 73}
@@ -146,7 +144,7 @@ sep1<separator, content> { content (separator content)* }
146 "\"" (![\\"\n] | "\\" (![\n] | "\n"))* "\"" 144 "\"" (![\\"\n] | "\\" (![\n] | "\n"))* "\""
147 } 145 }
148 146
149 ComparisonOp { ">" | ">=" | "<" | "<=" | "=:=" | "=!=" } 147 ComparisonOp { ">" | ">=" | "<" | "<=" | "==" }
150 148
151 NotOp { "!" } 149 NotOp { "!" }
152 150