From 8f4bb4db3597080b57d957eb444e58e032da2d78 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 2 Apr 2009 14:15:36 +0000 Subject: [PATCH] New file nTacStatus to: 1) collect type declarations and utility functions 2) make cic_term as abstract as possible --- helm/software/components/ng_tactics/.depend | 9 +- .../components/ng_tactics/.depend.opt | 9 +- helm/software/components/ng_tactics/Makefile | 1 + .../components/ng_tactics/nTacStatus.ml | 251 ++++++++++++++++ .../components/ng_tactics/nTacStatus.mli | 68 +++++ .../components/ng_tactics/nTactics.ml | 278 ++---------------- .../components/ng_tactics/nTactics.mli | 60 ++-- 7 files changed, 377 insertions(+), 299 deletions(-) create mode 100644 helm/software/components/ng_tactics/nTacStatus.ml create mode 100644 helm/software/components/ng_tactics/nTacStatus.mli diff --git a/helm/software/components/ng_tactics/.depend b/helm/software/components/ng_tactics/.depend index 7333bd37b..a93613c51 100644 --- a/helm/software/components/ng_tactics/.depend +++ b/helm/software/components/ng_tactics/.depend @@ -1,3 +1,6 @@ -nTactics.cmi: -nTactics.cmo: nTactics.cmi -nTactics.cmx: nTactics.cmi +nTacStatus.cmi: +nTactics.cmi: nTacStatus.cmi +nTacStatus.cmo: nTacStatus.cmi +nTacStatus.cmx: nTacStatus.cmi +nTactics.cmo: nTacStatus.cmi nTactics.cmi +nTactics.cmx: nTacStatus.cmx nTactics.cmi diff --git a/helm/software/components/ng_tactics/.depend.opt b/helm/software/components/ng_tactics/.depend.opt index 7333bd37b..a93613c51 100644 --- a/helm/software/components/ng_tactics/.depend.opt +++ b/helm/software/components/ng_tactics/.depend.opt @@ -1,3 +1,6 @@ -nTactics.cmi: -nTactics.cmo: nTactics.cmi -nTactics.cmx: nTactics.cmi +nTacStatus.cmi: +nTactics.cmi: nTacStatus.cmi +nTacStatus.cmo: nTacStatus.cmi +nTacStatus.cmx: nTacStatus.cmi +nTactics.cmo: nTacStatus.cmi nTactics.cmi +nTactics.cmx: nTacStatus.cmx nTactics.cmi diff --git a/helm/software/components/ng_tactics/Makefile b/helm/software/components/ng_tactics/Makefile index 64765023d..71183455b 100644 --- a/helm/software/components/ng_tactics/Makefile +++ b/helm/software/components/ng_tactics/Makefile @@ -1,6 +1,7 @@ PACKAGE = ng_tactics INTERFACE_FILES = \ + nTacStatus.mli \ nTactics.mli IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml) diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml new file mode 100644 index 000000000..3d81ca53c --- /dev/null +++ b/helm/software/components/ng_tactics/nTacStatus.ml @@ -0,0 +1,251 @@ +(* + ||M|| This file is part of HELM, an Hypertextual, Electronic + ||A|| Library of Mathematics, developed at the Computer Science + ||T|| Department, University of Bologna, Italy. + ||I|| + ||T|| HELM is free software; you can redistribute it and/or + ||A|| modify it under the terms of the GNU General Public License + \ / version 2 or (at your option) any later version. + \ / This software is distributed as is, NO WARRANTY. + V_______________________________________________________________ *) + +(* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *) + +exception Error of string lazy_t +let fail msg = raise (Error msg) + +type lowtac_status = { + pstatus : NCic.obj; + lstatus : LexiconEngine.status +} + +type lowtactic = lowtac_status -> int -> lowtac_status + +type tac_status = { + gstatus : Continuationals.Stack.t; + istatus : lowtac_status; +} + +type tactic = tac_status -> tac_status + +type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input +type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input + +let pp_tac_status status = + prerr_endline (NCicPp.ppobj status.istatus.pstatus) +;; + +let pp_lowtac_status status = + prerr_endline "--------------------------------------------"; + prerr_endline (NCicPp.ppobj status.pstatus) +;; + +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) + 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 +;; + + +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 = + match ty with + | None -> None | Some ty -> let _,_,x = relocate context ty in Some x + in + let metasenv, subst, lexicon_status, t = + GrafiteDisambiguate.disambiguate_nterm expty + status.lstatus context metasenv subst t + in + let new_pstatus = uri,height,metasenv,subst,obj in + { lstatus = lexicon_status; pstatus = new_pstatus }, (None, context, t) +;; + +let typeof status ctx t = + let _,_,metasenv,subst,_ = status.pstatus in + let _,_,t = relocate ctx t in + let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in + None, ctx, ty +;; + +let whd status ?delta ctx t = + let _,_,metasenv,subst,_ = status.pstatus in + let name,_,t = relocate ctx t in + let t = NCicReduction.whd ~subst ?delta ctx t in + name, ctx, t +;; + +let unify status ctx a b = + 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 + { status with pstatus = n,h,metasenv,subst,o } +;; + +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 + in + let name,height,metasenv,subst,obj = status.pstatus in + let db = NCicUnifHint.db () in (* XXX fixme *) + let coercion_db = NCicCoercion.db () in + let look_for_coercion = NCicCoercion.look_for_coercion coercion_db in + 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) }, + (nt,ctx,t), (ne,ctx,ty) +;; + +let get_goalty (status : lowtac_status) (g : int) = + let _,_,metasenv,_,_ = status.pstatus in + List.assoc g metasenv +;; + +let instantiate status i t = + let (gname, context, _ as gty) = get_goalty status i in + let status, (_,_,t), (_,_,ty) = + refine status (ctx_of gty) t (Some gty) + in + + let name,height,metasenv,subst,obj = status.pstatus in + let metasenv = List.filter (fun j,_ -> j <> i) metasenv in + let subst = (i, (gname, context, t, ty)) :: subst in + { status with pstatus = (name,height,metasenv,subst,obj) } +;; + +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 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 metasenv, metano, instance, _ = + NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in + let metasenv = List.filter (fun j,_ -> j <> metano) metasenv in + let subst = (metano, (name, ctx, bo_, ty)) :: subst in + let status = { status with pstatus = n,h,metasenv,subst,o } in + status, (None,ctx,instance) +;; + +let in_scope_tag = "tag:in_scope" ;; +let out_scope_tag = "tag:out_scope" ;; + +let select_term low_status (name,context,term) (wanted,path) = + let found status ctx t wanted = + (* we could lift wanted step-by-step *) + try true, unify status ctx (None, ctx, t) wanted + with + | NCicUnification.UnificationFailure _ + | NCicUnification.Uncertain _ -> false, status + in + let match_term status ctx (wanted : cic_term) t = + let rec aux ctx status t = + let b, status = found status ctx t wanted in + if b then + let status, (_,_,t) = + mk_meta status ~name:in_scope_tag ctx (`Def (None, ctx, t)) + in + status, t + else NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux status t + in + aux ctx status t + in + let rec select status ctx pat cic = + match pat, cic with + | NCic.LetIn (_,t1,s1,b1), NCic.LetIn (n,t2,s2,b2) -> + let status, t = select status ctx t1 t2 in + let status, s = select status ctx s1 s2 in + let ctx = (n, NCic.Def (s2,t2)) :: ctx in + let status, b = select status ctx b1 b2 in + status, NCic.LetIn (n,t,s,b) + | NCic.Lambda (_,s1,t1), NCic.Lambda (n,s2,t2) -> + let status, s = select status ctx s1 s2 in + let ctx = (n, NCic.Decl s2) :: ctx in + let status, t = select status ctx t1 t2 in + status, NCic.Lambda (n,s,t) + | NCic.Prod (_,s1,t1), NCic.Prod (n,s2,t2) -> + let status, s = select status ctx s1 s2 in + let ctx = (n, NCic.Decl s2) :: ctx in + let status, t = select status ctx t1 t2 in + status, NCic.Prod (n,s,t) + | NCic.Appl l1, NCic.Appl l2 -> + let status, l = + List.fold_left2 + (fun (status,l) x y -> + let status, x = select status ctx x y in + status, x::l) + (status,[]) l1 l2 + in + status, NCic.Appl (List.rev l) + | NCic.Match (_,ot1,t1,pl1), NCic.Match (u,ot2,t2,pl2) -> + let status, t = select status ctx t1 t2 in + let status, ot = select status ctx ot1 ot2 in + let status, pl = + List.fold_left2 + (fun (status,l) x y -> + let status, x = select status ctx x y in + status, x::l) + (status,[]) pl1 pl2 + in + status, NCic.Match (u,ot,t,List.rev pl) + | NCic.Implicit `Hole, t -> + (match wanted with + | Some wanted -> + let status, wanted = disambiguate status wanted None ctx in + match_term status ctx wanted t + | None -> match_term status ctx (None,ctx,t) t) + | NCic.Implicit _, t -> status, t + | _,t -> + fail (lazy ("malformed pattern: " ^ NCicPp.ppterm ~metasenv:[] + ~context:[] ~subst:[] pat)) + in + let status, term = select low_status context path term in + let term = (name, context, term) in + mk_meta status ~name:out_scope_tag context (`Def term) +;; + +let analyse_indty status ty = + let ref, args = + match whd status (ctx_of ty) ty with + | _,_,NCic.Const ref -> ref, [] + | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args + | _,_,_ -> fail (lazy ("not an inductive type")) in + let _,lno,tl,_,i = NCicEnvironment.get_checked_indtys ref in + 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 +;; + +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 new file mode 100644 index 000000000..4ca302890 --- /dev/null +++ b/helm/software/components/ng_tactics/nTacStatus.mli @@ -0,0 +1,68 @@ +(* + ||M|| This file is part of HELM, an Hypertextual, Electronic + ||A|| Library of Mathematics, developed at the Computer Science + ||T|| Department, University of Bologna, Italy. + ||I|| + ||T|| HELM is free software; you can redistribute it and/or + ||A|| modify it under the terms of the GNU General Public License + \ / version 2 or (at your option) any later version. + \ / This software is distributed as is, NO WARRANTY. + V_______________________________________________________________ *) + +(* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *) + +exception Error of string lazy_t +val fail: string lazy_t -> 'a + +type lowtac_status = { + pstatus : NCic.obj; + lstatus : LexiconEngine.status +} + +type lowtactic = lowtac_status -> int -> lowtac_status + +type tac_status = { + gstatus : Continuationals.Stack.t; + istatus : lowtac_status; +} + +type tactic = tac_status -> tac_status + +type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input +type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input + +type cic_term +val ctx_of : cic_term -> NCic.context + +val mk_cic_term : NCic.context -> NCic.term -> cic_term +type ast_term = string * int * CicNotationPt.term +val disambiguate: + lowtac_status -> ast_term -> cic_term option -> NCic.context -> + lowtac_status * cic_term (* * cic_term XXX *) + +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 +val unify: + lowtac_status -> NCic.context -> cic_term -> cic_term -> lowtac_status +val refine: + lowtac_status -> NCic.context -> cic_term -> cic_term option -> + lowtac_status * cic_term * cic_term (* status, term, type *) + +val get_goalty: lowtac_status -> int -> cic_term +val mk_meta: + lowtac_status -> ?name:string -> NCic.context -> + [ `Decl of cic_term | `Def of cic_term ] -> + lowtac_status * cic_term +val instantiate: lowtac_status -> int -> cic_term -> lowtac_status + +val in_scope_tag: string +val out_scope_tag: string +val select_term: + lowtac_status -> cic_term -> ast_term option * NCic.term -> + lowtac_status * cic_term + +(* end *) diff --git a/helm/software/components/ng_tactics/nTactics.ml b/helm/software/components/ng_tactics/nTactics.ml index 49daed849..7fa2b48d8 100644 --- a/helm/software/components/ng_tactics/nTactics.ml +++ b/helm/software/components/ng_tactics/nTactics.ml @@ -16,36 +16,8 @@ open Printf let debug = true let debug_print s = if debug then prerr_endline (Lazy.force s) else () -exception Error of string lazy_t -let fail msg = raise (Error msg) - -type lowtac_status = { - pstatus : NCic.obj; - lstatus : LexiconEngine.status -} - -type lowtactic = lowtac_status -> int -> lowtac_status - -type tac_status = { - gstatus : Continuationals.Stack.t; - istatus : lowtac_status; -} - -type tactic = tac_status -> tac_status - -type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input -type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input - -let pp_tac_status status = - prerr_endline (NCicPp.ppobj status.istatus.pstatus) -;; - -let pp_lowtac_status status = - prerr_endline "--------------------------------------------"; - prerr_endline (NCicPp.ppobj status.pstatus) -;; - open Continuationals.Stack +open NTacStatus let dot_tac status = let new_gstatus = @@ -239,211 +211,16 @@ let distribute_tac tac status = { gstatus = stack; istatus = sn } ;; -type cic_term = NCic.conjecture -type ast_term = string * int * CicNotationPt.term -type position = [ `Ctx of NCic.context | `Term of cic_term ] - - -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) - in - 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 disambiguate (status : lowtac_status) (t : ast_term) - (ty : cic_term option) (where : position) = - let uri,height,metasenv,subst,obj = status.pstatus in - let context = match where with `Ctx c -> c | `Term (_,c,_) -> c in - let expty = - match ty with - | None -> None | Some ty -> let _,_,x = relocate context ty in Some x - in - let metasenv, subst, lexicon_status, t = - GrafiteDisambiguate.disambiguate_nterm expty - status.lstatus context metasenv subst t - in - let new_pstatus = uri,height,metasenv,subst,obj in - { lstatus = lexicon_status; pstatus = new_pstatus }, (None, context, t) -;; - -let in_scope_tag = "tag:in_scope" ;; -let out_scope_tag = "tag:out_scope" ;; - -let typeof status where t = - let _,_,metasenv,subst,_ = status.pstatus in - let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in - let _,_,t = relocate ctx t in - let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in - None, ctx, ty -;; - -let whd status ?delta where t = - let _,_,metasenv,subst,_ = status.pstatus in - let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in - let _,_,t = relocate ctx t in - let t = NCicReduction.whd ~subst ?delta ctx t in - None, ctx, t -;; - -let unify status where a b = - let n,h,metasenv,subst,o = status.pstatus in - let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c 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 - { status with pstatus = n,h,metasenv,subst,o } -;; - -let refine status where term expty = - let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in - let nt,_,term = relocate ctx term in - let ne, ty = - match expty with None -> None, None - | Some e -> let n,_, e = relocate ctx e in Some n, Some e - in - let name,height,metasenv,subst,obj = status.pstatus in - let db = NCicUnifHint.db () in (* XXX fixme *) - let coercion_db = NCicCoercion.db () in - let look_for_coercion = NCicCoercion.look_for_coercion coercion_db in - let metasenv, subst, t, ty = - NCicRefiner.typeof db ~look_for_coercion metasenv subst ctx term ty - in - { status with pstatus = (name,height,metasenv,subst,obj) }, - (nt,ctx,t), (ne,ctx,ty) -;; - -let get_goal (status : lowtac_status) (g : int) = - let _,_,metasenv,_,_ = status.pstatus in - List.assoc g metasenv -;; - -let instantiate status i t = - let (goalname, context, _ as ety) = get_goal status i in - let status, (_,_,t), (_,_,ty) = refine status (`Term ety) t (Some ety) in - - let name,height,metasenv,subst,obj = status.pstatus in - let metasenv = List.filter (fun j,_ -> j <> i) metasenv in - let subst = (i, (goalname, context, t, ty)) :: subst in - { status with pstatus = (name,height,metasenv,subst,obj) } -;; - -let mk_meta status ?name where bo_or_ty = - let n,h,metasenv,subst,o = status.pstatus in - let ctx = match where with `Ctx c -> c | `Term (_,c,_) -> c in - match bo_or_ty with - | `Decl ty -> - let _,_,ty = relocate ctx ty 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 _,_,ty = typeof status (`Ctx ctx) bo in - let metasenv, metano, instance, _ = - NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) - in - let status = { status with pstatus = n,h,metasenv,subst,o } in - let status = instantiate status metano bo in - status, (None,ctx,instance) -;; - -let select_term low_status (name,context,term) (wanted,path) = - let found status ctx t wanted = - (* we could lift wanted step-by-step *) - try true, unify status (`Ctx ctx) (None,ctx,t) wanted - with - | NCicUnification.UnificationFailure _ - | NCicUnification.Uncertain _ -> false, status - in - let match_term status ctx (wanted : cic_term) t = - let rec aux ctx status t = - let b, status = found status ctx t wanted in - if b then - let status, (_,_,t) = - mk_meta status ~name:in_scope_tag (`Ctx ctx) (`Def (None,ctx,t)) - in - status, t - else NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux status t - in - aux ctx status t - in - let rec select status ctx pat cic = - match pat, cic with - | NCic.LetIn (_,t1,s1,b1), NCic.LetIn (n,t2,s2,b2) -> - let status, t = select status ctx t1 t2 in - let status, s = select status ctx s1 s2 in - let ctx = (n, NCic.Def (s2,t2)) :: ctx in - let status, b = select status ctx b1 b2 in - status, NCic.LetIn (n,t,s,b) - | NCic.Lambda (_,s1,t1), NCic.Lambda (n,s2,t2) -> - let status, s = select status ctx s1 s2 in - let ctx = (n, NCic.Decl s2) :: ctx in - let status, t = select status ctx t1 t2 in - status, NCic.Lambda (n,s,t) - | NCic.Prod (_,s1,t1), NCic.Prod (n,s2,t2) -> - let status, s = select status ctx s1 s2 in - let ctx = (n, NCic.Decl s2) :: ctx in - let status, t = select status ctx t1 t2 in - status, NCic.Prod (n,s,t) - | NCic.Appl l1, NCic.Appl l2 -> - let status, l = - List.fold_left2 - (fun (status,l) x y -> - let status, x = select status ctx x y in - status, x::l) - (status,[]) l1 l2 - in - status, NCic.Appl (List.rev l) - | NCic.Match (_,ot1,t1,pl1), NCic.Match (u,ot2,t2,pl2) -> - let status, t = select status ctx t1 t2 in - let status, ot = select status ctx ot1 ot2 in - let status, pl = - List.fold_left2 - (fun (status,l) x y -> - let status, x = select status ctx x y in - status, x::l) - (status,[]) pl1 pl2 - in - status, NCic.Match (u,ot,t,List.rev pl) - | NCic.Implicit `Hole, t -> - (match wanted with - | Some wanted -> - let status, wanted = disambiguate status wanted None (`Ctx ctx) in - match_term status ctx wanted t - | None -> match_term status ctx (None,ctx,t) t) - | NCic.Implicit _, t -> status, t - | _,t -> - fail (lazy ("malformed pattern: " ^ NCicPp.ppterm ~metasenv:[] - ~context:[] ~subst:[] pat)) - in - let status, term = select low_status context path term in - let term = (name, context, term) in - mk_meta status ~name:out_scope_tag (`Ctx context) (`Def term) -;; let select ~where status goal = - let name, _, _ as goalty = get_goal status goal in + let goalty = get_goalty status goal in let (wanted,_,where) = GrafiteDisambiguate.disambiguate_npattern where in let path = match where with None -> NCic.Implicit `Term | Some where -> where in let status, newgoalty = select_term status goalty (wanted,path) in let status, instance = - mk_meta status ?name (`Term newgoalty) (`Decl newgoalty) + mk_meta status (ctx_of newgoalty) (`Decl newgoalty) in instantiate status goal instance ;; @@ -451,8 +228,8 @@ let select ~where status goal = let select_tac ~where = distribute_tac (select ~where) ;; let exact t status goal = - let goalty = get_goal status goal in - let status, t = disambiguate status t (Some goalty) (`Term goalty) in + let goalty = get_goalty status goal in + let status, t = disambiguate status t (Some goalty) (ctx_of goalty) in instantiate status goal t ;; @@ -462,7 +239,8 @@ let reopen status = let n,h,metasenv,subst,o = status.pstatus in let subst, newm = List.partition - (function (_,(Some tag,_,_,_)) -> tag <> in_scope_tag && tag <> out_scope_tag + (function (_,(Some tag,_,_,_)) -> + tag <> in_scope_tag && tag <> out_scope_tag | _ -> true) subst in @@ -478,7 +256,7 @@ let reopen status = ;; let change ~where ~with_what status goal = - let (name,_,_ as goalty) = get_goal status goal in + let goalty = get_goalty status goal in let (wanted,_,where) = GrafiteDisambiguate.disambiguate_npattern where in let path = match where with None -> NCic.Implicit `Term | Some where -> where @@ -488,14 +266,14 @@ let change ~where ~with_what status goal = let status = List.fold_left (exact with_what) status in_scope in let j,(n,cctx,bo,_) = out_scope in - let _ = typeof status (`Term goalty) (n,cctx,bo) in + let _ = typeof status (ctx_of goalty) (Obj.magic (n,cctx,bo)) in let n,h,metasenv,subst,o = status.pstatus in let subst = out_scope :: subst in let status = { status with pstatus = n,h,metasenv,subst,o } in let status, instance = - mk_meta status ?name (`Term newgoalty) (`Decl newgoalty) + mk_meta status (ctx_of newgoalty) (`Decl newgoalty) in instantiate status goal instance ;; @@ -509,10 +287,10 @@ let elim_tac ~what ~where status = block_tac [ select_tac ~where; distribute_tac (fun status goal -> - let goalty = get_goal status goal in - let status, (_,_,w as what) = - disambiguate status what None (`Term goalty) in - let _ty_what = typeof status (`Term what) what in + 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 (* check inductive... find eliminator *) let w = (*astify what *) CicNotationPt.Ident ("m",None) in let holes = [ @@ -531,33 +309,23 @@ let intro_tac name = (CicNotationPt.Ident (name,None),None),CicNotationPt.Implicit))) ;; -let analyse_indty status ty = - let ref, args = - match whd status (`Term ty) ty with - | _,_,NCic.Const ref -> ref, [] - | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args - | _,_,_ -> fail (lazy ("not an inductive type")) in - let _,lno,tl,_,i = NCicEnvironment.get_checked_indtys ref in - 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 -;; - -let case status goal = - let _,ctx,_ = get_goal status goal in - let ty = typeof status (`Ctx ctx) ("",ctx,NCic.Rel 1) in +let case ~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, left, right = analyse_indty status ty in let t = NCic.Match (ref,NCic.Implicit `Term,NCic.Rel 1, HExtlib.mk_list (NCic.Implicit `Term) consno) in - let status,t,ty = refine status (`Ctx ctx) ("",ctx,t) None in + let ctx = ctx_of gty in + let status,t,ty = refine status ctx (mk_cic_term ctx t) None in instantiate status goal t ;; -let case_tac = distribute_tac case;; +let case_tac ~what = distribute_tac (case ~what);; let case1_tac name = - block_tac [ intro_tac name; case_tac ] + block_tac [ intro_tac name; + case_tac ~what:("",0,CicNotationPt.Ident (name,None)) ] ;; diff --git a/helm/software/components/ng_tactics/nTactics.mli b/helm/software/components/ng_tactics/nTactics.mli index fbebd4cbb..fffcad698 100644 --- a/helm/software/components/ng_tactics/nTactics.mli +++ b/helm/software/components/ng_tactics/nTactics.mli @@ -11,42 +11,26 @@ (* $Id: nCic.ml 9058 2008-10-13 17:42:30Z tassi $ *) -exception Error of string lazy_t +val dot_tac: NTacStatus.tactic +val branch_tac: NTacStatus.tactic +val shift_tac: NTacStatus.tactic +val pos_tac: int list -> NTacStatus.tactic +val wildcard_tac: NTacStatus.tactic +val merge_tac: NTacStatus.tactic +val focus_tac: int list -> NTacStatus.tactic +val unfocus_tac: NTacStatus.tactic +val skip_tac: NTacStatus.tactic + +val distribute_tac: NTacStatus.lowtactic -> NTacStatus.tactic +val block_tac: NTacStatus.tactic list -> NTacStatus.tactic + +val apply_tac: NTacStatus.tactic_term -> NTacStatus.tactic +val change_tac: + where:NTacStatus.tactic_pattern -> with_what:NTacStatus.tactic_term -> + NTacStatus.tactic +val elim_tac: + what:NTacStatus.tactic_term -> where:NTacStatus.tactic_pattern -> + NTacStatus.tactic +val intro_tac: string -> NTacStatus.tactic +val case1_tac: string -> NTacStatus.tactic -type lowtac_status = { - pstatus : NCic.obj; - lstatus : LexiconEngine.status -} - -type lowtactic = lowtac_status -> int -> lowtac_status - -type tac_status = { - gstatus : Continuationals.Stack.t; - istatus : lowtac_status; -} - -type tactic = tac_status -> tac_status - -type tactic_term = CicNotationPt.term Disambiguate.disambiguator_input -type tactic_pattern = GrafiteAst.npattern Disambiguate.disambiguator_input - -val dot_tac: tactic -val branch_tac: tactic -val shift_tac: tactic -val pos_tac: int list -> tactic -val wildcard_tac: tactic -val merge_tac: tactic -val focus_tac: int list -> tactic -val unfocus_tac: tactic -val skip_tac: tactic - -val distribute_tac: lowtactic -> tactic -val block_tac: tactic list -> tactic - -val apply_tac: tactic_term -> tactic -val change_tac: where:tactic_pattern -> with_what:tactic_term -> tactic -val elim_tac: what:tactic_term -> where:tactic_pattern -> tactic -val intro_tac: string -> tactic -val case1_tac: string -> tactic - -val pp_tac_status: tac_status -> unit -- 2.39.2