diff options
| author |  Stephane Glondu <steph@glondu.net> | 2010-12-24 12:51:11 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2010-12-24 12:51:11 +0100 |
| commit | 20d03a28285c430740d0b675583fe5c4d13ffecc (patch) | |
| tree | 36bd87c5c42d948291605fc35b4b7cf573fc8113 /interp/constrintern.ml | |
| parent | c0a92523eaa76afabcbaf06ac4a7e8f7930ee4a3 (diff) | |
| parent | 50dc9067e98ca001ad2e875011abab5da6fdb621 (diff) | |
Merge commit 'upstream/8.3.pl1+dfsg' into experimental/master
Diffstat (limited to 'interp/constrintern.ml')
| -rw-r--r-- | interp/constrintern.ml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/interp/constrintern.ml b/interp/constrintern.ml index d918e94d..524448a6 100644 --- a/interp/constrintern.ml +++ b/interp/constrintern.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: constrintern.ml 13492 2010-10-04 21:20:01Z herbelin $ *) +(* $Id: constrintern.ml 13620 2010-11-04 14:11:49Z herbelin $ *) open Pp open Util @@ -266,6 +266,9 @@ let set_var_scope loc id istermvar (_,_,scopt,scopes) ntnvars = try let idscopes,typ = List.assoc id ntnvars in if !idscopes <> None & + (* scopes have no effect on the interpretation of identifiers, hence + we can tolerate having a variable occurring several times in + different scopes: *) typ <> NtnInternTypeIdent & make_current_scope (Option.get !idscopes) <> make_current_scope (scopt,scopes) then error_inconsistent_scope loc id |