X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=bf39a1caca2170658880b4673bd77b2c7bd7a874;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=b456bb6eb39c57f45f3b301e6590adccd275f91e;hpb=6b5e1d495c61f459738187e8d71efadb162abdbe;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index b456bb6eb..bf39a1cac 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -24,18 +24,21 @@ *) open Printf + open MatitaTypes exception Drop;; -exception UnableToInclude of string;; +exception UnableToInclude of string +exception IncludedFileNotCompiled of string let debug = false ;; let debug_print = if debug then prerr_endline else ignore ;; -type options = { do_heavy_checks: bool ; include_paths: string list } - -type statement = - (CicNotationPt.term, GrafiteAst.obj, string) GrafiteAst.statement +type options = { + do_heavy_checks: bool ; + include_paths: string list ; + clean_baseuri: bool +} (** create a ProofEngineTypes.mk_fresh_name_type function which uses given * names as long as they are available, then it fallbacks to name generation @@ -51,12 +54,15 @@ let namer_of names = end else FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ -let tactic_of_ast = function +let tactic_of_ast ast = + let module PET = ProofEngineTypes in + match ast with | GrafiteAst.Absurd (_, term) -> Tactics.absurd term | GrafiteAst.Apply (_, term) -> Tactics.apply term | GrafiteAst.Assumption _ -> Tactics.assumption - | GrafiteAst.Auto (_,depth,width) -> - AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) () + | GrafiteAst.Auto (_,depth,width,paramodulation,full) -> + AutoTactic.auto_tac ?depth ?width ?paramodulation ?full + ~dbd:(MatitaDb.instance ()) () | GrafiteAst.Change (_, pattern, with_what) -> Tactics.change ~pattern with_what | GrafiteAst.Clear (_,id) -> Tactics.clear id @@ -68,27 +74,47 @@ let tactic_of_ast = function let names = match ident with None -> [] | Some id -> [id] in Tactics.cut ~mk_fresh_name_callback:(namer_of names) term | GrafiteAst.DecideEquality _ -> Tactics.decide_equality - | GrafiteAst.Decompose (_,term) -> Tactics.decompose term + | GrafiteAst.Decompose (_, types, what, names) -> + let to_type = function + | GrafiteAst.Type (uri, typeno) -> uri, typeno + | GrafiteAst.Ident _ -> assert false + in + let user_types = List.rev_map to_type types in + let dbd = MatitaDb.instance () in + let mk_fresh_name_callback = namer_of names in + Tactics.decompose ~mk_fresh_name_callback ~dbd ~user_types what | GrafiteAst.Discriminate (_,term) -> Tactics.discriminate term | GrafiteAst.Elim (_, what, using, depth, names) -> - Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names) what + Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names) + what | GrafiteAst.ElimType (_, what, using, depth, names) -> - Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names) what + Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names) + what | GrafiteAst.Exact (_, term) -> Tactics.exact term | GrafiteAst.Exists _ -> Tactics.exists | GrafiteAst.Fail _ -> Tactics.fail | GrafiteAst.Fold (_, reduction_kind, term, pattern) -> - let reduction = - match reduction_kind with - | `Normalize -> CicReduction.normalize ~delta:false ~subst:[] - | `Reduce -> ProofEngineReduction.reduce - | `Simpl -> ProofEngineReduction.simpl - | `Whd -> CicReduction.whd ~delta:false ~subst:[] - in + let reduction = + match reduction_kind with + | `Normalize -> + PET.const_lazy_reduction + (CicReduction.normalize ~delta:false ~subst:[]) + | `Reduce -> PET.const_lazy_reduction ProofEngineReduction.reduce + | `Simpl -> PET.const_lazy_reduction ProofEngineReduction.simpl + | `Unfold None -> + PET.const_lazy_reduction (ProofEngineReduction.unfold ?what:None) + | `Unfold (Some lazy_term) -> + (fun context metasenv ugraph -> + let what, metasenv, ugraph = lazy_term context metasenv ugraph in + ProofEngineReduction.unfold ~what, metasenv, ugraph) + | `Whd -> + PET.const_lazy_reduction (CicReduction.whd ~delta:false ~subst:[]) + in Tactics.fold ~reduction ~term ~pattern | GrafiteAst.Fourier _ -> Tactics.fourier | GrafiteAst.FwdSimpl (_, hyp, names) -> - Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) ~dbd:(MatitaDb.instance ()) hyp + Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) + ~dbd:(MatitaDb.instance ()) hyp | GrafiteAst.Generalize (_,pattern,ident) -> let names = match ident with None -> [] | Some id -> [id] in Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern @@ -101,8 +127,9 @@ let tactic_of_ast = function PrimitiveTactics.intros_tac ~howmany:num ~mk_fresh_name_callback:(namer_of names) () | GrafiteAst.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) ?how_many ~to_what what + let names = match ident with None -> [] | Some id -> [id] in + Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?how_many + ~to_what what | GrafiteAst.Left _ -> Tactics.left | GrafiteAst.LetIn (loc,term,name) -> Tactics.letin term ~mk_fresh_name_callback:(namer_of [name]) @@ -111,6 +138,7 @@ let tactic_of_ast = function | `Normalize -> Tactics.normalize ~pattern | `Reduce -> Tactics.reduce ~pattern | `Simpl -> Tactics.simpl ~pattern + | `Unfold what -> Tactics.unfold ~pattern what | `Whd -> Tactics.whd ~pattern) | GrafiteAst.Reflexivity _ -> Tactics.reflexivity | GrafiteAst.Replace (_, pattern, with_what) -> @@ -123,210 +151,425 @@ let tactic_of_ast = function | GrafiteAst.Symmetry _ -> Tactics.symmetry | GrafiteAst.Transitivity (_, term) -> Tactics.transitivity term -let disambiguate_term status term = - let (aliases, metasenv, cic, _) = - match - MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ()) - ~aliases:(status.aliases) ~context:(MatitaMisc.get_proof_context status) - ~metasenv:(MatitaMisc.get_proof_metasenv status) term - with - | [x] -> x - | _ -> assert false +let singleton = function + | [x], _ -> x + | _ -> assert false + + (** @param term not meaningful when context is given *) +let disambiguate_term ?context status_ref goal term = + let status = !status_ref in + let context = + match context with + | Some c -> c + | None -> MatitaTypes.get_proof_context status goal in - let proof_status = - match status.proof_status with - | No_proof -> Intermediate metasenv - | Incomplete_proof ((uri, _, proof, ty), goal) -> - Incomplete_proof ((uri, metasenv, proof, ty), goal) - | Intermediate _ -> Intermediate metasenv - | Proof _ -> assert false + let (diff, metasenv, cic, _) = + singleton + (MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ()) + ~aliases:status.aliases ~universe:(Some status.multi_aliases) + ~context ~metasenv:(MatitaTypes.get_proof_metasenv status) term) in - let status = { status with proof_status = proof_status } in - let status = MatitaSync.set_proof_aliases status aliases in - status, cic + let status = MatitaTypes.set_metasenv metasenv status in + let status = MatitaSync.set_proof_aliases status diff in + status_ref := status; + cic -let disambiguate_pattern status (wanted, hyp_paths, goal_path) = - let interp path = Disambiguate.interpretate_path [] status.aliases path in + (** disambiguate_lazy_term (circa): term -> (unit -> status) * lazy_term + * rationale: lazy_term will be invoked in different context to obtain a term, + * each invocation will disambiguate the term and can add aliases. Once all + * disambiguations have been performed, the first returned function can be + * used to obtain the resulting aliases *) +let disambiguate_lazy_term status_ref term = + (fun context metasenv ugraph -> + let status = !status_ref in + let (diff, metasenv, cic, ugraph) = + singleton + (MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ()) + ~initial_ugraph:ugraph ~aliases:status.aliases + ~universe:(Some status.multi_aliases) ~context ~metasenv term) + in + let status = MatitaTypes.set_metasenv metasenv status in + let status = MatitaSync.set_proof_aliases status diff in + status_ref := status; + cic, metasenv, ugraph) + +let disambiguate_pattern status_ref (wanted, hyp_paths, goal_path) = + let interp path = Disambiguate.interpretate_path [] path in let goal_path = interp goal_path in let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in - let status,wanted = + let wanted = match wanted with - None -> status,None + None -> None | Some wanted -> - let status,wanted = disambiguate_term status wanted in - status, Some wanted + let wanted = disambiguate_lazy_term status_ref wanted in + Some wanted in - status, (wanted, hyp_paths ,goal_path) + (wanted, hyp_paths ,goal_path) + +let disambiguate_reduction_kind aliases_ref = function + | `Unfold (Some t) -> + let t = disambiguate_lazy_term aliases_ref t in + `Unfold (Some t) + | `Normalize + | `Reduce + | `Simpl + | `Unfold None + | `Whd as kind -> kind -let disambiguate_tactic status = function - | GrafiteAst.Apply (loc, term) -> - let status, cic = disambiguate_term status term in - status, GrafiteAst.Apply (loc, cic) - | GrafiteAst.Absurd (loc, term) -> - let status, cic = disambiguate_term status term in - status, GrafiteAst.Absurd (loc, cic) - | GrafiteAst.Assumption loc -> status, GrafiteAst.Assumption loc - | GrafiteAst.Auto (loc,depth,width) -> status, GrafiteAst.Auto (loc,depth,width) - | GrafiteAst.Change (loc, pattern, with_what) -> - let status, with_what = disambiguate_term status with_what in - let status, pattern = disambiguate_pattern status pattern in - status, GrafiteAst.Change (loc, pattern, with_what) - | GrafiteAst.Clear (loc,id) -> status,GrafiteAst.Clear (loc,id) - | GrafiteAst.ClearBody (loc,id) -> status,GrafiteAst.ClearBody (loc,id) - | GrafiteAst.Compare (loc,term) -> - let status, term = disambiguate_term status term in - status, GrafiteAst.Compare (loc,term) - | GrafiteAst.Constructor (loc,n) -> - status, GrafiteAst.Constructor (loc,n) - | GrafiteAst.Contradiction loc -> - status, GrafiteAst.Contradiction loc - | GrafiteAst.Cut (loc, ident, term) -> - let status, cic = disambiguate_term status term in - status, GrafiteAst.Cut (loc, ident, cic) - | GrafiteAst.DecideEquality loc -> - status, GrafiteAst.DecideEquality loc - | GrafiteAst.Decompose (loc,term) -> - let status,term = disambiguate_term status term in - status, GrafiteAst.Decompose(loc,term) - | GrafiteAst.Discriminate (loc,term) -> - let status,term = disambiguate_term status term in - status, GrafiteAst.Discriminate(loc,term) - | GrafiteAst.Exact (loc, term) -> - let status, cic = disambiguate_term status term in - status, GrafiteAst.Exact (loc, cic) - | GrafiteAst.Elim (loc, what, Some using, depth, idents) -> - let status, what = disambiguate_term status what in - let status, using = disambiguate_term status using in - status, GrafiteAst.Elim (loc, what, Some using, depth, idents) - | GrafiteAst.Elim (loc, what, None, depth, idents) -> - let status, what = disambiguate_term status what in - status, GrafiteAst.Elim (loc, what, None, depth, idents) - | GrafiteAst.ElimType (loc, what, Some using, depth, idents) -> - let status, what = disambiguate_term status what in - let status, using = disambiguate_term status using in - status, GrafiteAst.ElimType (loc, what, Some using, depth, idents) - | GrafiteAst.ElimType (loc, what, None, depth, idents) -> - let status, what = disambiguate_term status what in - status, GrafiteAst.ElimType (loc, what, None, depth, idents) - | GrafiteAst.Exists loc -> status, GrafiteAst.Exists loc - | GrafiteAst.Fail loc -> status,GrafiteAst.Fail loc - | GrafiteAst.Fold (loc,reduction_kind, term, pattern) -> - let status, pattern = disambiguate_pattern status pattern in - let status, term = disambiguate_term status term in - status, GrafiteAst.Fold (loc,reduction_kind, term, pattern) - | GrafiteAst.FwdSimpl (loc, hyp, names) -> - status, GrafiteAst.FwdSimpl (loc, hyp, names) - | GrafiteAst.Fourier loc -> status, GrafiteAst.Fourier loc - | GrafiteAst.Generalize (loc,pattern,ident) -> - let status, pattern = disambiguate_pattern status pattern in - status, GrafiteAst.Generalize(loc,pattern,ident) - | GrafiteAst.Goal (loc, g) -> status, GrafiteAst.Goal (loc, g) - | GrafiteAst.IdTac loc -> status,GrafiteAst.IdTac loc - | GrafiteAst.Injection (loc,term) -> - let status, term = disambiguate_term status term in - status, GrafiteAst.Injection (loc,term) - | GrafiteAst.Intros (loc, num, names) -> - status, GrafiteAst.Intros (loc, num, names) - | GrafiteAst.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, GrafiteAst.LApply (loc, depth, to_what, what, ident) - | GrafiteAst.Left loc -> status, GrafiteAst.Left loc - | GrafiteAst.LetIn (loc, term, name) -> - let status, term = disambiguate_term status term in - status, GrafiteAst.LetIn (loc,term,name) - | GrafiteAst.Reduce (loc, reduction_kind, pattern) -> - let status, pattern = disambiguate_pattern status pattern in - status, GrafiteAst.Reduce(loc, reduction_kind, pattern) - | GrafiteAst.Reflexivity loc -> status, GrafiteAst.Reflexivity loc - | GrafiteAst.Replace (loc, pattern, with_what) -> - let status, pattern = disambiguate_pattern status pattern in - let status, with_what = disambiguate_term status with_what in - status, GrafiteAst.Replace (loc, pattern, with_what) - | GrafiteAst.Rewrite (loc, dir, t, pattern) -> - let status, term = disambiguate_term status t in - let status, pattern = disambiguate_pattern status pattern in - status, GrafiteAst.Rewrite (loc, dir, term, pattern) - | GrafiteAst.Right loc -> status, GrafiteAst.Right loc - | GrafiteAst.Ring loc -> status, GrafiteAst.Ring loc - | GrafiteAst.Split loc -> status, GrafiteAst.Split loc - | GrafiteAst.Symmetry loc -> status, GrafiteAst.Symmetry loc - | GrafiteAst.Transitivity (loc, term) -> - let status, cic = disambiguate_term status term in - status, GrafiteAst.Transitivity (loc, cic) - -let apply_tactic tactic status = - let status,tactic = disambiguate_tactic status tactic in +let disambiguate_tactic status goal tactic = + let status_ref = ref status in + let tactic = + match tactic with + | GrafiteAst.Absurd (loc, term) -> + let cic = disambiguate_term status_ref goal term in + GrafiteAst.Absurd (loc, cic) + | GrafiteAst.Apply (loc, term) -> + let cic = disambiguate_term status_ref goal term in + GrafiteAst.Apply (loc, cic) + | GrafiteAst.Assumption loc -> GrafiteAst.Assumption loc + | GrafiteAst.Auto (loc,depth,width,paramodulation,full) -> + GrafiteAst.Auto (loc,depth,width,paramodulation,full) + | GrafiteAst.Change (loc, pattern, with_what) -> + let with_what = disambiguate_lazy_term status_ref with_what in + let pattern = disambiguate_pattern status_ref pattern in + GrafiteAst.Change (loc, pattern, with_what) + | GrafiteAst.Clear (loc,id) -> GrafiteAst.Clear (loc,id) + | GrafiteAst.ClearBody (loc,id) -> GrafiteAst.ClearBody (loc,id) + | GrafiteAst.Compare (loc,term) -> + let term = disambiguate_term status_ref goal term in + GrafiteAst.Compare (loc,term) + | GrafiteAst.Constructor (loc,n) -> GrafiteAst.Constructor (loc,n) + | GrafiteAst.Contradiction loc -> GrafiteAst.Contradiction loc + | GrafiteAst.Cut (loc, ident, term) -> + let cic = disambiguate_term status_ref goal term in + GrafiteAst.Cut (loc, ident, cic) + | GrafiteAst.DecideEquality loc -> GrafiteAst.DecideEquality loc + | GrafiteAst.Decompose (loc, types, what, names) -> + let disambiguate types = function + | GrafiteAst.Type _ -> assert false + | GrafiteAst.Ident id -> + (match disambiguate_term status_ref goal + (CicNotationPt.Ident (id, None)) + with + | Cic.MutInd (uri, tyno, _) -> + (GrafiteAst.Type (uri, tyno) :: types) + | _ -> raise (MatitaDisambiguator.DisambiguationError [[lazy "Decompose works only on inductive types"]])) + in + let types = List.fold_left disambiguate [] types in + GrafiteAst.Decompose (loc, types, what, names) + | GrafiteAst.Discriminate (loc,term) -> + let term = disambiguate_term status_ref goal term in + GrafiteAst.Discriminate(loc,term) + | GrafiteAst.Exact (loc, term) -> + let cic = disambiguate_term status_ref goal term in + GrafiteAst.Exact (loc, cic) + | GrafiteAst.Elim (loc, what, Some using, depth, idents) -> + let what = disambiguate_term status_ref goal what in + let using = disambiguate_term status_ref goal using in + GrafiteAst.Elim (loc, what, Some using, depth, idents) + | GrafiteAst.Elim (loc, what, None, depth, idents) -> + let what = disambiguate_term status_ref goal what in + GrafiteAst.Elim (loc, what, None, depth, idents) + | GrafiteAst.ElimType (loc, what, Some using, depth, idents) -> + let what = disambiguate_term status_ref goal what in + let using = disambiguate_term status_ref goal using in + GrafiteAst.ElimType (loc, what, Some using, depth, idents) + | GrafiteAst.ElimType (loc, what, None, depth, idents) -> + let what = disambiguate_term status_ref goal what in + GrafiteAst.ElimType (loc, what, None, depth, idents) + | GrafiteAst.Exists loc -> GrafiteAst.Exists loc + | GrafiteAst.Fail loc -> GrafiteAst.Fail loc + | GrafiteAst.Fold (loc,red_kind, term, pattern) -> + let pattern = disambiguate_pattern status_ref pattern in + let term = disambiguate_lazy_term status_ref term in + let red_kind = disambiguate_reduction_kind status_ref red_kind in + GrafiteAst.Fold (loc, red_kind, term, pattern) + | GrafiteAst.FwdSimpl (loc, hyp, names) -> + GrafiteAst.FwdSimpl (loc, hyp, names) + | GrafiteAst.Fourier loc -> GrafiteAst.Fourier loc + | GrafiteAst.Generalize (loc,pattern,ident) -> + let pattern = disambiguate_pattern status_ref pattern in + GrafiteAst.Generalize (loc,pattern,ident) + | GrafiteAst.Goal (loc, g) -> GrafiteAst.Goal (loc, g) + | GrafiteAst.IdTac loc -> GrafiteAst.IdTac loc + | GrafiteAst.Injection (loc, term) -> + let term = disambiguate_term status_ref goal term in + GrafiteAst.Injection (loc,term) + | GrafiteAst.Intros (loc, num, names) -> GrafiteAst.Intros (loc, num, names) + | GrafiteAst.LApply (loc, depth, to_what, what, ident) -> + let f term to_what = + let term = disambiguate_term status_ref goal term in + term :: to_what + in + let to_what = List.fold_right f to_what [] in + let what = disambiguate_term status_ref goal what in + GrafiteAst.LApply (loc, depth, to_what, what, ident) + | GrafiteAst.Left loc -> GrafiteAst.Left loc + | GrafiteAst.LetIn (loc, term, name) -> + let term = disambiguate_term status_ref goal term in + GrafiteAst.LetIn (loc,term,name) + | GrafiteAst.Reduce (loc, red_kind, pattern) -> + let pattern = disambiguate_pattern status_ref pattern in + let red_kind = disambiguate_reduction_kind status_ref red_kind in + GrafiteAst.Reduce(loc, red_kind, pattern) + | GrafiteAst.Reflexivity loc -> GrafiteAst.Reflexivity loc + | GrafiteAst.Replace (loc, pattern, with_what) -> + let pattern = disambiguate_pattern status_ref pattern in + let with_what = disambiguate_lazy_term status_ref with_what in + GrafiteAst.Replace (loc, pattern, with_what) + | GrafiteAst.Rewrite (loc, dir, t, pattern) -> + let term = disambiguate_term status_ref goal t in + let pattern = disambiguate_pattern status_ref pattern in + GrafiteAst.Rewrite (loc, dir, term, pattern) + | GrafiteAst.Right loc -> GrafiteAst.Right loc + | GrafiteAst.Ring loc -> GrafiteAst.Ring loc + | GrafiteAst.Split loc -> GrafiteAst.Split loc + | GrafiteAst.Symmetry loc -> GrafiteAst.Symmetry loc + | GrafiteAst.Transitivity (loc, term) -> + let cic = disambiguate_term status_ref goal term in + GrafiteAst.Transitivity (loc, cic) + in + status_ref, tactic + +let reorder_metasenv start refine tactic goals current_goal always_opens_a_goal= + let module PEH = ProofEngineHelpers in +(* let print_m name metasenv = + prerr_endline (">>>>> " ^ name); + prerr_endline (CicMetaSubst.ppmetasenv [] metasenv) + in *) + (* phase one calculates: + * new_goals_from_refine: goals added by refine + * head_goal: the first goal opened by ythe tactic + * other_goals: other goals opened by the tactic + *) + let new_goals_from_refine = PEH.compare_metasenvs start refine in + let new_goals_from_tactic = PEH.compare_metasenvs refine tactic in + let head_goal, other_goals, goals = + match goals with + | [] -> None,[],goals + | hd::tl -> + (* assert (List.mem hd new_goals_from_tactic); + * invalidato dalla goal_tac + * *) + Some hd, List.filter ((<>) hd) new_goals_from_tactic, List.filter ((<>) + hd) goals + in + let produced_goals = + match head_goal with + | None -> new_goals_from_refine @ other_goals + | Some x -> x :: new_goals_from_refine @ other_goals + in + (* extract the metas generated by refine and tactic *) + let metas_for_tactic_head = + match head_goal with + | None -> [] + | Some head_goal -> List.filter (fun (n,_,_) -> n = head_goal) tactic in + let metas_for_tactic_goals = + List.map + (fun x -> List.find (fun (metano,_,_) -> metano = x) tactic) + goals + in + let metas_for_refine_goals = + List.filter (fun (n,_,_) -> List.mem n new_goals_from_refine) tactic in + let produced_metas, goals = + let produced_metas = + if always_opens_a_goal then + metas_for_tactic_head @ metas_for_refine_goals @ + metas_for_tactic_goals + else begin +(* print_m "metas_for_refine_goals" metas_for_refine_goals; + print_m "metas_for_tactic_head" metas_for_tactic_head; + print_m "metas_for_tactic_goals" metas_for_tactic_goals; *) + metas_for_refine_goals @ metas_for_tactic_head @ + metas_for_tactic_goals + end + in + let goals = List.map (fun (metano, _, _) -> metano) produced_metas in + produced_metas, goals + in + (* residual metas, preserving the original order *) + let before, after = + let rec split e = + function + | [] -> [],[] + | (metano, _, _) :: tl when metano = e -> + [], List.map (fun (x,_,_) -> x) tl + | (metano, _, _) :: tl -> let b, a = split e tl in metano :: b, a + in + let find n metasenv = + try + Some (List.find (fun (metano, _, _) -> metano = n) metasenv) + with Not_found -> None + in + let extract l = + List.fold_right + (fun n acc -> + match find n tactic with + | Some x -> x::acc + | None -> acc + ) l [] in + let before_l, after_l = split current_goal start in + let before_l = + List.filter (fun x -> not (List.mem x produced_goals)) before_l in + let after_l = + List.filter (fun x -> not (List.mem x produced_goals)) after_l in + let before = extract before_l in + let after = extract after_l in + before, after + in +(* |+ DEBUG CODE +| + print_m "BEGIN" start; + prerr_endline ("goal was: " ^ string_of_int current_goal); + prerr_endline ("and metas from refine are:"); + List.iter + (fun t -> prerr_string (" " ^ string_of_int t)) + new_goals_from_refine; + prerr_endline ""; + print_m "before" before; + print_m "metas_for_tactic_head" metas_for_tactic_head; + print_m "metas_for_refine_goals" metas_for_refine_goals; + print_m "metas_for_tactic_goals" metas_for_tactic_goals; + print_m "produced_metas" produced_metas; + print_m "after" after; +|+ FINE DEBUG CODE +| *) + before @ produced_metas @ after, goals + +(* maybe we only need special cases for apply and goal *) +let classify_tactic tactic = + match tactic with + (* tactics that can't close the goal (return a goal we want to "select") *) + | GrafiteAst.Rewrite _ + | GrafiteAst.Split _ + | GrafiteAst.Replace _ + | GrafiteAst.Reduce _ + | GrafiteAst.Injection _ + | GrafiteAst.IdTac _ + | GrafiteAst.Generalize _ + | GrafiteAst.Elim _ + | GrafiteAst.Cut _ + | GrafiteAst.Decompose _ -> true, true + (* tactics we don't want to reorder goals. I think only Goal needs this. *) + | GrafiteAst.Goal _ -> false, true + (* tactics like apply *) + | _ -> true, false + +let apply_tactic tactic (status, goal) = +(* prerr_endline "apply_tactic"; *) +(* prerr_endline (Continuationals.Stack.pp (MatitaTypes.get_stack status)); *) + let starting_metasenv = MatitaTypes.get_proof_metasenv status in + let before = List.map (fun g, _, _ -> g) starting_metasenv in +(* prerr_endline "disambiguate"; *) + let status_ref, tactic = disambiguate_tactic status goal tactic in + let metasenv_after_refinement = MatitaTypes.get_proof_metasenv !status_ref in + let proof = MatitaTypes.get_current_proof !status_ref in + let proof_status = proof, goal in + let needs_reordering, always_opens_a_goal = classify_tactic tactic in let tactic = tactic_of_ast tactic in - let (proof, goals) = - ProofEngineTypes.apply_tactic tactic (MatitaMisc.get_proof_status status) in - let dummy = -1 in - { status with - proof_status = MatitaTypes.Incomplete_proof (proof,dummy) }, goals + (* apply tactic will change the status pointed by status_ref ... *) +(* prerr_endline "apply_tactic bassa"; *) + let (proof, opened) = ProofEngineTypes.apply_tactic tactic proof_status in + let after = ProofEngineTypes.goals_of_proof proof in + let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in +(* prerr_endline("before: " ^ String.concat ", " (List.map string_of_int before)); +prerr_endline("after: " ^ String.concat ", " (List.map string_of_int after)); +prerr_endline("opened: " ^ String.concat ", " (List.map string_of_int opened)); *) +(* prerr_endline("opened_goals: " ^ String.concat ", " (List.map string_of_int opened_goals)); +prerr_endline("closed_goals: " ^ String.concat ", " (List.map string_of_int closed_goals)); *) + let proof, opened_goals = + if needs_reordering then begin + let uri, metasenv_after_tactic, t, ty = proof in +(* prerr_endline ("goal prima del riordino: " ^ String.concat " " (List.map string_of_int (ProofEngineTypes.goals_of_proof proof))); *) + let reordered_metasenv, opened_goals = + reorder_metasenv + starting_metasenv + metasenv_after_refinement metasenv_after_tactic + opened goal always_opens_a_goal + in + let proof' = uri, reordered_metasenv, t, ty in +(* prerr_endline ("goal dopo il riordino: " ^ String.concat " " (List.map string_of_int (ProofEngineTypes.goals_of_proof proof'))); *) + proof', opened_goals + end + else + proof, opened_goals + in + let incomplete_proof = + match !status_ref.proof_status with + | Incomplete_proof p -> p + | _ -> assert false + in + { !status_ref with proof_status = + Incomplete_proof { incomplete_proof with proof = proof } }, + opened_goals, closed_goals module MatitaStatus = - struct - type input_status = MatitaTypes.status - type output_status = MatitaTypes.status * ProofEngineTypes.goal list - type tactic = input_status -> output_status - - let focus (status,_) goal = - let proof,_ = MatitaMisc.get_proof_status status in - {status with proof_status = MatitaTypes.Incomplete_proof (proof,goal)} +struct + type input_status = MatitaTypes.status * ProofEngineTypes.goal - let goals (_,goals) = goals + type output_status = + MatitaTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list - let set_goals (status,_) goals = status,goals - - let id_tac status = - apply_tactic (GrafiteAst.IdTac Disambiguate.dummy_floc) status + type tactic = input_status -> output_status + let id_tactic = apply_tactic (GrafiteAst.IdTac DisambiguateTypes.dummy_floc) let mk_tactic tac = tac - let apply_tactic tac = tac + let goals (_, opened, closed) = opened, closed + let set_goals (opened, closed) (status, _, _) = (status, opened, closed) + let get_stack (status, _) = MatitaTypes.get_stack status + + let set_stack stack (status, opened, closed) = + MatitaTypes.set_stack stack status, opened, closed - end + let inject (status, _) = (status, [], []) + let focus goal (status, _, _) = (status, goal) +end -module MatitaTacticals = Tacticals.Make(MatitaStatus) +module MatitaTacticals = Tacticals.Make (MatitaStatus) let eval_tactical status tac = - let rec tactical_of_ast tac = - match tac with - | GrafiteAst.Tactic (loc, tactic) -> apply_tactic tactic + let rec tactical_of_ast l tac = + match tac with + | GrafiteAst.Tactic (loc, tactic) -> + MatitaTacticals.tactic (MatitaStatus.mk_tactic (apply_tactic tactic)) | GrafiteAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *) - MatitaTacticals.seq ~tactics:(List.map tactical_of_ast tacticals) - | GrafiteAst.Do (loc, num, tactical) -> - MatitaTacticals.do_tactic ~n:num ~tactic:(tactical_of_ast tactical) + assert (l > 0); + MatitaTacticals.seq ~tactics:(List.map (tactical_of_ast (l+1)) tacticals) + | GrafiteAst.Do (loc, n, tactical) -> + MatitaTacticals.do_tactic ~n ~tactic:(tactical_of_ast (l+1) tactical) | GrafiteAst.Repeat (loc, tactical) -> - MatitaTacticals.repeat_tactic ~tactic:(tactical_of_ast tactical) + MatitaTacticals.repeat_tactic ~tactic:(tactical_of_ast (l+1) tactical) | GrafiteAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *) - MatitaTacticals.thens ~start:(tactical_of_ast tactical) - ~continuations:(List.map tactical_of_ast tacticals) + assert (l > 0); + MatitaTacticals.thens ~start:(tactical_of_ast (l+1) tactical) + ~continuations:(List.map (tactical_of_ast (l+1)) tacticals) | GrafiteAst.First (loc, tacticals) -> MatitaTacticals.first - ~tactics:(List.map (fun t -> "", tactical_of_ast t) tacticals) + ~tactics:(List.map (fun t -> "", tactical_of_ast (l+1) t) tacticals) | GrafiteAst.Try (loc, tactical) -> - MatitaTacticals.try_tactic ~tactic:(tactical_of_ast tactical) + MatitaTacticals.try_tactic ~tactic:(tactical_of_ast (l+1) tactical) | GrafiteAst.Solve (loc, tacticals) -> MatitaTacticals.solve_tactics - ~tactics:(List.map (fun t -> "",tactical_of_ast t) tacticals) - in - let status,goals = tactical_of_ast tac status in - let proof,_ = MatitaMisc.get_proof_status status in - let new_status = - match goals with - | [] -> - let (_,metasenv,_,_) = proof in - (match metasenv with - | [] -> Proof proof - | (ng,_,_)::_ -> Incomplete_proof (proof,ng)) - | ng::_ -> Incomplete_proof (proof, ng) + ~tactics:(List.map (fun t -> "", tactical_of_ast (l+1) t) tacticals) + + | GrafiteAst.Skip loc -> MatitaTacticals.skip + | GrafiteAst.Dot loc -> MatitaTacticals.dot + | GrafiteAst.Semicolon loc -> MatitaTacticals.semicolon + | GrafiteAst.Branch loc -> MatitaTacticals.branch + | GrafiteAst.Shift loc -> MatitaTacticals.shift + | GrafiteAst.Pos (loc, i) -> MatitaTacticals.pos i + | GrafiteAst.Merge loc -> MatitaTacticals.merge + | GrafiteAst.Focus (loc, goals) -> MatitaTacticals.focus goals + | GrafiteAst.Unfocus loc -> MatitaTacticals.unfocus + in + let status, _, _ = tactical_of_ast 0 tac (status, ~-1) in + let status = (* is proof completed? *) + match status.proof_status with + | Incomplete_proof { stack = stack; proof = proof } + when Continuationals.Stack.is_empty stack -> + { status with proof_status = Proof proof } + | _ -> status in - { status with proof_status = new_status } + status let eval_coercion status coercion = let coer_uri,coer_ty = @@ -366,46 +609,44 @@ let eval_coercion status coercion = in let ty_src,ty_tgt = extract_last_two_p coer_ty in let context = [] in - let src_uri = - let ty_src = CicReduction.whd context ty_src in - CicUtil.uri_of_term ty_src - in - let tgt_uri = - let ty_tgt = CicReduction.whd context ty_tgt in - CicUtil.uri_of_term ty_tgt - in + let src_uri = CoercDb.coerc_carr_of_term (CicReduction.whd context ty_src) in + let tgt_uri = CoercDb.coerc_carr_of_term (CicReduction.whd context ty_tgt) in let new_coercions = - (* also adds them to the Db *) CoercGraph.close_coercion_graph src_uri tgt_uri coer_uri in let status = - List.fold_left (fun s (uri,o,ugraph) -> MatitaSync.add_obj uri o status) + List.fold_left (fun s (uri,o,_) -> + let status = MatitaSync.add_obj uri o status in + {status with coercions = uri :: status.coercions}) status new_coercions in + let status = {status with coercions = coer_uri :: status.coercions} in let statement_of name = - GrafiteAstPp.pp_statement - (GrafiteAst.Executable (Disambiguate.dummy_floc, - (GrafiteAst.Command (Disambiguate.dummy_floc, - (GrafiteAst.Coercion (Disambiguate.dummy_floc, - (CicNotationPt.Ident (name, None)))))))) ^ "\n" + GrafiteAst.Coercion (DisambiguateTypes.dummy_floc, + (CicNotationPt.Ident (name, None))) in - let moo_content_rev = - [statement_of (UriManager.name_of_uri coer_uri)] @ + let moo_content = + statement_of (UriManager.name_of_uri coer_uri) :: (List.map (fun (uri, _, _) -> statement_of (UriManager.name_of_uri uri)) - new_coercions) @ status.moo_content_rev + new_coercions) in - let status = {status with moo_content_rev = moo_content_rev} in - {status with proof_status = No_proof} + let status = add_moo_content moo_content status in + { status with proof_status = No_proof } let generate_elimination_principles uri status = - let elim sort status = - try - let uri,obj = CicElim.elim_of ~sort uri 0 in - MatitaSync.add_obj uri obj status - with CicElim.Can_t_eliminate -> status - in - List.fold_left (fun status sort -> elim sort status) status - [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ] + let status' = ref status in + let elim sort = + try + let uri,obj = CicElim.elim_of ~sort uri 0 in + status' := MatitaSync.add_obj uri obj !status' + with CicElim.Can_t_eliminate -> () + in + try + List.iter elim [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ]; + !status' + with exn -> + MatitaSync.time_travel ~present:!status' ~past:status; + raise exn let generate_projections uri fields status = let projections = CicRecord.projections_of uri fields in @@ -414,15 +655,13 @@ let generate_projections uri fields status = try let ty, ugraph = CicTypeChecker.type_of_aux' [] [] bo CicUniv.empty_ugraph in - let bo = Unshare.unshare bo in - let ty = Unshare.unshare ty in let attrs = [`Class `Projection; `Generated] in let obj = Cic.Constant (name,Some bo,ty,[],attrs) in MatitaSync.add_obj uri obj status with CicTypeChecker.TypeCheckerFailure s -> MatitaLog.message - ("Unable to create projection " ^ name ^ " cause: " ^ s); + ("Unable to create projection " ^ name ^ " cause: " ^ (Lazy.force s)); status | CicEnvironment.Object_not_found uri -> let depend = UriManager.name_of_uri uri in @@ -432,69 +671,68 @@ let generate_projections uri fields status = ) status projections (* to avoid a long list of recursive functions *) -let eval_from_stream_ref = ref (fun _ _ _ -> assert false);; +let eval_from_moo_ref = ref (fun _ _ _ -> assert false);; let disambiguate_obj status obj = let uri = match obj with GrafiteAst.Inductive (_,(name,_,_,_)::_) | GrafiteAst.Record (_,name,_,_) -> - Some (UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".ind")) + Some (UriManager.uri_of_string (MatitaTypes.qualify status name ^ ".ind")) | GrafiteAst.Inductive _ -> assert false | GrafiteAst.Theorem _ -> None in - let (aliases, metasenv, cic, _) = - match - MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) - ~aliases:(status.aliases) ~uri obj - with - | [x] -> x - | _ -> assert false + let (diff, metasenv, cic, _) = + singleton + (MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) + ~aliases:status.aliases ~universe:(Some status.multi_aliases) ~uri obj) in let proof_status = match status.proof_status with | No_proof -> Intermediate metasenv | Incomplete_proof _ - | Intermediate _ - | Proof _ -> assert false + | Proof _ -> command_error "imbricated proofs not allowed" + | Intermediate _ -> assert false in let status = { status with proof_status = proof_status } in - let status = MatitaSync.set_proof_aliases status aliases in + let status = MatitaSync.set_proof_aliases status diff in status, cic -let disambiguate_command status = function +let disambiguate_command status = + function | GrafiteAst.Alias _ | GrafiteAst.Default _ | GrafiteAst.Drop _ | GrafiteAst.Dump _ | GrafiteAst.Include _ | GrafiteAst.Interpretation _ + | GrafiteAst.Metadata _ | GrafiteAst.Notation _ | GrafiteAst.Qed _ | GrafiteAst.Render _ | GrafiteAst.Set _ as cmd -> status,cmd | GrafiteAst.Coercion (loc, term) -> - let status, term = disambiguate_term status term in - status, GrafiteAst.Coercion (loc,term) + let status_ref = ref status in + let term = disambiguate_term ~context:[] status_ref ~-1 term in + !status_ref, GrafiteAst.Coercion (loc,term) | GrafiteAst.Obj (loc,obj) -> let status,obj = disambiguate_obj status obj in - status, GrafiteAst.Obj (loc,obj) + status, GrafiteAst.Obj (loc,obj) -let try_open_in paths path = - let rec aux = function - | [] -> open_in path - | p :: tl -> - try - open_in (p ^ "/" ^ path) - with Sys_error _ -> aux tl - in - try - aux paths - with Sys_error _ as exc -> - MatitaLog.error ("Unable to read " ^ path); - MatitaLog.error ("opts.include_paths was " ^ String.concat ":" paths); - MatitaLog.error ("current working directory is " ^ Unix.getcwd ()); - raise exc +let make_absolute paths path = + if path = "coq.ma" then path + else + let rec aux = function + | [] -> ignore (Unix.stat path); path + | p :: tl -> + let path = p ^ "/" ^ path in + try + ignore (Unix.stat path); path + with Unix.Unix_error _ -> aux tl + in + try + aux paths + with Unix.Unix_error _ as exc -> raise (UnableToInclude path) ;; let eval_command opts status cmd = @@ -506,33 +744,42 @@ let eval_command opts status cmd = match cmd with | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; - {status with moo_content_rev = - (GrafiteAstPp.pp_command cmd ^ "\n") :: status.moo_content_rev} + add_moo_content [cmd] status | GrafiteAst.Include (loc, path) -> - let path = MatitaMisc.obj_file_of_script path in - let stream = - try - Stream.of_channel (try_open_in opts.include_paths path) - with Sys_error _ -> raise (UnableToInclude path) - in + let absolute_path = make_absolute opts.include_paths path in + let moopath = MatitacleanLib.obj_file_of_script absolute_path in let status = ref status in - !eval_from_stream_ref status stream (fun _ _ -> ()); - !status + if not (Sys.file_exists moopath) then + raise (IncludedFileNotCompiled moopath); + !eval_from_moo_ref status moopath (fun _ _ -> ()); + !status + | GrafiteAst.Metadata (loc, m) -> + (match m with + | GrafiteAst.Dependency uri -> MatitaTypes.add_moo_metadata [m] status + | GrafiteAst.Baseuri _ -> status) | GrafiteAst.Set (loc, name, value) -> - let value = - if name = "baseuri" then - let v = MatitaMisc.strip_trailing_slash value in - try - ignore (String.index v ' '); - command_error "baseuri can't contain spaces" - with Not_found -> v - else - value + let status = + if name = "baseuri" then begin + let value = + let v = MatitaMisc.strip_trailing_slash value in + try + ignore (String.index v ' '); + command_error "baseuri can't contain spaces" + with Not_found -> v + in + if not (MatitaMisc.is_empty value) && opts.clean_baseuri then begin + MatitaLog.warn ("baseuri " ^ value ^ " is not empty"); + MatitaLog.message ("cleaning baseuri " ^ value); + MatitacleanLib.clean_baseuris [value] + end; + add_moo_metadata [GrafiteAst.Baseuri value] status + end else + status in set_option status name value | GrafiteAst.Drop loc -> raise Drop | GrafiteAst.Qed loc -> - let uri, metasenv, bo, ty = + let uri, metasenv, bo, ty = match status.proof_status with | Proof (Some uri, metasenv, body, ty) -> uri, metasenv, body, ty @@ -540,7 +787,7 @@ let eval_command opts status cmd = command_error ("Someone allows to start a thm without giving the "^ "name/uri. This should be fixed!") - | _-> command_error "You can't qed an uncomplete theorem" + | _-> command_error "You can't Qed an incomplete theorem" in let suri = UriManager.string_of_uri uri in if metasenv <> [] then @@ -548,31 +795,40 @@ let eval_command opts status cmd = let name = UriManager.name_of_uri uri in let obj = Cic.Constant (name,Some bo,ty,[],[]) in MatitaSync.add_obj uri obj status - | GrafiteAst.Coercion (loc, coercion) -> - eval_coercion status coercion + | GrafiteAst.Coercion (loc, coercion) -> eval_coercion status coercion | GrafiteAst.Alias (loc, spec) -> - let aliases = + let diff = + (*CSC: Warning: this code should be factorized with the corresponding + code in DisambiguatePp *) match spec with | GrafiteAst.Ident_alias (id,uri) -> - DisambiguateTypes.Environment.add - (DisambiguateTypes.Id id) - (uri,(fun _ _ _-> CicUtil.term_of_uri (UriManager.uri_of_string uri))) - status.aliases + [DisambiguateTypes.Id id, + (uri,(fun _ _ _-> CicUtil.term_of_uri(UriManager.uri_of_string uri)))] | GrafiteAst.Symbol_alias (symb, instance, desc) -> - DisambiguateTypes.Environment.add - (DisambiguateTypes.Symbol (symb,instance)) - (DisambiguateChoices.lookup_symbol_by_dsc symb desc) - status.aliases + [DisambiguateTypes.Symbol (symb,instance), + DisambiguateChoices.lookup_symbol_by_dsc symb desc] | GrafiteAst.Number_alias (instance,desc) -> - DisambiguateTypes.Environment.add - (DisambiguateTypes.Num instance) - (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases + [DisambiguateTypes.Num instance, + DisambiguateChoices.lookup_num_by_dsc desc] in - MatitaSync.set_proof_aliases status aliases + MatitaSync.set_proof_aliases status diff | GrafiteAst.Render _ -> assert false (* ZACK: to be removed *) | GrafiteAst.Dump _ -> assert false (* ZACK: to be removed *) - | GrafiteAst.Interpretation _ - | GrafiteAst.Notation _ -> status + | GrafiteAst.Interpretation (_, dsc, (symbol, _), cic_appl_pattern) as stm -> + let status = add_moo_content [stm] status in + let uris = + List.map + (fun uri -> GrafiteAst.Dependency (UriManager.buri_of_uri uri)) + (CicNotationUtil.find_appl_pattern_uris cic_appl_pattern) + in + let diff = + [DisambiguateTypes.Symbol (symbol, 0), + DisambiguateChoices.lookup_symbol_by_dsc symbol dsc] + in + let status = MatitaSync.set_proof_aliases status diff in + let status = MatitaTypes.add_moo_metadata uris status in + status + | GrafiteAst.Notation _ as stm -> add_moo_content [stm] status | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with @@ -583,9 +839,9 @@ let eval_command opts status cmd = (match types with (name,_,_,_)::_ -> name | _ -> assert false) | _ -> assert false in let uri = - UriManager.uri_of_string (MatitaMisc.qualify status name ^ ext) + UriManager.uri_of_string (MatitaTypes.qualify status name ^ ext) in - let metasenv = MatitaMisc.get_proof_metasenv status in + let metasenv = MatitaTypes.get_proof_metasenv status in match obj with | Cic.CurrentProof (_,metasenv',bo,ty,_,_) -> let name = UriManager.name_of_uri uri in @@ -595,6 +851,12 @@ let eval_command opts status cmd = begin let dbd = MatitaDb.instance () in let similar = MetadataQuery.match_term ~dbd ty in + let similar_len = List.length similar in + if similar_len> 30 then + (MatitaLog.message + ("Duplicate check will compare your theorem with " ^ + string_of_int similar_len ^ + " theorems, this may take a while.")); let convertible = List.filter ( fun u -> @@ -618,32 +880,44 @@ let eval_command opts status cmd = match metasenv' with (goalno,_,_)::_ -> goalno | _ -> assert false in let initial_proof = (Some uri, metasenv, bo, ty) in - { status with proof_status = Incomplete_proof (initial_proof,goalno)} + let initial_stack = Continuationals.Stack.of_metasenv metasenv in + { status with proof_status = + Incomplete_proof { proof = initial_proof; stack = initial_stack } } | _ -> if metasenv <> [] then command_error ( "metasenv not empty while giving a definition with body: " ^ - CicMetaSubst.ppmetasenv metasenv []); - let status = MatitaSync.add_obj uri obj status in - match obj with - Cic.Constant _ -> status + CicMetaSubst.ppmetasenv [] metasenv); + let status' = ref status in + (try + status' := MatitaSync.add_obj uri obj !status'; + (match obj with + | Cic.Constant _ -> () | Cic.InductiveDefinition (_,_,_,attrs) -> - let status = generate_elimination_principles uri status in - let rec get_record_attrs = - function - [] -> None - | (`Class (`Record fields))::_ -> Some fields - | _::tl -> get_record_attrs tl - in + status' := generate_elimination_principles uri !status'; + let rec get_record_attrs = + function + | [] -> None + | (`Class (`Record fields))::_ -> Some fields + | _::tl -> get_record_attrs tl + in (match get_record_attrs attrs with - None -> status (* not a record *) - | Some fields -> generate_projections uri fields status) + | None -> () (* not a record *) + | Some fields -> + status' := generate_projections uri fields !status') | Cic.CurrentProof _ - | Cic.Variable _ -> assert false + | Cic.Variable _ -> assert false); + !status' + with exn -> + MatitaSync.time_travel ~present:!status' ~past:status; + raise exn) let eval_executable opts status ex = match ex with - | GrafiteAst.Tactical (_, tac) -> eval_tactical status tac + | GrafiteAst.Tactical (_, tac, None) -> eval_tactical status tac + | GrafiteAst.Tactical (_, tac, Some punct) -> + let status = eval_tactical status tac in + eval_tactical status punct | GrafiteAst.Command (_, cmd) -> eval_command opts status cmd | GrafiteAst.Macro (_, mac) -> command_error (sprintf "The macro %s can't be in a script" @@ -651,40 +925,74 @@ let eval_executable opts status ex = let eval_comment status c = status - -let eval_ast ?(do_heavy_checks=false) ?(include_paths=[]) status st = - let opts = - {do_heavy_checks = do_heavy_checks ; include_paths = include_paths} +let eval_ast + ?(do_heavy_checks=false) ?(include_paths=[]) ?(clean_baseuri=true) status st += + let opts = { + do_heavy_checks = do_heavy_checks ; + include_paths = include_paths; + clean_baseuri = clean_baseuri } in match st with | GrafiteAst.Executable (_,ex) -> eval_executable opts status ex | GrafiteAst.Comment (_,c) -> eval_comment status c -let eval_from_stream ?do_heavy_checks ?include_paths status str cb = +let eval_from_moo ?do_heavy_checks ?include_paths ?clean_baseuri status fname cb += + let ast_of_cmd cmd = + GrafiteAst.Executable (DisambiguateTypes.dummy_floc, + GrafiteAst.Command (DisambiguateTypes.dummy_floc, + (GrafiteAst.reash_cmd_uris cmd))) + in + let moo, metadata = MatitaMoo.load_moo fname in + List.iter + (fun ast -> + let ast = ast_of_cmd ast in + cb !status ast; + status := + eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast) + moo; + List.iter + (fun m -> + let ast = + ast_of_cmd (GrafiteAst.Metadata (DisambiguateTypes.dummy_floc, m)) + in + cb !status ast; + status := + eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast) + metadata + +let eval_from_stream + ?do_heavy_checks ?include_paths ?clean_baseuri status str cb += try while true do let ast = GrafiteParser.parse_statement str in cb !status ast; - status := eval_ast ?do_heavy_checks ?include_paths !status ast + status := + eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast done with End_of_file -> () (* to avoid a long list of recursive functions *) -let _ = eval_from_stream_ref := eval_from_stream +let _ = eval_from_moo_ref := eval_from_moo -let eval_from_stream_greedy ?do_heavy_checks ?include_paths status str cb = +let eval_from_stream_greedy + ?do_heavy_checks ?include_paths ?clean_baseuri status str cb += while true do print_string "matita> "; flush stdout; let ast = GrafiteParser.parse_statement str in cb !status ast; - status := eval_ast ?do_heavy_checks ?include_paths !status ast + status := eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast done ;; -let eval_string ?do_heavy_checks ?include_paths status str = +let eval_string ?do_heavy_checks ?include_paths ?clean_baseuri status str = eval_from_stream - ?do_heavy_checks ?include_paths status (Stream.of_string str) (fun _ _ ->()) + ?do_heavy_checks ?include_paths ?clean_baseuri status + (Ulexing.from_utf8_string str) (fun _ _ -> ()) let default_options () = (* @@ -704,11 +1012,13 @@ let default_options () = let initial_status = lazy { - aliases = DisambiguateTypes.empty_environment; - moo_content_rev = []; + aliases = DisambiguateTypes.Environment.empty; + multi_aliases = DisambiguateTypes.Environment.empty; + moo_content_rev = [], []; proof_status = No_proof; options = default_options (); objects = []; + coercions = []; notation_ids = []; }