we parametrized CicNotationPt.obj on 'term

[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 374d3bda6c077cb3fe8e49f84c22f818e03c9315..0d89a167e6c8293a9e279bf1e94f193c1c24b4f9 100644 (file)
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -25,6 +25,7 @@
 
 module T = Types
 
+module UM = UriManager
 module NP = CicNotationPp
 module GP = GrafiteAstPp
 module G = GrafiteAst
@@ -61,7 +62,7 @@ let out_preamble och (path, lines) =
 let out_command och cmd =
    let term_pp = NP.pp_term in
    let lazy_term_pp = NP.pp_term in
-   let obj_pp = NP.pp_obj in
+   let obj_pp = NP.pp_obj NP.pp_term in
    let s = GP.pp_statement ~term_pp ~lazy_term_pp ~obj_pp cmd in
    Printf.fprintf och "%s\n\n" s
 
@@ -77,18 +78,24 @@ let set key value =
 let require value =
    command_of_obj (G.Include (floc, value ^ ".ma"))
 
-let inline value =
-    command_of_macro (G.Inline (floc, value))
+let coercion value =
+   command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0))
+
+let inline (uri, prefix) =
+    command_of_macro (G.Inline (floc, G.Declarative, uri, prefix))
 
 let commit och items =
+   let trd (_, _, x) = x in
+   let trd_rth (_, _, x, y) = x, y in
    let commit = function
       | T.Heading heading   -> out_preamble och heading
       | T.Line line         -> out_line_comment och line
-      | T.BaseUri baseuri   -> out_command och (set "baseuri" baseuri)
-      | T.Include inc       -> out_unexported och "INCLUDE" inc (**)
-      | T.Coercion coercion -> out_unexported och "COERCION" coercion (**)
-      | T.Notation notation -> out_unexported och "NOTATION" notation (**)
-      | T.Inline (_, uri)   -> out_command och (inline uri)  
+      | T.BaseUri uri       -> out_command och (set "baseuri" uri)
+      | T.Include script    -> out_command och (require script)
+      | T.Coercion specs    -> out_command och (coercion (snd specs))
+      | T.Notation specs    -> out_unexported och "NOTATION" (snd specs) (**)
+      | 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.Verbatim verbatim -> out_verbatim och verbatim