Add support for UnaryOp.

whitequark · whitequark · commit c89bf6fae035 · 2015-06-12T08:59:41.000+03:00
diff --git a/artiq/py2llvm/types.py b/artiq/py2llvm/types.py
@@ -180,6 +180,18 @@ def TList(elt=None):
     return TMono("list", {"elt": elt})
 
 
+def is_var(typ):
+    return isinstance(typ, TVar)
+
+def is_mono(typ, name, **params):
+    return isinstance(typ, TMono) and \
+        typ.name == name and typ.params == params
+
+def is_numeric(typ):
+    return isinstance(typ, TMono) and \
+        typ.name in ('int', 'float')
+
+
 class TypePrinter(object):
     """
     A class that prints types using Python-like syntax and gives
diff --git a/artiq/py2llvm/typing.py b/artiq/py2llvm/typing.py
@@ -284,6 +284,27 @@ def visit_BoolOp(self, node):
                                 op_locs=node.op_locs, loc=node.loc)
         return self.visit(node)
 
+    def visit_UnaryOp(self, node):
+        node = self.generic_visit(node)
+        node = asttyped.UnaryOpT(type=types.TVar(),
+                                 op=node.op, operand=node.operand,
+                                 loc=node.loc)
+        return self.visit(node)
+
+    def visit_BinOp(self, node):
+        node = self.generic_visit(node)
+        node = asttyped.BinOpT(type=types.TVar(),
+                               left=node.left, op=node.op, right=node.right,
+                               loc=node.loc)
+        return self.visit(node)
+
+    def visit_Compare(self, node):
+        node = self.generic_visit(node)
+        node = asttyped.CompareT(type=types.TVar(),
+                                 left=node.left, ops=node.ops, comparators=node.comparators,
+                                 loc=node.loc)
+        return self.visit(node)
+
     # Visitors that just unify types
     #
     def visit_ListT(self, node):
@@ -310,6 +331,21 @@ def visit_BoolOpT(self, node):
                         node.loc, value.loc, self._makenotes_elts(node.values, "an operand"))
         return node
 
+    def visit_UnaryOpT(self, node):
+        if isinstance(node.op, ast.Not):
+            node.type = types.TBool()
+        else:
+            operand_type = node.operand.type.find()
+            if types.is_numeric(operand_type):
+                node.type = operand_type
+            elif not types.is_var(operand_type):
+                diag = diagnostic.Diagnostic("error",
+                    "expected operand to be of numeric type, not {type}",
+                    {"type": types.TypePrinter().name(operand_type)},
+                    node.operand.loc)
+                self.engine.process(diag)
+        return node
+
     def visit_Assign(self, node):
         node = self.generic_visit(node)
         if len(node.targets) > 1:
@@ -375,7 +411,6 @@ def visit_unsupported(self, node):
     visit_SetComp = visit_unsupported
     visit_Str = visit_unsupported
     visit_Starred = visit_unsupported
-    visit_UnaryOp = visit_unsupported
     visit_Yield = visit_unsupported
     visit_YieldFrom = visit_unsupported
 
diff --git a/lit-test/py2llvm/typing/error_unify.py b/lit-test/py2llvm/typing/error_unify.py
@@ -16,3 +16,6 @@
 1 and False
 # CHECK-L: note: an operand of type int(width='a)
 # CHECK-L: note: an operand of type bool
+
+# CHECK-L: ${LINE:+1}: error: expected operand to be of numeric type, not list(elt='a)
+~[]
diff --git a/lit-test/py2llvm/typing/unify.py b/lit-test/py2llvm/typing/unify.py
@@ -41,3 +41,9 @@
 
 1 and 0
 # CHECK-L: 1:int(width='g) and 0:int(width='g):int(width='g)
+
+~1
+# CHECK-L: 1:int(width='h):int(width='h)
+
+not 1
+# CHECK-L: 1:int(width='i):bool
