| TacticAst.Assumption _ -> Tactics.assumption
| TacticAst.Auto (_,depth,width) ->
AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) ()
- | TacticAst.Change (_, what, with_what, pattern) ->
- Tactics.change ~what ~with_what ~pattern
+ | TacticAst.Change (_, pattern, with_what) ->
+ Tactics.change ~pattern with_what
| TacticAst.Clear (_,id) -> Tactics.clear id
| TacticAst.ClearBody (_,id) -> Tactics.clearbody id
| TacticAst.Contradiction _ -> Tactics.contradiction
| TacticAst.Exact (_, term) -> Tactics.exact term
| TacticAst.Exists _ -> Tactics.exists
| TacticAst.Fail _ -> Tactics.fail
- | TacticAst.Fold (_, reduction_kind ,term, pattern) ->
+ | 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 ~pattern ~term
+ Tactics.fold ~reduction ~term ~pattern
| TacticAst.Fourier _ -> Tactics.fourier
- | TacticAst.FwdSimpl (_, term) ->
- Tactics.fwd_simpl ~what:term ~dbd:(MatitaDb.instance ())
- | TacticAst.Generalize (_,term,ident,pat) ->
+ | TacticAst.FwdSimpl (_, hyp, names) ->
+ Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) ~hyp ~dbd:(MatitaDb.instance ())
+ | TacticAst.Generalize (_,pattern,ident) ->
let names = match ident with None -> [] | Some id -> [id] in
- Tactics.generalize ~term ~mk_fresh_name_callback:(namer_of names) pat
+ Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern
| TacticAst.Goal (_, n) -> Tactics.set_goal n
| TacticAst.IdTac _ -> Tactics.id
| TacticAst.Injection (_,term) -> Tactics.injection term
| TacticAst.Intros (_, Some num, names) ->
PrimitiveTactics.intros_tac ~howmany:num
~mk_fresh_name_callback:(namer_of names) ()
- | TacticAst.LApply (_, to_what, what, ident) ->
+ | TacticAst.LApply (_, how_many, 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
+ Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?how_many ~to_what what
| TacticAst.Left _ -> Tactics.left
| TacticAst.LetIn (loc,term,name) ->
Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
| TacticAst.Reflexivity _ -> Tactics.reflexivity
| 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 ()
- else
- EqualityTactics.rewrite_back_tac ~where:pattern ~term:t ()
+ | TacticAst.Rewrite (_, direction, t, pattern) ->
+ EqualityTactics.rewrite_tac ~direction ~pattern t
| TacticAst.Right _ -> Tactics.right
| TacticAst.Ring _ -> Tactics.ring
| TacticAst.Split _ -> Tactics.split
let eval_command status cmd =
match cmd with
- | TacticAst.Set (loc, name, value) -> set_option status name value
+ | TacticAst.Set (loc, name, value) ->
+ let value =
+ if name = "baseuri" then
+ MatitaMisc.strip_trailing_slash value
+ else
+ value
+ in
+ set_option status name value
| TacticAst.Drop loc -> raise Drop
| TacticAst.Qed loc ->
let uri, metasenv, bo, ty =
in
status, cic
-let disambiguate_pattern aliases (hyp_paths ,goal_path) =
- let interp path = Disambiguate.interpretate_path [] aliases path in
- let goal_path =
- match goal_path with
- | None -> None
- | Some path -> Some (interp path) in
+let disambiguate_pattern status (wanted, hyp_paths, goal_path) =
+ let interp path = Disambiguate.interpretate_path [] status.aliases path in
+ let goal_path = interp goal_path in
let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in
- (hyp_paths ,goal_path)
+ let status,wanted =
+ match wanted with
+ None -> status,None
+ | Some wanted ->
+ let status,wanted = disambiguate_term status wanted in
+ status, Some wanted
+ in
+ status, (wanted, hyp_paths ,goal_path)
let disambiguate_tactic status = function
| TacticAst.Apply (loc, term) ->
status, TacticAst.Absurd (loc, cic)
| TacticAst.Assumption loc -> status, TacticAst.Assumption loc
| TacticAst.Auto (loc,depth,width) -> status, TacticAst.Auto (loc,depth,width)
- | TacticAst.Change (loc, what, with_what, pattern) ->
- let status, cic1 = disambiguate_term status what in
- 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.Change (loc, pattern, with_what) ->
+ let status, with_what = disambiguate_term status with_what in
+ let status, pattern = disambiguate_pattern status pattern in
+ status, TacticAst.Change (loc, pattern, with_what)
| TacticAst.Clear (loc,id) -> status,TacticAst.Clear (loc,id)
| TacticAst.ClearBody (loc,id) -> status,TacticAst.ClearBody (loc,id)
| TacticAst.Compare (loc,term) ->
| TacticAst.Exists loc -> status, TacticAst.Exists loc
| TacticAst.Fail loc -> status,TacticAst.Fail loc
| TacticAst.Fold (loc,reduction_kind, term, pattern) ->
+ let status, pattern = disambiguate_pattern status pattern in
let status, term = disambiguate_term status term in
- 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.FwdSimpl (loc, hyp, names) ->
+ status, TacticAst.FwdSimpl (loc, hyp, names)
| TacticAst.Fourier loc -> status, TacticAst.Fourier loc
- | 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,ident,pattern)
+ | TacticAst.Generalize (loc,pattern,ident) ->
+ let status, pattern = disambiguate_pattern status pattern in
+ status, TacticAst.Generalize(loc,pattern,ident)
| TacticAst.Goal (loc, g) -> status, TacticAst.Goal (loc, g)
| TacticAst.IdTac loc -> status,TacticAst.IdTac loc
| TacticAst.Injection (loc,term) ->
status, TacticAst.Injection (loc,term)
| TacticAst.Intros (loc, num, names) ->
status, TacticAst.Intros (loc, num, names)
- | TacticAst.LApply (loc, to_what, what, ident) ->
- let status, to_what =
- match to_what with
- None -> status,None
- | Some to_what ->
- let status, to_what = disambiguate_term status to_what in
- status, Some to_what
+ | TacticAst.LApply (loc, depth, to_what, what, ident) ->
+ let f term (status, to_what) =
+ let status, term = disambiguate_term status term in
+ status, term :: to_what
in
+ let status, to_what = List.fold_right f to_what (status, []) in
let status, what = disambiguate_term status what in
- status, TacticAst.LApply (loc, to_what, what, ident)
+ status, TacticAst.LApply (loc, depth, to_what, what, ident)
| TacticAst.Left loc -> status, TacticAst.Left loc
| TacticAst.LetIn (loc, term, name) ->
let status, term = disambiguate_term status term in
status, TacticAst.LetIn (loc,term,name)
| TacticAst.Reduce (loc, reduction_kind, pattern) ->
- let pattern = disambiguate_pattern status.aliases pattern in
+ let status, pattern = disambiguate_pattern status pattern in
status, TacticAst.Reduce(loc, reduction_kind, pattern)
| TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc
| TacticAst.Replace (loc, pattern, with_what) ->
- let pattern = disambiguate_pattern status.aliases pattern in
+ let status, pattern = disambiguate_pattern status 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
+ let status, pattern = disambiguate_pattern status pattern in
status, TacticAst.Rewrite (loc, dir, term, pattern)
| TacticAst.Right loc -> status, TacticAst.Right loc
| TacticAst.Ring loc -> status, TacticAst.Ring loc
projects / helm.git / blobdiff