Commits

camlspotter committed 164616a

simplif

Comments (0)

Files changed (5)

    lmodule
    lbuilder_intf
    lbuilder
-#  lbuilder2_intf
-#  lbuilder2
    lwrap_intf
    lwrap
-#  lwrap2_intf
-#  lwrap2
    lgenvalue
 
 OCAML_LIBS +=
   (* void pointer is special in LLVM. It is illegal! *)
   type void_pointer = i8 pointer
 
-  module type Tagged = sig
-    val tags : ('a, ('tag * lltype)) P.ts -> 'tag list
-    val types : ('a, ('tag * lltype)) P.ts -> 'a typs
-    val combine : 'tag list -> 'a typs -> ('a, ('tag * lltype)) P.ts
-    val tag : 'tag -> 'a typ -> ('a, ('tag * lltype)) P.t
-  end
-
-  module Tagged = struct
+  module WithString = struct
     let tags ts = List.map fst (P.to_list ts)
     let types (ts : ('a, 'tag * lltype) P.ts) : 'a typs = 
       P.unsafe_of_list (List.map snd (P.to_list ts))
       P.unsafe_of_list (List.combine tags (P.to_list ts))
     let tag t (v : ('a, lltype) P.t) : ('a, ('tag * lltype)) P.t = P.unsafe (t, !<v)
   end
-  
-  module WithString = Tagged
 end
 
 open Base
   and type 'a vector = 'a vector
   and type ('a, 'b) array_ = ('a, 'b) array_
   and type void_pointer = void_pointer
-  and module Tagged = Base.Tagged
   and module WithString = Base.WithString
   (* void pointer is special in LLVM. It is illegal! *)
   type void_pointer = i8 pointer
 
-  module type Tagged = sig
+  module WithString : sig
     val tags : ('a, ('tag * Llvm.lltype)) ts -> 'tag list
     val types : ('a, ('tag * Llvm.lltype)) ts -> 'a typs
     val combine : 'tag list -> 'a typs -> ('a, ('tag * Llvm.lltype)) ts
     val tag : 'tag -> 'a typ -> ('a, ('tag * Llvm.lltype)) t
   end
-
-  module Tagged : Tagged
-  module WithString : Tagged
 end
 
 module type S = sig
       and type 'a vector = 'a vector
       and type ('a, 'b) array_ = ('a, 'b) array_
       and type void_pointer = void_pointer
-      and module Tagged = Tagged
-      and module WithString = WithString
 
     (* Type related functions originally defined in Lvalue.ml *)	
     val size_i64_of : 'a typ -> i64 v