aboutsummaryrefslogtreecommitdiff
path: root/parsing
diff options
context:
space:
mode:
authorherbelin2003-10-01 10:33:33 +0000
committerherbelin2003-10-01 10:33:33 +0000
commit89a82fa99972ce5cbcd6aca93294f5dea3f30a26 (patch)
treed9887dc7eedc6259de2c6cc96a6d75456ff9e81c /parsing
parenta9a84910da0c2192c2625530041ce7901500ed95 (diff)
Implantation de l'option 'format' des Notations
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4509 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
-rw-r--r--parsing/extend.ml2
-rw-r--r--parsing/extend.mli2
-rw-r--r--parsing/g_basevernac.ml42
-rw-r--r--parsing/g_vernacnew.ml42
4 files changed, 4 insertions, 4 deletions
diff --git a/parsing/extend.ml b/parsing/extend.ml
index 1a9bdec915..89a3da95f1 100644
--- a/parsing/extend.ml
+++ b/parsing/extend.ml
@@ -91,7 +91,7 @@ type syntax_modifier =
| SetAssoc of Gramext.g_assoc
| SetEntryType of string * simple_constr_production_entry
| SetOnlyParsing
- | SetFormat of string
+ | SetFormat of string located
type nonterm =
| NtShort of string
diff --git a/parsing/extend.mli b/parsing/extend.mli
index d15376430e..4aae3e3094 100644
--- a/parsing/extend.mli
+++ b/parsing/extend.mli
@@ -79,7 +79,7 @@ type syntax_modifier =
| SetAssoc of Gramext.g_assoc
| SetEntryType of string * simple_constr_production_entry
| SetOnlyParsing
- | SetFormat of string
+ | SetFormat of string located
type nonterm =
| NtShort of string
diff --git a/parsing/g_basevernac.ml4 b/parsing/g_basevernac.ml4
index 0d27fc759a..14f1061ed8 100644
--- a/parsing/g_basevernac.ml4
+++ b/parsing/g_basevernac.ml4
@@ -368,7 +368,7 @@ GEXTEND Gram
| IDENT "no"; IDENT "associativity" -> SetAssoc Gramext.NonA
| x = IDENT; typ = syntax_extension_type -> SetEntryType (x,typ)
| IDENT "only"; IDENT "parsing" -> SetOnlyParsing
- | IDENT "format"; s = STRING -> SetFormat s ] ]
+ | IDENT "format"; s = [s = STRING -> (loc,s)] -> SetFormat s ] ]
;
syntax_extension_type:
[ [ IDENT "ident" -> ETIdent | IDENT "global" -> ETReference
diff --git a/parsing/g_vernacnew.ml4 b/parsing/g_vernacnew.ml4
index b6fe4efa35..3e382e5fd8 100644
--- a/parsing/g_vernacnew.ml4
+++ b/parsing/g_vernacnew.ml4
@@ -752,7 +752,7 @@ GEXTEND Gram
| IDENT "no"; IDENT "associativity" -> SetAssoc Gramext.NonA
| x = IDENT; typ = syntax_extension_type -> SetEntryType (x,typ)
| IDENT "only"; IDENT "parsing" -> SetOnlyParsing
- | IDENT "format"; s = STRING -> SetFormat s ] ]
+ | IDENT "format"; s = [s = STRING -> (loc,s)] -> SetFormat s ] ]
;
syntax_extension_type:
[ [ IDENT "ident" -> ETIdent | IDENT "global" -> ETReference