[sledge][NFC] Simplify Term rec module

Summary: Remove one duplicate of auxilliary type definitions.

Reviewed By: ngorogiannis

Differential Revision: D18298141

fbshipit-source-id: cfc5076c3

sledge/src/llair/term.ml

@@ -9,17 +9,14 @@
 
 [@@@warning "+9"]
 
-module rec T : sig
+type op1 =
-  type qset = Qset.M(T).t [@@deriving compare, equal, hash, sexp]
-
-  type op1 =
   | Signed of {bits: int}
   | Unsigned of {bits: int}
   | Convert of {src: Typ.t; dst: Typ.t}
   | Select of int
-  [@@deriving compare, equal, hash, sexp]
+[@@deriving compare, equal, hash, sexp]
 
-  type op2 =
+type op2 =
   | Eq
   | Dq
   | Lt
@@ -37,11 +34,14 @@ module rec T : sig
   | Splat
   | Memory
   | Update of int
-  [@@deriving compare, equal, hash, sexp]
+[@@deriving compare, equal, hash, sexp]
+
+type op3 = Conditional [@@deriving compare, equal, hash, sexp]
+type opN = Concat | Record [@@deriving compare, equal, hash, sexp]
+type recN = Record [@@deriving compare, equal, hash, sexp]
 
-  type op3 = Conditional [@@deriving compare, equal, hash, sexp]
+module rec T : sig
-  type opN = Concat | Record [@@deriving compare, equal, hash, sexp]
+  type qset = Qset.M(T).t [@@deriving compare, equal, hash, sexp]
-  type recN = Record [@@deriving compare, equal, hash, sexp]
 
   type t =
     | Add of qset
@@ -73,37 +73,6 @@ end
 and T0 : sig
   type qset = Qset.M(T).t [@@deriving compare, equal, hash, sexp]
 
-  type op1 =
-    | Signed of {bits: int}
-    | Unsigned of {bits: int}
-    | Convert of {src: Typ.t; dst: Typ.t}
-    | Select of int
-  [@@deriving compare, equal, hash, sexp]
-
-  type op2 =
-    | Eq
-    | Dq
-    | Lt
-    | Le
-    | Ord
-    | Uno
-    | Div
-    | Rem
-    | And
-    | Or
-    | Xor
-    | Shl
-    | Lshr
-    | Ashr
-    | Splat
-    | Memory
-    | Update of int
-  [@@deriving compare, equal, hash, sexp]
-
-  type op3 = Conditional [@@deriving compare, equal, hash, sexp]
-  type opN = Concat | Record [@@deriving compare, equal, hash, sexp]
-  type recN = Record [@@deriving compare, equal, hash, sexp]
-
   type t =
     | Add of qset
     | Mul of qset
@@ -121,37 +90,6 @@ and T0 : sig
 end = struct
   type qset = Qset.M(T).t [@@deriving compare, equal, hash, sexp]
 
-  type op1 =
-    | Signed of {bits: int}
-    | Unsigned of {bits: int}
-    | Convert of {src: Typ.t; dst: Typ.t}
-    | Select of int
-  [@@deriving compare, equal, hash, sexp]
-
-  type op2 =
-    | Eq
-    | Dq
-    | Lt
-    | Le
-    | Ord
-    | Uno
-    | Div
-    | Rem
-    | And
-    | Or
-    | Xor
-    | Shl
-    | Lshr
-    | Ashr
-    | Splat
-    | Memory
-    | Update of int
-  [@@deriving compare, equal, hash, sexp]
-
-  type op3 = Conditional [@@deriving compare, equal, hash, sexp]
-  type opN = Concat | Record [@@deriving compare, equal, hash, sexp]
-  type recN = Record [@@deriving compare, equal, hash, sexp]
-
   type t =
     | Add of qset
     | Mul of qset