X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteEngine.ml;h=679f4246f82fad9fcb905fa246fa0c361d0a71d8;hb=910c252965fe17d6b5af92e4658e7d02bac82d58;hp=409c0921aeb3f41b1876511fb95d2a2100921527;hpb=5c1b44dfefa085fbb56e23047652d3650be9d855;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml index 409c0921a..679f4246f 100644 --- a/helm/software/components/grafite_engine/grafiteEngine.ml +++ b/helm/software/components/grafite_engine/grafiteEngine.ml @@ -82,6 +82,7 @@ let rec tactic_of_ast status ast = (* First order tactics *) | GrafiteAst.Absurd (_, term) -> Tactics.absurd term | GrafiteAst.Apply (_, 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 @@ -89,9 +90,9 @@ let rec tactic_of_ast status ast = | GrafiteAst.AutoBatch (_,params) -> Tactics.auto ~params ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe - | GrafiteAst.Cases (_, what, (howmany, names)) -> + | GrafiteAst.Cases (_, what, pattern, (howmany, names)) -> Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names) - what + ~pattern what | GrafiteAst.Change (_, pattern, with_what) -> Tactics.change ~pattern with_what | GrafiteAst.Clear (_,id) -> Tactics.clear id @@ -107,9 +108,10 @@ let rec tactic_of_ast status ast = | GrafiteAst.Decompose (_, names) -> let mk_fresh_name_callback = namer_of names in Tactics.decompose ~mk_fresh_name_callback () - | GrafiteAst.Demodulate _ -> + | GrafiteAst.Demodulate (_, params) -> Tactics.demodulate - ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe + ~dbd:(LibraryDb.instance ()) ~params + ~universe:status.GrafiteTypes.universe | 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) @@ -126,7 +128,6 @@ let rec tactic_of_ast status ast = | `Normalize -> PET.const_lazy_reduction (CicReduction.normalize ~delta:false ~subst:[]) - | `Reduce -> PET.const_lazy_reduction ProofEngineReduction.reduce | `Simpl -> PET.const_lazy_reduction ProofEngineReduction.simpl | `Unfold None -> PET.const_lazy_reduction (ProofEngineReduction.unfold ?what:None) @@ -161,7 +162,6 @@ let rec tactic_of_ast status ast = | GrafiteAst.Reduce (_, reduction_kind, pattern) -> (match reduction_kind with | `Normalize -> Tactics.normalize ~pattern - | `Reduce -> Tactics.reduce ~pattern | `Simpl -> Tactics.simpl ~pattern | `Unfold what -> Tactics.unfold ~pattern what | `Whd -> Tactics.whd ~pattern) @@ -180,9 +180,9 @@ let rec tactic_of_ast status ast = (* Implementazioni Aggiunte *) | GrafiteAst.Assume (_, id, t) -> Declarative.assume id t | GrafiteAst.Suppose (_, t, id, t1) -> Declarative.suppose t id t1 - | GrafiteAst.By_term_we_proved (_, t, ty, id, t1) -> - Declarative.by_term_we_proved ~dbd:(LibraryDb.instance()) - ~universe:status.GrafiteTypes.universe t ty 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 | GrafiteAst.We_need_to_prove (_, t, id, t2) -> Declarative.we_need_to_prove t id t2 | GrafiteAst.Bydone (_, t) -> @@ -194,11 +194,13 @@ let rec tactic_of_ast status ast = Declarative.we_proceed_by_induction_on t t1 | GrafiteAst.Byinduction (_, t, id) -> Declarative.byinduction t id | GrafiteAst.Thesisbecomes (_, t) -> Declarative.thesisbecomes t - | GrafiteAst.ExistsElim (_, t, id1, t1, id2, t2) -> + | GrafiteAst.ExistsElim (_, just, id1, t1, id2, t2) -> Declarative.existselim ~dbd:(LibraryDb.instance()) - ~universe:status.GrafiteTypes.universe t id1 t1 id2 t2 + ~universe:status.GrafiteTypes.universe just id1 t1 id2 t2 | GrafiteAst.Case (_,id,params) -> Declarative.case id params - | GrafiteAst.AndElim(_,t,id1,t1,id2,t2) -> Declarative.andelim t id1 t1 id2 t2 + | GrafiteAst.AndElim(_,just,id1,t1,id2,t2) -> + Declarative.andelim ~dbd:(LibraryDb.instance ()) + ~universe:status.GrafiteTypes.universe just id1 t1 id2 t2 | GrafiteAst.RewritingStep (_,termine,t1,t2,cont) -> Declarative.rewritingstep ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe termine t1 t2 cont @@ -453,8 +455,9 @@ type 'a eval_executable = type 'a eval_from_moo = { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status } -let coercion_moo_statement_of (uri,arity, saturations) = - GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, 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' = @@ -480,16 +483,21 @@ let refinement_toolkit = { } 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) + List.map coercion_moo_statement_of ((uri,arity,saturations,0)::compounds) 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 + List.map (fun u,_,_,_ -> u) compounds module MatitaStatus = struct @@ -558,7 +566,7 @@ let add_coercions_of_record_to_moo obj lemmas status = let is_a_coercion uri = try let obj,_ = - CicEnvironment.get_cooked_obj CicUniv.empty_ugraph uri in + CicEnvironment.get_cooked_obj CicUniv.oblivion_ugraph uri in let attrs = CicUtil.attributes_of_obj obj in try match List.find @@ -600,9 +608,9 @@ let add_coercions_of_record_to_moo obj lemmas status = 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)) + Some (uri, coercion_moo_statement_of (uri,arity_coercion,0,0)) else if is_a_wanted_coercion then - Some (uri, coercion_moo_statement_of (uri,arity_wanted,0)) + Some (uri, coercion_moo_statement_of (uri,arity_wanted,0,0)) else None) lemmas) @@ -747,7 +755,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status let t = CicUtil.term_of_uri u in let ty',g = CicTypeChecker.type_of_aux' - metasenv' [] t CicUniv.empty_ugraph + metasenv' [] t CicUniv.oblivion_ugraph in fst(CicReduction.are_convertible [] ty' ty g)) similar