transcript: we now check for non-existing objects

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

diff --git a/helm/software/components/binaries/transcript/grafite.ml b/helm/software/components/binaries/transcript/grafite.ml
index 83b745980ead119f83b76191ced70b16a2649013..8776185b8b9451db0da72bb9ffa324b30a3187e3 100644 (file)
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -24,12 +24,14 @@
  *)
 
 module T = Types
+module O = Options
 
 module UM = UriManager
 module NP = CicNotationPp
 module GP = GrafiteAstPp
-module G = GrafiteAst
-module H = HExtlib
+module G  = GrafiteAst
+module H  = HExtlib
+module HG = Http_getter
 
 let floc = H.dummy_floc
 
@@ -46,6 +48,7 @@ let out_unexported och head s =
 
 let out_line_comment och s =
    let l = 70 - String.length s in
+   let l = if l < 0 then 0 else l in
    let s = Printf.sprintf " %s %s" s (String.make l '*') in
    out_comment och s
 
@@ -78,30 +81,48 @@ let require value =
 let coercion value =
    command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0, 0))
 
-let inline (kind, uri, prefix) =
+let inline kind uri prefix flavour =
     let kind = match kind with
        | T.Declarative -> G.Declarative
        | T.Procedural  -> G.Procedural None 
     in
-    command_of_macro (G.Inline (floc, kind, uri, prefix, None))
+    command_of_macro (G.Inline (floc, kind, uri, prefix, flavour))
 
 let out_alias och name uri =
    Printf.fprintf och "alias id \"%s\" = \"%s\".\n\n" name uri
 
+let check och src =
+   if HG.exists ~local:false src then () else
+   let msg = "UNAVAILABLE OBJECT: " ^ src in
+   out_line_comment och msg;
+   prerr_endline msg
+
 let commit kind och items =
    let trd (_, _, x) = x in
-   let trd_rth kind (_, _, x, y) = kind, x, y in
    let commit = function
       | T.Heading heading   -> out_preamble och heading
-      | T.Line line         -> out_line_comment och line
+      | T.Line line         ->
+         if !O.comments then out_line_comment och line
       | T.Include script    -> out_command och (require script)
-      | T.Coercion specs    -> out_unexported och "COERCION" (snd specs)
-      | T.Notation specs    -> out_unexported och "NOTATION" (snd specs) (**)
-      | T.Inline (_, T.Var, src, _) -> out_alias och (UriManager.name_of_uri (UriManager.uri_of_string src)) src 
-      | T.Inline specs      -> out_command och (inline (trd_rth kind specs))
-      | T.Section specs     -> out_unexported och "UNEXPORTED" (trd specs)
-      | T.Comment comment   -> out_comment och comment
-      | T.Unexport unexport -> out_unexported och "UNEXPORTED" unexport 
+      | T.Coercion specs    -> 
+         if !O.comments then out_unexported och "COERCION" (snd specs)
+      | T.Notation specs    -> 
+         if !O.comments then out_unexported och "NOTATION" (snd specs) (**)
+      | T.Inline (_, T.Var, src, _, _) ->
+         if !O.comments then out_unexported och "UNEXPORTED" src
+(* FG: we do not export variables because we cook the other objects         
+ *      let name = UriManager.name_of_uri (UriManager.uri_of_string src) in
+ *       out_alias och name src
+ *)
+      | T.Inline (_, _, src, pre, fl) -> 
+         if !O.getter then check och src; 
+        out_command och (inline kind src pre fl)
+      | T.Section specs     -> 
+         if !O.comments then out_unexported och "UNEXPORTED" (trd specs)
+      | T.Comment comment   -> 
+         if !O.comments then out_comment och comment
+      | T.Unexport unexport -> 
+         if !O.comments then out_unexported och "UNEXPORTED" unexport 
       | T.Verbatim verbatim -> out_verbatim och verbatim
       | T.Discard _         -> ()
    in