let tactic_terminator = tactical_terminator
let command_terminator = tactical_terminator
-let pp_tactic_pattern ~map_unicode_to_tex (what, hyp, goal) =
+let pp_tactic_pattern status ~map_unicode_to_tex (what, hyp, goal) =
if what = None && hyp = [] && goal = None then "" else
let what_text =
match what with
| None -> ""
- | Some t -> Printf.sprintf "in match (%s) " (NotationPp.pp_term t) in
+ | Some t -> Printf.sprintf "in match (%s) " (NotationPp.pp_term status t) in
let hyp_text =
String.concat " "
(List.map (fun (name, p) -> Printf.sprintf "%s:(%s)" name
- (NotationPp.pp_term p)) hyp) in
+ (NotationPp.pp_term status p)) hyp) in
let goal_text =
match goal with
| None -> ""
| Some t ->
let vdash = if map_unicode_to_tex then "\\vdash" else "⊢" in
- Printf.sprintf "%s (%s)" vdash (NotationPp.pp_term t)
+ Printf.sprintf "%s (%s)" vdash (NotationPp.pp_term status t)
in
Printf.sprintf "%sin %s%s" what_text hyp_text goal_text
-let rec pp_ntactic ~map_unicode_to_tex =
+let pp_auto_params params status =
+ match params with
+ | (None,flags) -> String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flags)
+ | (Some l,flags) -> (String.concat "," (List.map (NotationPp.pp_term status) l)) ^
+ String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flags)
+;;
+
+let pp_just status just =
+ match just with
+ `Term term -> "exact " ^ NotationPp.pp_term status term
+ | `Auto params -> pp_auto_params params status
+;;
+
+let rec pp_ntactic status ~map_unicode_to_tex =
let pp_tactic_pattern = pp_tactic_pattern ~map_unicode_to_tex in
function
- | NApply (_,t) -> "napply " ^ NotationPp.pp_term t
+ | NApply (_,t) -> "@" ^ NotationPp.pp_term status t
| NSmartApply (_,t) -> "fixme"
| NAuto (_,(None,flgs)) ->
"nautobatch" ^
String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
| NAuto (_,(Some l,flgs)) ->
"nautobatch" ^ " by " ^
- (String.concat "," (List.map NotationPp.pp_term l)) ^
+ (String.concat "," (List.map (NotationPp.pp_term status) l)) ^
String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
- | NCases (_,what,where) -> "ncases " ^ NotationPp.pp_term what ^
+ | NCases (_,what,where) -> "ncases " ^ NotationPp.pp_term status what ^
"...to be implemented..." ^ " " ^ "...to be implemented..."
| NConstructor (_,None,l) -> "@ " ^
- String.concat " " (List.map NotationPp.pp_term l)
+ String.concat " " (List.map (NotationPp.pp_term status) l)
| NConstructor (_,Some x,l) -> "@" ^ string_of_int x ^ " " ^
- String.concat " " (List.map NotationPp.pp_term l)
+ String.concat " " (List.map (NotationPp.pp_term status) l)
| NCase1 (_,n) -> "*" ^ n ^ ":"
| NChange (_,what,wwhat) -> "nchange " ^ "...to be implemented..." ^
- " with " ^ NotationPp.pp_term wwhat
- | NCut (_,t) -> "ncut " ^ NotationPp.pp_term t
-(*| NDiscriminate (_,t) -> "ndiscriminate " ^ NotationPp.pp_term t
- | NSubst (_,t) -> "nsubst " ^ NotationPp.pp_term t *)
+ " with " ^ NotationPp.pp_term status wwhat
+ | NCut (_,t) -> "ncut " ^ NotationPp.pp_term status t
+(*| NDiscriminate (_,t) -> "ndiscriminate " ^ NotationPp.pp_term status t
+ | NSubst (_,t) -> "nsubst " ^ NotationPp.pp_term status t *)
+ | NClear (_,l) -> "nclear " ^ String.concat " " l
| NDestruct (_,dom,skip) -> "ndestruct ..."
- | NElim (_,what,where) -> "nelim " ^ NotationPp.pp_term what ^
+ | NElim (_,what,where) -> "nelim " ^ NotationPp.pp_term status what ^
"...to be implemented..." ^ " " ^ "...to be implemented..."
| NId _ -> "nid"
| NIntro (_,n) -> "#" ^ n
| NIntros (_,l) -> "#" ^ String.concat " " l
- | NInversion (_,what,where) -> "ninversion " ^ NotationPp.pp_term what ^
- assert false ^ " " ^ assert false
- | NLApply (_,t) -> "lapply " ^ NotationPp.pp_term t
+ | NInversion (_,what,where) -> "ninversion " ^ NotationPp.pp_term status what ^
+ "...to be implemented..." ^ " " ^ "...to be implemented..."
+ | NLApply (_,t) -> "lapply " ^ NotationPp.pp_term status t
| NRewrite (_,dir,n,where) -> "nrewrite " ^
(match dir with `LeftToRight -> ">" | `RightToLeft -> "<") ^
- " " ^ NotationPp.pp_term n ^ " " ^ pp_tactic_pattern where
+ " " ^ NotationPp.pp_term status n ^ " " ^ pp_tactic_pattern status where
| NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> "TO BE IMPLEMENTED"
| NDot _ -> "."
| NSemicolon _ -> ";"
(String.concat " " (List.map string_of_int l))
| NUnfocus _ -> "unfocus"
| NSkip _ -> "skip"
- | NTry (_,tac) -> "ntry " ^ pp_ntactic ~map_unicode_to_tex tac
+ | NTry (_,tac) -> "ntry " ^ pp_ntactic status ~map_unicode_to_tex tac
| NAssumption _ -> "nassumption"
| NBlock (_,l) ->
- "(" ^ String.concat " " (List.map (pp_ntactic ~map_unicode_to_tex) l)^ ")"
- | NRepeat (_,t) -> "nrepeat " ^ pp_ntactic ~map_unicode_to_tex t
+ "(" ^ String.concat " " (List.map (pp_ntactic status ~map_unicode_to_tex) l)^ ")"
+ | NRepeat (_,t) -> "nrepeat " ^ pp_ntactic status ~map_unicode_to_tex t
+ | Assume (_, ident, term, term1) -> "assume" ^ ident ^ ":" ^ NotationPp.pp_term status term ^
+ (match term1 with None -> " " | Some t1 -> " that is eqivalent to " ^ NotationPp.pp_term status t1)
+ | Suppose (_,term,ident,term1) -> "suppose" ^ NotationPp.pp_term status term ^ "(" ^ ident ^ ")" ^ (match
+ term1 with None -> " " | Some t -> " that is equivalent to " ^ NotationPp.pp_term status t)
+ | 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)
+ | Bydone (_, just) -> pp_just status just ^ "done"
+ | 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 (_, term1, term2) -> "the thesis becomes " ^ NotationPp.pp_term status term1 ^ (match
+ term2 with None -> " " | Some term2 -> NotationPp.pp_term status term2)
+ | 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 "")
+(*
+ | RewritingStep (_, term, term1, term2, cont) ->
+ (match term with
+ | None -> " "
+ | Some (None,term) -> "conclude " ^ NotationPp.pp_term status term
+ | Some (Some name,term) ->
+ "obtain (" ^ name ^ ") " ^ NotationPp.pp_term status term)
+ ^ "=" ^
+ NotationPp.pp_term status term1 ^
+ (match term2 with
+ | `Auto params -> pp_auto_params params status
+ | `Term term2 -> " exact " ^ NotationPp.pp_term status term2
+ | `Proof -> " proof"
+ | `SolveWith term -> " using " ^ NotationPp.pp_term status term)
+ ^ (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 = function
- | NCheck (_, term) -> Printf.sprintf "ncheck %s" (NotationPp.pp_term term)
+let pp_nmacro status = function
+ | NCheck (_, term) -> Printf.sprintf "ncheck %s" (NotationPp.pp_term status term)
| Screenshot (_, name) -> Printf.sprintf "screenshot \"%s\"" name
;;
| Some `LeftToRight -> "> "
| Some `RightToLeft -> "< "
-let pp_notation dir_opt l1_pattern assoc prec l2_pattern =
+let pp_notation status dir_opt l1_pattern assoc prec l2_pattern =
sprintf "notation %s\"%s\" %s %s for %s."
(pp_dir_opt dir_opt)
- (pp_l1_pattern l1_pattern)
+ (pp_l1_pattern status l1_pattern)
(pp_associativity assoc)
(pp_precedence prec)
- (pp_l2_pattern l2_pattern)
+ (pp_l2_pattern status l2_pattern)
-let pp_ncommand = function
+let pp_ncommand status = function
| UnificationHint (_,t, n) ->
- "unification hint " ^ string_of_int n ^ " " ^ NotationPp.pp_term t
+ "unification hint " ^ string_of_int n ^ " " ^ NotationPp.pp_term status t
| NDiscriminator (_,_)
| NInverter (_,_,_,_,_)
| NUnivConstraint (_) -> "not supported"
| NCoercion (_) -> "not supported"
- | NObj (_,obj) -> NotationPp.pp_obj NotationPp.pp_term obj
- | NQed (_) -> "nqed"
+ | NObj (_,obj,index) ->
+ (if not index then "-" else "") ^
+ NotationPp.pp_obj (NotationPp.pp_term status) obj
+ | NQed (_,true) -> "qed"
+ | NQed (_,false) -> "qed-"
| NCopy (_,name,uri,map) ->
"copy " ^ name ^ " from " ^ NUri.string_of_uri uri ^ " with " ^
String.concat " and "
map)
| Include (_,mode,path) -> (* not precise, since path is absolute *)
if mode = WithPreferences then
- "include \"" ^ path ^ "\"."
+ "include \"" ^ path ^ "\""
else
- "include' \"" ^ path ^ "\"."
+ "include' \"" ^ path ^ "\""
| Alias (_,s) -> pp_alias s
| Interpretation (_, dsc, (symbol, arg_patterns), cic_appl_pattern) ->
pp_interpretation dsc symbol arg_patterns cic_appl_pattern
| Notation (_, dir_opt, l1_pattern, assoc, prec, l2_pattern) ->
- pp_notation dir_opt l1_pattern assoc prec l2_pattern
+ pp_notation status dir_opt l1_pattern assoc prec l2_pattern
;;
-let pp_command = function
- | Print (_,s) -> "print " ^ s
- | Set (_, name, value) -> Printf.sprintf "set \"%s\" \"%s\"" name value
-
-let pp_executable ~map_unicode_to_tex =
+let pp_executable status ~map_unicode_to_tex =
function
- | NMacro (_, macro) -> pp_nmacro macro ^ "."
+ | NMacro (_, macro) -> pp_nmacro status macro ^ "."
| NTactic (_,tacl) ->
- String.concat " " (List.map (pp_ntactic ~map_unicode_to_tex) tacl)
- | Command (_, cmd) -> pp_command cmd ^ "."
- | NCommand (_, cmd) -> pp_ncommand cmd ^ "."
+ String.concat " " (List.map (pp_ntactic status ~map_unicode_to_tex) tacl)
+ | NCommand (_, cmd) -> pp_ncommand status cmd ^ "."
-let pp_comment ~map_unicode_to_tex =
+let pp_comment status ~map_unicode_to_tex =
function
| Note (_,"") -> Printf.sprintf "\n"
| Note (_,str) -> Printf.sprintf "\n(* %s *)" str
| Code (_,code) ->
- Printf.sprintf "\n(** %s. **)" (pp_executable ~map_unicode_to_tex code)
+ Printf.sprintf "\n(** %s. **)" (pp_executable status ~map_unicode_to_tex code)
-let pp_statement =
+let pp_statement status =
function
- | Executable (_, ex) -> pp_executable ex
- | Comment (_, c) -> pp_comment c
+ | Executable (_, ex) -> pp_executable status ex
+ | Comment (_, c) -> pp_comment status c
projects / helm.git / blobdiff