...

[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 1616c18a9a5f5c467ab997a155b14e773792d428..f5c4a49f8ccabe1f2f95f89554904a2c9f2440be 100644 (file)
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -24,6 +24,7 @@
  *)
 
 module T = Types
+module O = Options
 
 module UM = UriManager
 module NP = CicNotationPp
@@ -72,36 +73,47 @@ let command_of_obj obj =
 let command_of_macro macro =
    G.Executable (floc, G.Macro (floc, macro))
 
-let set key value =
-   command_of_obj (G.Set (floc, key, value))
-
 let require value =
    command_of_obj (G.Include (floc, value ^ ".ma"))
 
 let coercion value =
    command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0, 0))
 
-let inline (uri, prefix) =
-    command_of_macro (G.Inline (floc, G.Declarative, 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, flavour))
 
 let out_alias och name uri =
    Printf.fprintf och "alias id \"%s\" = \"%s\".\n\n" name uri
 
-let commit och items =
+let commit kind och items =
    let trd (_, _, x) = x in
-   let trd_rth (_, _, x, y) = x, y in
+   let trd_rth kind (_, _, x, y, z) = kind, x, y, z in
    let commit = function
       | T.Heading heading   -> out_preamble och heading
-      | T.Line line         -> out_line_comment och line
-      | T.BaseUri uri       -> out_command och (set "baseuri" uri)
+      | 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 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 object         
+ *      let name = UriManager.name_of_uri (UriManager.uri_of_string src) in
+ *       out_alias och name src
+ *)
+      | T.Inline specs      -> out_command och (inline (trd_rth kind specs))
+      | 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