open Printf
open MatitaTypes
+exception Drop;;
+
let debug = false ;;
let debug_print = if debug then prerr_endline else ignore ;;
| TacticAst.Assumption _ -> Tactics.assumption
| TacticAst.Auto (_,depth,width) ->
AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) ()
- | TacticAst.Change (_, what, with_what, _) -> Tactics.change ~what ~with_what
+ | TacticAst.Change (_, what, with_what, pattern) ->
+ Tactics.change ~what ~with_what ~pattern
+ | TacticAst.Clear (_,id) -> Tactics.clear id
+ | TacticAst.ClearBody (_,id) -> Tactics.clearbody id
| TacticAst.Contradiction _ -> Tactics.contradiction
| TacticAst.Compare (_, term) -> Tactics.compare term
| TacticAst.Constructor (_, n) -> Tactics.constructor n
| TacticAst.ElimType (_, term) -> Tactics.elim_type term
| TacticAst.Exact (_, term) -> Tactics.exact term
| TacticAst.Exists _ -> Tactics.exists
- | TacticAst.Fold (_, reduction_kind ,term) ->
+ | TacticAst.Fail _ -> Tactics.fail
+ | TacticAst.Fold (_, reduction_kind ,term, pattern) ->
let reduction =
match reduction_kind with
| `Normalize -> CicReduction.normalize ~delta:false ~subst:[]
| `Simpl -> ProofEngineReduction.simpl
| `Whd -> CicReduction.whd ~delta:false ~subst:[]
in
- Tactics.fold ~reduction ~also_in_hypotheses:false ~term
+ Tactics.fold ~reduction ~pattern ~term
| TacticAst.Fourier _ -> Tactics.fourier
| TacticAst.FwdSimpl (_, term) ->
Tactics.fwd_simpl ~what:term ~dbd:(MatitaDb.instance ())
- | TacticAst.Generalize (_,term,pat) -> Tactics.generalize term pat
+ | TacticAst.Generalize (_,term,ident,pat) ->
+ let names = match ident with None -> [] | Some id -> [id] in
+ Tactics.generalize ~term ~mk_fresh_name_callback:(namer_of names) pat
| TacticAst.Goal (_, n) -> Tactics.set_goal n
+ | TacticAst.IdTac _ -> Tactics.id
| TacticAst.Injection (_,term) -> Tactics.injection term
| TacticAst.Intros (_, None, names) ->
PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
| TacticAst.Intros (_, Some num, names) ->
PrimitiveTactics.intros_tac ~howmany:num
~mk_fresh_name_callback:(namer_of names) ()
- | TacticAst.LApply (_, to_what, what) ->
- Tactics.lapply ?to_what what
+ | TacticAst.LApply (_, to_what, what, ident) ->
+ let names = match ident with None -> [] | Some id -> [id] in
+ Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?to_what what
| TacticAst.Left _ -> Tactics.left
| TacticAst.LetIn (loc,term,name) ->
Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
| `Simpl -> Tactics.simpl ~pattern
| `Whd -> Tactics.whd ~pattern)
| TacticAst.Reflexivity _ -> Tactics.reflexivity
- | TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~with_what
+ | TacticAst.Replace (_, pattern, with_what) ->
+ Tactics.replace ~pattern ~with_what
| TacticAst.Rewrite (_, dir, t, pattern) ->
if dir = `Left then
EqualityTactics.rewrite_tac ~where:pattern ~term:t ()
in
let rec tactical_of_ast = function
| TacticAst.Tactic (loc, tactic) -> tactic_of_ast tactic
- | TacticAst.Fail loc -> Tacticals.fail
| TacticAst.Do (loc, num, tactical) ->
Tacticals.do_tactic num (tactical_of_ast tactical)
- | TacticAst.IdTac loc -> Tacticals.id_tac
| TacticAst.Repeat (loc, tactical) ->
Tacticals.repeat_tactic (tactical_of_ast tactical)
| TacticAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *)
let eval_command status cmd =
match cmd with
| TacticAst.Set (loc, name, value) -> set_option status name value
+ | TacticAst.Drop loc -> raise Drop
| TacticAst.Qed loc ->
let uri, metasenv, bo, ty =
match status.proof_status with
let status, cic2 = disambiguate_term status with_what in
let pattern = disambiguate_pattern status.aliases pattern in
status, TacticAst.Change (loc, cic1, cic2, pattern)
+ | TacticAst.Clear (loc,id) -> status,TacticAst.Clear (loc,id)
+ | TacticAst.ClearBody (loc,id) -> status,TacticAst.ClearBody (loc,id)
| TacticAst.Compare (loc,term) ->
let status, term = disambiguate_term status term in
status, TacticAst.Compare (loc,term)
let status, cic = disambiguate_term status term in
status, TacticAst.ElimType (loc, cic)
| TacticAst.Exists loc -> status, TacticAst.Exists loc
- | TacticAst.Fold (loc,reduction_kind, term) ->
+ | TacticAst.Fail loc -> status,TacticAst.Fail loc
+ | TacticAst.Fold (loc,reduction_kind, term, pattern) ->
let status, term = disambiguate_term status term in
- status, TacticAst.Fold (loc,reduction_kind, term)
+ let pattern = disambiguate_pattern status.aliases pattern in
+ status, TacticAst.Fold (loc,reduction_kind, term, pattern)
| TacticAst.FwdSimpl (loc, term) ->
let status, term = disambiguate_term status term in
status, TacticAst.FwdSimpl (loc, term)
| TacticAst.Fourier loc -> status, TacticAst.Fourier loc
- | TacticAst.Generalize (loc,term,pattern) ->
+ | TacticAst.Generalize (loc,term,ident,pattern) ->
let status,term = disambiguate_term status term in
let pattern = disambiguate_pattern status.aliases pattern in
- status, TacticAst.Generalize(loc,term,pattern)
+ status, TacticAst.Generalize(loc,term,ident,pattern)
| TacticAst.Goal (loc, g) -> status, TacticAst.Goal (loc, g)
+ | TacticAst.IdTac loc -> status,TacticAst.IdTac loc
| TacticAst.Injection (loc,term) ->
let status, term = disambiguate_term status term in
status, TacticAst.Injection (loc,term)
| TacticAst.Intros (loc, num, names) ->
status, TacticAst.Intros (loc, num, names)
- | TacticAst.LApply (loc, to_what, what) ->
+ | TacticAst.LApply (loc, to_what, what, ident) ->
let status, to_what =
match to_what with
None -> status,None
status, Some to_what
in
let status, what = disambiguate_term status what in
- status, TacticAst.LApply (loc, to_what, what)
+ status, TacticAst.LApply (loc, to_what, what, ident)
| TacticAst.Left loc -> status, TacticAst.Left loc
| TacticAst.LetIn (loc, term, name) ->
let status, term = disambiguate_term status term in
let pattern = disambiguate_pattern status.aliases pattern in
status, TacticAst.Reduce(loc, reduction_kind, pattern)
| TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc
- | TacticAst.Replace (loc, what, with_what) ->
- let status, cic1 = disambiguate_term status what in
- let status, cic2 = disambiguate_term status with_what in
- status, TacticAst.Replace (loc, cic1, cic2)
+ | TacticAst.Replace (loc, pattern, with_what) ->
+ let pattern = disambiguate_pattern status.aliases pattern in
+ let status, with_what = disambiguate_term status with_what in
+ status, TacticAst.Replace (loc, pattern, with_what)
| TacticAst.Rewrite (loc, dir, t, pattern) ->
let status, term = disambiguate_term status t in
let pattern = disambiguate_pattern status.aliases pattern in
| TacticAst.Try (loc, tactical) ->
let status, tactical = disambiguate_tactical status tactical in
status, TacticAst.Try (loc, tactical)
- | (TacticAst.IdTac _ | TacticAst.Fail _) as tac ->
- status, tac
and disambiguate_tacticals status tacticals =
let status, tacticals =
| TacticAst.Coercion (loc, term) ->
let status, term = disambiguate_term status term in
status, TacticAst.Coercion (loc,term)
- | (TacticAst.Set _ | TacticAst.Qed _) as cmd ->
+ | (TacticAst.Set _ | TacticAst.Qed _ | TacticAst.Drop _ ) as cmd ->
status, cmd
| TacticAst.Alias _ as x -> status, x
| TacticAst.Obj (loc,obj) ->
let eval_from_stream status str cb =
let stl = CicTextualParser2.parse_statements str in
- List.fold_left
- (fun status ast -> cb status ast;eval_ast status ast) status
- stl
+ List.iter (fun ast -> cb !status ast;status := eval_ast !status ast) stl
+
+let eval_from_stream_greedy status str cb =
+ while true do
+ print_string "matita> ";
+ flush stdout;
+ let ast = CicTextualParser2.parse_statement str in
+ cb !status ast;
+ status := eval_ast !status ast
+ done
let eval_string status str =
eval_from_stream status (Stream.of_string str) (fun _ _ -> ())
let default_options () =
+(*
let options =
StringMap.add "baseuri"
(String
(Helm_registry.get "matita.baseuri" ^ Helm_registry.get "matita.owner"))
no_options
in
+*)
let options =
StringMap.add "basedir"
(String (Helm_registry.get "matita.basedir" ))
- options
+ no_options
in
options