[r2005-04-22 14:49:14 by afrisch] Empty log message

Original author: afrisch
Date: 2005-04-22 14:49:14+00:00

runtime/value.ml

@@ -734,6 +734,10 @@ let add v1 v2 = match (v1,v2) with
   | (Record r1, Record r2) -> Record (LabelMap.merge (fun x y -> y) r1 r2)
   | _ -> assert false
 
+let merge v1 v2 = match (v1,v2) with
+  | (Record r1, Record r2) -> Record (LabelMap.merge (fun x y -> y) r1 r2)
+  | _ -> assert false
+
 let sub v1 v2 = match (v1,v2) with
   | (Integer x, Integer y) -> Integer (Intervals.V.sub x y)
   | _ -> assert false

runtime/value.mli

@@ -143,6 +143,7 @@ val print_utf8: U.t -> unit
 
 
 val add: t -> t -> t
+val merge: t -> t -> t
 val sub: t -> t -> t
 val mul: t -> t -> t
 val div: t -> t -> t

typing/typer.ml

@@ -367,7 +367,6 @@ module IType = struct
 	  raise_loc_generic loc 
 	    ("Capture variable not allowed: " ^ (Ident.to_string x))
 
-  module Ids = Set.Make(Id)
   let type_defs env b =
     let _,b' = derecurs_def (penv env) b in
     elim_concats ();