X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fhelena%2Fsrc%2Fbasic_rg%2FbrgGallina.ml;h=7346e58357c71dcacaadcf5ba5162e48db37804c;hb=fdb80b08af83b86759833142456ce3c4f84cd80e;hp=b8274ca301b1fb527410601ab93a6bc1f9c64cb2;hpb=b37863d4598516a06241f18ad0db963399015bf2;p=helm.git

diff --git a/helm/software/helena/src/basic_rg/brgGallina.ml b/helm/software/helena/src/basic_rg/brgGallina.ml
index b8274ca30..7346e5835 100644
--- a/helm/software/helena/src/basic_rg/brgGallina.ml
+++ b/helm/software/helena/src/basic_rg/brgGallina.ml
@@ -26,6 +26,8 @@ IFDEF MANAGER THEN
 
 let ok = ref true
 
+let version = KP.sprintf "This file was generated by %s: do not edit" (G.version_string true)
+
 let base = "coq"
 
 let ext = ".v"
@@ -77,38 +79,38 @@ let out_name och a =
    E.name err f a
 
 let rec out_term st p e och = function
-   | B.Sort (_, h)                   ->
-      let sort = if h = 0 then "Type" else if h = 1 then "Prop" else assert false in
+   | B.Sort k                        ->
+      let sort = if k = 0 then "Type" else if k = 1 then "Prop" else assert false in
       KP.fprintf och "%s" sort
    | B.LRef (_, i)                   ->
-      let _, _, a, b = B.get e i in
-      KP.fprintf och "%a" out_name a
+      let _, _, _, y, b = B.get e i in
+      KP.fprintf och "%a" out_name y
    | B.GRef (_, s)                   ->
       KP.fprintf och "%a" out_uri s
-   | B.Cast (_, u, t)                ->
+   | B.Cast (u, t)                   ->
       KP.fprintf och "(%a : %a)" (out_term st false e) t (out_term st false e) u 
-   | B.Appl (_, _, v, t)             ->
+   | B.Appl (_, v, t)                ->
       let pt = match t with B.Appl _ -> false | _ -> true in
       let op, cp = if p then "(", ")" else "", "" in
       KP.fprintf och "%s%a %a%s" op (out_term st pt e) t (out_term st true e) v cp
-   | B.Bind (a, B.Abst (r, n, w), t) ->
+   | B.Bind (y, B.Abst (r, n, w), t) ->
       let p = true in
       let op, cp = if p then "(", ")" else "", "" in
-      let a = R.alpha B.mem e a in
-      let ee = B.push e B.empty a (B.abst r n w) in
+      let y = R.alpha B.mem e y in
+      let ee = B.push e B.empty E.empty_node y (B.abst r n w) in
       let ob, cb = match N.to_string st n with
          | "1" -> "forall", ","
          | "2" -> "fun", " =>"
          | _   -> ok := false; "?", "?"
       in
       KP.fprintf och "%s%s (%a:%a)%s %a%s"
-         op ob out_name a (out_term st false e) w cb (out_term st false ee) t cp
-   | B.Bind (a, B.Abbr v, t)         ->
+         op ob out_name y (out_term st false e) w cb (out_term st false ee) t cp
+   | B.Bind (y, B.Abbr v, t)         ->
       let op, cp = if p then "(", ")" else "", "" in
-      let a = R.alpha B.mem e a in
-      let ee = B.push e B.empty a (B.abbr v) in
+      let y = R.alpha B.mem e y in
+      let ee = B.push e B.empty E.empty_node y (B.abbr v) in
       KP.fprintf och "%slet %a := %a in %a%s"
-         op out_name a (out_term st false e) v (out_term st false ee) t cp
+         op out_name y (out_term st false e) v (out_term st false ee) t cp
    | B.Bind (a, B.Void, t)           -> C.err ()
 
 let close_out och () = close_out och
@@ -116,6 +118,12 @@ let close_out och () = close_out och
 let output_entity och st (_, na, u, b) =
    out_comment och (KP.sprintf "constant %u" na.E.n_apix);
    match b with
+(*
+      | E.Abbr (B.Cast (w, v)) ->
+         KP.fprintf och "Definition %a : %a.\n%!" out_uri u (out_term st false B.empty) w;
+         KP.fprintf och "exact %a.\n%!" (out_term st true B.empty) v;
+         KP.fprintf och "Time Defined.\n\n%!";
+*)
       | E.Abbr v ->
          KP.fprintf och "Definition %a := %a.\n\n%!" out_uri u (out_term st false B.empty) v;
 (*         KP.fprintf och "Strategy -%u [ %a ].\n\n%!" na.E.n_apix out_uri u; *) !ok
@@ -130,7 +138,7 @@ let open_out fname =
    let path = KF.concat dir fname in
    let och = open_out (path ^ ext) in
    out_preamble och;
-   out_top_comment och (KP.sprintf "This file was generated by %s: do not edit" G.version_string);
+   out_top_comment och version;
    output_entity och, close_out och
 
 END