From e0d682ec25282a348d35c5b169abafec48555690 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Mon, 20 Aug 2012 18:27:01 +0200
Subject: Imported Upstream version 8.4dfsg

---
 pretyping/pretyping.ml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'pretyping/pretyping.ml')

diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml
index d0c9df51..d8678371 100644
--- a/pretyping/pretyping.ml
+++ b/pretyping/pretyping.ml
@@ -1,6 +1,6 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
@@ -319,6 +319,18 @@ module Pretyping_F (Coercion : Coercion.S) = struct
   let pretype_ref evdref env ref =
     let c = constr_of_global ref in
       make_judge c (Retyping.get_type_of env Evd.empty c)
+  let pretype_ref loc evdref env = function
+    | VarRef id ->
+        (* Section variable *)
+        (try let (_,_,ty) = lookup_named id env in make_judge (mkVar id) ty
+         with Not_found ->
+           (* This may happen if env is a goal env and section variables have
+              been cleared - section variables should be different from goal
+              variables *)
+           Pretype_errors.error_var_not_found_loc loc id)
+    | ref ->
+        let c = constr_of_global ref in
+        make_judge c (Retyping.get_type_of env Evd.empty c)
 
   let pretype_sort evdref = function
     | GProp c -> judge_of_prop_contents c
@@ -335,7 +347,7 @@ module Pretyping_F (Coercion : Coercion.S) = struct
   let rec pretype (tycon : type_constraint) env evdref lvar = function
     | GRef (loc,ref) ->
 	inh_conv_coerce_to_tycon loc env evdref
-	  (pretype_ref evdref env ref)
+	  (pretype_ref loc evdref env ref)
 	  tycon
 
     | GVar (loc, id) ->
-- 
cgit v1.2.3