From f69af1fe44d2a1ff7260147ca643a4f4981379cd Mon Sep 17 00:00:00 2001
From: herbelin
Date: Wed, 11 Jun 2008 11:10:31 +0000
Subject: Correction de deux bugs liés au commit 11094 sur les clauses "at" et
 "in".

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11100 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 pretyping/termops.ml | 6 ++----
 proofs/tacexpr.ml    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pretyping/termops.ml b/pretyping/termops.ml
index aa6c374913..44c63ba0e6 100644
--- a/pretyping/termops.ml
+++ b/pretyping/termops.ml
@@ -670,10 +670,8 @@ let subst_term_occ_decl (nowhere_except_in,locs as plocs) c (id,bodyopt,typ as d
     | None -> (id,None,subst_term_occ plocs c typ)
     | Some body -> 
 	if locs = [] then
-	  if nowhere_except_in then
-	    (id,Some (subst_term c body),subst_term c typ)
-	  else
-	    d
+	  if nowhere_except_in then d
+	  else (id,Some (subst_term c body),subst_term c typ)
 	else 
 	  let (nbocc,body') = subst_term_occ_gen plocs 1 c body in
 	  let (nbocc',t') = subst_term_occ_gen plocs nbocc c typ in
diff --git a/proofs/tacexpr.ml b/proofs/tacexpr.ml
index 17961fd427..1808fd3aac 100644
--- a/proofs/tacexpr.ml
+++ b/proofs/tacexpr.ml
@@ -96,7 +96,7 @@ type 'id gclause =
   { onhyps : 'id raw_hyp_location list option;
     concl_occs : bool * int or_var list }
 
-let nowhere = {onhyps=Some[]; concl_occs=(false,[])}
+let nowhere = {onhyps=Some[]; concl_occs=no_occurrences_expr}
 
 let simple_clause_of = function
 | { onhyps = Some [scl]; concl_occs = occs } when occs = no_occurrences_expr ->
-- 
cgit v1.2.3