X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=0806057ec14ab1d67189dba4832028c6509576db;hb=ddd6560f4e70ec3306d223738a441d5f1dd3eac9;hp=65b6683ebc384e107331a0c42c51a5f0a9ca323b;hpb=df1201e37d6f2631dc31ffc87b979a6c81180a3a;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 65b6683eb..0806057ec 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -33,6 +33,7 @@ exception IncludedFileNotCompiled of string * string exception Macro of GrafiteAst.loc * (Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) +exception NMacro of GrafiteAst.loc * GrafiteAst.nmacro type 'a disambiguator_input = string * int * 'a @@ -40,6 +41,11 @@ type options = { do_heavy_checks: bool ; } +let concat_nuris uris nuris = + match uris,nuris with + | `New uris, `New nuris -> `New (nuris@uris) + | _ -> assert false +;; (** 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 *) @@ -86,11 +92,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 +118,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 +189,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 +203,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 @@ -347,13 +353,13 @@ let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) = 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 +387,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: @@ -475,24 +481,46 @@ let basic_eval_unification_hint (t,n) status = ;; let inject_unification_hint = - let basic_eval_unification_hint (t,n) ~refresh_uri_in_term = + let basic_eval_unification_hint (t,n) + ~refresh_uri_in_universe + ~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 = - let estatus = GrafiteTypes.get_estatus status in - let metasenv,subst,estatus,t = - GrafiteDisambiguate.disambiguate_nterm None estatus [] [] [] ("",0,t) in + let metasenv,subst,status,t = + GrafiteDisambiguate.disambiguate_nterm None status [] [] [] ("",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 + let status = basic_eval_unification_hint (t,n) status in + let dump = inject_unification_hint (t,n)::status#dump in + let status = status#set_dump dump in + status,`New [] +;; + +let basic_eval_add_constraint (u1,u2) status = + NCicLibrary.add_constraint status u1 u2 +;; + +let inject_constraint = + let basic_eval_add_constraint (u1,u2) + ~refresh_uri_in_universe + ~refresh_uri_in_term + = + let u1 = refresh_uri_in_universe u1 in + let u2 = refresh_uri_in_universe u2 in + basic_eval_add_constraint (u1,u2) + in + NRstatus.Serializer.register "constraints" basic_eval_add_constraint +;; + +let eval_add_constraint status u1 u2 = + let status = basic_eval_add_constraint (u1,u2) status in + let dump = inject_constraint (u1,u2)::status#dump in + let status = status#set_dump dump in status,`Old [] ;; @@ -508,7 +536,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 = @@ -520,7 +548,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 @@ -581,11 +609,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 @@ -603,7 +631,8 @@ let eval_ng_punct (_text, _prefix_len, punct) = | GrafiteAst.Merge _ -> NTactics.merge_tac ;; -let eval_ng_tac (text, prefix_len, tac) = +let eval_ng_tac tac = + let rec aux f (text, prefix_len, tac) = match tac with | GrafiteAst.NApply (_loc, t) -> NTactics.apply_tac (text,prefix_len,t) | GrafiteAst.NAssert (_loc, seqs) -> @@ -629,6 +658,10 @@ 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.NConstructor (_loc,num,args) -> + NTactics.constructor_tac + ?num ~args:(List.map (fun x -> text,prefix_len,x) args) + | GrafiteAst.NCut (_loc, t) -> NTactics.cut_tac (text,prefix_len,t) | GrafiteAst.NDot _ -> NTactics.dot_tac | GrafiteAst.NElim (_loc, what, where) -> NTactics.elim_tac @@ -639,6 +672,7 @@ let eval_ng_tac (text, prefix_len, tac) = NTactics.generalize_tac ~where:(text,prefix_len,where) | GrafiteAst.NId _ -> (fun x -> x) | GrafiteAst.NIntro (_loc,n) -> NTactics.intro_tac n + | GrafiteAst.NLApply (_loc, t) -> NTactics.lapply_tac (text,prefix_len,t) | GrafiteAst.NLetIn (_loc,where,what,name) -> NTactics.letin_tac ~where:(text,prefix_len,where) ~what:(text,prefix_len,what) name @@ -654,98 +688,202 @@ let eval_ng_tac (text, prefix_len, tac) = | GrafiteAst.NSkip _ -> NTactics.skip_tac | GrafiteAst.NUnfocus _ -> NTactics.unfocus_tac | GrafiteAst.NWildcard _ -> NTactics.wildcard_tac + | GrafiteAst.NTry (_,tac) -> NTactics.try_tac + (aux f (text, prefix_len, tac)) + | GrafiteAst.NAssumption _ -> NTactics.assumption_tac + | GrafiteAst.NBlock (_,l) -> + NTactics.block_tac (List.map (fun x -> aux f (text,prefix_len,x)) l) + |GrafiteAst.NRepeat (_,tac) -> + NTactics.repeat_tac (f f (text, prefix_len, tac)) + in + aux aux tac (* trick for non uniform recursion call *) ;; -let subst_metasenv_and_fix_names s = - let u,h,metasenv, subst,o = s.NTacStatus.istatus.NTacStatus.pstatus in +let subst_metasenv_and_fix_names status = + let u,h,metasenv, subst,o = status#obj 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}} + status#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.NCoercion (loc, name, t, ty, source, target) -> + NCicCoercDeclaration.eval_ncoercion status name t ty source target | GrafiteAst.NQed loc -> - (match status.GrafiteTypes.ng_status with - | GrafiteTypes.ProofMode - { NTacStatus.istatus = - { NTacStatus.pstatus = pstatus; estatus = estatus } } -> - 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 = 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 - GrafiteTypes.set_estatus estatus - {status with - GrafiteTypes.ng_status = - GrafiteTypes.CommandMode estatus },`New uris - | _ -> raise (GrafiteTypes.Command_error "Not in proof mode")) + if status#ng_mode <> `ProofMode then + raise (GrafiteTypes.Command_error "Not in proof mode") + else + let uri,height,menv,subst,obj_kind = status#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 + let old_status = status in + let status = NCicLibrary.add_obj status obj in + HLog.message ("New object: " ^ NUri.string_of_uri uri); + (try + (*prerr_endline (NCicPp.ppobj obj);*) + let boxml = NCicElim.mk_elims obj in + let boxml = boxml @ NCicElim.mk_projections obj in +(* + let objs = [] in + let timestamp,uris_rev = + List.fold_left + (fun (status,uris_rev) (uri,_,_,_,_) as obj -> + let status = NCicLibrary.add_obj status obj in + status,uri::uris_rev + ) (status,[]) objs in + let uris = uri::List.rev uris_rev in +*) + let status = status#set_ng_mode `CommandMode in + let status = LexiconSync.add_aliases_for_objs status (`New [uri]) in + let status,uris = + List.fold_left + (fun (status,uris) boxml -> + try + let status,nuris = + eval_ncommand opts status + ("",0,GrafiteAst.NObj (HExtlib.dummy_floc,boxml)) + in + status, concat_nuris uris nuris + with + | MultiPassDisambiguator.DisambiguationError _ + | NCicTypeChecker.TypeCheckerFailure _ -> + HLog.warn "error in generating projection/eliminator"; + status,uris + ) (status,`New [] (* uris *)) boxml in + let coercions = + match obj with + _,_,_,_,NCic.Inductive + (true,leftno,[_,_,_,[_,_,_]],(_,`Record fields)) + -> + HExtlib.filter_map + (fun (name,is_coercion,arity) -> + if is_coercion then Some(name,leftno,arity) else None) fields + | _ -> [] in + let status,uris = + List.fold_left + (fun (status,uris) (name,cpos,arity) -> + try + let metasenv,subst,status,t = + GrafiteDisambiguate.disambiguate_nterm None status [] [] [] + ("",0,CicNotationPt.Ident (name,None)) in + assert (metasenv = [] && subst = []); + let status, nuris = + NCicCoercDeclaration. + basic_eval_and_record_ncoercion_from_t_cpos_arity + status (name,t,cpos,arity) + in + let uris = concat_nuris nuris uris in + status, uris + with MultiPassDisambiguator.DisambiguationError _-> + HLog.warn ("error in generating coercion: "^name); + status, uris) + (status,uris) coercions + in + status,uris + with + exn -> + NCicLibrary.time_travel old_status; + raise exn) + | GrafiteAst.NCopy (log,tgt,src_uri, map) -> + if status#ng_mode <> `CommandMode then + raise (GrafiteTypes.Command_error "Not in command mode") + else + let tgt_uri_ext, old_ok = + match NCicEnvironment.get_checked_obj src_uri with + | _,_,[],[], (NCic.Inductive _ as ok) -> ".ind", ok + | _,_,[],[], (NCic.Fixpoint _ as ok) -> ".con", ok + | _,_,[],[], (NCic.Constant _ as ok) -> ".con", ok + | _ -> assert false + in + let tgt_uri = NUri.uri_of_string (status#baseuri^"/"^tgt^tgt_uri_ext) in + let map = (src_uri, tgt_uri) :: map in + let ok = + let rec subst () = function + | NCic.Meta _ -> assert false + | NCic.Const (NReference.Ref (u,spec)) as t -> + (try NCic.Const + (NReference.reference_of_spec (List.assoc u map)spec) + with Not_found -> t) + | t -> NCicUtils.map (fun _ _ -> ()) () subst t + in + NCicUntrusted.map_obj_kind ~skip_body:false (subst ()) old_ok + in + let ninitial_stack = Continuationals.Stack.of_nmetasenv [] in + let status = status#set_obj (tgt_uri,0,[],[],ok) in + (*prerr_endline (NCicPp.ppobj (tgt_uri,0,[],[],ok));*) + let status = status#set_stack ninitial_stack in + let status = subst_metasenv_and_fix_names status in + let status = status#set_ng_mode `ProofMode in + eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) | GrafiteAst.NObj (loc,obj) -> - let estatus = - match status.GrafiteTypes.ng_status with - | GrafiteTypes.ProofMode _ -> assert false - | GrafiteTypes.CommandMode es -> es - in - let estatus,obj = - GrafiteDisambiguate.disambiguate_nobj estatus - ~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 - let status = - { status with - GrafiteTypes.ng_status = - GrafiteTypes.ProofMode - (subst_metasenv_and_fix_names - { NTacStatus.gstatus = ninitial_stack; - istatus = { NTacStatus.pstatus = obj; estatus = estatus}}) - } - in - (match nmenv with - [] -> + if status#ng_mode <> `CommandMode then + raise (GrafiteTypes.Command_error "Not in command mode") + else + let status,obj = + GrafiteDisambiguate.disambiguate_nobj status + ~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_obj obj in + let status = status#set_stack ninitial_stack in + let status = subst_metasenv_and_fix_names status in + let status = status#set_ng_mode `ProofMode in + (match nmenv with + [] -> + eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc) + | _ -> status,`New []) + | GrafiteAst.NInverter (loc, name, indty) -> + if status#ng_mode <> `CommandMode then + raise (GrafiteTypes.Command_error "Not in command mode") + else + let status = status#set_ng_mode `ProofMode in + let metasenv,subst,status,indty = + GrafiteDisambiguate.disambiguate_nterm None status [] [] [] (text,prefix_len,indty) in + let _,leftno,tys,_,_ = match indty with + NCic.Const r -> NCicEnvironment.get_checked_indtys r + | _ -> assert false in + let it = match tys with + hd::tl -> hd + | _ -> assert false + in + let status,obj = + NInversion.mk_inverter name it leftno status status#baseuri in + let _,_,menv,_,_ = obj in + (match menv 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] + | _ -> assert false) + | GrafiteAst.NUnivConstraint (loc,u1,u2) -> + eval_add_constraint status [`Type,u1] [`Type,u2] ;; let rec eval_command = {ec_go = fun ~disambiguate_command opts status @@ -757,13 +895,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 @@ -775,20 +913,20 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let status = GrafiteTypes.add_moo_content [cmd] status in status,`Old [] | GrafiteAst.Select (_,uri) as cmd -> - if List.mem cmd status.GrafiteTypes.moo_content_rev then status, `Old [] + 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, `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 + let status = status#set_automation_cache cache in status, `Old [] | GrafiteAst.PreferCoercion (loc, coercion) -> eval_prefer_coercion status coercion @@ -798,7 +936,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status 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 @@ -812,39 +950,32 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status LibraryObjects.set_default what uris; GrafiteTypes.add_moo_content [cmd] status,`Old [] | GrafiteAst.Drop loc -> raise Drop - | GrafiteAst.Include (loc, _, baseuri) -> - let moopath_rw, moopath_r = - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:true, - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:false - in - let moopath = - if Sys.file_exists moopath_r then moopath_r else - if Sys.file_exists moopath_rw then moopath_rw else - raise (IncludedFileNotCompiled (moopath_rw,baseuri)) + | GrafiteAst.Include (loc, mode, new_or_old, baseuri) -> + (* Old Include command is not recursive; new one is *) + let status = + if new_or_old = `OldAndNew then + let moopath_rw, moopath_r = + LibraryMisc.obj_file_of_baseuri + ~must_exist:false ~baseuri ~writable:true, + LibraryMisc.obj_file_of_baseuri + ~must_exist:false ~baseuri ~writable:false in + let moopath = + if Sys.file_exists moopath_r then moopath_r else + if Sys.file_exists moopath_rw then moopath_rw else + raise (IncludedFileNotCompiled (moopath_rw,baseuri)) + in + eval_from_moo.efm_go status moopath + else + status in - let status = eval_from_moo.efm_go status moopath in - let estatus = GrafiteTypes.get_estatus status in - let estatus = + let status = 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 - let nat = Cic.MutInd(nat_uri,0,[]) in - let zero = Cic.MutConstruct(nat_uri,0,1,[]) in - let succ = Cic.MutConstruct(nat_uri,0,2,[]) in - let fake= Cic.Meta(-1,[]) in - let term= Cic.Appl [Cic.Const (lt_uri,[]);zero;Cic.Appl[succ;zero]] in let msg = - let candidates = Universe.get_candidates status.GrafiteTypes.universe term in - ("candidates for " ^ (CicPp.ppterm term) ^ " = " ^ - (String.concat "\n" (List.map CicPp.ppterm candidates))) - in - prerr_endline msg; -*) - status,`Old [] + status in + let status = + GrafiteTypes.add_moo_content + [GrafiteAst.Include (loc,mode,`New,baseuri)] status + in + status,`Old [] | GrafiteAst.Print (_,"proofterm") -> let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in prerr_endline (Auto.pp_proofterm (Lazy.force p)); @@ -852,7 +983,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | 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) -> @@ -870,7 +1001,7 @@ 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 *) `Old (uri::lemmas) | GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) -> @@ -887,7 +1018,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status ".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 @@ -927,10 +1058,9 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status 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 @@ -939,12 +1069,12 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status 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}, + 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 @@ -968,19 +1098,17 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status eval_tactical status (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old [] | GrafiteAst.NTactic (_(*loc*), tacl) -> - (match status.GrafiteTypes.ng_status with - | GrafiteTypes.CommandMode _ -> assert false - | 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 - NTacStatus.pp_tac_status nstatus; - { status with GrafiteTypes.ng_status= GrafiteTypes.ProofMode nstatus }, - `New []) + if status#ng_mode <> `ProofMode then + raise (GrafiteTypes.Command_error "Not in proof mode") + else + let status = + List.fold_left + (fun status tac -> + let status = eval_ng_tac (text,prefix_len,tac) status in + subst_metasenv_and_fix_names status) + status tacl + in + status,`New [] | GrafiteAst.NonPunctuationTactical (_, tac, punct) -> let status = eval_tactical status @@ -994,6 +1122,8 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status eval_ncommand opts status (text,prefix_len,cmd) | GrafiteAst.Macro (loc, macro) -> raise (Macro (loc,disambiguate_macro status (text,prefix_len,macro))) + | GrafiteAst.NMacro (loc, macro) -> + raise (NMacro (loc,macro)) } and eval_from_moo = {efm_go = fun status fname -> let ast_of_cmd cmd =