X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=8101dd667b96572d2581108e806004b28ad8f007;hb=11b2157bacf59cfc561c2ef6f92ee41ee2c1a006;hp=1f32e8c9e2db06944bf86b6e4ca8938940093fca;hpb=b4f6b1a39b59e923527f5c17d8fdd0fa1e13e1bf;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 1f32e8c9e..8101dd667 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -336,14 +336,14 @@ let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) = let after = ProofEngineTypes.goals_of_proof proof in let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in let proof, opened_goals = - let uri, metasenv_after_tactic, _subst, t, ty, attrs = proof in + let uri, metasenv_after_tactic, subst, t, ty, attrs = proof in let reordered_metasenv, opened_goals = reorder_metasenv starting_metasenv metasenv_after_refinement metasenv_after_tactic opened goal always_opens_a_goal in - let proof' = uri, reordered_metasenv, _subst, t, ty, attrs in + let proof' = uri, reordered_metasenv, [], t, ty, attrs in proof', opened_goals in let incomplete_proof = @@ -414,7 +414,7 @@ type eval_ast = GrafiteTypes.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] } type 'a eval_command = @@ -424,7 +424,7 @@ type 'a eval_command = GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) -> options -> GrafiteTypes.status -> (('term,'obj) GrafiteAst.command) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] } type 'a eval_comment = @@ -434,7 +434,7 @@ type 'a eval_comment = GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) -> options -> GrafiteTypes.status -> (('term,'lazy_term,'reduction_kind,'obj,'ident) GrafiteAst.comment) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] } type 'a eval_executable = @@ -460,7 +460,7 @@ type 'a eval_executable = options -> GrafiteTypes.status -> (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.code) disambiguator_input -> - GrafiteTypes.status * UriManager.uri list + GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] } type 'a eval_from_moo = @@ -473,7 +473,7 @@ let coercion_moo_statement_of (uri,arity, saturations,_) = let eval_unification_hint status t n = (* XXX no undo *) NCicUnifHint.add_user_provided_hint t n; - status,[] + status,`Old [] ;; let add_coercions_of_lemmas lemmas status = @@ -514,7 +514,7 @@ let eval_prefer_coercion status c = let status = GrafiteSync.prefer_coercion status uri in let moo_content = GrafiteAst.PreferCoercion (HExtlib.dummy_floc,c) in let status = GrafiteTypes.add_moo_content [moo_content] status in - status, [] + status, `Old [] module MatitaStatus = struct @@ -583,6 +583,13 @@ let eval_ng_punct (_text, _prefix_len, punct) = | GrafiteAst.Merge _ -> NTactics.merge_tac ;; +let eval_ng_non_punct (_text, _prefix_len, punct) = + match punct with + | GrafiteAst.Focus (_,l) -> NTactics.focus_tac l + | GrafiteAst.Unfocus _ -> NTactics.unfocus_tac + | GrafiteAst.Skip _ -> NTactics.skip_tac +;; + let eval_ng_tac (text, prefix_len, tac) = match tac with | GrafiteAst.NApply (_loc, t) -> NTactics.apply_tac (text,prefix_len,t) @@ -609,8 +616,6 @@ let eval_ng_tac (text, prefix_len, tac) = NTactics.elim_tac ~what:(text,prefix_len,what) ~where:(text,prefix_len,where) - | GrafiteAst.NEval (_loc, where, reduction) -> - NTactics.eval_tac ~reduction ~where:(text,prefix_len,where) | GrafiteAst.NGeneralize (_loc, where) -> NTactics.generalize_tac ~where:(text,prefix_len,where) | GrafiteAst.NId _ -> (fun x -> x) @@ -618,10 +623,23 @@ let eval_ng_tac (text, prefix_len, tac) = | GrafiteAst.NLetIn (_loc,where,what,name) -> NTactics.letin_tac ~where:(text,prefix_len,where) ~what:(text,prefix_len,what) name + | GrafiteAst.NReduce (_loc, reduction, where) -> + NTactics.reduce_tac ~reduction ~where:(text,prefix_len,where) | GrafiteAst.NRewrite (_loc,dir,what,where) -> NTactics.rewrite_tac ~dir ~what:(text,prefix_len,what) ~where:(text,prefix_len,where) ;; + +let subst_metasenv_and_fix_names s = + let u,h,metasenv, subst,o = s.NTacStatus.istatus.NTacStatus.pstatus in + let o = + NCicUntrusted.map_obj_kind ~skip_body:true + (NCicUntrusted.apply_subst subst []) o + in + { s with NTacStatus.istatus = + { s.NTacStatus.istatus with NTacStatus.pstatus = + u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o}} +;; let rec eval_command = {ec_go = fun ~disambiguate_command opts status (text,prefix_len,cmd) -> @@ -648,18 +666,48 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status prerr_endline msg; *) let status = GrafiteTypes.add_moo_content [cmd] status in - status,[] + status,`Old [] + | GrafiteAst.Select (_,uri) as cmd -> + if List.mem cmd status.GrafiteTypes.moo_content_rev then status, `Old [] + else + let cache = + AutomationCache.add_term_to_active status.GrafiteTypes.automation_cache + [] [] [] (CicUtil.term_of_uri uri) None + in + let status = { status with GrafiteTypes.automation_cache = cache } in + let status = GrafiteTypes.add_moo_content [cmd] status in + status, `Old [] + | GrafiteAst.Pump (_,steps) -> + let cache = + AutomationCache.pump status.GrafiteTypes.automation_cache steps + in + let status = { status with GrafiteTypes.automation_cache = cache } in + status, `Old [] | GrafiteAst.PreferCoercion (loc, coercion) -> eval_prefer_coercion status coercion | GrafiteAst.Coercion (loc, uri, add_composites, arity, saturations) -> - eval_coercion status ~add_composites uri arity saturations + let res,uris = + eval_coercion status ~add_composites uri arity saturations + in + res,`Old uris + | GrafiteAst.Inverter (loc, name, indty, params) -> + let buri = GrafiteTypes.get_baseuri status in + let uri = UriManager.uri_of_string (buri ^ "/" ^ name ^ ".con") in + let indty_uri = + try CicUtil.uri_of_term indty + with Invalid_argument _ -> + raise (Invalid_argument "not an inductive type to invert") in + let res,uris = + Inversion_principle.build_inverter ~add_obj status uri indty_uri params + in + res,`Old uris | GrafiteAst.UnificationHint (loc, t, n) -> eval_unification_hint status t n | GrafiteAst.Default (loc, what, uris) as cmd -> LibraryObjects.set_default what uris; - GrafiteTypes.add_moo_content [cmd] status,[] + GrafiteTypes.add_moo_content [cmd] status,`Old [] | GrafiteAst.Drop loc -> raise Drop - | GrafiteAst.Include (loc, baseuri) -> + | GrafiteAst.Include (loc, _, baseuri) -> let moopath_rw, moopath_r = LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri ~writable:true, @@ -686,12 +734,12 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status in prerr_endline msg; *) - status,[] + status,`Old [] | GrafiteAst.Print (_,"proofterm") -> let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in prerr_endline (Auto.pp_proofterm (Lazy.force p)); - status,[] - | GrafiteAst.Print (_,_) -> status,[] + status,`Old [] + | GrafiteAst.Print (_,_) -> status,`Old [] | GrafiteAst.Qed loc -> let uri, metasenv, _subst, bo, ty, attrs = match status.GrafiteTypes.proof_status with @@ -712,47 +760,72 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let name = UriManager.name_of_uri uri in let obj = Cic.Constant (name,Some (Lazy.force bo),ty,[],attrs) in let status, lemmas = add_obj uri obj status in - {status with - GrafiteTypes.proof_status = GrafiteTypes.No_proof}, + {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, (*CSC: I throw away the arities *) - uri::lemmas + `Old (uri::lemmas) + | GrafiteAst.NQed loc -> + (match status.GrafiteTypes.ng_status with + | GrafiteTypes.ProofMode + { NTacStatus.istatus = + {NTacStatus.pstatus = pstatus; lstatus=lexicon_status} } -> + let uri,height,menv,subst,obj_kind = pstatus in + if menv <> [] then + raise + (GrafiteTypes.Command_error"You can't Qed an incomplete theorem") + else + let obj_kind = + NCicUntrusted.map_obj_kind + (NCicUntrusted.apply_subst subst []) obj_kind in + let height = NCicUntrusted.height_of_obj_kind uri obj_kind in + let obj = uri,height,[],[],obj_kind in + NCicTypeChecker.typecheck_obj obj; + NCicLibrary.add_obj uri obj; + let objs = NCicElim.mk_elims obj in + let uris = + uri:: + List.map + (fun (uri,_,_,_,_) as obj -> + NCicTypeChecker.typecheck_obj obj; + NCicLibrary.add_obj uri obj; + uri + ) objs + in + {status with + GrafiteTypes.ng_status = + GrafiteTypes.CommandMode lexicon_status },`New uris + | _ -> raise (GrafiteTypes.Command_error "Not in proof mode")) | GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) -> Setoids.add_relation id a aeq refl sym trans; - status, [] (*CSC: TO BE FIXED *) - | GrafiteAst.Set (loc, name, value) -> status, [] + status, `Old [] (*CSC: TO BE FIXED *) + | GrafiteAst.Set (loc, name, value) -> status, `Old [] (* GrafiteTypes.set_option status name value,[] *) + | GrafiteAst.NUnivConstraint (loc,strict,u1,u2) -> + NCicEnvironment.add_constraint strict [false,u1] [false,u2]; + status, `New [u1;u2] | GrafiteAst.NObj (loc,obj) -> - let ty, name = - match obj with - | CicNotationPt.Theorem (_,name,ty,_) -> ty, name - | _ -> assert false - in - let suri = "cic:/ng_matita/" ^ name ^ ".def" in - let nlexicon_status = + let lexicon_status = match status.GrafiteTypes.ng_status with | GrafiteTypes.ProofMode _ -> assert false - | GrafiteTypes.CommandMode ls -> ls - in - let nmenv, nsubst, nlexicon_status, nty = - GrafiteDisambiguate.disambiguate_nterm None - nlexicon_status [] [] [] (text,prefix_len,ty) - in - let nmenv, nsubst, nlexicon_status, nbo = - GrafiteDisambiguate.disambiguate_nterm (Some nty) - nlexicon_status [] nmenv nsubst ("",0,CicNotationPt.Implicit) - in + | GrafiteTypes.CommandMode ls -> ls in + let lexicon_status,obj = + GrafiteDisambiguate.disambiguate_nobj lexicon_status + ~baseuri:(GrafiteTypes.get_baseuri status) (text,prefix_len,obj) in + let uri,height,nmenv,nsubst,nobj = obj in let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in - prerr_endline ("nuovo lemma: " ^ NCicPp.ppmetasenv ~subst:nsubst nmenv); - { status with - GrafiteTypes.ng_status = - GrafiteTypes.ProofMode { NTacStatus.gstatus = ninitial_stack; - istatus = { - NTacStatus.pstatus = - NUri.uri_of_string suri, 0, nmenv, nsubst, - (NCic.Constant ([],"",Some nbo,nty,(`Provided,`Definition,`Regular))); - lstatus = nlexicon_status} } - }, - [] + let status = + { status with + GrafiteTypes.ng_status = + GrafiteTypes.ProofMode + (subst_metasenv_and_fix_names + { NTacStatus.gstatus = ninitial_stack; + istatus = { NTacStatus.pstatus = obj; lstatus = lexicon_status}}) + } + in + (match nmenv with + [] -> + eval_command.ec_go ~disambiguate_command opts status + ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + | _ -> status,`New []) | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with @@ -806,18 +879,16 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status GrafiteTypes.Incomplete_proof { GrafiteTypes.proof = initial_proof; stack = initial_stack } ; }, - [] + `Old [] | _ -> if metasenv <> [] then raise (GrafiteTypes.Command_error ( "metasenv not empty while giving a definition with body: " ^ CicMetaSubst.ppmetasenv [] metasenv)); let status, lemmas = add_obj uri obj status in - let status,new_lemmas = - add_coercions_of_lemmas lemmas status - in + let status,new_lemmas = add_coercions_of_lemmas lemmas status in {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, - uri::new_lemmas@lemmas + `Old (uri::new_lemmas@lemmas) in match status.GrafiteTypes.proof_status with GrafiteTypes.Intermediate _ -> @@ -840,25 +911,36 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status print_endline "GOOD"; () with ProofEngineTypes.Fail _ -> print_endline "BAD" | _ -> ());*) eval_tactical status - (punctuation_tactical_of_ast (text,prefix_len,punct)),[] + (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old [] | GrafiteAst.Tactic (_, None, punct) -> eval_tactical status - (punctuation_tactical_of_ast (text,prefix_len,punct)),[] + (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old [] | GrafiteAst.NTactic (_(*loc*), tac, punct) -> - (match status.GrafiteTypes.ng_status with + (match status.GrafiteTypes.ng_status with | GrafiteTypes.CommandMode _ -> assert false | GrafiteTypes.ProofMode nstatus -> let nstatus = eval_ng_tac (text,prefix_len,tac) nstatus in + let nstatus = subst_metasenv_and_fix_names nstatus in let nstatus = eval_ng_punct (text,prefix_len,punct) nstatus in NTacStatus.pp_tac_status nstatus; - { status with GrafiteTypes.ng_status = GrafiteTypes.ProofMode nstatus }, []) + { status with GrafiteTypes.ng_status= GrafiteTypes.ProofMode nstatus }, + `New []) | GrafiteAst.NonPunctuationTactical (_, tac, punct) -> let status = eval_tactical status (non_punctuation_tactical_of_ast (text,prefix_len,tac)) in eval_tactical status - (punctuation_tactical_of_ast (text,prefix_len,punct)),[] + (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old [] + | GrafiteAst.NNonPunctuationTactical (_, non_punct, punct) -> + (match status.GrafiteTypes.ng_status with + | GrafiteTypes.CommandMode _ -> assert false + | GrafiteTypes.ProofMode nstatus -> + let nstatus = eval_ng_non_punct (text,prefix_len,non_punct) nstatus in + let nstatus = eval_ng_punct (text,prefix_len,punct) nstatus in + NTacStatus.pp_tac_status nstatus; + { status with GrafiteTypes.ng_status= GrafiteTypes.ProofMode nstatus }, + `New []) | GrafiteAst.Command (_, cmd) -> eval_command.ec_go ~disambiguate_command opts status (text,prefix_len,cmd) | GrafiteAst.Macro (loc, macro) -> @@ -881,7 +963,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status ~disambiguate_macro:(fun _ _ -> assert false) status ast in - assert (lemmas=[]); + assert (lemmas=`Old []); status) status moo } and eval_ast = {ea_go = fun ~disambiguate_tactic ~disambiguate_command @@ -896,7 +978,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | GrafiteAst.Comment (_,c) -> eval_comment.ecm_go ~disambiguate_command opts status (text,prefix_len,c) } and eval_comment = { ecm_go = fun ~disambiguate_command opts status (text,prefix_len,c) -> - status, [] + status, `Old [] } ;;