- Procedural: generation of "exact" is now complete

[helm.git] / helm / software / components / binaries / transcript / engine.ml

diff --git a/helm/software/components/binaries/transcript/engine.ml b/helm/software/components/binaries/transcript/engine.ml
index ccf07423f6dd5cc14b5af35f6ede71356a5bbc2f..4504d2999e9f7b51646152dc316a1ac86c2cc6b6 100644 (file)
--- a/helm/software/components/binaries/transcript/engine.ml
+++ b/helm/software/components/binaries/transcript/engine.ml
@@ -46,8 +46,9 @@ type status = {
    output_base_uri: string;
    input_path: string;
    output_path: string;
-   input_type: string;
+   input_type: T.input_kind;
    output_type: T.output_kind;
+   input_ext: string;
    includes: (string * string) list;
    coercions: (string * string) list;
    files: string list;
@@ -72,8 +73,8 @@ let load_registry registry =
 
 let set_files st =
    let eof ich = try Some (input_line ich) with End_of_file -> None in
-   let trim l = Filename.chop_extension (Str.string_after l 2) in
-   let cmd = Printf.sprintf "cd %s && find -name *%s" st.input_path st.input_type in
+   let trim l = Filename.chop_extension (Str.string_after l 2) in 
+   let cmd = Printf.sprintf "cd %s && find -name *%s" st.input_path st.input_ext in
    let ich = Unix.open_process_in cmd in
    let rec aux files =
       match eof ich with
@@ -100,6 +101,12 @@ let init () =
 let make registry =
    let id x = x in
    let get_pairs = R.get_list (R.pair id id) in 
+   let get_input_type key =
+      match R.get_string key with
+         | "gallina8" -> T.Gallina8, ".v"
+        | "grafite"  -> T.Grafite, ".ma"
+        | _          -> failwith "unknown input type"
+   in
    let get_output_type key =
       match R.get_string key with
          | "procedural"  -> T.Procedural
@@ -107,17 +114,23 @@ let make registry =
         | _             -> failwith "unknown output type"
    in
    load_registry registry;
+   let input_type, input_ext = get_input_type "package.input_type" in 
+   let heading_lines = match input_type with
+      | T.Grafite -> 0
+      | _         -> R.get_int "transcript.heading_lines"
+   in
    let st = {
       heading_path = R.get_string "transcript.heading_path";
-      heading_lines = R.get_int "transcript.heading_lines";
+      heading_lines = heading_lines;
       input_package = R.get_string "package.input_name";
       output_package = R.get_string "package.output_name";
       input_base_uri = R.get_string "package.input_base_uri";
       output_base_uri = R.get_string "package.output_base_uri";
       input_path = R.get_string "package.input_path";
       output_path = R.get_string "package.output_path";
-      input_type = R.get_string "package.input_type";
+      input_type = input_type;
       output_type = get_output_type "package.output_type";
+      input_ext = input_ext;
       includes = get_pairs "package.include";
       coercions = get_pairs "package.coercion";
       files = [];
@@ -126,7 +139,8 @@ let make registry =
    } in
    let st = {st with
       heading_path = Filename.concat !O.cwd st.heading_path;
-      output_path = Filename.concat !O.cwd st.output_path;
+      input_path = Filename.concat !O.cwd st.input_path;
+      output_path = Filename.concat !O.cwd st.output_path
    } in
    prerr_endline "reading file names ...";
    let st = set_files st in
@@ -154,7 +168,7 @@ let set_items st name items =
    let contents = List.rev_append items script.contents in
    st.scripts.(i) <- {script with name = name; contents = contents}
    
-let set_heading st name =
+let set_heading st name = 
    let heading = st.heading_path, st.heading_lines in
    set_items st name [T.Heading heading] 
    
@@ -193,6 +207,10 @@ let produce st =
       | T.Notation (false, _) -> false
       | _                     -> true
    in
+   let get_items = match st.input_type with
+      | T.Gallina8 -> Gallina8Parser.items Gallina8Lexer.token
+      | T.Grafite  -> GrafiteParser.items GrafiteLexer.token
+   in
    let produce st name =
       let in_base_uri = Filename.concat st.input_base_uri name in
       let out_base_uri = Filename.concat st.output_base_uri name in
@@ -225,12 +243,11 @@ let produce st =
         with Not_found -> ()
       in
       Printf.eprintf "processing file name: %s ...\n" name; flush stderr; 
-      let file = Filename.concat st.input_path (name ^ st.input_type) in
+      let file = Filename.concat st.input_path (name ^ st.input_ext) in
       let ich = open_in file in
       let lexbuf = Lexing.from_channel ich in
       try 
-         let items = V8Parser.items V8Lexer.token lexbuf in
-         close_in ich; 
+         let items = get_items lexbuf in close_in ich; 
         let _, rev_items = X.list_rev_map_filter_fold filter [] items in
         let items = List.rev rev_items in
         let local_items, global_items = List.partition partition items in