From 1c5f5f658c95def5cf19fdf5fdb2fe0a0aa1c740 Mon Sep 17 00:00:00 2001
From: ppedrot
Date: Mon, 24 Jun 2013 12:56:39 +0000
Subject: Using the whole tactic environment while Pretyping.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16605 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 interp/constrintern.ml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'interp')

diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index 87efaca199..ec8794e468 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -632,14 +632,11 @@ let intern_var genv (ltacvars,ntnvars) namedctx loc id =
   else if Id.equal id ldots_var
   then
     if ntnvars != [] then GVar (loc,id), [], [], [] else error_ldots_var loc
+  else if Id.Map.mem id unbndltacvars then
+    (* Is [id] bound to a free name in ltac (this is an ltac error message) *)
+    user_err_loc (loc,"intern_var",
+      str "variable " ++ pr_id id ++ str " should be bound to a term.")
   else
-  (* Is [id] bound to a free name in ltac (this is an ltac error message) *)
-  try
-    match Id.Map.find id unbndltacvars with
-      | None -> user_err_loc (loc,"intern_var",
-	  str "variable " ++ pr_id id ++ str " should be bound to a term.")
-      | Some id0 -> Pretype_errors.error_var_not_found_loc loc id0
-  with Not_found ->
     (* Is [id] a goal or section variable *)
     let _ = Context.lookup_named id namedctx in
       try
-- 
cgit v1.2.3