...

[helm.git] / helm / software / components / ng_tactics / nTacStatus.ml

diff --git a/helm/software/components/ng_tactics/nTacStatus.ml b/helm/software/components/ng_tactics/nTacStatus.ml
index 29eee6b7bf09da98310c0049ea98f1c71f18b05d..a2847a410061089440699f1612b412555f652b50 100644 (file)
--- a/helm/software/components/ng_tactics/nTacStatus.ml
+++ b/helm/software/components/ng_tactics/nTacStatus.ml
@@ -135,6 +135,13 @@ let whd status ?delta ctx t =
   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
@@ -231,22 +238,23 @@ let select_term
     | 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 = 
@@ -296,9 +304,12 @@ let select_term
     | 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:[]
@@ -320,7 +331,7 @@ let analyse_indty status ty =
  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 "NTS 1" lno args in
+ let left, right = HExtlib.split_nth lno args in
  status, (ref, consno, left, right)
 ;;
 
@@ -329,5 +340,5 @@ let mk_cic_term c t = None,c,t ;;
 let apply_subst status ctx t =
  let status, (name,_,t) = relocate status ctx t in
  let _,_,_,subst,_ = status.pstatus in
-  status, (name, ctx, NCicUntrusted.apply_subst subst t)
+  status, (name, ctx, NCicUntrusted.apply_subst subst ctx t)
 ;;