Nested vectors are implemented, including parser and class nstio.

[Faustine.git] / interpreter / main.ml

diff --git a/interpreter/main.ml b/interpreter/main.ml
index 94b0ae1..4444646 100644 (file)
--- a/interpreter/main.ml
+++ b/interpreter/main.ml
@@ -36,20 +36,20 @@ let time_max = ref 0xFFFF;;
 let dir_output = ref "";;
 let format_output = ref "";;
 let basename_output = ref "";;
 let dir_output = ref "";;
 let format_output = ref "";;
 let basename_output = ref "";;

-let output = ref "";;
+let stdout_filename = ref "";;

 
 let option_usage = "usage: " ^ Sys.argv.(0) 
 
 let option_usage = "usage: " ^ Sys.argv.(0) 

-  ^ " [-f dsp_src] [-i input] [-l length] [--odir dir] [--oformat wav/csv] [--obasename name]";;
+  ^ " [-f dsp_src] [-i input] [-l length] [--odir dir] [--oformat wav/csv/nst] [--obasename name]";;

 
 let option_unknown = 
   fun x -> raise (Arg.Bad ("Bad argument : " ^ x))
 
 let speclist = [
   ("-f", Arg.String (fun s -> path_dsp := s), ": faust .dsp source file");
 
 let option_unknown = 
   fun x -> raise (Arg.Bad ("Bad argument : " ^ x))
 
 let speclist = [
   ("-f", Arg.String (fun s -> path_dsp := s), ": faust .dsp source file");

-  ("-i", Arg.String (fun s -> incr size_input; inputs := !inputs @ [s]), ": set input wave file");
+  ("-i", Arg.String (fun s -> incr size_input; inputs := !inputs @ [s]), ": set input file");

   ("-l", Arg.Int (fun i -> time_max := i), ": maximun number of output samples");
   ("--odir", Arg.String (fun s -> dir_output := s), ": set output directory");
   ("-l", Arg.Int (fun i -> time_max := i), ": maximun number of output samples");
   ("--odir", Arg.String (fun s -> dir_output := s), ": set output directory");

-  ("--oformat", Arg.String (fun s -> format_output := s), ": set output format");
+  ("--oformat", Arg.String (fun s -> format_output := s), ": set output format wav/csv/nst");

   ("--obasename", Arg.String (fun s -> basename_output := s), ": set output basename");
   ];;
  
   ("--obasename", Arg.String (fun s -> basename_output := s), ": set output basename");
   ];;
  


@@ -59,18 +59,22 @@ let file_of_path : string -> string =
     let n = List.length fragments in
     List.nth fragments (n - 1);;  
 
     let n = List.length fragments in
     List.nth fragments (n - 1);;  
 

-let valid_input_file : string -> bool = 
+let get_extension : string -> string = 

   fun (file : string) ->
     let fragments = Str.split (Str.regexp "\.") file in
     let n = List.length fragments in
   fun (file : string) ->
     let fragments = Str.split (Str.regexp "\.") file in
     let n = List.length fragments in

-    let extension = List.nth fragments (n - 1) in
-    if extension = "csv" || extension = "wav" then true
+    List.nth fragments (n - 1);;
+
+let chk_extension : string -> bool = 
+  fun (file : string) ->
+    let extension = get_extension file in
+    if extension = "csv" || extension = "wav" || extension = "nst" then true

     else false;;
 
 let chk_input_path : string -> bool =
   fun (path : string) ->
     let file_in = file_of_path path in
     else false;;
 
 let chk_input_path : string -> bool =
   fun (path : string) ->
     let file_in = file_of_path path in

-    valid_input_file file_in;;
+    chk_extension file_in;;

 
 let stdinput = fun (x : unit) ->
   let path = Unix.readlink "/proc/self/fd/0" in
 
 let stdinput = fun (x : unit) ->
   let path = Unix.readlink "/proc/self/fd/0" in


@@ -88,7 +92,7 @@ let chk_output_path : string -> bool =
 
 let stdoutput = fun (x : unit) ->
   let path = Unix.readlink "/proc/self/fd/1" in
 
 let stdoutput = fun (x : unit) ->
   let path = Unix.readlink "/proc/self/fd/1" in

-  if chk_output_path path then output := path
+  if chk_output_path path then stdout_filename := path

   else ();;
 
 let stdio = fun (x : unit) -> 
   else ();;
 
 let stdio = fun (x : unit) -> 


@@ -102,7 +106,7 @@ let main () =
         let _ = Sys.signal Sys.sigalrm Sys.Signal_ignore in
        let _ = set_GC () in
        let io = new iomanager 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 () = io#set !stdout_filename !dir_output !format_output !basename_output in

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


@@ -134,23 +138,44 @@ let main () =
        let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc3 -. tic3)) ^ "s.)\n") in
 
 
        let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc3 -. tic3)) ^ "s.)\n") in
 
 

-       let () = output_string stderr ("    Faustine -> Evaluating...") in
-       let tic4 = Unix.time () in
-       let data = output#output !time_max in
-       let rates = output#frequency in
-       let toc4 = Unix.time () in
-       let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc4 -. tic4)) ^ "s.)\n") in
-
-
-       let () = output_string stderr ("    Faustine -> Writing output...") in
-       let tic5 = Unix.time () in
-       let output_paths = io#write rates data in
-       let toc5 = Unix.time () in
-       let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc5 -. tic5)) ^ "s.)\n") in
-
-       let _ = Array.map (output_string stderr)  
-           (Array.map decorate output_paths) in
-       ();;
+        if (!stdout_filename = "" && !format_output = "") || (!format_output = "nst") 
+               || (!stdout_filename <> "" && (get_extension !stdout_filename) = "nst") then (
+          let () = output_string stderr ("    Faustine -> Evaluating...") in
+         let tic4 = Unix.time () in
+         let raws = output#output_values !time_max in
+         let rates = output#frequency in
+         let toc4 = Unix.time () in
+         let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc4 -. tic4)) ^ "s.)\n") in
+
+
+         let () = output_string stderr ("    Faustine -> Writing output...") in
+         let tic5 = Unix.time () in
+         let output_paths = io#write_nst rates raws in
+         let toc5 = Unix.time () in
+         let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc5 -. tic5)) ^ "s.)\n") in
+
+         let _ = Array.map (output_string stderr) (Array.map decorate output_paths) in
+         ()
+        )
+
+        else (
+         let () = output_string stderr ("    Faustine -> Evaluating...") in
+         let tic6 = Unix.time () in
+         let data = output#output !time_max in
+         let rates = output#frequency in
+         let toc6 = Unix.time () in
+         let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc6 -. tic6)) ^ "s.)\n") in
+
+
+         let () = output_string stderr ("    Faustine -> Writing output...") in
+         let tic7 = Unix.time () in
+         let output_paths = io#write rates data in
+         let toc7 = Unix.time () in
+         let () = output_string stderr (" Done. (duration: " ^ (string_of_float (toc7 -. tic7)) ^ "s.)\n") in
+
+         let _ = Array.map (output_string stderr) (Array.map decorate output_paths) in
+         ()
+        );;

 
 main();;
 
 
 main();;