--- asmcomp/asmlink.ml.orig Fri Jul 17 18:13:07 1998 +++ asmcomp/asmlink.ml Fri Jul 17 18:13:23 1998 @@ -140,7 +140,7 @@ Emit.begin_assembly(); let name_list = List.map (fun ui -> ui.ui_name) info_list in Asmgen.compile_phrase(Cmmgen.entry_point name_list); - let apply_functions = ref (IntSet.add 2 (IntSet.add 3 IntSet.empty)) in + let apply_functions = ref (IntSet.add 2 (IntSet.make 3)) in (* The callback functions always reference caml_apply[23] *) let curry_functions = ref IntSet.empty in --- asmcomp/reg.ml.orig Fri Jul 17 18:14:44 1998 +++ asmcomp/reg.ml Fri Jul 17 18:15:30 1998 @@ -116,7 +116,7 @@ match Array.length v with 0 -> Set.empty | 1 -> if Set.mem v.(0) s - then Set.add v.(0) Set.empty + then Set.make v.(0) else Set.empty | n -> let rec inter_all i = if i >= n then Set.empty @@ -127,7 +127,7 @@ let set_of_array v = match Array.length v with 0 -> Set.empty - | 1 -> Set.add v.(0) Set.empty + | 1 -> Set.make v.(0) | n -> let rec add_all i = if i >= n then Set.empty else Set.add v.(i) (add_all(i+1)) in add_all 0 --- lex/lexgen.ml.orig Fri Jul 17 18:16:55 1998 +++ lex/lexgen.ml Fri Jul 17 18:17:37 1998 @@ -118,8 +118,8 @@ let rec firstpos = function Empty -> TransSet.empty - | Chars pos -> TransSet.add (OnChars pos) TransSet.empty - | Action act -> TransSet.add (ToAction act) TransSet.empty + | Chars pos -> TransSet.make (OnChars pos) + | Action act -> TransSet.make (ToAction act) | Seq(r1,r2) -> if nullable r1 then TransSet.union (firstpos r1) (firstpos r2) else firstpos r1 @@ -128,8 +128,8 @@ let rec lastpos = function Empty -> TransSet.empty - | Chars pos -> TransSet.add (OnChars pos) TransSet.empty - | Action act -> TransSet.add (ToAction act) TransSet.empty + | Chars pos -> TransSet.make (OnChars pos) + | Action act -> TransSet.make (ToAction act) | Seq(r1,r2) -> if nullable r2 then TransSet.union (lastpos r1) (lastpos r2) else lastpos r2