exception Error of string lazy_t * exn option
let fail ?exn msg = raise (Error (msg,exn))
-let wrap f x =
+module NRef = NReference
+
+let wrap fname f x =
try f x
with
| MultiPassDisambiguator.DisambiguationError _
| NCicRefiner.RefineFailure _
| NCicUnification.UnificationFailure _
| NCicTypeChecker.TypeCheckerFailure _
- | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy "")
+ | NCicMetaSubst.MetaSubstFailure _ as exn -> fail ~exn (lazy fname)
;;
class pstatus =
prerr_endline (NCicPp.ppobj status#obj)
;;
-type cic_term = NCic.conjecture (* name, context, term *)
-let ctx_of (_,c,_) = c ;;
+type cic_term = NCic.context * NCic.term
+let ctx_of (c,_) = c ;;
-let relocate status destination (name,source,t as orig) =
+let relocate status destination (source,t as orig) =
if source == destination then status, orig else
let u, d, metasenv, subst, o = status#obj in
let rec lcp ctx j i = function
metasenv subst source 0 lc t
in
let status = status#set_obj (u, d, metasenv, subst, o) in
- status, (name, destination, t)
+ status, (destination, t)
;;
-let relocate a b c = wrap (relocate a b) c;;
+let relocate a b c = wrap "relocate" (relocate a b) c;;
let term_of_cic_term s t c =
- let s, (_,_,t) = relocate s c t in
+ let s, (_,t) = relocate s c t in
s, t
;;
let ppterm status t =
let uri,height,metasenv,subst,obj = status#obj in
- let _,context,t = t in
+ let context,t = t in
NCicPp.ppterm ~metasenv ~subst ~context t
;;
match ty with
| None -> status, None
| Some ty ->
- let status, (_,_,x) = relocate status context ty in status, Some x
+ let status, (_,x) = relocate status context ty in status, Some x
in
let uri,height,metasenv,subst,obj = status#obj in
let metasenv, subst, status, t =
GrafiteDisambiguate.disambiguate_nterm expty status context metasenv subst t
in
let new_pstatus = uri,height,metasenv,subst,obj in
- status#set_obj new_pstatus, (None, context, t)
+ status#set_obj new_pstatus, (context, t)
;;
-let disambiguate a b c d = wrap (disambiguate a b c) d;;
+let disambiguate a b c d = wrap "disambiguate" (disambiguate a b c) d;;
let typeof status ctx t =
- let status, (_,_,t) = relocate status ctx t in
+ let status, (_,t) = relocate status ctx t in
let _,_,metasenv,subst,_ = status#obj in
let ty = NCicTypeChecker.typeof ~subst ~metasenv ctx t in
- status, (None, ctx, ty)
+ status, (ctx, ty)
;;
-let typeof a b c = wrap (typeof a b) c;;
+let typeof a b c = wrap "typeof" (typeof a b) c;;
let whd status ?delta ctx t =
- let status, (name,_,t) = relocate status ctx t in
+ let status, (_,t) = relocate status ctx t in
let _,_,_,subst,_ = status#obj in
let t = NCicReduction.whd ~subst ?delta ctx t in
- status, (name, ctx, t)
+ status, (ctx, t)
;;
let normalize status ?delta ctx t =
- let status, (name,_,t) = relocate status ctx t in
+ let status, (_,t) = relocate status ctx t in
let _,_,_,subst,_ = status#obj in
let t = NCicTacReduction.normalize ~subst ?delta ctx t in
- status, (name, ctx, t)
+ status, (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 status, (_,a) = relocate status ctx a in
+ let status, (_,b) = relocate status ctx b in
let n,h,metasenv,subst,o = status#obj in
let metasenv, subst = NCicUnification.unify status metasenv subst ctx a b in
status#set_obj (n,h,metasenv,subst,o)
;;
-let unify a b c d = wrap (unify a b c) d;;
+let unify a b c d = wrap "unify" (unify a b c) d;;
+
+let fix_sorts (ctx,t) =
+ let f () =
+ let t = NCicUnification.fix_sorts t in
+ ctx,t
+ in
+ wrap "fix_sorts" f ()
+;;
let refine status ctx term expty =
- let status, (nt,_,term) = relocate status ctx term in
- let status, ne, expty =
- match expty with None -> status, None, None
+ let status, (_,term) = relocate status ctx term in
+ let status, expty =
+ match expty with
+ None -> status, None
| Some e ->
- let status, (n,_, e) = relocate status ctx e in status, n, Some e
+ let status, (_, e) = relocate status ctx e in status, Some e
in
let name,height,metasenv,subst,obj = status#obj in
let metasenv,subst,t,ty =
NCicRefiner.typeof status metasenv subst ctx term expty
in
- status#set_obj (name,height,metasenv,subst,obj), (nt,ctx,t), (ne,ctx,ty)
+ status#set_obj (name,height,metasenv,subst,obj), (ctx,t), (ctx,ty)
;;
-let refine a b c d = wrap (refine a b c) d;;
+let refine a b c d = wrap "refine" (refine a b c) d;;
let get_goalty status g =
let _,_,metasenv,_,_ = status#obj in
- List.assoc g metasenv
+ try
+ let _, ctx, ty = NCicUtils.lookup_meta g metasenv in
+ ctx, ty
+ with NCicUtils.Meta_not_found _ as exn -> fail ~exn (lazy "get_goalty")
;;
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)
+ let _,_,metasenv,_,_ = status#obj in
+ let gname, context, gty = List.assoc i metasenv in
+ let status, (_,t), (_,ty) =
+ refine status context t (Some (context,gty))
in
let name,height,metasenv,subst,obj = status#obj in
status#set_obj (name,height,metasenv,subst,obj)
;;
-let mk_meta status ?name ctx bo_or_ty =
+let mk_meta status ?(attrs=[]) ctx bo_or_ty =
match bo_or_ty with
| `Decl ty ->
- let status, (_,_,ty) = relocate status ctx ty in
+ let status, (_,ty) = relocate status ctx ty in
let n,h,metasenv,subst,o = status#obj in
let metasenv, _, instance, _ =
- NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty)
+ NCicMetaSubst.mk_meta ~attrs metasenv ctx (`WithType ty)
in
let status = status#set_obj (n,h,metasenv,subst,o) in
- status, (None,ctx,instance)
+ status, (ctx,instance)
| `Def bo ->
- let status, (_,_,bo_ as bo) = relocate status ctx bo in
- let status, (_,_,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#obj in
let metasenv, metano, instance, _ =
- NCicMetaSubst.mk_meta ?name metasenv ctx (`WithType ty) in
+ NCicMetaSubst.mk_meta ~attrs 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 subst = (metano, (attrs, ctx, bo_, ty)) :: subst in
let status = status#set_obj (n,h,metasenv,subst,o) in
- status, (None,ctx,instance)
+ status, (ctx,instance)
;;
-let mk_in_scope status t =
- mk_meta status ~name:NCicMetaSubst.in_scope_tag (ctx_of t) (`Def t)
+let mk_in_scope status t =
+ mk_meta status ~attrs:[`InScope] (ctx_of t) (`Def t)
;;
let mk_out_scope n status t =
- mk_meta status ~name:(NCicMetaSubst.out_scope_tag n) (ctx_of t) (`Def t)
+ mk_meta status ~attrs:[`OutScope n] (ctx_of t) (`Def t)
;;
(* the following unification problem will be driven by
* postprocess is called on the entire term after selection
*)
let select_term
- low_status ~found ~postprocess (name,context,term) (wanted,path)
+ low_status ~found ~postprocess (context,term) (wanted,path)
=
let is_found status ctx t wanted =
(* we could lift wanted step-by-step *)
- try true, unify status ctx (None, ctx, t) wanted
+ try true, unify status ctx (ctx, t) wanted
with
- | NCicUnification.UnificationFailure _
- | NCicUnification.Uncertain _ -> false, status
+ | Error (_, Some (NCicUnification.UnificationFailure _))
+ | Error (_, Some (NCicUnification.Uncertain _)) -> false, status
in
let match_term status ctx (wanted : cic_term) t =
let rec aux ctx (status,already_found) t =
let b, status = is_found status ctx t wanted in
if b then
- let status , (_,_,t) = found status (None, ctx, t) in
+ let status , (_,t) = found status (ctx, t) in
(status,true),t
else
let _,_,_,subst,_ = status#obj in
let (status',found), t' = match_term status' ctx wanted t in
if found then status',t' else status,t
| None ->
- let (status,_),t = match_term status ctx (None,ctx,t) t in
+ let (status,_),t = match_term status ctx (ctx,t) t in
status,t)
| NCic.Implicit _, t -> status, t
| _,t ->
NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] t))
in
let status, term = select low_status context path term in
- let term = (name, context, term) in
+ let term = (context, term) in
postprocess status term
;;
let status, reduct = whd status (ctx_of ty) ty in
let ref, args =
match reduct with
- | _,_,NCic.Const ref -> ref, []
- | _,_,NCic.Appl (NCic.Const ref :: args) -> ref, args
- | _,_,_ -> fail (lazy ("not an inductive type")) in
+ | _,NCic.Const ref -> ref, []
+ | _,NCic.Appl (NCic.Const (NRef.Ref (_,(NRef.Ind _)) as 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
status, (ref, consno, left, right)
;;
-let mk_cic_term c t = None,c,t ;;
+let mk_cic_term c t = c,t ;;
let apply_subst status ctx t =
- let status, (name,_,t) = relocate status ctx t in
+ let status, (_,t) = relocate status ctx t in
let _,_,_,subst,_ = status#obj in
- status, (name, ctx, NCicUntrusted.apply_subst subst ctx t)
+ status, (ctx, NCicUntrusted.apply_subst subst ctx t)
;;
(* ============= move this elsewhere ====================*)
type 'status tactic = #tac_status as 'status -> 'status
+module NCicInverseRelIndexable : Discrimination_tree.Indexable
+with type input = cic_term and type constant_name = NUri.uri = struct
+
+open Discrimination_tree
+
+type input = cic_term
+type constant_name = NUri.uri
+
+let ppelem = function
+ | Constant (uri,arity) ->
+ "("^NUri.name_of_uri uri ^ "," ^ string_of_int arity^")"
+ | Bound (i,arity) ->
+ "("^string_of_int i ^ "," ^ string_of_int arity^")"
+ | Variable -> "?"
+ | Proposition -> "Prop"
+ | Datatype -> "Type"
+ | Dead -> "Dead"
+;;
+
+let path_string_of (ctx,t) =
+ let len_ctx = List.length ctx in
+ let rec aux arity = function
+ | NCic.Appl ((NCic.Meta _|NCic.Implicit _)::_) -> [Variable]
+ | NCic.Appl (NCic.Lambda _ :: _) -> [Variable] (* maybe we should b-reduce *)
+ | NCic.Appl [] -> assert false
+ | NCic.Appl (hd::tl) ->
+ aux (List.length tl) hd @ List.flatten (List.map (aux 0) tl)
+ | NCic.Lambda _ | NCic.Prod _ -> [Variable]
+ (* I think we should CicSubstitution.subst Implicit t *)
+ | NCic.LetIn _ -> [Variable] (* z-reduce? *)
+ | NCic.Meta _ | NCic.Implicit _ -> assert (arity = 0); [Variable]
+ | NCic.Rel i -> [Bound (len_ctx - i, arity)]
+ | NCic.Sort (NCic.Prop) -> assert (arity=0); [Proposition]
+ | NCic.Sort _ -> assert (arity=0); [Datatype]
+ | NCic.Const (NReference.Ref (u,_)) -> [Constant (u, arity)]
+ | NCic.Match _ -> [Dead]
+ in
+ aux 0 t
+;;
+
+let compare e1 e2 =
+ match e1,e2 with
+ | Constant (u1,a1),Constant (u2,a2) ->
+ let x = NUri.compare u1 u2 in
+ if x = 0 then Pervasives.compare a1 a2 else x
+ | e1,e2 -> Pervasives.compare e1 e2
+;;
+
+let string_of_path l = String.concat "." (List.map ppelem l) ;;
+
+end
+
+module Ncic_termOT : Set.OrderedType with type t = cic_term =
+ struct
+ type t = cic_term
+ let compare = Pervasives.compare
+ end
+
+module Ncic_termSet : Set.S with type elt = cic_term = Set.Make(Ncic_termOT)
+
+module InvRelDiscriminationTree =
+ Discrimination_tree.Make(NCicInverseRelIndexable)(Ncic_termSet)
+