From 2e3ff68be69aee9ad078f61a481c808dbcfd8c75 Mon Sep 17 00:00:00 2001
From: Marcell Vazquez-Chanlatte <mvc@linux.com>
Date: Sat, 9 Jul 2016 20:27:04 -0700
Subject: [PATCH] drop kind from var

---
 parser.py | 7 +++----
 stl.py    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/parser.py b/parser.py
index 1295fb6..dd204a4 100644
--- a/parser.py
+++ b/parser.py
@@ -96,16 +96,15 @@ class STLVisitor(NodeVisitor):
     visit_and = partialmethod(binop_visitor, op=stl.And)
 
     def visit_id(self, name, _):
-        var_kind, *_ = name.text
-        return stl.str_to_varkind[var_kind] , Symbol(name.text)
+        return Symbol(name.text)
 
     def visit_var(self, _, children):
-        (var_kind, iden), time_node = children
+        iden, time_node = children
 
         time_node = list(flatten(time_node))
         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):
         return children[3]* children[5]
diff --git a/stl.py b/stl.py
index 3834ffb..5adf66b 100644
--- a/stl.py
+++ b/stl.py
@@ -28,10 +28,10 @@ class LinEq(namedtuple("LinEquality", ["terms", "op", "const"])):
         return []
 
 
-class Var(namedtuple("Var", ["kind", "id", "time"])):
+class Var(namedtuple("Var", ["id", "time"])):
     def __repr__(self):
         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'])):