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=b3a6284637692baedf3577c15217d4c308ca62e0;hpb=ca41435a6021292ccba239aa173651c0be705b45;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index b3a628463..8101dd667 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -32,7 +32,7 @@ exception Drop exception IncludedFileNotCompiled of string * string exception Macro of GrafiteAst.loc * - (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) + (Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) type 'a disambiguator_input = string * int * 'a @@ -82,13 +82,15 @@ let rec tactic_of_ast status ast = (* First order tactics *) | GrafiteAst.Absurd (_, term) -> Tactics.absurd term | GrafiteAst.Apply (_, term) -> Tactics.apply term + | GrafiteAst.ApplyRule (_, term) -> Tactics.apply term + | 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 @@ -110,7 +112,7 @@ let rec tactic_of_ast status ast = | 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) @@ -181,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()) - ~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) -> @@ -195,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()) - ~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 @@ -334,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 = @@ -405,14 +407,14 @@ type eval_ast = disambiguate_macro: (GrafiteTypes.status -> - ('term GrafiteAst.macro) disambiguator_input -> - Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> + (('term,'lazy_term) GrafiteAst.macro) disambiguator_input -> + Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) -> ?do_heavy_checks:bool -> 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 = @@ -422,7 +424,17 @@ 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 = + {ecm_go: 'term 'lazy_term 'reduction_kind 'obj 'ident. + disambiguate_command: + (GrafiteTypes.status -> (('term,'obj) GrafiteAst.command) disambiguator_input -> + GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) -> + options -> GrafiteTypes.status -> + (('term,'lazy_term,'reduction_kind,'obj,'ident) GrafiteAst.comment) disambiguator_input -> + GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list] } type 'a eval_executable = @@ -442,61 +454,67 @@ type 'a eval_executable = disambiguate_macro: (GrafiteTypes.status -> - ('term GrafiteAst.macro) disambiguator_input -> - Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) -> + (('term,'lazy_term) GrafiteAst.macro) disambiguator_input -> + Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) -> 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 = { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status } -let coercion_moo_statement_of (uri,arity, saturations) = +let coercion_moo_statement_of (uri,arity, saturations,_) = GrafiteAst.Coercion (HExtlib.dummy_floc, CicUtil.term_of_uri uri, false, arity, saturations) -let refinement_toolkit = { - RefinementTool.type_of_aux' = - (fun ?localization_tbl e c t u -> - let saved = !CicRefine.insert_coercions in - CicRefine.insert_coercions:= false; - let rc = - try - let t, ty, metasenv, ugraph = - CicRefine.type_of_aux' ?localization_tbl e c t u in - RefinementTool.Success (t, ty, metasenv, ugraph) - with - | CicRefine.RefineFailure s - | CicRefine.Uncertain s - | CicRefine.AssertFailure s -> RefinementTool.Exception s - in - CicRefine.insert_coercions := saved; - rc); - RefinementTool.ppsubst = CicMetaSubst.ppsubst; - RefinementTool.apply_subst = CicMetaSubst.apply_subst; - RefinementTool.ppmetasenv = CicMetaSubst.ppmetasenv; - RefinementTool.pack_coercion_obj = CicRefine.pack_coercion_obj; - } - +let eval_unification_hint status t n = + (* XXX no undo *) + NCicUnifHint.add_user_provided_hint t n; + status,`Old [] +;; + +let add_coercions_of_lemmas lemmas status = + let moo_content = + HExtlib.filter_map + (fun uri -> + match CoercDb.is_a_coercion (Cic.Const (uri,[])) with + | None -> None + | Some (_,tgt,_,sat,_) -> + let arity = match tgt with CoercDb.Fun n -> n | _ -> 0 in + Some (coercion_moo_statement_of (uri,arity,sat,0))) + lemmas + in + let status = GrafiteTypes.add_moo_content moo_content status in + {status with GrafiteTypes.coercions = CoercDb.dump () }, + lemmas + let eval_coercion status ~add_composites uri arity saturations = let uri = try CicUtil.uri_of_term uri with Invalid_argument _ -> raise (Invalid_argument "coercion can only be constants/constructors") in - let status,compounds = - GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity - saturations (GrafiteTypes.get_baseuri status) - in - let moo_content = - List.map coercion_moo_statement_of ((uri,arity,saturations)::compounds) + let status, lemmas = + GrafiteSync.add_coercion ~add_composites + ~pack_coercion_obj:CicRefine.pack_coercion_obj + status uri arity saturations (GrafiteTypes.get_baseuri status) 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 + +let eval_prefer_coercion status c = + let uri = + try CicUtil.uri_of_term c + with Invalid_argument _ -> + raise (Invalid_argument "coercion can only be constants/constructors") in - let status = GrafiteTypes.add_moo_content moo_content status in - {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof}, - List.map (fun u,_,_ -> u) compounds + 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, `Old [] module MatitaStatus = struct @@ -552,85 +570,77 @@ let eval_tactical status tac = in status -let eval_comment status c = status - -(* since the record syntax allows to declare coercions, we have to put this - * information inside the moo *) -let add_coercions_of_record_to_moo obj lemmas status = - let attributes = CicUtil.attributes_of_obj obj in - let is_record = function `Class (`Record att) -> Some att | _-> None in - match HExtlib.list_findopt is_record attributes with - | None -> status,[] - | Some fields -> - let is_a_coercion uri = - try - let obj,_ = - CicEnvironment.get_cooked_obj CicUniv.oblivion_ugraph uri in - let attrs = CicUtil.attributes_of_obj obj in - try - match List.find - (function `Class (`Coercion _) -> true | _-> false) attrs - with `Class (`Coercion n) -> true,n | _ -> assert false - with Not_found -> false,0 - with Not_found -> assert false - in - let buri = GrafiteTypes.get_baseuri status in - (* looking at the fields we can know the 'wanted' coercions, but not the - * actually generated ones. So, only the intersection between the wanted - * and the actual should be in the moo as coercion, while everithing in - * lemmas should go as aliases *) - let wanted_coercions = - HExtlib.filter_map - (function - | (name,true,arity) -> - Some - (arity, UriManager.uri_of_string (buri ^ "/" ^ name ^ ".con" )) - | _ -> None) - fields - in - (*prerr_endline "wanted coercions:"; - List.iter - (fun u -> prerr_endline (UriManager.string_of_uri u)) - wanted_coercions; *) - let coercions, moo_content = - List.split - (HExtlib.filter_map - (fun uri -> - let is_a_wanted_coercion,arity_wanted = - try - let arity,_ = - List.find (fun (n,u) -> UriManager.eq u uri) - wanted_coercions - in - true, arity - with Not_found -> false, 0 - in - let is_a_coercion, arity_coercion = is_a_coercion uri in - if is_a_coercion then - Some (uri, coercion_moo_statement_of (uri,arity_coercion,0)) - else if is_a_wanted_coercion then - Some (uri, coercion_moo_statement_of (uri,arity_wanted,0)) - else - None) - lemmas) - in - (*prerr_endline "actual coercions:"; - List.iter - (fun u -> prerr_endline (UriManager.string_of_uri u)) - coercions; - prerr_endline "lemmas was:"; - List.iter - (fun u -> prerr_endline (UriManager.string_of_uri u)) - lemmas; *) - let status = GrafiteTypes.add_moo_content moo_content status in - {status with - GrafiteTypes.coercions = coercions @ status.GrafiteTypes.coercions}, - lemmas - -let add_obj uri obj status = - let status,lemmas = GrafiteSync.add_obj refinement_toolkit uri obj status in - status, lemmas +let add_obj = GrafiteSync.add_obj ~pack_coercion_obj:CicRefine.pack_coercion_obj + +let eval_ng_punct (_text, _prefix_len, punct) = + match punct with + | GrafiteAst.Dot _ -> NTactics.dot_tac + | GrafiteAst.Semicolon _ -> fun x -> x + | GrafiteAst.Branch _ -> NTactics.branch_tac + | GrafiteAst.Shift _ -> NTactics.shift_tac + | GrafiteAst.Pos (_,l) -> NTactics.pos_tac l + | GrafiteAst.Wildcard _ -> NTactics.wildcard_tac + | 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) + | GrafiteAst.NAssert (_loc, seqs) -> + NTactics.assert_tac + ((List.map + (function (hyps,concl) -> + List.map + (function + (id,`Decl t) -> id,`Decl (text,prefix_len,t) + |(id,`Def (b,t))->id,`Def((text,prefix_len,b),(text,prefix_len,t)) + ) hyps, + (text,prefix_len,concl)) + ) seqs) + | GrafiteAst.NCases (_loc, what, where) -> + NTactics.cases_tac + ~what:(text,prefix_len,what) + ~where:(text,prefix_len,where) + | GrafiteAst.NCase1 (_loc,n) -> NTactics.case1_tac n + | GrafiteAst.NChange (_loc, pat, ww) -> + NTactics.change_tac + ~where:(text,prefix_len,pat) ~with_what:(text,prefix_len,ww) + | GrafiteAst.NElim (_loc, what, where) -> + NTactics.elim_tac + ~what:(text,prefix_len,what) + ~where:(text,prefix_len,where) + | GrafiteAst.NGeneralize (_loc, where) -> + NTactics.generalize_tac ~where:(text,prefix_len,where) + | GrafiteAst.NId _ -> (fun x -> x) + | GrafiteAst.NIntro (_loc,n) -> NTactics.intro_tac n + | 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) -> let status,cmd = disambiguate_command status (text,prefix_len,cmd) in @@ -639,9 +649,14 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | 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 @@ -651,14 +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, @@ -685,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 p); - status,[] - | GrafiteAst.Print (_,_) -> status,[] + prerr_endline (Auto.pp_proofterm (Lazy.force p)); + status,`Old [] + | GrafiteAst.Print (_,_) -> status,`Old [] | GrafiteAst.Qed loc -> let uri, metasenv, _subst, bo, ty, attrs = match status.GrafiteTypes.proof_status with @@ -709,17 +758,74 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status (GrafiteTypes.Command_error "Proof not completed! metasenv is not empty!"); let name = UriManager.name_of_uri uri in - let obj = Cic.Constant (name,Some bo,ty,[],attrs) 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 lexicon_status = + match status.GrafiteTypes.ng_status with + | GrafiteTypes.ProofMode _ -> assert false + | 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 + 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 @@ -767,23 +873,22 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status "\nPlease use a variant.")); end; let _subst = [] in - let initial_proof = (Some uri, metasenv', _subst, bo, ty, attrs) 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 } }, - [] + { 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_record_to_moo obj 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 _ -> @@ -793,21 +898,49 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status } and eval_executable = {ee_go = fun ~disambiguate_tactic ~disambiguate_command ~disambiguate_macro opts status (text,prefix_len,ex) -> match ex with - | GrafiteAst.Tactic (_, Some tac, punct) -> + | GrafiteAst.Tactic (_(*loc*), Some tac, punct) -> let tac = apply_tactic ~disambiguate_tactic (text,prefix_len,tac) in let status = eval_tactical status (tactic_of_ast' tac) in + (* CALL auto on every goal, easy way of testing it + let auto = + GrafiteAst.AutoBatch + (loc, ([],["depth","2";"timeout","1";"type","1"])) in + (try + let auto = apply_tactic ~disambiguate_tactic ("",0,auto) in + let _ = eval_tactical status (tactic_of_ast' auto) in + 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 + | 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 }, + `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) -> @@ -830,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 @@ -842,7 +975,12 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status | GrafiteAst.Executable (_,ex) -> eval_executable.ee_go ~disambiguate_tactic ~disambiguate_command ~disambiguate_macro opts status (text,prefix_len,ex) - | GrafiteAst.Comment (_,c) -> eval_comment status (text,prefix_len,c),[] + | 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, `Old [] } +;; + let eval_ast = eval_ast.ea_go