Finished infer-types pass

1 files changed, 29 insertions, 27 deletions

diff --git a/src/main/stanza/ir-utils.stanza b/src/main/stanza/ir-utils.stanza
index 4da64981..9e8c63c5 100644
--- a/src/main/stanza/ir-utils.stanza
+++ b/src/main/stanza/ir-utils.stanza
@@ -69,26 +69,26 @@ defmethod print (o:OutputStream, op:PrimOp) :
       SUB-WRAP-US-OP : "sub-wrap-us"
       SUB-WRAP-SU-OP : "sub-wrap-su"
       SUB-WRAP-SS-OP : "sub-wrap-ss"
-      LESS-OP : "less"
-      LESS-UU-OP : "less-uu"
-      LESS-US-OP : "less-us"
-      LESS-SU-OP : "less-su"
-      LESS-SS-OP : "less-ss"
-      LESS-EQ-OP : "less-eq"
-      LESS-EQ-UU-OP : "less-eq-uu"
-      LESS-EQ-US-OP : "less-eq-us"
-      LESS-EQ-SU-OP : "less-eq-su"
-      LESS-EQ-SS-OP : "less-eq-ss"
-      GREATER-OP : "greater"
-      GREATER-UU-OP : "greater-uu"
-      GREATER-US-OP : "greater-us"
-      GREATER-SU-OP : "greater-su"
-      GREATER-SS-OP : "greater-ss"
-      GREATER-EQ-OP : "greater-eq"
-      GREATER-EQ-UU-OP : "greater-eq-uu"
-      GREATER-EQ-US-OP : "greater-eq-us"
-      GREATER-EQ-SU-OP : "greater-eq-su"
-      GREATER-EQ-SS-OP : "greater-eq-ss"
+      LESS-OP : "lt"
+      LESS-UU-OP : "lt-uu"
+      LESS-US-OP : "lt-us"
+      LESS-SU-OP : "lt-su"
+      LESS-SS-OP : "lt-ss"
+      LESS-EQ-OP : "leq"
+      LESS-EQ-UU-OP : "leq-uu"
+      LESS-EQ-US-OP : "leq-us"
+      LESS-EQ-SU-OP : "leq-su"
+      LESS-EQ-SS-OP : "leq-ss"
+      GREATER-OP : "gt"
+      GREATER-UU-OP : "gt-uu"
+      GREATER-US-OP : "gt-us"
+      GREATER-SU-OP : "gt-su"
+      GREATER-SS-OP : "gt-ss"
+      GREATER-EQ-OP : "geq"
+      GREATER-EQ-UU-OP : "geq-uu"
+      GREATER-EQ-US-OP : "geq-us"
+      GREATER-EQ-SU-OP : "geq-su"
+      GREATER-EQ-SS-OP : "geq-ss"
       EQUAL-OP : "equal"
       EQUAL-UU-OP : "equal-uu"
       EQUAL-SS-OP : "equal-ss"
@@ -104,12 +104,12 @@ defmethod print (o:OutputStream, op:PrimOp) :
       AS-SINT-OP : "as-SInt"
       AS-SINT-U-OP : "as-SInt-u"
       AS-SINT-S-OP : "as-SInt-s"
-      SHIFT-LEFT-OP : "shift-left"
-      SHIFT-LEFT-U-OP : "shift-left-u"
-      SHIFT-LEFT-S-OP : "shift-left-s"
-      SHIFT-RIGHT-OP : "shift-right"
-      SHIFT-RIGHT-U-OP : "shift-right-u"
-      SHIFT-RIGHT-S-OP : "shift-right-s"
+      SHIFT-LEFT-OP : "shl"
+      SHIFT-LEFT-U-OP : "shl-u"
+      SHIFT-LEFT-S-OP : "shl-s"
+      SHIFT-RIGHT-OP : "shr"
+      SHIFT-RIGHT-U-OP : "shr-u"
+      SHIFT-RIGHT-S-OP : "shr-s"
       CONVERT-OP : "convert"
       CONVERT-U-OP : "convert-u"
       CONVERT-S-OP : "convert-s"
@@ -198,7 +198,9 @@ defmethod print (o:OutputStream, t:Type) :
             (w:UnknownWidth) : print-all(o, ["UInt"])
             (w) : print-all(o, ["UInt(" width(t) ")"])
       (t:SIntType) :
-         print-all(o, ["SInt(" width(t) ")"])
+         match(width(t)) :
+            (w:UnknownWidth) : print-all(o, ["SInt"])
+            (w) : print-all(o, ["SInt(" width(t) ")"])
       (t:BundleType) :
          print(o, "{")
          print-all(o, join(ports(t), ", "))