X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=89481b287434a12284dedd67c24e76c08acee8e5;hb=33a02e0b639217093eb63f30169aaa6ac8c78907;hp=a74df9313cc5a05755e1a883f836dfe0cb4d92e6;hpb=9d92e1df3dd394def0d8bcb86b04f524e27f98ff;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index a74df9313..89481b287 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -1,10 +1,50 @@ +(* 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 *) @@ -19,172 +59,359 @@ let namer_of names = end else FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ -let tactic_of_ast = function - | TacticAst.Intros (_, None, names) -> - (* TODO Zack implement intros length *) +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 + | 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 + | 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 + | 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 + | 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) -> - (* TODO Zack implement intros length *) + | GrafiteAst.Intros (_, Some num, names) -> PrimitiveTactics.intros_tac ~howmany:num ~mk_fresh_name_callback:(namer_of names) () - | TacticAst.Reflexivity _ -> Tactics.reflexivity - | TacticAst.Assumption _ -> Tactics.assumption - | TacticAst.Contradiction _ -> Tactics.contradiction - | TacticAst.Exists _ -> Tactics.exists - | TacticAst.Fourier _ -> Tactics.fourier - | TacticAst.Goal (_, n) -> Tactics.set_goal n - | TacticAst.Left _ -> Tactics.left - | TacticAst.Right _ -> Tactics.right - | TacticAst.Ring _ -> Tactics.ring - | TacticAst.Split _ -> Tactics.split - | TacticAst.Symmetry _ -> Tactics.symmetry - | TacticAst.Transitivity (_, term) -> Tactics.transitivity term - | TacticAst.Apply (_, term) -> Tactics.apply term - | TacticAst.Absurd (_, term) -> Tactics.absurd term - | TacticAst.Exact (_, term) -> Tactics.exact term - | TacticAst.Cut (_, term) -> Tactics.cut term - | TacticAst.Elim (_, term, _) -> - (* TODO Zack implement "using" argument *) - (* old: Tactics.elim_intros_simpl term *) - Tactics.elim_intros term - | TacticAst.ElimType (_, term) -> Tactics.elim_type term - | TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~with_what - | TacticAst.Auto (_,depth) -> -(* AutoTactic.auto_tac ~num (MatitaDb.instance ()) *) - AutoTactic.auto_tac_new ?depth ~dbd:(MatitaDb.instance ()) () - | TacticAst.Change (_, what, with_what, _) -> Tactics.change ~what ~with_what -(* - (* TODO Zack a lot more of tactics to be implemented here ... *) - | TacticAst.Change_pattern of 'term pattern * 'term * 'ident option - | TacticAst.Change of 'term * 'term * 'ident option - | TacticAst.Decompose of 'ident * 'ident list - | TacticAst.Discriminate of 'ident - | TacticAst.Fold of reduction_kind * 'term - | TacticAst.Injection of 'ident - | TacticAst.Replace_pattern of 'term pattern * 'term -*) - | 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.ReduceAt (_,reduction_kind,ident,path) -> - ProofEngineTypes.mk_tactic - (fun (((_,metasenv,_,_),goal) as status) -> - let metano,context,ty = CicUtil.lookup_meta goal metasenv in - let where, also_in_hypotheses = - if ident = "goal" then - ty, false - else - let hyp = - try - List.find (function - | Some (Cic.Name name,entry) when name = ident -> true - | _ -> false) - context - with - Not_found -> - raise (ProofEngineTypes.Fail - (ident ^ " is not an hypothesis")) - in - (match hyp with - | Some (_, Cic.Decl term) -> term - | Some (_, Cic.Def (term,ty)) -> term - | None -> assert false),true - in - let pointers = CicUtil.select ~term:where ~context:path in - (match reduction_kind with - | `Normalize -> - ProofEngineTypes.apply_tactic - (Tactics.normalize ~also_in_hypotheses ~terms:(Some pointers)) - status - | `Reduce -> - ProofEngineTypes.apply_tactic - (Tactics.reduce ~also_in_hypotheses ~terms:(Some pointers)) - status - | `Simpl -> - ProofEngineTypes.apply_tactic - (Tactics.simpl ~also_in_hypotheses ~terms:(Some pointers)) - status - | `Whd -> - ProofEngineTypes.apply_tactic - (Tactics.whd ~also_in_hypotheses ~terms:(Some pointers)) - status)) - | TacticAst.Reduce (_,reduction_kind,opts) -> - let terms, also_in_hypotheses = - match opts with - | Some (l,`Goal) -> Some l, false - | Some (l,`Everywhere) -> Some l, true - | None -> None, false - in + | GrafiteAst.Reduce (_, reduction_kind, pattern) -> (match reduction_kind with - | `Normalize -> Tactics.normalize ~also_in_hypotheses ~terms - | `Reduce -> Tactics.reduce ~also_in_hypotheses ~terms - | `Simpl -> Tactics.simpl ~also_in_hypotheses ~terms - | `Whd -> Tactics.whd ~also_in_hypotheses ~terms) - | TacticAst.Rewrite (_,dir,t,ident) -> - if dir = `Left then - EqualityTactics.rewrite_tac ~term:t - else - EqualityTactics.rewrite_back_tac ~term:t - | TacticAst.FwdSimpl (_, name) -> - Tactics.fwd_simpl ~hyp:(Cic.Name name) ~dbd:(MatitaDb.instance ()) - | TacticAst.LApply (_, term, substs) -> - let f (name, term) = Cic.Name name, term in - Tactics.lapply ~substs:(List.map f substs) term + | `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) -> + Tactics.replace ~pattern ~with_what + | GrafiteAst.Rewrite (_, direction, t, pattern) -> + EqualityTactics.rewrite_tac ~direction ~pattern t + | 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 eval_tactical status tac = - let apply_tactic tactic = - let (proof, goals) = - ProofEngineTypes.apply_tactic tactic (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) +let disambiguate_term status_ref term = + let status = !status_ref in + let (aliases, metasenv, cic, _) = + singleton + (MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ()) + ~aliases:(status.aliases) ~context:(MatitaMisc.get_proof_context status) + ~metasenv:(MatitaMisc.get_proof_metasenv status) term) + in + let status = MatitaTypes.set_metasenv metasenv status in + let status = MatitaSync.set_proof_aliases status aliases in + status_ref := status; + cic + + (** 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 - { status with proof_status = new_status } + 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 [] path in + let goal_path = interp goal_path in + let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in + let wanted = + match wanted with + None -> None + | Some wanted -> + let wanted = disambiguate_lazy_term status_ref wanted in + Some wanted in - let rec tactical_of_ast = function - | TacticAst.Tactic (loc, tactic) -> tactic_of_ast tactic - | TacticAst.Fail loc -> Tacticals.fail - | TacticAst.Do (loc, num, tactical) -> - Tacticals.do_tactic num (tactical_of_ast tactical) - | TacticAst.IdTac loc -> Tacticals.id_tac - | TacticAst.Repeat (loc, tactical) -> - Tacticals.repeat_tactic (tactical_of_ast tactical) - | TacticAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *) - Tacticals.seq (List.map tactical_of_ast tacticals) - | TacticAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *) - Tacticals.thens (tactical_of_ast tactical) - (List.map tactical_of_ast tacticals) - | TacticAst.Tries (loc, tacticals) -> - Tacticals.try_tactics - (List.map (fun t -> "", tactical_of_ast t) tacticals) - | TacticAst.Try (loc, tactical) -> - Tacticals.try_tactic (tactical_of_ast tactical) + (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 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 - apply_tactic (tactical_of_ast tac) + status_ref, tactic + +let apply_tactic tactic status = + 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 + (* 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_ref with + proof_status = MatitaTypes.Incomplete_proof (proof,dummy) }, + 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)} + + let goals (_,goals) = goals + + let set_goals (status,_) goals = status,goals + + let id_tac status = + apply_tactic (GrafiteAst.IdTac DisambiguateTypes.dummy_floc) status + + let mk_tactic tac = tac + + let apply_tactic tac = tac + + end + +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 + | 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) + | GrafiteAst.Repeat (loc, tactical) -> + MatitaTacticals.repeat_tactic ~tactic:(tactical_of_ast tactical) + | GrafiteAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *) + MatitaTacticals.thens ~start:(tactical_of_ast tactical) + ~continuations:(List.map tactical_of_ast tacticals) + | GrafiteAst.First (loc, tacticals) -> + MatitaTacticals.first + ~tactics:(List.map (fun t -> "", tactical_of_ast t) tacticals) + | GrafiteAst.Try (loc, tactical) -> + MatitaTacticals.try_tactic ~tactic:(tactical_of_ast 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) + in + { status with proof_status = new_status } let eval_coercion status coercion = let coer_uri,coer_ty = match coercion with | Cic.Const (uri,_) | Cic.Var (uri,_) -> - let o,_ = - CicEnvironment.get_obj CicUniv.empty_ugraph uri - in + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in (match o with | Cic.Constant (_,_,ty,_,_) | Cic.Variable (_,_,ty,_,_) -> uri,ty | _ -> assert false) | Cic.MutConstruct (uri,t,c,_) -> - let o,_ = - CicEnvironment.get_obj CicUniv.empty_ugraph uri - in + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in (match o with | Cic.InductiveDefinition (l,_,_,_) -> let (_,_,_,cl) = List.nth l t in @@ -212,11 +439,11 @@ let eval_coercion status coercion = let context = [] in let src_uri = let ty_src = CicReduction.whd context ty_src in - UriManager.uri_of_string (CicUtil.uri_of_term ty_src) + CicUtil.uri_of_term ty_src in let tgt_uri = let ty_tgt = CicReduction.whd context ty_tgt in - UriManager.uri_of_string (CicUtil.uri_of_term ty_tgt) + CicUtil.uri_of_term ty_tgt in let new_coercions = (* also adds them to the Db *) @@ -224,7 +451,19 @@ let eval_coercion status coercion = let status = List.fold_left (fun s (uri,o,ugraph) -> MatitaSync.add_obj uri o status) status new_coercions in - {status with proof_status = No_proof} + let statement_of name = + GrafiteAst.Coercion (DisambiguateTypes.dummy_floc, + (CicNotationPt.Ident (name, None))) + in + let moo_content = + statement_of (UriManager.name_of_uri coer_uri) :: + (List.map + (fun (uri, _, _) -> + statement_of (UriManager.name_of_uri uri)) + new_coercions) + in + 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 = @@ -243,8 +482,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 @@ -259,12 +496,115 @@ let generate_projections uri fields status = ("Unable to create projection " ^ name ^ " because it requires " ^ depend); status ) status projections + +(* to avoid a long list of recursive functions *) +let eval_from_stream_ref = ref (fun _ _ _ -> assert false);; -let eval_command status cmd = +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")) + | GrafiteAst.Inductive _ -> assert false + | GrafiteAst.Theorem _ -> None in + let (aliases, metasenv, cic, _) = + singleton + (MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) + ~aliases:(status.aliases) ~uri obj) + in + let proof_status = + match status.proof_status with + | No_proof -> Intermediate metasenv + | Incomplete_proof _ + | 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 + | 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, GrafiteAst.Obj (loc,obj) + +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.Set (loc, name, value) -> set_option status name value - | TacticAst.Qed loc -> - let uri, metasenv, bo, ty = + | GrafiteAst.Default (loc, what, uris) as cmd -> + LibraryObjects.set_default what uris; + add_moo_content [cmd] status + | 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 + | 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 + 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 + | GrafiteAst.Drop loc -> raise Drop + | GrafiteAst.Qed loc -> + let uri, metasenv, bo, ty = match status.proof_status with | Proof (Some uri, metasenv, body, ty) -> uri, metasenv, body, ty @@ -280,28 +620,42 @@ 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) -> - (match spec with - | TacticAst.Ident_alias (id,uri) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Id id) - ("boh?",(fun _ _ _ -> CicUtil.term_of_uri uri)) - status.aliases } - | TacticAst.Symbol_alias (symb, instance, desc) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Symbol (symb,instance)) - (DisambiguateChoices.lookup_symbol_by_dsc symb desc) - status.aliases } - | TacticAst.Number_alias (instance,desc) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Num instance) - (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases }) - | TacticAst.Obj (loc,obj) -> + | GrafiteAst.Alias (loc, spec) -> + let aliases = + (*CSC: Warning: this code should be factorized with the corresponding + code in DisambiguatePp *) + match spec with + | GrafiteAst.Ident_alias (id,uri) -> + DisambiguateTypes.Environment.cons + (DisambiguateTypes.Id id) + (uri,(fun _ _ _-> CicUtil.term_of_uri (UriManager.uri_of_string uri))) + status.aliases + | GrafiteAst.Symbol_alias (symb, instance, desc) -> + DisambiguateTypes.Environment.cons + (DisambiguateTypes.Symbol (symb,instance)) + (DisambiguateChoices.lookup_symbol_by_dsc symb desc) + status.aliases + | GrafiteAst.Number_alias (instance,desc) -> + DisambiguateTypes.Environment.cons + (DisambiguateTypes.Num instance) + (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases + in + MatitaSync.set_proof_aliases status aliases + | GrafiteAst.Render _ -> assert false (* ZACK: to be removed *) + | GrafiteAst.Dump _ -> assert false (* ZACK: to be removed *) + | GrafiteAst.Interpretation (_, dsc, (symbol, _), _) as stm -> + let status' = add_moo_content [stm] status in + let aliases' = + DisambiguateTypes.Environment.cons + (DisambiguateTypes.Symbol (symbol, 0)) + (DisambiguateChoices.lookup_symbol_by_dsc symbol dsc) + status.aliases + in + MatitaSync.set_proof_aliases status' aliases' + | GrafiteAst.Notation _ as stm -> add_moo_content [stm] status + | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with Cic.Constant (name,_,_,_,_) @@ -315,311 +669,142 @@ 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.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_cic mac)) + (GrafiteAstPp.pp_macro_ast mac)) let eval_comment status c = status -let eval status st = - match st with - | TacticAst.Executable (_,ex) -> eval_executable status ex - | TacticAst.Comment (_,c) -> eval_comment status c -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 - 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 - in - let status = - { status with - aliases = aliases; - proof_status = proof_status } - in - status, cic - -let disambiguate_obj status obj = - let uri = - match obj with - TacticAst.Inductive (_,(name,_,_,_)::_) - | TacticAst.Record (_,name,_,_) -> - Some (UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".ind")) - | TacticAst.Inductive _ -> assert false - | _ -> None in - let (aliases, metasenv, cic, _) = - match - MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) - ~aliases:(status.aliases) ~uri obj - with - | [x] -> x - | _ -> assert false +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 - let proof_status = - match status.proof_status with - | No_proof -> Intermediate metasenv - | Incomplete_proof _ - | Intermediate _ - | Proof _ -> assert false - in - let status = - { status with - aliases = aliases; - proof_status = proof_status } - in - status, cic - -let disambiguate_tactic status = function - | TacticAst.Transitivity (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Transitivity (loc, cic) - | 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.Exact (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Exact (loc, cic) - | TacticAst.Cut (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Cut (loc, cic) - | TacticAst.Elim (loc, term, Some term') -> - let status, cic1 = disambiguate_term status term in - let status, cic2 = disambiguate_term status term' in - status, TacticAst.Elim (loc, cic1, Some cic2) - | TacticAst.Elim (loc, term, None) -> - let status, cic = disambiguate_term status term in - status, TacticAst.Elim (loc, cic, None) - | TacticAst.ElimType (loc, term) -> - let status, cic = disambiguate_term status term in - status, TacticAst.ElimType (loc, cic) - | TacticAst.Replace (loc, what, with_what) -> - let status, cic1 = disambiguate_term status what in - let status, cic2 = disambiguate_term status with_what in - status, TacticAst.Replace (loc, cic1, cic2) - | TacticAst.Change (loc, what, with_what, ident) -> - let status, cic1 = disambiguate_term status what in - let status, cic2 = disambiguate_term status with_what in - status, TacticAst.Change (loc, cic1, cic2, ident) -(* - (* TODO Zack a lot more of tactics to be implemented here ... *) - | TacticAst.Change_pattern of 'term pattern * 'term * 'ident option - | TacticAst.Change of 'term * 'term * 'ident option - | TacticAst.Decompose of 'ident * 'ident list - | TacticAst.Discriminate of 'ident - | TacticAst.Fold of reduction_kind * 'term - | TacticAst.Injection of 'ident - | TacticAst.Replace_pattern of 'term pattern * 'term -*) - | TacticAst.LetIn (loc,term,name) -> - let status, term = disambiguate_term status term in - status, TacticAst.LetIn (loc,term,name) - | TacticAst.ReduceAt (loc, reduction_kind, ident, path) -> - let path = Disambiguate.interpretate_path [] status.aliases path in - status, TacticAst.ReduceAt(loc, reduction_kind, ident, path) - | TacticAst.Reduce (loc, reduction_kind, opts) -> - let status, opts = - match opts with - | None -> status, None - | Some (l,pat) -> - let status, l = - List.fold_right (fun t (status,acc) -> - let status',t' = disambiguate_term status t in - status', t'::acc) - l (status,[]) - in - status, Some (l, pat) - in - status, TacticAst.Reduce (loc, reduction_kind, opts) - | TacticAst.Rewrite (loc,dir,t,ident) -> - let status, term = disambiguate_term status t in - status, TacticAst.Rewrite (loc,dir,term,ident) - | TacticAst.Intros (loc, num, names) -> - status, TacticAst.Intros (loc, num, names) - | TacticAst.Auto (loc,num) -> status, TacticAst.Auto (loc,num) - | TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc - | TacticAst.Assumption loc -> status, TacticAst.Assumption loc - | TacticAst.Contradiction loc -> status, TacticAst.Contradiction loc - | TacticAst.Exists loc -> status, TacticAst.Exists loc - | TacticAst.Fourier loc -> status, TacticAst.Fourier loc - | TacticAst.Left loc -> status, TacticAst.Left loc - | 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.Goal (loc, g) -> status, TacticAst.Goal (loc, g) - | TacticAst.FwdSimpl (loc, name) -> status, TacticAst.FwdSimpl (loc, name) - | TacticAst.LApply (loc, term, substs) -> - let f (status, substs) (name, term) = - let status, term = disambiguate_term status term in - status, (name, term) :: substs - in - let status, term = disambiguate_term status term in - let status, substs = List.fold_left f (status, []) substs in - status, TacticAst.LApply (loc, term, substs) - - | x -> - print_endline ("Not yet implemented:" ^ TacticAstPp.pp_tactic x); - assert false - -let rec disambiguate_tactical status = function - | TacticAst.Tactic (loc, tactic) -> - let status, tac = disambiguate_tactic status tactic in - status, TacticAst.Tactic (loc, tac) - | TacticAst.Do (loc, num, tactical) -> - let status, tac = disambiguate_tactical status tactical in - status, TacticAst.Do (loc, num, tac) - | TacticAst.Repeat (loc, tactical) -> - let status, tac = disambiguate_tactical status tactical in - status, TacticAst.Repeat (loc, tac) - | TacticAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *) - let status, tacticals = disambiguate_tacticals status tacticals in - let tacticals = List.rev tacticals in - status, TacticAst.Seq (loc, tacticals) - | TacticAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *) - let status, tactical = disambiguate_tactical status tactical in - let status, tacticals = disambiguate_tacticals status tacticals in - status, TacticAst.Then (loc, tactical, tacticals) - | TacticAst.Tries (loc, tacticals) -> - let status, tacticals = disambiguate_tacticals status tacticals in - status, TacticAst.Tries (loc, tacticals) - | TacticAst.Try (loc, tactical) -> - let status, tactical = disambiguate_tactical status tactical in - status, TacticAst.Try (loc, tactical) - | (TacticAst.IdTac _ | TacticAst.Fail _) as tac -> - status, tac - -and disambiguate_tacticals status tacticals = - let status, tacticals = - List.fold_left - (fun (status, tacticals) tactical -> - let status, tac = disambiguate_tactical status tactical in - status, tac :: tacticals) - (status, []) - tacticals - in - let tacticals = List.rev tacticals in - status, tacticals - -let disambiguate_command status = function - | TacticAst.Coercion (loc, term) -> - let status, term = disambiguate_term status term in - status, TacticAst.Coercion (loc,term) - | (TacticAst.Set _ | TacticAst.Qed _) as cmd -> - status, cmd - | TacticAst.Alias _ as x -> status, x - | TacticAst.Obj (loc,obj) -> - let status,obj = disambiguate_obj status obj in - status, TacticAst.Obj (loc,obj) + match st with + | GrafiteAst.Executable (_,ex) -> eval_executable opts status ex + | GrafiteAst.Comment (_,c) -> eval_comment status c -let disambiguate_executable status ex = - match ex with - | TacticAst.Tactical (loc, tac) -> - let status, tac = disambiguate_tactical status tac in - status, (TacticAst.Tactical (loc, tac)) - | TacticAst.Command (loc, cmd) -> - let status, cmd = disambiguate_command status cmd in - status, (TacticAst.Command (loc, cmd)) - | TacticAst.Macro (_, mac) -> - command_error (sprintf "The macro %s can't be in a script" - (TacticAstPp.pp_macro_ast mac)) - -let disambiguate_comment status c = - match c with - | TacticAst.Note (loc,n) -> status, TacticAst.Note (loc,n) - | TacticAst.Code (loc,ex) -> - let status, ex = disambiguate_executable status ex in - status, TacticAst.Code (loc,ex) - -let disambiguate_statement status statement = - match statement with - | TacticAst.Comment (loc,c) -> - let status, c = disambiguate_comment status c in - status, TacticAst.Comment (loc,c) - | TacticAst.Executable (loc,ex) -> - let status, ex = disambiguate_executable status ex in - status, TacticAst.Executable (loc,ex) - -let eval_ast status ast = - let status,st = disambiguate_statement status ast in - (* this disambiguation step should be deferred to support tacticals *) - eval status st - -let eval_from_stream status str cb = - let stl = CicTextualParser2.parse_statements str in - List.fold_left - (fun status ast -> cb status ast;eval_ast status ast) status - stl +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 *) +let _ = eval_from_stream_ref := eval_from_stream -let eval_string status str = - eval_from_stream status (Stream.of_string str) (fun _ _ -> ()) +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 ?clean_baseuri !status ast + done +;; + +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 () = +(* let options = StringMap.add "baseuri" (String (Helm_registry.get "matita.baseuri" ^ Helm_registry.get "matita.owner")) no_options in +*) let options = StringMap.add "basedir" - (String (Helm_registry.get "matita.basedir" )) - options + (String (Helm_registry.get "matita.basedir")) + no_options in options let initial_status = lazy { aliases = DisambiguateTypes.empty_environment; + moo_content_rev = []; proof_status = No_proof; options = default_options (); objects = []; + notation_ids = []; } -