X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=e8864255d28e27a864429ad0df541a605e285ca7;hb=5cfd68a5d9e73edb40e1cfe021a1426354767aa8;hp=4e685c26dabe285f9d9f814cbcb766d37f30ad5a;hpb=433e66b381d1b89e48c05d517494fc300fd0abb5;p=helm.git diff --git a/matita/components/grafite/grafiteAstPp.ml b/matita/components/grafite/grafiteAstPp.ml index 4e685c26d..e8864255d 100644 --- a/matita/components/grafite/grafiteAstPp.ml +++ b/matita/components/grafite/grafiteAstPp.ml @@ -127,15 +127,39 @@ let rec pp_ntactic status ~map_unicode_to_tex = | By_just_we_proved (_, just, term1, ident, term2) -> pp_just status just ^ "we proved" ^ NotationPp.pp_term status term1 ^ (match ident with None -> "" | Some ident -> "(" ^ident^ ")") ^ (match term2 with None -> " " | Some term2 -> " that is equivalent to " ^ NotationPp.pp_term status term2) - | We_need_to_prove (_,term,ident,term1) -> "we need to prove" ^ NotationPp.pp_term status term ^ - (match ident with None -> " " | Some id -> "(" ^ id ^ ")") ^ (match term1 with None -> " " | Some t1 - -> "or equivalently" ^ NotationPp.pp_term status t1) + | We_need_to_prove (_,term,ident,t) -> "we need to prove" ^ NotationPp.pp_term status term ^ + (match ident with None -> " " | Some id -> "(" ^ id ^ ")") ^ (match t with None -> "" | Some t -> + " or equivalently " ^ (NotationPp.pp_term status t)) + | BetaRewritingStep (_,t) -> "or equivalently " ^ (NotationPp.pp_term status t) | Bydone (_, just) -> pp_just status just ^ "done" - (* - | ExistsElim (_, just, ident, term, term1, ident1) -> pp_just ~term_pp just ^ "let " ^ ident ^ ":" - ^ NotationPp.pp_term term ^ "such that " ^ NotationPp.pp_term term1 ^ "(" ^ ident1 ^ ")" - | AndElim (_, just, term1, ident1, term2, ident2) -> pp_just ~NotationPp.pp_term just ^ "we have " ^ NotationPp.pp_term term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ NotationPp.pp_term term2 ^ " (" ^ ident2 ^ ")" - *) + | ExistsElim (_, just, ident, term, term1, ident1) -> pp_just status just ^ "let " ^ ident ^ ":" + ^ NotationPp.pp_term status term ^ "such that " ^ NotationPp.pp_term status term1 ^ "(" ^ ident1 ^ ")" + | AndElim (_, just, term1, ident1, term2, ident2) -> pp_just status just ^ "we have " ^ + NotationPp.pp_term status term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ NotationPp.pp_term status term2 + ^ " (" ^ ident2 ^ ")" + | Thesisbecomes (_, t, t1) -> "the thesis becomes " ^ NotationPp.pp_term status t ^ + (match t1 with None -> "" | Some t1 -> " or equivalently " ^ + NotationPp.pp_term status + t1) + | RewritingStep (_, rhs, just, cont) -> + "=" ^ + NotationPp.pp_term status rhs ^ + (match just with + | `Auto params -> pp_auto_params params status + | `Term t -> " exact " ^ NotationPp.pp_term status t + | `Proof -> " proof" + | `SolveWith t -> " using " ^ NotationPp.pp_term status t) + ^ (if cont then " done" else "") + | Obtain (_,id,t1) -> "obtain (" ^ id ^ ")" ^ NotationPp.pp_term status t1 + | Conclude (_,t1) -> "conclude " ^ NotationPp.pp_term status t1 + | We_proceed_by_cases_on (_, term, term1) -> "we proceed by cases on" ^ NotationPp.pp_term status term ^ "to prove" ^ NotationPp.pp_term status term1 + | We_proceed_by_induction_on (_, term, term1) -> "we proceed by induction on" ^ NotationPp.pp_term status term ^ "to prove" ^ NotationPp.pp_term status term1 + | Byinduction (_, term, ident) -> "by induction hypothesis we know" ^ NotationPp.pp_term status term ^ "(" ^ ident ^ ")" + | Case (_, id, args) -> + "case" ^ id ^ + String.concat " " + (List.map (function (id,term) -> "(" ^ id ^ ": " ^ NotationPp.pp_term status term ^ ")") + args) ;; let pp_nmacro status = function