function
| Absurd (_, term) -> "absurd" ^ term_pp term
| Apply (_, term) -> "apply " ^ term_pp term
+ | Auto (_,_,_,Some kind,_) -> "auto " ^ kind
| Auto _ -> "auto"
| Assumption _ -> "assumption"
| Change (_, where, with_what) ->
| Fourier _ -> "fourier"
| IdTac _ -> "id"
| Injection (_, term) -> "injection " ^ term_pp term
- | Intros (_, None, []) -> "intro"
+ | Intros (_, None, []) -> "intros"
| Inversion (_, term) -> "inversion " ^ term_pp term
| Intros (_, num, idents) ->
sprintf "intros%s%s"
(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 ident_opt with None -> "" | Some ident -> " using " ^ ident)
+ (match ident_opt with None -> "" | Some ident -> " as " ^ ident)
| Left _ -> "left"
| LetIn (_, term, ident) -> sprintf "let %s in %s" (term_pp term) ident
| Reduce (_, kind, pat) ->
| `Elim -> "elim"
| `Instance -> "instance"
-let pp_macro ~term_pp = function
+let pp_arg ~term_pp arg =
+ let s = term_pp arg in
+ if s = "" || (s.[0] = '(' && s.[String.length s - 1] = ')') then
+ (* _nice_ heuristic *)
+ s
+ else
+ "(" ^ s ^ ")"
+
+let pp_macro ~term_pp =
+ let term_pp = pp_arg ~term_pp in
+ function
(* Whelp *)
| WInstance (_, term) -> "whelp instance " ^ term_pp term
| WHint (_, t) -> "whelp hint " ^ term_pp t
- | WLocate (_, s) -> "whelp locate " ^ s
+ | WLocate (_, s) -> "whelp locate \"" ^ s ^ "\""
| WElim (_, t) -> "whelp elim " ^ term_pp t
| WMatch (_, term) -> "whelp match " ^ term_pp term
(* real macros *)
(if do_composites then "compounds" else "no compounds")
let pp_command ~obj_pp = function
- | Include (_,path) -> "include " ^ path
+ | Include (_,path) -> "include \"" ^ path ^ "\""
| Qed _ -> "qed"
| Drop _ -> "drop"
| Set (_, name, value) -> sprintf "set \"%s\" \"%s\"" name value
| Semicolon _ -> ";"
| Branch _ -> "["
| Shift _ -> "|"
- | Pos (_, i) -> sprintf "%d:" i
+ | Pos (_, i) -> sprintf "%s:" (String.concat "," (List.map string_of_int i))
+ | Wildcard _ -> "*:"
| Merge _ -> "]"
| Focus (_, goals) ->
sprintf "focus %s" (String.concat " " (List.map string_of_int goals))
let pp_executable ~term_pp ~lazy_term_pp ~obj_pp =
function
- | Macro (_, macro) -> pp_macro ~term_pp macro
+ | Macro (_, macro) -> pp_macro ~term_pp macro ^ "."
| Tactical (_, tac, Some punct) ->
pp_tactical ~lazy_term_pp ~term_pp tac
^ pp_tactical ~lazy_term_pp ~term_pp punct
| Tactical (_, tac, None) -> pp_tactical ~lazy_term_pp ~term_pp tac
- | Command (_, cmd) -> pp_command ~obj_pp cmd
+ | Command (_, cmd) -> pp_command ~obj_pp cmd ^ "."
let pp_comment ~term_pp ~lazy_term_pp ~obj_pp =
function
let pp_statement ~term_pp ~lazy_term_pp ~obj_pp =
function
- | Executable (_, ex) -> pp_executable ~lazy_term_pp ~term_pp ~obj_pp ex
+ | Executable (_, ex) -> pp_executable ~lazy_term_pp ~term_pp ~obj_pp ex
| Comment (_, c) -> pp_comment ~term_pp ~lazy_term_pp ~obj_pp c