X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite%2FgrafiteAstPp.ml;h=de7af826370d8c87acd36762cf9ac19c4475130c;hb=300ab2c8e9300f3479e029115c48f31bc537c96c;hp=6dc488816f304193c834271b1273f51033f49e01;hpb=c68d9805aa7e37554bc4f00eca61083b75ef43da;p=helm.git diff --git a/components/grafite/grafiteAstPp.ml b/components/grafite/grafiteAstPp.ml index 6dc488816..de7af8263 100644 --- a/components/grafite/grafiteAstPp.ml +++ b/components/grafite/grafiteAstPp.ml @@ -75,11 +75,11 @@ let opt_string_pp = function | Some what -> what ^ " " let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = - let pp_tactic = pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_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 = - pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~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 = + pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in + let rec pp_tactic = function (* Higher order tactics *) | Do (_, count, tac) -> @@ -199,6 +199,7 @@ let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = String.concat " " (List.map (function (id,term) -> "(" ^ id ^ ": " ^ term_pp term ^ ")") args) + in pp_tactic and pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~sep tacs = String.concat sep @@ -238,7 +239,8 @@ let pp_macro ~term_pp = | WMatch (_, term) -> "whelp match " ^ term_pp term (* real macros *) | Check (_, term) -> Printf.sprintf "check %s" (term_pp term) - | Hint _ -> "hint" + | Hint (_, true) -> "hint rewrite" + | Hint (_, false) -> "hint" | AutoInteractive (_,params) -> "auto " ^ String.concat " " (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params) @@ -261,13 +263,15 @@ let pp_default what uris = Printf.sprintf "default \"%s\" %s" what (String.concat " " (List.map UriManager.string_of_uri uris)) -let pp_coercion uri do_composites arity = - Printf.sprintf "coercion %s %d (* %s *)" (UriManager.string_of_uri uri) arity - (if do_composites then "compounds" else "no compounds") +let pp_coercion uri do_composites arity saturations= + Printf.sprintf "coercion %s %d %d (* %s *)" + (UriManager.string_of_uri uri) arity saturations + (if do_composites then "compounds" else "no compounds") let pp_command ~term_pp ~obj_pp = function | Index (_,_,uri) -> "Indexing " ^ UriManager.string_of_uri uri - | Coercion (_, uri, do_composites, i) -> pp_coercion uri do_composites i + | Coercion (_, uri, do_composites, i, j) -> + pp_coercion uri do_composites i j | Default (_,what,uris) -> pp_default what uris | Drop _ -> "drop" | Include (_,path) -> "include \"" ^ path ^ "\""