X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=192e396af0f2838d0704a53226a9c41699504cf1;hb=9a7c77e5c29d764109a104aa629761ba90cb511c;hp=26e3aab2d05d4066def1e1e64fcbe267746226d1;hpb=585469505faa97c21687128490828a1aabee94ee;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 26e3aab2d..192e396af 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -86,11 +86,11 @@ let rec tactic_of_ast status ast = | GrafiteAst.ApplyP (_, term) -> Tactics.applyP term | GrafiteAst.ApplyS (_, term, params) -> Tactics.applyS ~term ~params ~dbd:(LibraryDb.instance ()) - ~automation_cache:status.GrafiteTypes.automation_cache + ~automation_cache:status#automation_cache | GrafiteAst.Assumption _ -> Tactics.assumption | GrafiteAst.AutoBatch (_,params) -> Tactics.auto ~params ~dbd:(LibraryDb.instance ()) - ~automation_cache:status.GrafiteTypes.automation_cache + ~automation_cache:status#automation_cache | GrafiteAst.Cases (_, what, pattern, (howmany, names)) -> Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names) ~pattern what @@ -112,7 +112,7 @@ let rec tactic_of_ast status ast = | GrafiteAst.Demodulate (_, params) -> Tactics.demodulate ~dbd:(LibraryDb.instance ()) ~params - ~automation_cache:status.GrafiteTypes.automation_cache + ~automation_cache:status#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) @@ -183,12 +183,12 @@ let rec tactic_of_ast status ast = | 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()) - ~automation_cache:status.GrafiteTypes.automation_cache just ty id t1 + ~automation_cache:status#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()) - ~automation_cache:status.GrafiteTypes.automation_cache t + ~automation_cache:status#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) -> @@ -197,14 +197,14 @@ let rec tactic_of_ast status ast = | GrafiteAst.Thesisbecomes (_, t) -> Declarative.thesisbecomes t | GrafiteAst.ExistsElim (_, just, id1, t1, id2, t2) -> Declarative.existselim ~dbd:(LibraryDb.instance()) - ~automation_cache:status.GrafiteTypes.automation_cache just id1 t1 id2 t2 + ~automation_cache:status#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 ()) - ~automation_cache:status.GrafiteTypes.automation_cache just id1 t1 id2 t2 + ~automation_cache:status#automation_cache just id1 t1 id2 t2 | GrafiteAst.RewritingStep (_,termine,t1,t2,cont) -> Declarative.rewritingstep ~dbd:(LibraryDb.instance ()) - ~automation_cache:status.GrafiteTypes.automation_cache termine t1 t2 cont + ~automation_cache:status#automation_cache termine t1 t2 cont let classify_tactic tactic = match tactic with @@ -336,24 +336,24 @@ 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 = - match status.GrafiteTypes.proof_status with + match status#proof_status with | GrafiteTypes.Incomplete_proof p -> p | _ -> assert false in - { status with GrafiteTypes.proof_status = - GrafiteTypes.Incomplete_proof - { incomplete_proof with GrafiteTypes.proof = proof } }, + status#set_proof_status + (GrafiteTypes.Incomplete_proof + { incomplete_proof with GrafiteTypes.proof = proof }), opened_goals, closed_goals let apply_atomic_tactical ~disambiguate_tactic ~patch (text,prefix_len,tactic) (status, goal) = @@ -381,13 +381,13 @@ let apply_atomic_tactical ~disambiguate_tactic ~patch (text,prefix_len,tactic) ( proof', opened_goals in let incomplete_proof = - match status.GrafiteTypes.proof_status with + match status#proof_status with | GrafiteTypes.Incomplete_proof p -> p | _ -> assert false in - { status with GrafiteTypes.proof_status = - GrafiteTypes.Incomplete_proof - { incomplete_proof with GrafiteTypes.proof = proof } }, + status#set_proof_status + (GrafiteTypes.Incomplete_proof + { incomplete_proof with GrafiteTypes.proof = proof }), opened_goals, closed_goals type eval_ast = {ea_go: @@ -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 = @@ -470,10 +470,30 @@ let coercion_moo_statement_of (uri,arity, saturations,_) = GrafiteAst.Coercion (HExtlib.dummy_floc, CicUtil.term_of_uri uri, false, arity, saturations) +let basic_eval_unification_hint (t,n) status = + NCicUnifHint.add_user_provided_hint status t n +;; + +let inject_unification_hint = + let basic_eval_unification_hint (t,n) ~refresh_uri_in_term = + let t = refresh_uri_in_term t in basic_eval_unification_hint (t,n) + in + NRstatus.Serializer.register "unification_hints" basic_eval_unification_hint +;; + let eval_unification_hint status t n = - (* XXX no undo *) - NCicUnifHint.add_user_provided_hint t n; - status,[] + let estatus = GrafiteTypes.get_estatus status in + let metasenv,subst,estatus,t = + GrafiteDisambiguate.disambiguate_nterm None estatus [] [] [] ("",0,t) in + assert (metasenv=[]); + let t = NCicUntrusted.apply_subst subst [] t in + let status = GrafiteTypes.set_estatus estatus status in + let estatus = + basic_eval_unification_hint (t,n) (GrafiteTypes.get_estatus status) in + let dump = inject_unification_hint (t,n)::estatus#dump in + let estatus = estatus#set_dump dump in + let status = GrafiteTypes.set_estatus estatus status in + status,`Old [] ;; let add_coercions_of_lemmas lemmas status = @@ -488,7 +508,7 @@ let add_coercions_of_lemmas lemmas status = lemmas in let status = GrafiteTypes.add_moo_content moo_content status in - {status with GrafiteTypes.coercions = CoercDb.dump () }, + status#set_coercions (CoercDb.dump ()), lemmas let eval_coercion status ~add_composites uri arity saturations = @@ -500,7 +520,7 @@ let eval_coercion status ~add_composites uri arity saturations = let status, lemmas = GrafiteSync.add_coercion ~add_composites ~pack_coercion_obj:CicRefine.pack_coercion_obj - status uri arity saturations (GrafiteTypes.get_baseuri status) in + status uri arity saturations status#baseuri in let moo_content = coercion_moo_statement_of (uri,arity,saturations,0) in let status = GrafiteTypes.add_moo_content [moo_content] status in add_coercions_of_lemmas lemmas status @@ -514,7 +534,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 @@ -561,11 +581,11 @@ let non_punctuation_tactical_of_ast (text,prefix_len,punct) = let eval_tactical status tac = let status, _, _ = MatitaTacticals.eval tac (status, ~-1) in let status = (* is proof completed? *) - match status.GrafiteTypes.proof_status with + match status#proof_status with | GrafiteTypes.Incomplete_proof { GrafiteTypes.stack = stack; proof = proof } when Continuationals.Stack.is_empty stack -> - { status with GrafiteTypes.proof_status = GrafiteTypes.Proof proof } + status#set_proof_status (GrafiteTypes.Proof proof) | _ -> status in status @@ -583,7 +603,7 @@ let eval_ng_punct (_text, _prefix_len, punct) = | GrafiteAst.Merge _ -> NTactics.merge_tac ;; -let eval_ng_tac (text, prefix_len, tac) = +let rec eval_ng_tac (text, prefix_len, tac) = match tac with | GrafiteAst.NApply (_loc, t) -> NTactics.apply_tac (text,prefix_len,t) | GrafiteAst.NAssert (_loc, seqs) -> @@ -597,6 +617,10 @@ let eval_ng_tac (text, prefix_len, tac) = ) hyps, (text,prefix_len,concl)) ) seqs) + | GrafiteAst.NAuto (_loc, (l,a)) -> + NTactics.auto_tac + ~params:(List.map (fun x -> "",0,x) l,a) + | GrafiteAst.NBranch _ -> NTactics.branch_tac | GrafiteAst.NCases (_loc, what, where) -> NTactics.cases_tac ~what:(text,prefix_len,what) @@ -605,12 +629,12 @@ let eval_ng_tac (text, prefix_len, tac) = | GrafiteAst.NChange (_loc, pat, ww) -> NTactics.change_tac ~where:(text,prefix_len,pat) ~with_what:(text,prefix_len,ww) + | GrafiteAst.NDot _ -> NTactics.dot_tac | GrafiteAst.NElim (_loc, what, where) -> 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.NFocus (_,l) -> NTactics.focus_tac l | GrafiteAst.NGeneralize (_loc, where) -> NTactics.generalize_tac ~where:(text,prefix_len,where) | GrafiteAst.NId _ -> (fun x -> x) @@ -618,9 +642,104 @@ 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.NMerge _ -> NTactics.merge_tac + | GrafiteAst.NPos (_,l) -> NTactics.pos_tac l + | 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) + | GrafiteAst.NSemicolon _ -> fun x -> x + | GrafiteAst.NShift _ -> NTactics.shift_tac + | GrafiteAst.NSkip _ -> NTactics.skip_tac + | GrafiteAst.NUnfocus _ -> NTactics.unfocus_tac + | GrafiteAst.NWildcard _ -> NTactics.wildcard_tac + | GrafiteAst.NTry (_,tac) -> NTactics.try_tac + (eval_ng_tac (text, prefix_len, tac)) + | GrafiteAst.NAssumption _ -> NTactics.assumption_tac +;; + +let subst_metasenv_and_fix_names s = + let u,h,metasenv, subst,o = s#obj in + let o = + NCicUntrusted.map_obj_kind ~skip_body:true + (NCicUntrusted.apply_subst subst []) o + in + s#set_obj (u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o) +;; + +let rec eval_ncommand opts status (text,prefix_len,cmd) = + match cmd with + | GrafiteAst.UnificationHint (loc, t, n) -> eval_unification_hint status t n + | GrafiteAst.NQed loc -> + (match status#ng_status with + | GrafiteTypes.ProofMode estatus -> + let uri,height,menv,subst,obj_kind = estatus#obj 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 = NCicTypeChecker.height_of_obj_kind uri obj_kind in + (* fix the height inside the object *) + let rec fix () = function + | NCic.Const (NReference.Ref (u,spec)) when NUri.eq u uri -> + NCic.Const (NReference.reference_of_spec u + (match spec with + | NReference.Def _ -> NReference.Def height + | NReference.Fix (i,j,_) -> NReference.Fix(i,j,height) + | NReference.CoFix _ -> NReference.CoFix height + | NReference.Ind _ | NReference.Con _ + | NReference.Decl as s -> s)) + | t -> NCicUtils.map (fun _ () -> ()) () fix t + in + let obj_kind = + match obj_kind with + | NCic.Fixpoint _ -> + NCicUntrusted.map_obj_kind (fix ()) obj_kind + | _ -> obj_kind + in + let obj = uri,height,[],[],obj_kind in + NCicTypeChecker.typecheck_obj obj; + let estatus = NCicLibrary.add_obj estatus uri obj in + let objs = NCicElim.mk_elims obj in + let timestamp,uris_rev = + List.fold_left + (fun (estatus,uris_rev) (uri,_,_,_,_) as obj -> + NCicTypeChecker.typecheck_obj obj; + let estatus = NCicLibrary.add_obj estatus uri obj in + estatus,uri::uris_rev + ) (estatus,[]) objs in + let uris = uri::List.rev uris_rev in + status#set_ng_status + (GrafiteTypes.CommandMode (estatus :> NEstatus.status)),`New uris + | _ -> raise (GrafiteTypes.Command_error "Not in proof mode")) + | GrafiteAst.NObj (loc,obj) -> + let estatus = + match status#ng_status with + | GrafiteTypes.ProofMode _ -> assert false + | GrafiteTypes.CommandMode es -> es + in + let estatus,obj = + GrafiteDisambiguate.disambiguate_nobj estatus + ~baseuri:status#baseuri (text,prefix_len,obj) in + let uri,height,nmenv,nsubst,nobj = obj in + let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in + let status = + status#set_ng_status + (GrafiteTypes.ProofMode + (subst_metasenv_and_fix_names + ((new NTacStatus.status obj ninitial_stack)#set_estatus estatus))) + in + (match nmenv with + [] -> + eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + | _ -> status,`New []) + | GrafiteAst.NUnivConstraint (loc,strict,u1,u2) -> + NCicEnvironment.add_constraint strict [false,u1] [false,u2]; + status, `New [u1;u2] ;; let rec eval_command = {ec_go = fun ~disambiguate_command opts status @@ -632,13 +751,13 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status assert false (* TODO: for user input *) | GrafiteAst.Index (loc,Some key,uri) -> let universe = - status.GrafiteTypes.automation_cache.AutomationCache.univ + status#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 } + status#automation_cache with AutomationCache.univ = universe } in - let status = { status with GrafiteTypes.automation_cache = cache } in + let status = status#set_automation_cache cache in (* debug let msg = let candidates = Universe.get_candidates status.GrafiteTypes.universe key in @@ -648,43 +767,46 @@ 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, [] + if List.mem cmd status#moo_content_rev then status, `Old [] else let cache = - AutomationCache.add_term_to_active status.GrafiteTypes.automation_cache + AutomationCache.add_term_to_active status#automation_cache [] [] [] (CicUtil.term_of_uri uri) None in - let status = { status with GrafiteTypes.automation_cache = cache } in + let status = status#set_automation_cache cache in let status = GrafiteTypes.add_moo_content [cmd] status in - status, [] + status, `Old [] | GrafiteAst.Pump (_,steps) -> let cache = - AutomationCache.pump status.GrafiteTypes.automation_cache steps + AutomationCache.pump status#automation_cache steps in - let status = { status with GrafiteTypes.automation_cache = cache } in - status, [] + let status = status#set_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 buri = status#baseuri 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") + 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 - Inversion_principle.build_inverter ~add_obj status uri indty_uri params - | GrafiteAst.UnificationHint (loc, t, n) -> - eval_unification_hint status t n + res,`Old uris | 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, @@ -697,6 +819,11 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status raise (IncludedFileNotCompiled (moopath_rw,baseuri)) in let status = eval_from_moo.efm_go status moopath in + let estatus = GrafiteTypes.get_estatus status in + let estatus = + NRstatus.Serializer.require ~baseuri:(NUri.uri_of_string baseuri) + estatus in + let status = GrafiteTypes.set_estatus estatus status in (* debug let lt_uri = UriManager.uri_of_string "cic:/matita/nat/orders/lt.con" in let nat_uri = UriManager.uri_of_string "cic:/matita/nat/nat/nat.ind" in @@ -711,15 +838,15 @@ 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 + match status#proof_status with | GrafiteTypes.Proof (Some uri, metasenv, subst, body, ty, attrs) -> uri, metasenv, subst, body, ty, attrs | GrafiteTypes.Proof (None, metasenv, subst, body, ty, attrs) -> @@ -737,68 +864,14 @@ 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#set_proof_status GrafiteTypes.No_proof, (*CSC: I throw away the arities *) - 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!!!"; -prerr_endline (NUri.string_of_uri uri); - uri,height,[],[],NTacStatus.apply_subst_obj subst obj - in - NCicLibrary.add_obj uri obj; - {status with - GrafiteTypes.ng_status = - GrafiteTypes.CommandMode lexicon_status },[] - | _ -> raise (GrafiteTypes.Command_error "Not in proof mode")) + `Old (uri::lemmas) | 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 - (* CSC: ".con"??? it is like that for now *) - let suri = "cic:/ng_matita/" ^ name ^ ".con" in - let nlexicon_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} } - }, - [] | GrafiteAst.Obj (loc,obj) -> let ext,name = match obj with @@ -808,7 +881,7 @@ prerr_endline (NUri.string_of_uri uri); ".ind", (match types with (name,_,_,_)::_ -> name | _ -> assert false) | _ -> assert false in - let buri = GrafiteTypes.get_baseuri status in + let buri = status#baseuri in let uri = UriManager.uri_of_string (buri ^ "/" ^ name ^ ext) in let obj = CicRefine.pack_coercion_obj obj in let metasenv = GrafiteTypes.get_proof_metasenv status in @@ -848,26 +921,23 @@ prerr_endline (NUri.string_of_uri uri); let _subst = [] in let initial_proof = (Some uri, metasenv', _subst, lazy bo, ty, attrs) in let initial_stack = Continuationals.Stack.of_metasenv metasenv' in - { status with GrafiteTypes.proof_status = - GrafiteTypes.Incomplete_proof - { GrafiteTypes.proof = initial_proof; stack = initial_stack } ; - }, - [] + status#set_proof_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 - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, - uri::new_lemmas@lemmas + let status,new_lemmas = add_coercions_of_lemmas lemmas status in + status#set_proof_status GrafiteTypes.No_proof, + `Old (uri::new_lemmas@lemmas) in - match status.GrafiteTypes.proof_status with + match status#proof_status with GrafiteTypes.Intermediate _ -> - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},uris + status#set_proof_status GrafiteTypes.No_proof,uris | _ -> status,uris } and eval_executable = {ee_go = fun ~disambiguate_tactic ~disambiguate_command @@ -886,27 +956,34 @@ prerr_endline (NUri.string_of_uri uri); 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)),[] - | GrafiteAst.NTactic (_(*loc*), tac, punct) -> - (match status.GrafiteTypes.ng_status with + (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old [] + | GrafiteAst.NTactic (_(*loc*), tacl) -> + (match status#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 }, []) + let nstatus = + List.fold_left + (fun nstatus tac -> + let nstatus = eval_ng_tac (text,prefix_len,tac) nstatus in + subst_metasenv_and_fix_names nstatus) + nstatus tacl + in + status#set_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.NCommand (_, cmd) -> + eval_ncommand opts status (text,prefix_len,cmd) | GrafiteAst.Macro (loc, macro) -> raise (Macro (loc,disambiguate_macro status (text,prefix_len,macro))) @@ -927,7 +1004,7 @@ prerr_endline (NUri.string_of_uri uri); ~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 @@ -942,7 +1019,7 @@ prerr_endline (NUri.string_of_uri uri); | 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 [] } ;;