From aefcb5f4e531c0318b7f495956c28eab971a4aa1 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 9 Apr 2009 13:09:58 +0000 Subject: [PATCH] - generalize finished - relocate implemented in terms of delift --- .../components/ng_tactics/nTacStatus.ml | 99 +++++++++++-------- .../components/ng_tactics/nTacStatus.mli | 15 ++- .../components/ng_tactics/nTactics.ml | 46 +++++---- 3 files changed, 96 insertions(+), 64 deletions(-) diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml index 4bc751f3a..545e5603b 100644 --- a/helm/software/components/ng_tactics/nTacStatus.ml +++ b/helm/software/components/ng_tactics/nTacStatus.ml @@ -43,38 +43,56 @@ let pp_lowtac_status status = type cic_term = NCic.conjecture (* name, context, term *) let ctx_of (_,c,_) = c ;; -let relocate context (name,ctx,t as term) = - let is_prefix l1 l2 = - let rec aux = function - | [],[] -> true - | x::xs, y::ys -> x=y && aux (xs,ys) - | _ -> false - in - aux (List.rev l1, List.rev l2) +let relocate status destination (name,source,t as orig) = + if source == destination then status, orig else + let rec lcp j i = function + | (n1, t1)::cl1, (n2, t2)::cl2 -> + if n1 = n2 && t1 = t2 then + NCic.Rel i :: lcp (j-1) (i-1) (cl1,cl2) + else + HExtlib.mk_list (NCic.Appl + [NCic.Sort NCic.Prop; NCic.Sort NCic.Prop]) j + | _::_, [] -> + HExtlib.mk_list (NCic.Appl + [NCic.Sort NCic.Prop; NCic.Sort NCic.Prop]) j + | _ -> [] in - if ctx == context then term else - if ctx = context then term else - if is_prefix ctx context then - (name, context, - NCicSubstitution.lift (List.length context - List.length ctx) t) - else - assert false + let lc = + lcp (List.length destination) (List.length source) + (List.rev destination, List.rev source) + in + let lc = (0,NCic.Ctx (List.rev lc)) in + let u, d, metasenv, subst, o = status.pstatus in + let db = NCicUnifHint.db () in (* XXX fixme *) + let (metasenv, subst), t = + NCicMetaSubst.delift + ~unify:(fun m s c t1 t2 -> + try Some (NCicUnification.unify db m s c t1 t2) + with + | NCicUnification.UnificationFailure _ + | NCicUnification.Uncertain _ -> None) + metasenv subst source 0 lc t + in + let status = { status with pstatus = u, d, metasenv, subst, o } in + status, (name, destination, t) ;; -let term_of_cic_term t c = - let _,_,t = relocate c t in - t +let term_of_cic_term s t c = + let s, (_,_,t) = relocate s c t in + s, t ;; type ast_term = string * int * CicNotationPt.term let disambiguate (status : lowtac_status) (t : ast_term) (ty : cic_term option) context = - let uri,height,metasenv,subst,obj = status.pstatus in - let expty = + let status, expty = match ty with - | None -> None | Some ty -> let _,_,x = relocate context ty in Some x + | None -> status, None + | Some ty -> + let status, (_,_,x) = relocate status context ty in status, Some x in + let uri,height,metasenv,subst,obj = status.pstatus in let metasenv, subst, lexicon_status, t = GrafiteDisambiguate.disambiguate_nterm expty status.lstatus context metasenv subst t @@ -84,23 +102,23 @@ let disambiguate (status : lowtac_status) (t : ast_term) ;; let typeof status ctx t = + let status, (_,_,t) = relocate status ctx t in let _,_,metasenv,subst,_ = status.pstatus in - let _,_,t = relocate ctx t in let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in - None, ctx, ty + status, (None, ctx, ty) ;; let whd status ?delta ctx t = - let _,_,metasenv,subst,_ = status.pstatus in - let name,_,t = relocate ctx t in + let status, (name,_,t) = relocate status ctx t in + let _,_,_,subst,_ = status.pstatus in let t = NCicReduction.whd ~subst ?delta ctx t in - name, ctx, t + status, (name, ctx, t) ;; let unify status ctx a b = + let status, (_,_,a) = relocate status ctx a in + let status, (_,_,b) = relocate status ctx b in let n,h,metasenv,subst,o = status.pstatus in - let _,_,a = relocate ctx a in - let _,_,b = relocate ctx b in let metasenv, subst = NCicUnification.unify (NCicUnifHint.db ()) metasenv subst ctx a b in @@ -108,10 +126,11 @@ let unify status ctx a b = ;; let refine status ctx term expty = - let nt,_,term = relocate ctx term in - let ne, expty = - match expty with None -> None, None - | Some e -> let n,_, e = relocate ctx e in n, Some e + let status, (nt,_,term) = relocate status ctx term in + let status, ne, expty = + match expty with None -> status, None, None + | Some e -> + let status, (n,_, e) = relocate status ctx e in status, n, Some e in let name,height,metasenv,subst,obj = status.pstatus in let db = NCicUnifHint.db () in (* XXX fixme *) @@ -120,7 +139,7 @@ let refine status ctx term expty = let metasenv, subst, t, ty = NCicRefiner.typeof db ~look_for_coercion metasenv subst ctx term expty in - { status with pstatus = (name,height,metasenv,subst,obj) }, + { status with pstatus = name,height,metasenv,subst,obj }, (nt,ctx,t), (ne,ctx,ty) ;; @@ -142,18 +161,19 @@ let instantiate status i t = ;; let mk_meta status ?name ctx bo_or_ty = - let n,h,metasenv,subst,o = status.pstatus in match bo_or_ty with | `Decl ty -> - let _,_,ty = relocate ctx ty in + let status, (_,_,ty) = relocate status ctx ty in + let n,h,metasenv,subst,o = status.pstatus in let metasenv, _, instance, _ = NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in let status = { status with pstatus = n,h,metasenv,subst,o } in status, (None,ctx,instance) | `Def bo -> - let _,_,bo_ as bo = relocate ctx bo in - let _,_,ty = typeof status ctx bo in + let status, (_,_,bo_ as bo) = relocate status ctx bo in + let status, (_,_,ty) = typeof status ctx bo in + let n,h,metasenv,subst,o = status.pstatus in let metasenv, metano, instance, _ = NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in @@ -271,8 +291,9 @@ let select_term ;; let analyse_indty status ty = + let status, reduct = whd status (ctx_of ty) ty in let ref, args = - match whd status (ctx_of ty) ty with + match reduct with | _,_,NCic.Const ref -> ref, [] | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args | _,_,_ -> fail (lazy ("not an inductive type")) in @@ -280,7 +301,7 @@ let analyse_indty status ty = let _,_,_,cl = List.nth tl i in let consno = List.length cl in let left, right = HExtlib.split_nth lno args in - ref, consno, left, right + status, (ref, consno, left, right) ;; let mk_cic_term c t = None,c,t ;; diff --git a/helm/software/components/ng_tactics/nTacStatus.mli b/helm/software/components/ng_tactics/nTacStatus.mli index df862f223..3963f2500 100644 --- a/helm/software/components/ng_tactics/nTacStatus.mli +++ b/helm/software/components/ng_tactics/nTacStatus.mli @@ -33,7 +33,8 @@ type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input type cic_term val ctx_of : cic_term -> NCic.context -val term_of_cic_term : cic_term -> NCic.context -> NCic.term +val term_of_cic_term : + lowtac_status -> cic_term -> NCic.context -> lowtac_status * NCic.term val mk_cic_term : NCic.context -> NCic.term -> cic_term type ast_term = string * int * CicNotationPt.term @@ -43,10 +44,14 @@ val disambiguate: val analyse_indty: lowtac_status -> cic_term -> - NReference.reference * int * NCic.term list * NCic.term list - -val whd: lowtac_status -> ?delta:int -> NCic.context -> cic_term -> cic_term -val typeof: lowtac_status -> NCic.context -> cic_term -> cic_term + lowtac_status * + (NReference.reference * int * NCic.term list * NCic.term list) + +val whd: + lowtac_status -> ?delta:int -> NCic.context -> cic_term -> + lowtac_status * cic_term +val typeof: + lowtac_status -> NCic.context -> cic_term -> lowtac_status * cic_term val unify: lowtac_status -> NCic.context -> cic_term -> cic_term -> lowtac_status val refine: diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml index a2042dda6..e1fed4deb 100644 --- a/helm/software/components/ng_tactics/nTactics.ml +++ b/helm/software/components/ng_tactics/nTactics.ml @@ -21,7 +21,11 @@ open NTacStatus module Ast = CicNotationPt let id_tac status = status ;; -let print_tac message status = prerr_endline message; status ;; +let print_tac print_status message status = + if print_status then pp_tac_status status; + prerr_endline message; + status +;; let dot_tac status = let new_gstatus = @@ -253,8 +257,6 @@ let clear_tac names = { status with pstatus = n,h,metasenv,subst,o }) ;; -let force f s = Lazy.force f s;; - let generalize0_tac args = if args = [] then id_tac else exact_tac ("",0,Ast.Appl (Ast.Implicit :: args)) @@ -302,7 +304,8 @@ let generalize_tac ~where = let l = ref [] in block_tac [ select_tac ~where ~job:(`Collect l) true; - force (lazy (distribute_tac (fun status goal -> + print_tac true "ha selezionato?"; + (fun s -> distribute_tac (fun status goal -> if !l = [] then fail (lazy "No term to generalize"); let goalty = get_goalty status goal in let canon = List.hd !l in @@ -310,10 +313,10 @@ let generalize_tac ~where = List.fold_left (fun s t -> unify s (ctx_of goalty) canon t) status (List.tl !l) in + let status, canon = term_of_cic_term status canon (ctx_of goalty) in instantiate status goal - (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; - term_of_cic_term canon (ctx_of goalty) ])) - ))) ] + (mk_cic_term (ctx_of goalty) (NCic.Appl [NCic.Implicit `Term ; canon ])) + ) s) ] ;; @@ -381,8 +384,8 @@ type indtyinfo = { let analyze_indty_tac ~what indtyref = distribute_tac (fun status goal -> let goalty = get_goalty status goal in let status, what = disambiguate status what None (ctx_of goalty) in - let ty_what = typeof status (ctx_of what) what in - let r,consno,lefts,rights = analyse_indty status ty_what in + let status, ty_what = typeof status (ctx_of what) what in + let status, (r,consno,lefts,rights) = analyse_indty status ty_what in let leftno = List.length rights in let rightno = List.length rights in indtyref := Some { @@ -397,21 +400,23 @@ let elim_tac ~what ~where = let sort = ref None in let compute_goal_sort_tac = distribute_tac (fun status goal -> let goalty = get_goalty status goal in - let goalsort = typeof status (ctx_of goalty) goalty in + let status, goalsort = typeof status (ctx_of goalty) goalty in sort := Some goalsort; exec id_tac status goal) in atomic_tac (block_tac [ analyze_indty_tac ~what indtyinfo; - force (lazy (select_tac - ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1)) true)); + (fun s -> select_tac + ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1)) true s); compute_goal_sort_tac; - force (lazy ( + (fun status -> let sort = HExtlib.unopt !sort in let ity = HExtlib.unopt !indtyinfo in let NReference.Ref (uri, _) = ity.reference in + let istatus, sort = term_of_cic_term status.istatus sort (ctx_of sort) in + let status = { status with istatus = istatus } in let name = NUri.name_of_uri uri ^ - match term_of_cic_term sort (ctx_of sort) with + match sort with | NCic.Sort NCic.Prop -> "_ind" | NCic.Sort _ -> "_rect" | _ -> assert false @@ -422,7 +427,7 @@ let elim_tac ~what ~where = let _,_,w = what in Ast.Appl(Ast.Ident(name,None)::holes @ [ w ]) in - exact_tac ("",0,eliminator))) ]) + exact_tac ("",0,eliminator) status) ]) ;; let rewrite_tac ~dir ~what:(_,_,what) ~where = @@ -448,10 +453,11 @@ let intro_tac name = let cases ~what status goal = let gty = get_goalty status goal in let status, what = disambiguate status what None (ctx_of gty) in - let ty = typeof status (ctx_of what) what in - let ref, consno, _, _ = analyse_indty status ty in + let status, ty = typeof status (ctx_of what) what in + let status, (ref, consno, _, _) = analyse_indty status ty in + let status, what = term_of_cic_term status what (ctx_of gty) in let t = - NCic.Match (ref,NCic.Implicit `Term, term_of_cic_term what (ctx_of gty), + NCic.Match (ref,NCic.Implicit `Term, what, HExtlib.mk_list (NCic.Implicit `Term) consno) in let ctx = ctx_of gty in @@ -464,8 +470,8 @@ let cases_tac ~what ~where = atomic_tac (block_tac [ analyze_indty_tac ~what indtyinfo; - force (lazy (select_tac - ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1))true)); + (fun s -> select_tac + ~where ~job:(`Substexpand ((HExtlib.unopt !indtyinfo).rightno+1))true s); distribute_tac (cases ~what) ]) ;; -- 2.39.2