diff options
| author |  Stephane Glondu <steph@glondu.net> | 2012-12-29 10:57:45 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2012-12-29 10:57:45 +0100 |
| commit | 357d49cfb956380788efbf6d080ab00e678d29f7 (patch) | |
| tree | 2b133eca4ef9b37eb9245db01db72493e5cbe19b /interp/constrintern.ml | |
| parent | eabf57d06ca1eafa762d7f31262e5515401eff55 (diff) | |
| parent | bf12eb93f3f6a6a824a10878878fadd59745aae0 (diff) | |
Merge tag 'upstream/8.4pl1dfsg' into experimental/master
Upstream version 8.4pl1dfsg
Diffstat (limited to 'interp/constrintern.ml')
| -rw-r--r-- | interp/constrintern.ml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/interp/constrintern.ml b/interp/constrintern.ml index 45df005c..81e4501a 100644 --- a/interp/constrintern.ml +++ b/interp/constrintern.ml @@ -1411,7 +1411,8 @@ let internalize sigma globalenv env allow_patvar lvar c = | None -> [], None in let na = match tm', na with - | GVar (loc,id), None when Idset.mem id env.ids -> loc,Name id + | GVar (loc,id), None when not (List.mem_assoc id (snd lvar)) -> + loc,Name id | GRef (loc, VarRef id), None -> loc,Name id | _, None -> dummy_loc,Anonymous | _, Some (loc,na) -> loc,na in |