aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-09-02 20:47:46 +0000
committerGravatar msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-09-02 20:47:46 +0000
commitca341a63254abea7c4f20ee3c6af485d2362497c (patch)
tree987a32664f40018d02340db4c463f03c052fa3fd
parent2015ca9f06f02f4a22653600dec676fc68dd83f7 (diff)
Postpone checking of Local/Global to allow grammar extensions to use it
too. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12304 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--parsing/g_vernac.ml43
-rw-r--r--toplevel/vernacentries.ml3
2 files changed, 4 insertions, 2 deletions
diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4
index d10a2950c..9940a1378 100644
--- a/parsing/g_vernac.ml4
+++ b/parsing/g_vernac.ml4
@@ -67,8 +67,7 @@ GEXTEND Gram
vernac: FIRST
[ [ IDENT "Time"; v = vernac -> VernacTime v
| IDENT "Timeout"; n = natural; v = vernac -> VernacTimeout(n,v)
- | locality; v = vernac_aux ->
- check_locality (); v ] ]
+ | locality; v = vernac_aux -> v ] ]
;
vernac_aux:
(* Better to parse "." here: in case of failure (e.g. in coerce_to_var), *)
diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml
index 0e11ba582..739193f51 100644
--- a/toplevel/vernacentries.ml
+++ b/toplevel/vernacentries.ml
@@ -1406,3 +1406,6 @@ let interp c = match c with
(* Extensions *)
| VernacExtend (opn,args) -> Vernacinterp.call (opn,args)
+
+let interp c = interp c ; check_locality ()
+