implement negation
This commit is contained in:
parent
bfe74e9843
commit
652fdde4d4
1 changed files with 8 additions and 3 deletions
|
|
@ -21,12 +21,14 @@ from sympy import Symbol, Number
|
||||||
from stl import ast
|
from stl import ast
|
||||||
|
|
||||||
STL_GRAMMAR = Grammar(u'''
|
STL_GRAMMAR = Grammar(u'''
|
||||||
phi = (g / f / until / lineq / AP / or / and / paren_phi)
|
phi = (g / f / until / lineq / AP / or / and / neg / paren_phi)
|
||||||
|
|
||||||
paren_phi = "(" __ phi __ ")"
|
paren_phi = "(" __ phi __ ")"
|
||||||
|
|
||||||
or = paren_phi _ ("∨" / "or") _ (or / paren_phi)
|
or = paren_phi _ ("∨" / "or" / "|") _ (or / paren_phi)
|
||||||
and = paren_phi _ ("∧" / "and") _ (and / paren_phi)
|
and = paren_phi _ ("∧" / "and" / "&") _ (and / paren_phi)
|
||||||
|
|
||||||
|
neg = ("~" / "¬") paren_phi
|
||||||
|
|
||||||
f = F interval phi
|
f = F interval phi
|
||||||
g = G interval phi
|
g = G interval phi
|
||||||
|
|
@ -157,6 +159,9 @@ class STLVisitor(NodeVisitor):
|
||||||
def visit_AP(self, node, _):
|
def visit_AP(self, node, _):
|
||||||
return ast.AtomicPred(node.text)
|
return ast.AtomicPred(node.text)
|
||||||
|
|
||||||
|
def visit_neg(self, _, children):
|
||||||
|
return ast.Neg(children[1])
|
||||||
|
|
||||||
|
|
||||||
def parse(stl_str:str, rule:str="phi") -> "STL":
|
def parse(stl_str:str, rule:str="phi") -> "STL":
|
||||||
return STLVisitor().visit(STL_GRAMMAR[rule].parse(stl_str))
|
return STLVisitor().visit(STL_GRAMMAR[rule].parse(stl_str))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue