X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAstPp.ml;h=cf9106ea374d44527481c5e12297be63ee52f9f2;hb=24dd4569daf1d35bffaa813b8164058d8643f14d;hp=de7af826370d8c87acd36762cf9ac19c4475130c;hpb=396a578b680e7fdb9d262822184e52f0d4d5086b;p=helm.git diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml index de7af8263..cf9106ea3 100644 --- a/components/grafite/grafiteAstPp.ml +++ b/components/grafite/grafiteAstPp.ml @@ -68,13 +68,14 @@ let pp_intros_specs s = function | None, idents -> Printf.sprintf " %s%s" s (pp_idents idents) | Some num, idents -> Printf.sprintf " %s%i %s" s num (pp_idents idents) -let terms_pp ~term_pp terms = String.concat ", " (List.map term_pp terms) +let pp_terms ~term_pp terms = String.concat ", " (List.map term_pp terms) let opt_string_pp = function | None -> "" | Some what -> what ^ " " let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = + let pp_terms = pp_terms ~term_pp in let pp_tactics = pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp in let pp_reduction_kind = pp_reduction_kind ~term_pp in let pp_tactic_pattern = @@ -126,7 +127,8 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = Printf.sprintf "decompose%s" (pp_intros_specs "names " (None, names)) | Demodulate _ -> "demodulate" - | Destruct (_, term) -> "destruct " ^ term_pp term + | Destruct (_, None) -> "destruct" + | Destruct (_, Some terms) -> "destruct " ^ pp_terms terms | Elim (_, what, using, pattern, specs) -> Printf.sprintf "elim %s%s %s%s" (term_pp what) @@ -158,7 +160,7 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = (if linear then " linear " else "") (match level_opt with None -> "" | Some i -> " depth = " ^ string_of_int i ^ " ") (term_pp term) - (match terms with [] -> "" | _ -> " to " ^ terms_pp ~term_pp terms) + (match terms with [] -> "" | _ -> " to " ^ pp_terms terms) (match ident_opt with None -> "" | Some ident -> " as " ^ ident) | Left _ -> "left" | LetIn (_, term, ident) -> @@ -177,7 +179,6 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = | Right _ -> "right" | Ring _ -> "ring" | Split _ -> "split" - | Subst _ -> "subst" | Symmetry _ -> "symmetry" | Transitivity (_, term) -> "transitivity " ^ term_pp term (* Tattiche Aggiunte *)