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

drop kind from var

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2016-07-09 20:27:04 -07:00
parent 41ccd20a6e
commit 2e3ff68be6
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
parser.py
View file

@ -96,16 +96,15 @@ class STLVisitor(NodeVisitor):
visit_and = partialmethod(binop_visitor, op=stl.And) visit_and = partialmethod(binop_visitor, op=stl.And)
def visit_id(self, name, _): def visit_id(self, name, _):
var_kind, *_ = name.text return Symbol(name.text)
return stl.str_to_varkind[var_kind] , Symbol(name.text)
def visit_var(self, _, children): def visit_var(self, _, children):
(var_kind, iden), time_node = children iden, time_node = children
time_node = list(flatten(time_node)) time_node = list(flatten(time_node))
time = time_node[0] if len(time_node) > 0 else stl.t_sym time = time_node[0] if len(time_node) > 0 else stl.t_sym
return stl.Var(var_kind, iden, time) return stl.Var(iden, time)
def visit_time_index(self, _, children): def visit_time_index(self, _, children):
return children[3]* children[5] return children[3]* children[5]

4
stl.py
View file

@ -28,10 +28,10 @@ class LinEq(namedtuple("LinEquality", ["terms", "op", "const"])):
return [] return []
class Var(namedtuple("Var", ["kind", "id", "time"])): class Var(namedtuple("Var", ["id", "time"])):
def __repr__(self): def __repr__(self):
time_str = "[{}]".format(self.time) time_str = "[{}]".format(self.time)
return "{i}{t}".format(k=self.kind.name, i=self.id, t=time_str) return "{i}{t}".format(i=self.id, t=time_str)
class Interval(namedtuple('I', ['lower', 'upper'])): class Interval(namedtuple('I', ['lower', 'upper'])):