lurette 0.76 Wed, 28 Aug 2002 12:58:05 +0200 by jahier

Parent-Version:      0.75
Version-Log:

*.ml:
    Avoid using Sys.command  when possible.

Project-Description: Lurette

bin/Makefile.gen_stubs

@@ -14,7 +14,7 @@ OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
 
 SOURCES = $(LURETTE_PATH)/source/util.ml $(LURETTE_PATH)/source/gen_stubs.ml
 RESULT  = gen_stubs
-LIBS = str
+LIBS = str unix
 
 -include $(OCAMLMAKEFILE)
 

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 0 75)
-(Parent-Version lurette 0 74)
+(Project-Version lurette 0 76)
+(Parent-Version lurette 0 75)
 (Version-Log "
 
-makefile.lurette:
-bin/makefile.lurette_lib:
-    put all files that do not depend on lurette_stubs into a lib.
-
-source/lurettetop.ml:
-    Add a few new options (show, step, ...)
+*.ml:
+    Avoid using Sys.command  when possible.
 ")
 (New-Version-Log "")
-(Checkin-Time "Wed, 28 Aug 2002 11:13:06 +0200")
+(Checkin-Time "Wed, 28 Aug 2002 12:58:05 +0200")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -32,7 +28,7 @@ source/lurettetop.ml:
 
 ;; Sources files for lurette only
   (source/lurette.mli (lurette/11_lurette.ml 1.12 644))
-  (source/lurette.ml (lurette/12_lurette.ml 1.45 644))
+  (source/lurette.ml (lurette/12_lurette.ml 1.46 644))
 
   (source/command_line.ml (lurette/b/20_command_li 1.7 644))
   (source/command_line.mli (lurette/b/21_command_li 1.6 644))
@@ -56,13 +52,13 @@ source/lurettetop.ml:
   (source/parse_env.ml (lurette/41_parse_env. 1.20 644))
 
   (source/show_env.mli (lurette/42_show_env.m 1.7 644))
-  (source/show_env.ml (lurette/43_show_env.m 1.11 644))
+  (source/show_env.ml (lurette/43_show_env.m 1.12 644))
 
   (source/formula.mli (lurette/44_formula.ml 1.14 644))
   (source/formula.ml (lurette/45_formula.ml 1.16 644))
 
   (source/print.mli (lurette/46_print.mli 1.10 644))
-  (source/print.ml (lurette/47_print.ml 1.17 644))
+  (source/print.ml (lurette/47_print.ml 1.18 644))
 
   (source/eval.mli (lurette/48_eval.mli 1.10 644))
   (source/eval.ml (lurette/49_eval.ml 1.13 644))
@@ -80,7 +76,7 @@ source/lurettetop.ml:
   (source/gne.ml (lurette/b/37_gne.ml 1.2 644))
 
   (source/lurettetop.ml (lurette/c/1_lurettetop 1.2 644))
-  (source/gen_stubs.ml (lurette/24_generate_l 1.28 644))
+  (source/gen_stubs.ml (lurette/24_generate_l 1.29 644))
 
 ; little script that sets env vars and starts the lurette build
   (make_lurette (lurette/27_make_luret 1.15 755))
@@ -91,7 +87,7 @@ source/lurettetop.ml:
 
   (bin/Makefile.show_ima (lurette/b/40_Makefile.s 1.4 644))
   (bin/Makefile.ima_exe (lurette/b/41_Makefile.i 1.3 644))
-  (bin/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.1 644))
+  (bin/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.2 644))
   (bin/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.1 644))
 
 ;; Documentation

source/gen_stubs.ml

@@ -819,9 +819,7 @@ let update_file new_file old_file =
     not ((Sys.file_exists old_file)) ||
     ((Util.readfile old_file) <> (Util.readfile new_file))
   then 
-      if ((Sys.command ("mv " ^ new_file ^ " " ^ old_file)) <> 0) 
-      then assert false
-      else print_string ("... " ^ old_file ^ " successfully created.\n")
+    Unix.rename new_file old_file 
 	
 let main2 sut oracle =
   let sut_h = (sut ^ ".h") in

source/lurette.ml

@@ -179,8 +179,6 @@ and
     let env_llist = (get_env_from_args 4 []) in
     let () = Env_state.read_env_state env_llist in
 
-(*       XXX use unix lib primitive instead *)
-    let _ = Sys.command ("touch " ^ options.output ^ "; rm " ^ options.output) in
     let rif = open_out options.output in
     let local_var_name_and_type_list_unsorted0 = Env_state.loc_env_unsorted () in
     let local_var_name_and_type_list_unsorted = 

source/print.ml

@@ -181,7 +181,6 @@ let (bdd_with_dot: Bdd.t -> (int -> string) -> string -> unit) =
   fun bdd index_to_vn label ->
     let arcs = bdd_to_graph bdd (index_to_vn) in
     let dot_file = label ^ ".dot" in
-    let _ = Sys.command ("touch " ^ dot_file ^ "; rm " ^ dot_file) in 
     let ps_file = label ^ ".ps" in
     let dot_oc = open_out dot_file in 
     let put = output_string dot_oc in

source/show_env.ml

@@ -103,7 +103,6 @@ let (graph_to_dot: 'node list -> 'node list -> string ->
 	 ('node, 'arc) Graph.t -> unit) =
   fun pnodes cnodes str node2str arc2str graph ->
     let dot_file = str ^ ".dot" in
-    let _ = Sys.command ("rm -f " ^ dot_file) in 
     let ps_file = str ^ ".ps" in
     let dot_oc = open_out dot_file in 
       dump_graph dot_oc pnodes cnodes node2str arc2str graph ;