X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fhelena%2Fsrc%2Fbasic_rg%2FbrgGrafite.ml;h=b1cfe21caf67a26a12d0031806555ea7c9bafbdb;hb=2cf2e883f91164ce614bdc86b5c5e2419b98f68d;hp=e6b8cd8da35014de6d45ae0e9759751cbff0bcfb;hpb=c2a2ecf1a9d02b03b9e840e01128632663e5d8a5;p=helm.git diff --git a/helm/software/helena/src/basic_rg/brgGrafite.ml b/helm/software/helena/src/basic_rg/brgGrafite.ml index e6b8cd8da..b1cfe21ca 100644 --- a/helm/software/helena/src/basic_rg/brgGrafite.ml +++ b/helm/software/helena/src/basic_rg/brgGrafite.ml @@ -80,15 +80,15 @@ let rec out_term st p e och = function KP.fprintf och "%a" out_uri s | 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 (x, n, w), t) -> + | B.Bind (a, B.Abst (r, n, w), 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.abst x n w) in - let binder = match N.to_string st n, a.E.n_sort with + let ee = B.push e B.empty a (B.abst r n w) in + let binder = match N.to_string st n, fst a.E.n_main with | "1", 0 -> "Π" | "1", 1 -> "∀" | "2", _ -> "λ" @@ -106,13 +106,13 @@ let rec out_term st p e och = function let close_out och () = close_out och -let output_entity och st (_, na, s, b) = +let output_entity och st (_, na, u, b) = out_comment och (KP.sprintf "constant %u" na.E.n_apix); match b with - | E.Abbr t -> - KP.fprintf och "definition %a ≝ %a.\n\n%!" out_uri s (out_term st false B.empty) t; !ok - | E.Abst t -> - KP.fprintf och "axiom %a : %a.\n\n%!" out_uri s (out_term st false B.empty) t; !ok + | E.Abbr v -> + KP.fprintf och "definition %a ≝ %a.\n\n%!" out_uri u (out_term st false B.empty) v; !ok + | E.Abst w -> + KP.fprintf och "axiom %a : %a.\n\n%!" out_uri u (out_term st false B.empty) w; !ok | E.Void -> C.err () (* Interface functions ******************************************************)