| GrafiteAst.ApplyP (_, term) -> Tactics.applyP term
| GrafiteAst.ApplyS (_, term, params) ->
Tactics.applyS ~term ~params ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe
+ ~automation_cache:status.GrafiteTypes.automation_cache
| GrafiteAst.Assumption _ -> Tactics.assumption
| GrafiteAst.AutoBatch (_,params) ->
Tactics.auto ~params ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe
+ ~automation_cache:status.GrafiteTypes.automation_cache
| GrafiteAst.Cases (_, what, pattern, (howmany, names)) ->
Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names)
~pattern what
| GrafiteAst.Demodulate (_, params) ->
Tactics.demodulate
~dbd:(LibraryDb.instance ()) ~params
- ~universe:status.GrafiteTypes.universe
+ ~automation_cache:status.GrafiteTypes.automation_cache
| GrafiteAst.Destruct (_,xterms) -> Tactics.destruct xterms
| GrafiteAst.Elim (_, what, using, pattern, (depth, names)) ->
Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names)
| GrafiteAst.Suppose (_, t, id, t1) -> Declarative.suppose t id t1
| GrafiteAst.By_just_we_proved (_, just, ty, id, t1) ->
Declarative.by_just_we_proved ~dbd:(LibraryDb.instance())
- ~universe:status.GrafiteTypes.universe just ty id t1
+ ~automation_cache:status.GrafiteTypes.automation_cache just ty id t1
| GrafiteAst.We_need_to_prove (_, t, id, t2) ->
Declarative.we_need_to_prove t id t2
| GrafiteAst.Bydone (_, t) ->
Declarative.bydone ~dbd:(LibraryDb.instance())
- ~universe:status.GrafiteTypes.universe t
+ ~automation_cache:status.GrafiteTypes.automation_cache t
| GrafiteAst.We_proceed_by_cases_on (_, t, t1) ->
Declarative.we_proceed_by_cases_on t t1
| GrafiteAst.We_proceed_by_induction_on (_, t, t1) ->
| GrafiteAst.Thesisbecomes (_, t) -> Declarative.thesisbecomes t
| GrafiteAst.ExistsElim (_, just, id1, t1, id2, t2) ->
Declarative.existselim ~dbd:(LibraryDb.instance())
- ~universe:status.GrafiteTypes.universe just id1 t1 id2 t2
+ ~automation_cache:status.GrafiteTypes.automation_cache just id1 t1 id2 t2
| GrafiteAst.Case (_,id,params) -> Declarative.case id params
| GrafiteAst.AndElim(_,just,id1,t1,id2,t2) ->
Declarative.andelim ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe just id1 t1 id2 t2
+ ~automation_cache:status.GrafiteTypes.automation_cache just id1 t1 id2 t2
| GrafiteAst.RewritingStep (_,termine,t1,t2,cont) ->
Declarative.rewritingstep ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe termine t1 t2 cont
+ ~automation_cache:status.GrafiteTypes.automation_cache termine t1 t2 cont
let classify_tactic tactic =
match tactic with
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 =
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 =
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 =
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 =
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 =
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
| GrafiteAst.Index (loc,None,uri) ->
assert false (* TODO: for user input *)
| GrafiteAst.Index (loc,Some key,uri) ->
- let universe = Universe.index
- status.GrafiteTypes.universe key (CicUtil.term_of_uri uri) in
- let status = {status with GrafiteTypes.universe = universe} in
+ let universe =
+ status.GrafiteTypes.automation_cache.AutomationCache.univ
+ in
+ let universe = Universe.index universe key (CicUtil.term_of_uri uri) in
+ let cache = {
+ status.GrafiteTypes.automation_cache with AutomationCache.univ = universe }
+ in
+ let status = { status with GrafiteTypes.automation_cache = cache } in
(* debug
let msg =
let candidates = Universe.get_candidates status.GrafiteTypes.universe key in
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) ->
let moopath_rw, moopath_r =
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
{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 = pstatus in
+ if menv <> [] then
+ raise
+ (GrafiteTypes.Command_error"You can't Qed an incomplete theorem")
+ else
+ let obj =
+prerr_endline "CSC: here we should fix the height!!!";
+ uri,height,[],[],NTacStatus.apply_subst_obj subst obj
+ in
+ NCicLibrary.add_obj uri obj;
+ {status with
+ GrafiteTypes.ng_status =
+ GrafiteTypes.CommandMode lexicon_status },`New [uri]
+ | _ -> 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.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
- 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} }
- },
- []
+ | 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
+ (match nmenv with
+ [] ->
+ (* CSC: cut&paste code from NQed *)
+ let obj =
+prerr_endline "CSC: here we should fix the height!!!";
+ uri,height,[],[],NTacStatus.apply_subst_obj nsubst nobj
+ in
+ NCicLibrary.add_obj uri obj;
+ {status with
+ GrafiteTypes.ng_status=GrafiteTypes.CommandMode lexicon_status },
+ `New [uri]
+ | _ ->
+ let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
+ { status with
+ GrafiteTypes.ng_status =
+ GrafiteTypes.ProofMode
+ { NTacStatus.gstatus = ninitial_stack;
+ istatus = { NTacStatus.pstatus = obj; lstatus = lexicon_status}}
+ },`New [])
| GrafiteAst.Obj (loc,obj) ->
let ext,name =
match obj with
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 _ ->
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 = 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.Command (_, cmd) ->
eval_command.ec_go ~disambiguate_command opts status (text,prefix_len,cmd)
| GrafiteAst.Macro (loc, macro) ->
~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
| 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 []
}
;;
projects / helm.git / blobdiff