Stdin, stdout and stderr updated, tested.

[Faustine.git] / interpreter / main.ml

diff --git a/interpreter/main.ml b/interpreter/main.ml
index 3c5ef42..7275d01 100644 (file)
--- a/interpreter/main.ml
+++ b/interpreter/main.ml
@@ -34,7 +34,7 @@ let size_input = ref 0;;
 let inputs = ref [];;
 let time_max = ref 0xFFFF;;
 let dir_output = ref "";;
 let inputs = ref [];;
 let time_max = ref 0xFFFF;;
 let dir_output = ref "";;

-let format_output = ref "csv";;
+let format_output = ref "";;

 let basename_output = ref "";;
 let output = ref "";;
 
 let basename_output = ref "";;
 let output = ref "";;
 


@@ -77,20 +77,15 @@ let stdio = fun (x : unit) ->
 
 let main () = 
 
 
 let main () = 
 

-(*
-       let () = print_endline (Unix.readlink "/proc/self/fd/0") in
-       let () = print_endline (Unix.readlink "/proc/self/fd/1") in
-       let () = print_endline (Unix.readlink "/proc/self/fd/2") in
-*)
-        let () = stdio () in 

        let () = Arg.parse speclist option_unknown option_usage in
        let () = Arg.parse speclist option_unknown option_usage in

+        let () = stdio () in 

         let _ = Sys.signal Sys.sigalrm Sys.Signal_ignore in
        let _ = set_GC () in
        let io = new iomanager in
        let () = io#set !output !dir_output !format_output !basename_output in
 
 
         let _ = Sys.signal Sys.sigalrm Sys.Signal_ignore in
        let _ = set_GC () in
        let io = new iomanager in
        let () = io#set !output !dir_output !format_output !basename_output in
 
 

-       let () = output_string stderr ("    Faustine -> Reading input ...") in
+       let () = output_string stderr ("\n    Faustine -> Reading input ...") in

        let tic0 = Unix.time () in
        let input : beam = io#read !inputs in
        let toc0 = Unix.time () in
        let tic0 = Unix.time () in
        let input : beam = io#read !inputs in
        let toc0 = Unix.time () in