--- /dev/null
+(*
+ ||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 $ *)
+
+let rec normalize ?(delta=0) ~subst ctx t =
+ let aux = normalize ~delta ~subst in
+ match NCicReduction.whd ~delta ~subst ctx t with
+ NCic.Meta (n,(s,lc)) ->
+ let l = NCicUtils.expand_local_context lc in
+ let l' = List.map (aux ctx) l in
+ if l = l' then t
+ else
+ NCic.Meta (n,(s,NCic.Ctx l))
+ | t -> NCicUtils.map (fun h ctx -> h::ctx) ctx aux t
+;;
--- /dev/null
+(*
+ ||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 $ *)
+
+val normalize:
+ ?delta:int -> subst:NCic.substitution -> NCic.context -> NCic.term -> NCic.term
status, (name, ctx, t)
;;
+let normalize status ?delta ctx t =
+ let status, (name,_,t) = relocate status ctx t in
+ let _,_,_,subst,_ = status.pstatus in
+ let t = NCicTacReduction.normalize ~subst ?delta ctx t in
+ 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
| NCicUnification.Uncertain _ -> false, status
in
let match_term status ctx (wanted : cic_term) t =
- let rec aux ctx status 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
- status, t
+ (status,true),t
else
let _,_,_,subst,_ = status.pstatus in
match t with
| NCic.Meta (i,lc) when List.mem_assoc i subst ->
let _,_,t,_ = NCicUtils.lookup_subst i subst in
- aux ctx status t
- | NCic.Meta _ -> status, t
- | _ ->
- NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux status t
+ aux ctx (status,already_found) t
+ | NCic.Meta _ -> (status,already_found),t
+ | _ ->
+ NCicUntrusted.map_term_fold_a (fun e c -> e::c) ctx aux
+ (status,already_found) t
in
- aux ctx status t
+ aux ctx (status,false) t
in
let _,_,_,subst,_ = low_status.pstatus in
let rec select status ctx pat cic =
| 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)
+ let status', wanted = disambiguate status wanted None ctx 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
+ status,t)
| NCic.Implicit _, t -> status, t
| _,t ->
fail (lazy ("malformed pattern: " ^ NCicPp.ppterm ~metasenv:[]
projects / helm.git / commitdiff