teaching/mtl-aas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support overwritting default interval

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2017-02-25 23:48:34 -08:00
parent 4c5924782d
commit 00eec50f79
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
stl/parser.py
View file

@ -68,9 +68,11 @@ __ = ~r"\s"*
EOL = "\\n" EOL = "\\n"
''') ''')
default_interval = ast.Interval(0, float('inf'))
class STLVisitor(NodeVisitor): class STLVisitor(NodeVisitor):
def __init__(self, H=float('inf')):
super().__init__()
self.default_interval = ast.Interval(0, H)
def generic_visit(self, _, children): def generic_visit(self, _, children):
return children return children
@ -94,7 +96,7 @@ class STLVisitor(NodeVisitor):
def unary_temp_op_visitor(self, _, children, op): def unary_temp_op_visitor(self, _, children, op):
_, i, phi = children _, i, phi = children
i = default_interval if not i else i[0] i = self.default_interval if not i else i[0]
return op(i, phi) return op(i, phi)
def binop_visitor(self, _, children, op): def binop_visitor(self, _, children, op):
@ -117,7 +119,7 @@ class STLVisitor(NodeVisitor):
def visit_until(self, _, children): def visit_until(self, _, children):
_, _, phi1, _, _, i, _, phi2, *_ = children _, _, phi1, _, _, i, _, phi2, *_ = children
i = default_interval if not i else i[0] i = self.default_interval if not i else i[0]
return ast.Until(i, phi1, phi2) return ast.Until(i, phi1, phi2)
def visit_id(self, name, _): def visit_id(self, name, _):
@ -178,5 +180,5 @@ class STLVisitor(NodeVisitor):
return ast.Neg(children[1]) return ast.Neg(children[1])
def parse(stl_str:str, rule:str="phi") -> "STL": def parse(stl_str:str, rule:str="phi", H=float('inf')) -> "STL":
return STLVisitor().visit(STL_GRAMMAR[rule].parse(stl_str)) return STLVisitor(H).visit(STL_GRAMMAR[rule].parse(stl_str))