X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=c5b2fb98774702ee955193f6872a191240cea8a8;hb=f263e4ec717d5ec2e7f9c057855f8223f81baae8;hp=e5bb82786a3b742989a72746aa05f7971491f44c;hpb=8f8d3ad5a02faed2ddcaa22f49a9099175445ef4;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index e5bb82786..c5b2fb987 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -2,6 +2,8 @@ open Printf open MatitaTypes +exception Drop;; + let debug = false ;; let debug_print = if debug then prerr_endline else ignore ;; @@ -20,170 +22,294 @@ let namer_of names = FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ let tactic_of_ast = function - | TacticAst.Intros (_, None, names) -> - (* TODO Zack implement intros length *) - PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) () - | TacticAst.Intros (_, Some num, names) -> - (* TODO Zack implement intros length *) - PrimitiveTactics.intros_tac ~howmany:num - ~mk_fresh_name_callback:(namer_of names) () - | TacticAst.Reflexivity _ -> Tactics.reflexivity + | 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) -> + 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) -> + 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 + 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) -> + 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) -> + PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) () + | TacticAst.Intros (_, Some num, names) -> + PrimitiveTactics.intros_tac ~howmany:num + ~mk_fresh_name_callback:(namer_of names) () + | TacticAst.LApply (_, 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) -> + Tactics.letin term ~mk_fresh_name_callback:(namer_of [name]) + | TacticAst.Reduce (_, reduction_kind, pattern) -> + (match reduction_kind with + | `Normalize -> Tactics.normalize ~pattern + | `Reduce -> Tactics.reduce ~pattern + | `Simpl -> Tactics.simpl ~pattern + | `Whd -> Tactics.whd ~pattern) + | TacticAst.Reflexivity _ -> Tactics.reflexivity + | TacticAst.Replace (_, pattern, with_what) -> + Tactics.replace ~pattern ~with_what + | TacticAst.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 - | 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 (_,num) -> - AutoTactic.auto_tac ~num (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) -> - 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 - (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 - | _ -> 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) - in - { status with proof_status = new_status } +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 rec tactical_of_ast = function - | TacticAst.Tactic (loc, tactic) -> tactic_of_ast tactic - | TacticAst.Fail loc -> Tacticals.fail + let status = { status with proof_status = proof_status } in + let status = MatitaSync.set_proof_aliases status aliases in + status, cic + +let disambiguate_pattern status (wanted, hyp_paths, goal_path) = + let interp path = Disambiguate.interpretate_path [] status.aliases path in + let goal_path = interp goal_path in + let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in + let status,wanted = + match wanted with + None -> status,None + | Some wanted -> + let status,wanted = disambiguate_term status wanted in + status, Some wanted + in + status, (wanted, hyp_paths ,goal_path) + +let disambiguate_tactic status = function + | TacticAst.Apply (loc, term) -> + 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 apply_tactic tactic status = + let status,tactic = disambiguate_tactic status 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 + +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 (TacticAst.IdTac CicAst.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 + | TacticAst.Tactic (loc, tactic) -> apply_tactic tactic + | TacticAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *) + MatitaTacticals.seq ~tactics:(List.map tactical_of_ast tacticals) | TacticAst.Do (loc, num, tactical) -> - Tacticals.do_tactic num (tactical_of_ast tactical) - | TacticAst.IdTac loc -> Tacticals.id_tac + MatitaTacticals.do_tactic ~n:num ~tactic:(tactical_of_ast tactical) | 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) + MatitaTacticals.repeat_tactic ~tactic:(tactical_of_ast tactical) | 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) + MatitaTacticals.thens ~start:(tactical_of_ast tactical) + ~continuations:(List.map tactical_of_ast tacticals) + | TacticAst.First (loc, tacticals) -> + MatitaTacticals.first + ~tactics:(List.map (fun t -> "", tactical_of_ast t) tacticals) | TacticAst.Try (loc, tactical) -> - Tacticals.try_tactic (tactical_of_ast tactical) + MatitaTacticals.try_tactic ~tactic:(tactical_of_ast tactical) + | TacticAst.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 - apply_tactic (tactical_of_ast tac) + { 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 @@ -211,11 +337,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 *) @@ -223,6 +349,21 @@ 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 + 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" + in + let moo_content_rev = + [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 + in + let status = {status with moo_content_rev = moo_content_rev} in {status with proof_status = No_proof} let generate_elimination_principles uri status = @@ -258,10 +399,76 @@ 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 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 + | TacticAst.Theorem _ -> None in + let (aliases, metasenv, cic, _) = + match + MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) + ~aliases:(status.aliases) ~uri obj + with + | [x] -> x + | _ -> assert false + in + let proof_status = + match status.proof_status with + | No_proof -> Intermediate metasenv + | Incomplete_proof _ + | Intermediate _ + | Proof _ -> 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) -> + let status,obj = disambiguate_obj status obj in + status, TacticAst.Obj (loc,obj) + let eval_command status cmd = + let status,cmd = disambiguate_command status cmd in match cmd with - | TacticAst.Set (loc, name, value) -> set_option status name value + | TacticAst.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 + let status = ref status in + !eval_from_stream_ref status stream (fun _ _ -> ()); + !status + | TacticAst.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 + set_option status name value + | TacticAst.Drop loc -> raise Drop | TacticAst.Qed loc -> let uri, metasenv, bo, ty = match status.proof_status with @@ -282,24 +489,24 @@ let eval_command status cmd = | TacticAst.Coercion (loc, coercion) -> eval_coercion status coercion | TacticAst.Alias (loc, spec) -> - (match spec with + let aliases = + 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 } + 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) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Symbol (symb,instance)) - (DisambiguateChoices.lookup_symbol_by_dsc symb desc) - status.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 }) + 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) -> let ext,name = match obj with @@ -315,6 +522,9 @@ let eval_command status cmd = let metasenv = MatitaMisc.get_proof_metasenv status in match obj with 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); assert (metasenv = metasenv'); let goalno = match metasenv' with (goalno,_,_)::_ -> goalno | _ -> assert false in @@ -348,279 +558,57 @@ let eval_executable status ex = | TacticAst.Command (_, cmd) -> eval_command status cmd | TacticAst.Macro (_, mac) -> command_error (sprintf "The macro %s can't be in a script" - (TacticAstPp.pp_macro_cic mac)) + (TacticAstPp.pp_macro_ast mac)) let eval_comment status c = status -let eval status st = +let eval_ast 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 - 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_closedtypes status terms = - let term = CicAst.pack terms in - let status, term = disambiguate_term status term in - status, CicUtil.unpack term - -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) - -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 + List.iter + (fun ast -> cb !status ast;status := eval_ast !status ast) stl +;; + +(* to avoid a long list of recursive functions *) +eval_from_stream_ref := eval_from_stream;; +let eval_from_stream_greedy status str cb = + while true do + print_string "matita> "; + flush stdout; + let ast = CicTextualParser2.parse_statement str in + cb !status ast; + status := eval_ast !status ast + done +;; + let eval_string status str = eval_from_stream status (Stream.of_string str) (fun _ _ -> ()) let default_options () = +(* let options = StringMap.add "baseuri" (String (Helm_registry.get "matita.baseuri" ^ Helm_registry.get "matita.owner")) no_options in +*) let options = StringMap.add "basedir" (String (Helm_registry.get "matita.basedir" )) - options + no_options in options let initial_status = lazy { aliases = DisambiguateTypes.empty_environment; + moo_content_rev = []; proof_status = No_proof; options = default_options (); objects = [];