aboutsummaryrefslogtreecommitdiff
path: root/parsing
diff options
context:
space:
mode:
authorbarras2003-03-14 10:54:28 +0000
committerbarras2003-03-14 10:54:28 +0000
commit7e787bce059ea8c69caadfc31110c648c3837b9c (patch)
treeb00d786d92b1a366040e5c33024599213a6c914b /parsing
parentaf0a1bfa3a277c15c4881bed3ceb99dda81c9362 (diff)
reparations suite a la nouvelle syntaxe:
- syntaxe des modules - syntaxe existentielle git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3769 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
-rw-r--r--parsing/g_ltac.ml42
-rw-r--r--parsing/g_vernac.ml411
2 files changed, 7 insertions, 6 deletions
diff --git a/parsing/g_ltac.ml4 b/parsing/g_ltac.ml4
index 1cc0c02973..7519df465c 100644
--- a/parsing/g_ltac.ml4
+++ b/parsing/g_ltac.ml4
@@ -225,7 +225,7 @@ GEXTEND Gram
;
tactic_arg0:
[ [ "("; a = tactic_expr; ")" -> arg_of_expr a
- | "()" -> Integer 0
+ | "()" -> TacVoid
| r = reference -> Reference r
| n = integer -> Integer n
| id = METAIDENT -> MetaIdArg (loc,id)
diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4
index dadef23ddd..d60a4db73a 100644
--- a/parsing/g_vernac.ml4
+++ b/parsing/g_vernac.ml4
@@ -327,14 +327,15 @@ GEXTEND Gram
IDENT "Section"; id = base_ident -> VernacBeginSection id
| IDENT "Chapter"; id = base_ident -> VernacBeginSection id ] ]
;
-
module_vardecls:
- [ [ "("; id = base_ident; idl = ident_comma_list_tail;
- ":"; mty = Module.module_type; ")"
- -> (id::idl,mty) ] ]
+ [ [ id = base_ident; idl = ident_comma_list_tail; ":";
+ mty = Module.module_type -> (id::idl,mty) ] ]
+ ;
+ module_binders:
+ [ [ "["; bl = LIST1 module_vardecls SEP ";"; "]" -> bl ] ]
;
module_binders_list:
- [ [ bl = LIST0 module_vardecls -> bl ] ]
+ [ [ bls = LIST0 module_binders -> List.flatten bls ] ]
;
of_module_type:
[ [ ":"; mty = Module.module_type -> (mty, true)