Fix for #141 (#142)

* Add Atom and Literal base classes to CDSL Ast. Change substitution() and copy() on Def/Apply/Rtl to support substituting Var->Union[Var, Literal]. Check in Apply() constructor kinds of passed in Literals respect instruction signature

* Change verify_semantics to check all possible instantiations of enumerated immediates (needed to descrive icmp). Add all bitvector comparison primitives and bvite; Change set_semantics to optionally accept XForms; Add semantics for icmp; Fix typing errors in semantics/{smtlib, elaborate, __init__}.py after the change of VarMap->VarAtomMap

* Forgot macros.py

* Nit obscured by testing with mypy enabled present.

* Typo

lib/cretonne/meta/cdsl/test_xform.py

@@ -80,15 +80,52 @@ class TestXForm(TestCase):
         dst = Rtl(b << icmp(intcc.eq, z, u))
         assert src.substitution(dst, {}) == {a: b, x: z, y: u}
 
-    def test_subst_enum_bad(self):
+    def test_subst_enum_var_const(self):
         src = Rtl(a << icmp(CC1, x, y))
         dst = Rtl(b << icmp(intcc.eq, z, u))
-        assert src.substitution(dst, {}) is None
+        assert src.substitution(dst, {}) == {CC1: intcc.eq, x: z, y: u, a: b},\
+            "{} != {}".format(src.substitution(dst, {}),
+                              {CC1: intcc.eq, x: z, y: u, a: b})
 
         src = Rtl(a << icmp(intcc.eq, x, y))
         dst = Rtl(b << icmp(CC1, z, u))
-        assert src.substitution(dst, {}) is None
+        assert src.substitution(dst, {}) == {CC1: intcc.eq, x: z, y: u, a: b}
 
+    def test_subst_enum_bad(self):
         src = Rtl(a << icmp(intcc.eq, x, y))
         dst = Rtl(b << icmp(intcc.sge, z, u))
         assert src.substitution(dst, {}) is None
+
+    def test_subst_enum_bad_var_const(self):
+        a1 = Var('a1')
+        x1 = Var('x1')
+        y1 = Var('y1')
+
+        b1 = Var('b1')
+        z1 = Var('z1')
+        u1 = Var('u1')
+
+        # Var mapping to 2 different constants
+        src = Rtl(a << icmp(CC1, x, y),
+                  a1 << icmp(CC1, x1, y1))
+        dst = Rtl(b << icmp(intcc.eq, z, u),
+                  b1 << icmp(intcc.sge, z1, u1))
+
+        assert src.substitution(dst, {}) is None
+
+        # 2 different constants mapping to the same var
+        src = Rtl(a << icmp(intcc.eq, x, y),
+                  a1 << icmp(intcc.sge, x1, y1))
+        dst = Rtl(b << icmp(CC1, z, u),
+                  b1 << icmp(CC1, z1, u1))
+
+        assert src.substitution(dst, {}) is None
+
+        # Var mapping to var and constant - note that full unification would
+        # have allowed this.
+        src = Rtl(a << icmp(CC1, x, y),
+                  a1 << icmp(CC1, x1, y1))
+        dst = Rtl(b << icmp(CC2, z, u),
+                  b1 << icmp(intcc.sge, z1, u1))
+
+        assert src.substitution(dst, {}) is None