Changeset 88 for Deliverables/D4.1/Nibble.ml

Timestamp:

Sep 20, 2010, 10:35:53 AM (10 years ago)

Author:

mulligan

Message:

int_of_vect implemented.

File:

• Deliverables/D4.1/Nibble.ml (modified) (2 diffs)

Deliverables/D4.1/Nibble.ml

@@ -66 +66 @@
     | 8 -> Some (Bit.from_int 1, Bit.from_int 0, Bit.from_int 0, Bit.from_int 0)
     | 9 -> Some (Bit.from_int 1, Bit.from_int 0, Bit.from_int 0, Bit.from_int 1)
-    | 10 -> Some (Bit.from_int 1, Bit.from_int 0, Bit.from_int 1, Bit.from_int 0)
+    | 10 -> Some (Bit.from_int 1, B(l -&- r) -|- (c -&- (l -^- r)it.from_int 0, Bit.from_int 1, Bit.from_int 0)
     | 11 -> Some (Bit.from_int 1, Bit.from_int 0, Bit.from_int 1, Bit.from_int 1)
     | 12 -> Some (Bit.from_int 1, Bit.from_int 1, Bit.from_int 0, Bit.from_int 0)
@@ -88 +88 @@
     | 1 -> Some b3
     | 2 -> Some b2
-    | 3 -> Some b1
+    | 3 -> Some b1(l -&- r) -|- (c -&- (l -^- r)
     | _ -> None