- some depend files fixed

[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 3184aad369dc353383123c52121a14b7bc7cd0ed..da07dd235489890fa39b5ec31d2aa3e47bcdb415 100644 (file)
--- a/helm/software/components/binaries/transcript/engine.ml
+++ b/helm/software/components/binaries/transcript/engine.ml
@@ -28,8 +28,8 @@ module X  = HExtlib
 module HG = Http_getter
 module GA = GrafiteAst
 
-module T  = Types
-module G  = Grafite
+module T = Types
+module G = Grafite
 module O = Options
 
 type script = {
@@ -66,8 +66,9 @@ let default_script = {
 
 let default_scripts = 2
 
+let suffix = ".conf.xml"
+
 let load_registry registry =
-   let suffix = ".conf.xml" in
    let registry = 
       if Filename.check_suffix registry suffix then registry
       else registry ^ suffix
@@ -84,8 +85,10 @@ let set_files st =
       | None   -> List.rev files
       | Some l ->
         let l = trim l in
-        if List.mem l st.excludes then aux files else aux (l :: files)
-   in 
+        if List.mem l st.excludes then aux files else 
+        if !O.sources = [] || List.mem l !O.sources then aux (l :: files) else
+        aux files
+   in
    let files = aux [] in
    let _ = Unix.close_process_in ich in
    {st with files = files}
@@ -172,15 +175,15 @@ let is_ma st name =
 let set_items st name items =
    let i = get_index st name in
    let script = st.scripts.(i) in
-   let contents = List.rev_append items script.contents in
+   let contents = List.rev_append (X.list_uniq items) script.contents in
    st.scripts.(i) <- {script with name = name; contents = contents}
    
 let set_heading st name = 
    let heading = st.heading_path, st.heading_lines in
    set_items st name [T.Heading heading] 
    
-let require st name inc =
-   set_items st name [T.Include inc]
+let require st name moo inc =
+   set_items st name [T.Include (moo, inc)]
 
 let get_coercion st str =
    try List.assoc str st.coercions with Not_found -> ""
@@ -196,9 +199,18 @@ let make_script_name st script name =
    Filename.concat st.output_path (name ^ ext)
 
 let get_iparams st name =
+   let debug debug = GA.IPDebug debug in
    let map = function
+      | "comments"   -> GA.IPComments
       | "nodefaults" -> GA.IPNoDefaults
-      | s            -> failwith ("unknown inline parameter: " ^ s)
+      | "coercions"  -> GA.IPCoercions
+      | "cr"         -> GA.IPCR
+      | s            -> 
+        try Scanf.sscanf s "debug-%u" debug with
+           | Scanf.Scan_failure _
+           | Failure _
+           | End_of_file ->
+              failwith ("unknown inline parameter: " ^ s)
    in
    List.map map (X.list_assoc_all name st.iparams) 
 
@@ -233,14 +245,19 @@ let produce st =
            let obj, p = 
               if b then Filename.concat (make_path path) obj, make_prefix path
               else obj, p
-           in 
-           let s = obj ^ G.string_of_inline_kind k in
-           let full_s = Filename.concat in_base_uri s in
-           let params = params @ get_iparams st (Filename.concat name obj) in
-           path, Some (T.Inline (b, k, full_s, p, f, params))
-        | T.Include s                  ->
+           in
+           let ext = G.string_of_inline_kind k in
+           let s = Filename.concat in_base_uri (obj ^ ext) in
+           let params = 
+              params @
+              get_iparams st "*" @
+              get_iparams st ("*" ^ ext) @
+              get_iparams st (Filename.concat name obj)
+           in
+           path, Some (T.Inline (b, k, s, p, f, params))
+        | T.Include (moo, s)           ->
            begin 
-              try path, Some (T.Include (List.assoc s st.requires))
+              try path, Some (T.Include (moo, List.assoc s st.requires))
               with Not_found -> path, None
            end
         | T.Coercion (b, obj)          ->
@@ -258,7 +275,7 @@ let produce st =
         | item                         -> path, Some item
       in
       let set_includes st name =
-        try require st name (List.assoc name st.includes) 
+        try require st name true (List.assoc name st.includes) 
         with Not_found -> ()
       in
       let rec remove_lines ich n =
@@ -279,21 +296,21 @@ let produce st =
            set_items st st.input_package (comment :: global_items);
         init name; 
         begin match st.input_type with
-           | T.Grafite "" -> require st name file
-           | _            -> require st name st.input_package
+           | T.Grafite "" -> require st name false file
+           | _            -> require st name false st.input_package
         end; 
         set_includes st name; set_items st name local_items; commit st name
       with e -> 
          prerr_endline (Printexc.to_string e); close_in ich 
    in
    is_ma st st.input_package;
-   init st.input_package; require st st.input_package "preamble"; 
+   init st.input_package; require st st.input_package false "preamble"; 
    match st.input_type with
       | T.Grafite "" ->
          List.iter (produce st) st.files
       | T.Grafite s  ->
          let theory = Filename.concat st.input_path s in
-        require st st.input_package theory;
+        require st st.input_package false theory;
          List.iter (produce st) st.files;
          commit st st.input_package
       | _            ->