fix a typo in type_to_tag

Author: jsiek

interp_Ctup.py

@@ -4,6 +4,13 @@
 
 class InterpCtup(InterpCif):
 
+  def interp_cmp(self, cmp):
+    match cmp:
+      case Is():
+        return lambda x, y: x is y
+      case _:
+        return super().interp_cmp(cmp)
+      
   def interp_exp(self, e, env):
     match e:
       case Tuple(es, Load()):

interp_Lany.py

@@ -21,7 +21,7 @@ def type_to_tag(self, typ):
         case IntType():
           return 'int'
         case BoolType():
-          return 'int'
+          return 'bool'
         case _:
           raise Exception('type_to_tag unexpected ' + repr(typ))
 

interp_Lvar.py

@@ -12,8 +12,8 @@ def interp_exp(self, e, env):
 
   def interp_stmt(self, s, env, cont):
     match s:
-      case Assign([lhs], value):
-        env[lhs.id] = self.interp_exp(value, env)
+      case Assign([Name(id)], value):
+        env[id] = self.interp_exp(value, env)
         return self.interp_stmts(cont, env)
       case _:
         return super().interp_stmt(s, env, cont)

type_check_Ctup.py

@@ -22,6 +22,11 @@ def check_type_equal(self, t1, t2, e):
 
   def type_check_exp(self, e, env):
     match e:
+        case Compare(left, [cmp], [right]) if isinstance(cmp, Is):
+          l = self.type_check_exp(left, env)
+          r = self.type_check_exp(right, env)
+          self.check_type_equal(l, r, e)
+          return BoolType()
         case Allocate(length, typ):
           return typ
         case GlobalValue(name):

utils.py

@@ -289,7 +289,7 @@ def repr_Not(self):
 
 
 def str_UnaryOp(self):
-    return str(self.op) + str(self.operand)
+    return str(self.op) + ' ' + str(self.operand)
 
 
 UnaryOp.__str__ = str_UnaryOp
@@ -469,6 +469,20 @@ def repr_GtE(self):
 GtE.__repr__ = repr_GtE
 
 
+def str_Is(self):
+    return 'is'
+
+
+Is.__str__ = str_Is
+
+
+def repr_Is(self):
+    return 'Is()'
+
+
+Is.__repr__ = repr_Is
+
+
 def str_Tuple(self):
     return '(' + ', '.join([str(e) for e in self.elts]) + ',)'
 
@@ -863,7 +877,7 @@ class Closure(expr):
     __match_args__ = ("arity", "args")
 
     def __str__(self):
-        return 'closure[' + repr(self.arity) + '](' + ', '.join([str(e) for e in self.args]) + ')'
+        return 'closure{' + repr(self.arity) + '}(' + ', '.join([str(e) for e in self.args]) + ')'
 
 
 @dataclass