From 7f110df7d7ff6a4d43f3c8d19305b20e24f4800e Mon Sep 17 00:00:00 2001
From: herbelin
Date: Tue, 1 Jul 2008 21:59:00 +0000
Subject: Documentation Prop<=Set et Arguments Scope Global Correction au
 passage d'un bug de Arguments Scope Global

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

(limited to 'interp/notation.ml')

diff --git a/interp/notation.ml b/interp/notation.ml
index 424cb93ef7..bafce17af6 100644
--- a/interp/notation.ml
+++ b/interp/notation.ml
@@ -464,8 +464,8 @@ let subst_arguments_scope (_,subst,(req,r,scl)) =
   (ArgsScopeNoDischarge,fst (subst_global subst r),scl)
 
 let discharge_arguments_scope (_,(req,r,l)) =
-  if req = ArgsScopeNoDischarge then None
-  else Some (req,pop_global_reference r,l)
+  if req = ArgsScopeNoDischarge or (isVarRef r & Lib.is_in_section r) then None
+  else Some (req,Lib.discharge_global r,l)
 
 let rebuild_arguments_scope (_,(req,r,l)) =
   match req with
@@ -493,8 +493,7 @@ let declare_arguments_scope_gen req r scl =
   Lib.add_anonymous_leaf (inArgumentsScope (req,r,scl))
 
 let declare_arguments_scope local ref scl =
-  let req =
-    if local or isVarRef ref then ArgsScopeNoDischarge else ArgsScopeManual in
+  let req = if local then ArgsScopeNoDischarge else ArgsScopeManual in
   declare_arguments_scope_gen req ref scl
 
 let find_arguments_scope r =
@@ -503,8 +502,7 @@ let find_arguments_scope r =
 
 let declare_ref_arguments_scope ref =
   let t = Global.type_of_global ref in
-  let req = if isVarRef ref then ArgsScopeNoDischarge else ArgsScopeAuto in
-  declare_arguments_scope_gen req ref (compute_arguments_scope t)
+  declare_arguments_scope_gen ArgsScopeAuto ref (compute_arguments_scope t)
 
 (********************************)
 (* Encoding notations as string *)
-- 
cgit v1.2.3