X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=a9b46267f98c9ba1a032ce6a9315aac3d04cadfe;hb=d1126c6b78a3333bbf415daf027004496b77c2f4;hp=354ecd9e819424cccf20424c31f99604a0252212;hpb=34104f5a2b1ba5c2a795cd5c8502f8944de23b20;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index 354ecd9e8..a9b46267f 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -1,12 +1,49 @@ +(* Copyright (C) 2005, HELM Team. + * + * This file is part of HELM, an Hypertextual, Electronic + * Library of Mathematics, developed at the Computer Science + * Department, University of Bologna, Italy. + * + * HELM is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * HELM is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with HELM; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + * + * For details, see the HELM World-Wide-Web page, + * http://helm.cs.unibo.it/ + *) open Printf open MatitaTypes exception Drop;; +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 ; + clean_baseuri: bool +} + +type statement = + (CicNotationPt.term, CicNotationPt.term, GrafiteAst.reduction, GrafiteAst.obj, + string) + GrafiteAst.statement + (** create a ProofEngineTypes.mk_fresh_name_type function which uses given * names as long as they are available, then it fallbacks to name generation * using FreshNamesGenerator module *) @@ -21,222 +58,287 @@ let namer_of names = end else FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ -let tactic_of_ast = function - | TacticAst.Absurd (_, term) -> Tactics.absurd term - | TacticAst.Apply (_, term) -> Tactics.apply term - | TacticAst.Assumption _ -> Tactics.assumption - | TacticAst.Auto (_,depth,width) -> - AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) () - | TacticAst.Change (_, pattern, with_what) -> +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,paramodulation) -> + AutoTactic.auto_tac ?depth ?width ?paramodulation + ~dbd:(MatitaDb.instance ()) () + | GrafiteAst.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.Compare (_, term) -> Tactics.compare term - | TacticAst.Constructor (_, n) -> Tactics.constructor n - | TacticAst.Cut (_, ident, term) -> + | GrafiteAst.Clear (_,id) -> Tactics.clear id + | GrafiteAst.ClearBody (_,id) -> Tactics.clearbody id + | GrafiteAst.Contradiction _ -> Tactics.contradiction + | GrafiteAst.Compare (_, term) -> Tactics.compare term + | GrafiteAst.Constructor (_, n) -> Tactics.constructor n + | GrafiteAst.Cut (_, ident, term) -> let names = match ident with None -> [] | Some id -> [id] in Tactics.cut ~mk_fresh_name_callback:(namer_of names) term - | TacticAst.DecideEquality _ -> Tactics.decide_equality - | TacticAst.Decompose (_,term) -> Tactics.decompose term - | TacticAst.Discriminate (_,term) -> Tactics.discriminate term - | TacticAst.Elim (_, what, using, depth, names) -> - Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names) what - | TacticAst.ElimType (_, what, using, depth, names) -> - Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names) what - | TacticAst.Exact (_, term) -> Tactics.exact term - | TacticAst.Exists _ -> Tactics.exists - | TacticAst.Fail _ -> Tactics.fail - | TacticAst.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 + | GrafiteAst.DecideEquality _ -> Tactics.decide_equality + | 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 + | GrafiteAst.ElimType (_, what, using, depth, names) -> + 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 -> + 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 - | TacticAst.Fourier _ -> Tactics.fourier - | TacticAst.FwdSimpl (_, hyp, names) -> - Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) ~dbd:(MatitaDb.instance ()) hyp - | TacticAst.Generalize (_,pattern,ident) -> + | GrafiteAst.Fourier _ -> Tactics.fourier + | GrafiteAst.FwdSimpl (_, hyp, names) -> + 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 - | TacticAst.Goal (_, n) -> Tactics.set_goal n - | TacticAst.IdTac _ -> Tactics.id - | TacticAst.Injection (_,term) -> Tactics.injection term - | TacticAst.Intros (_, None, names) -> + | GrafiteAst.Goal (_, n) -> Tactics.set_goal n + | GrafiteAst.IdTac _ -> Tactics.id + | GrafiteAst.Injection (_,term) -> Tactics.injection term + | GrafiteAst.Intros (_, None, names) -> PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) () - | TacticAst.Intros (_, Some num, names) -> + | GrafiteAst.Intros (_, Some num, names) -> PrimitiveTactics.intros_tac ~howmany:num ~mk_fresh_name_callback:(namer_of names) () - | 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) ?how_many ~to_what what - | TacticAst.Left _ -> Tactics.left - | TacticAst.LetIn (loc,term,name) -> + | 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 + | GrafiteAst.Left _ -> Tactics.left + | GrafiteAst.LetIn (loc,term,name) -> Tactics.letin term ~mk_fresh_name_callback:(namer_of [name]) - | TacticAst.Reduce (_, reduction_kind, pattern) -> + | GrafiteAst.Reduce (_, reduction_kind, pattern) -> (match reduction_kind with | `Normalize -> Tactics.normalize ~pattern | `Reduce -> Tactics.reduce ~pattern | `Simpl -> Tactics.simpl ~pattern + | `Unfold what -> Tactics.unfold ~pattern what | `Whd -> Tactics.whd ~pattern) - | TacticAst.Reflexivity _ -> Tactics.reflexivity - | TacticAst.Replace (_, pattern, with_what) -> + | GrafiteAst.Reflexivity _ -> Tactics.reflexivity + | GrafiteAst.Replace (_, pattern, with_what) -> Tactics.replace ~pattern ~with_what - | TacticAst.Rewrite (_, direction, t, pattern) -> + | GrafiteAst.Rewrite (_, direction, t, pattern) -> EqualityTactics.rewrite_tac ~direction ~pattern t - | TacticAst.Right _ -> Tactics.right - | TacticAst.Ring _ -> Tactics.ring - | TacticAst.Split _ -> Tactics.split - | TacticAst.Symmetry _ -> Tactics.symmetry - | TacticAst.Transitivity (_, term) -> Tactics.transitivity term + | GrafiteAst.Right _ -> Tactics.right + | GrafiteAst.Ring _ -> Tactics.ring + | GrafiteAst.Split _ -> Tactics.split + | GrafiteAst.Symmetry _ -> Tactics.symmetry + | GrafiteAst.Transitivity (_, term) -> Tactics.transitivity term + +let singleton = function + | [x] -> x + | _ -> assert false -let disambiguate_term status term = +let disambiguate_term status_ref term = + let status = !status_ref in let (aliases, metasenv, cic, _) = - match - MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ()) + singleton + (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 - 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 + ~metasenv:(MatitaMisc.get_proof_metasenv status) term) in - let status = { status with proof_status = proof_status } in + let status = MatitaTypes.set_metasenv metasenv status in let status = MatitaSync.set_proof_aliases status aliases in - status, cic + 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 (aliases, metasenv, cic, ugraph) = + singleton + (MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ()) + ~initial_ugraph:ugraph ~aliases:status.aliases ~context ~metasenv + term) + in + let status = MatitaTypes.set_metasenv metasenv status in + let status = MatitaSync.set_proof_aliases status aliases in + status_ref := status; + cic, metasenv, ugraph) + +let disambiguate_pattern status_ref (wanted, hyp_paths, goal_path) = + let interp path = + Disambiguate.interpretate_path [] !status_ref.aliases 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 - | TacticAst.Apply (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Apply (loc, cic) - | TacticAst.Absurd (loc, term) -> - let status, cic = disambiguate_term status term in - 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, 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) -> - let status, term = disambiguate_term status term in - status, TacticAst.Compare (loc,term) - | TacticAst.Constructor (loc,n) -> - status, TacticAst.Constructor (loc,n) - | TacticAst.Contradiction loc -> - status, TacticAst.Contradiction loc - | TacticAst.Cut (loc, ident, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Cut (loc, ident, cic) - | TacticAst.DecideEquality loc -> - status, TacticAst.DecideEquality loc - | TacticAst.Decompose (loc,term) -> - let status,term = disambiguate_term status term in - status, TacticAst.Decompose(loc,term) - | TacticAst.Discriminate (loc,term) -> - let status,term = disambiguate_term status term in - status, TacticAst.Discriminate(loc,term) - | TacticAst.Exact (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Exact (loc, cic) - | TacticAst.Elim (loc, what, Some using, depth, idents) -> - let status, what = disambiguate_term status what in - let status, using = disambiguate_term status using in - status, TacticAst.Elim (loc, what, Some using, depth, idents) - | TacticAst.Elim (loc, what, None, depth, idents) -> - let status, what = disambiguate_term status what in - status, TacticAst.Elim (loc, what, None, depth, idents) - | TacticAst.ElimType (loc, what, Some using, depth, idents) -> - let status, what = disambiguate_term status what in - let status, using = disambiguate_term status using in - status, TacticAst.ElimType (loc, what, Some using, depth, idents) - | TacticAst.ElimType (loc, what, None, depth, idents) -> - let status, what = disambiguate_term status what in - status, TacticAst.ElimType (loc, what, None, depth, idents) - | 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 - status, TacticAst.Fold (loc,reduction_kind, term, pattern) - | TacticAst.FwdSimpl (loc, hyp, names) -> - status, TacticAst.FwdSimpl (loc, hyp, names) - | TacticAst.Fourier loc -> status, TacticAst.Fourier loc - | 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) -> - 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, 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, 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 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 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 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 - | TacticAst.Split loc -> status, TacticAst.Split loc - | TacticAst.Symmetry loc -> status, TacticAst.Symmetry loc - | TacticAst.Transitivity (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Transitivity (loc, cic) +let disambiguate_tactic status tactic = + let status_ref = ref status in + let tactic = + match tactic with + | GrafiteAst.Absurd (loc, term) -> + let cic = disambiguate_term status_ref term in + GrafiteAst.Absurd (loc, cic) + | GrafiteAst.Apply (loc, term) -> + let cic = disambiguate_term status_ref term in + GrafiteAst.Apply (loc, cic) + | GrafiteAst.Assumption loc -> GrafiteAst.Assumption loc + | GrafiteAst.Auto (loc,depth,width,paramodulation) -> + GrafiteAst.Auto (loc,depth,width,paramodulation) + | 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 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 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 (CicNotationPt.Ident (id, None)) with + | Cic.MutInd (uri, tyno, _) -> + (GrafiteAst.Type (uri, tyno) :: types) + | _ -> raise Disambiguate.NoWellTypedInterpretation) + 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 term in + GrafiteAst.Discriminate(loc,term) + | GrafiteAst.Exact (loc, term) -> + let cic = disambiguate_term status_ref term in + GrafiteAst.Exact (loc, cic) + | GrafiteAst.Elim (loc, what, Some using, depth, idents) -> + let what = disambiguate_term status_ref what in + let using = disambiguate_term status_ref using in + GrafiteAst.Elim (loc, what, Some using, depth, idents) + | GrafiteAst.Elim (loc, what, None, depth, idents) -> + let what = disambiguate_term status_ref what in + GrafiteAst.Elim (loc, what, None, depth, idents) + | GrafiteAst.ElimType (loc, what, Some using, depth, idents) -> + let what = disambiguate_term status_ref what in + let using = disambiguate_term status_ref using in + GrafiteAst.ElimType (loc, what, Some using, depth, idents) + | GrafiteAst.ElimType (loc, what, None, depth, idents) -> + let what = disambiguate_term status_ref 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 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 term in + term :: to_what + in + let to_what = List.fold_right f to_what [] in + let what = disambiguate_term status_ref 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 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 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 term in + GrafiteAst.Transitivity (loc, cic) + in + status_ref, tactic let apply_tactic tactic status = - let status,tactic = disambiguate_tactic status tactic in + let status_ref, tactic = disambiguate_tactic status tactic in + let proof_status = MatitaMisc.get_proof_status !status_ref in let tactic = tactic_of_ast tactic in - let (proof, goals) = - ProofEngineTypes.apply_tactic tactic (MatitaMisc.get_proof_status status) in + (* apply tactic will change the status pointed by status_ref ... *) + let (proof, goals) = ProofEngineTypes.apply_tactic tactic proof_status in let dummy = -1 in - { status with - proof_status = MatitaTypes.Incomplete_proof (proof,dummy) }, goals + { !status_ref with + proof_status = MatitaTypes.Incomplete_proof (proof,dummy) }, + goals module MatitaStatus = struct @@ -252,7 +354,8 @@ module MatitaStatus = let set_goals (status,_) goals = status,goals - let id_tac status = apply_tactic (TacticAst.IdTac CicAst.dummy_floc) status + let id_tac status = + apply_tactic (GrafiteAst.IdTac Disambiguate.dummy_floc) status let mk_tactic tac = tac @@ -265,22 +368,22 @@ module MatitaTacticals = Tacticals.Make(MatitaStatus) let eval_tactical status tac = let rec tactical_of_ast tac = match tac with - | TacticAst.Tactic (loc, tactic) -> apply_tactic tactic - | TacticAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *) + | GrafiteAst.Tactic (loc, tactic) -> apply_tactic tactic + | GrafiteAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *) MatitaTacticals.seq ~tactics:(List.map tactical_of_ast tacticals) - | TacticAst.Do (loc, num, tactical) -> + | GrafiteAst.Do (loc, num, tactical) -> MatitaTacticals.do_tactic ~n:num ~tactic:(tactical_of_ast tactical) - | TacticAst.Repeat (loc, tactical) -> + | GrafiteAst.Repeat (loc, tactical) -> MatitaTacticals.repeat_tactic ~tactic:(tactical_of_ast tactical) - | TacticAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *) + | GrafiteAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *) MatitaTacticals.thens ~start:(tactical_of_ast tactical) ~continuations:(List.map tactical_of_ast tacticals) - | TacticAst.First (loc, tacticals) -> + | GrafiteAst.First (loc, tacticals) -> MatitaTacticals.first ~tactics:(List.map (fun t -> "", tactical_of_ast t) tacticals) - | TacticAst.Try (loc, tactical) -> + | GrafiteAst.Try (loc, tactical) -> MatitaTacticals.try_tactic ~tactic:(tactical_of_ast tactical) - | TacticAst.Solve (loc, tacticals) -> + | GrafiteAst.Solve (loc, tacticals) -> MatitaTacticals.solve_tactics ~tactics:(List.map (fun t -> "",tactical_of_ast t) tacticals) in @@ -350,11 +453,11 @@ let eval_coercion status coercion = List.fold_left (fun s (uri,o,ugraph) -> MatitaSync.add_obj uri o status) status new_coercions in let statement_of name = - TacticAstPp.pp_statement - (TacticAst.Executable (CicAst.dummy_floc, - (TacticAst.Command (CicAst.dummy_floc, - (TacticAst.Coercion (CicAst.dummy_floc, - (CicAst.Ident (name, None)))))))) ^ "\n" + GrafiteAstPp.pp_statement + (GrafiteAst.Executable (Disambiguate.dummy_floc, + (GrafiteAst.Command (Disambiguate.dummy_floc, + (GrafiteAst.Coercion (Disambiguate.dummy_floc, + (CicNotationPt.Ident (name, None)))))))) ^ "\n" in let moo_content_rev = [statement_of (UriManager.name_of_uri coer_uri)] @ @@ -383,8 +486,6 @@ 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 @@ -406,11 +507,11 @@ let eval_from_stream_ref = ref (fun _ _ _ -> assert false);; let disambiguate_obj status obj = let uri = match obj with - TacticAst.Inductive (_,(name,_,_,_)::_) - | TacticAst.Record (_,name,_,_) -> + GrafiteAst.Inductive (_,(name,_,_,_)::_) + | GrafiteAst.Record (_,name,_,_) -> Some (UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".ind")) - | TacticAst.Inductive _ -> assert false - | _ -> None in + | GrafiteAst.Inductive _ -> assert false + | GrafiteAst.Theorem _ -> None in let (aliases, metasenv, cic, _) = match MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) @@ -423,40 +524,72 @@ let disambiguate_obj status obj = 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 status, cic let disambiguate_command status = function - | TacticAst.Default _ - | TacticAst.Alias _ - | TacticAst.Include _ as cmd -> status,cmd - | TacticAst.Coercion (loc, term) -> - let status, term = disambiguate_term status term in - status, TacticAst.Coercion (loc,term) - | (TacticAst.Set _ | TacticAst.Qed _ | TacticAst.Drop _ ) as cmd -> - status, cmd - | TacticAst.Obj (loc,obj) -> + | GrafiteAst.Alias _ + | GrafiteAst.Default _ + | GrafiteAst.Drop _ + | GrafiteAst.Dump _ + | GrafiteAst.Include _ + | GrafiteAst.Interpretation _ + | GrafiteAst.Notation _ + | GrafiteAst.Qed _ + | GrafiteAst.Render _ + | GrafiteAst.Set _ as cmd -> + status,cmd + | GrafiteAst.Coercion (loc, term) -> + let status_ref = ref status in + let term = disambiguate_term status_ref term in + !status_ref, GrafiteAst.Coercion (loc,term) + | GrafiteAst.Obj (loc,obj) -> let status,obj = disambiguate_obj status obj in - status, TacticAst.Obj (loc,obj) + status, GrafiteAst.Obj (loc,obj) -let eval_command status cmd = - let status,cmd = disambiguate_command status cmd in +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 = + let status,cmd = disambiguate_command status cmd in + let cmd,notation_ids' = CicNotation.process_notation cmd in + let status = + { status with notation_ids = notation_ids' @ status.notation_ids } + in match cmd with - | TacticAst.Default (loc, what, uris) as cmd -> + | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; {status with moo_content_rev = - (TacticAstPp.pp_command cmd ^ "\n") :: status.moo_content_rev} - | TacticAst.Include (loc, path) -> - let path = MatitaMisc.obj_file_of_script path in - let stream = Stream.of_channel (open_in path) in + (GrafiteAstPp.pp_command cmd ^ "\n") :: status.moo_content_rev} + | GrafiteAst.Include (loc, path) -> + let absolute_path = make_absolute opts.include_paths path in + let moopath = MatitaMisc.obj_file_of_script absolute_path in + let ic = + try open_in moopath with Sys_error _ -> + raise (IncludedFileNotCompiled moopath) in + let stream = Stream.of_channel ic in let status = ref status in !eval_from_stream_ref status stream (fun _ _ -> ()); + close_in ic; !status - | TacticAst.Set (loc, name, value) -> + | GrafiteAst.Set (loc, name, value) -> let value = if name = "baseuri" then let v = MatitaMisc.strip_trailing_slash value in @@ -467,9 +600,18 @@ let eval_command status cmd = else value in + if not (MatitaMisc.is_empty value) then + begin + MatitaLog.warn ("baseuri " ^ value ^ " is not empty"); + if opts.clean_baseuri then + begin + MatitaLog.message ("cleaning baseuri " ^ value); + MatitacleanLib.clean_baseuris [value] + end + end; set_option status name value - | TacticAst.Drop loc -> raise Drop - | TacticAst.Qed loc -> + | GrafiteAst.Drop loc -> raise Drop + | GrafiteAst.Qed loc -> let uri, metasenv, bo, ty = match status.proof_status with | Proof (Some uri, metasenv, body, ty) -> @@ -486,28 +628,36 @@ let eval_command 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 - | TacticAst.Coercion (loc, coercion) -> + | GrafiteAst.Coercion (loc, coercion) -> eval_coercion status coercion - | TacticAst.Alias (loc, spec) -> + | GrafiteAst.Alias (loc, spec) -> let aliases = + (*CSC: Warning: this code should be factorized with the corresponding + code in DisambiguatePp *) match spec with - | TacticAst.Ident_alias (id,uri) -> + | GrafiteAst.Ident_alias (id,uri) -> DisambiguateTypes.Environment.add (DisambiguateTypes.Id id) (uri,(fun _ _ _-> CicUtil.term_of_uri (UriManager.uri_of_string uri))) status.aliases - | TacticAst.Symbol_alias (symb, instance, desc) -> - DisambiguateTypes.Environment.add + | GrafiteAst.Symbol_alias (symb, instance, desc) -> + DisambiguateTypes.Environment.add (DisambiguateTypes.Symbol (symb,instance)) - (DisambiguateChoices.lookup_symbol_by_dsc symb desc) + (DisambiguateChoices.lookup_symbol_by_dsc symb desc) status.aliases - | TacticAst.Number_alias (instance,desc) -> - DisambiguateTypes.Environment.add - (DisambiguateTypes.Num instance) + | GrafiteAst.Number_alias (instance,desc) -> + DisambiguateTypes.Environment.add + (DisambiguateTypes.Num instance) (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases in MatitaSync.set_proof_aliases status aliases - | TacticAst.Obj (loc,obj) -> + | GrafiteAst.Render _ -> assert false (* ZACK: to be removed *) + | GrafiteAst.Dump _ -> assert false (* ZACK: to be removed *) + | GrafiteAst.Interpretation _ + | GrafiteAst.Notation _ as stm -> + { status with moo_content_rev = + (GrafiteAstPp.pp_command stm ^ "\n") :: status.moo_content_rev } + | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with Cic.Constant (name,_,_,_,_) @@ -521,73 +671,118 @@ let eval_command status cmd = in let metasenv = MatitaMisc.get_proof_metasenv status in match obj with - Cic.CurrentProof (_,metasenv',bo,ty,_,_) -> + | Cic.CurrentProof (_,metasenv',bo,ty,_,_) -> let name = UriManager.name_of_uri uri in if not(CicPp.check name ty) then - MatitaLog.warn ("Bad name: " ^ name); + MatitaLog.error ("Bad name: " ^ name); + if opts.do_heavy_checks then + 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 -> + let t = CicUtil.term_of_uri u in + let ty',g = + CicTypeChecker.type_of_aux' + metasenv' [] t CicUniv.empty_ugraph + in + fst(CicReduction.are_convertible [] ty' ty g)) + similar + in + (match convertible with + | [] -> () + | x::_ -> + MatitaLog.warn + ("Theorem already proved: " ^ UriManager.string_of_uri x ^ + "\nPlease use a variant.")); + end; assert (metasenv = metasenv'); let goalno = - match metasenv' with (goalno,_,_)::_ -> goalno | _ -> assert false in + 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)} - | _ -> - 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 - | 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 - (match get_record_attrs attrs with - None -> status (* not a record *) - | Some fields -> generate_projections uri fields status) - | Cic.CurrentProof _ - | Cic.Variable _ -> assert false + { status with proof_status = Incomplete_proof (initial_proof,goalno)} + | _ -> + 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 + | 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 + (match get_record_attrs attrs with + None -> status (* not a record *) + | Some fields -> generate_projections uri fields status) + | Cic.CurrentProof _ + | Cic.Variable _ -> assert false -let eval_executable status ex = +let eval_executable opts status ex = match ex with - | TacticAst.Tactical (_, tac) -> eval_tactical status tac - | TacticAst.Command (_, cmd) -> eval_command status cmd - | TacticAst.Macro (_, mac) -> + | GrafiteAst.Tactical (_, tac) -> eval_tactical status tac + | GrafiteAst.Command (_, cmd) -> eval_command opts status cmd + | GrafiteAst.Macro (_, mac) -> command_error (sprintf "The macro %s can't be in a script" - (TacticAstPp.pp_macro_ast mac)) + (GrafiteAstPp.pp_macro_ast mac)) let eval_comment status c = status -let eval_ast status st = + +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 - | TacticAst.Executable (_,ex) -> eval_executable status ex - | TacticAst.Comment (_,c) -> eval_comment status c + | GrafiteAst.Executable (_,ex) -> eval_executable opts status ex + | GrafiteAst.Comment (_,c) -> eval_comment status c -let eval_from_stream status str cb = - let stl = CicTextualParser2.parse_statements str in - List.iter - (fun ast -> cb !status ast;status := eval_ast !status ast) stl -;; +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 ?clean_baseuri !status ast + done + with End_of_file -> () (* to avoid a long list of recursive functions *) -eval_from_stream_ref := eval_from_stream;; +let _ = eval_from_stream_ref := eval_from_stream -let eval_from_stream_greedy 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 = CicTextualParser2.parse_statement str in + let ast = GrafiteParser.parse_statement str in cb !status ast; - status := eval_ast !status ast + status := eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast done ;; -let eval_string status str = - eval_from_stream status (Stream.of_string str) (fun _ _ -> ()) +let eval_string ?do_heavy_checks ?include_paths ?clean_baseuri status str = + eval_from_stream + ?do_heavy_checks ?include_paths ?clean_baseuri status (Stream.of_string str) (fun _ _ ->()) let default_options () = (* @@ -600,7 +795,7 @@ let default_options () = *) let options = StringMap.add "basedir" - (String (Helm_registry.get "matita.basedir" )) + (String (Helm_registry.get "matita.basedir")) no_options in options @@ -612,6 +807,6 @@ let initial_status = proof_status = No_proof; options = default_options (); objects = []; + notation_ids = []; } -