diff options
| author | herbelin | 2003-09-02 17:55:03 +0000 |
|---|---|---|
| committer | herbelin | 2003-09-02 17:55:03 +0000 |
| commit | 4c336314495ebb0a41e0aaf8b896a773f20873de (patch) | |
| tree | d48e420ddb349726f6e6f25d9b5f3ef474a6e703 | |
| parent | 38926d117cc99cd081e768c9539edd59369a56cd (diff) | |
Relachement conflit 'with' dans le cas des Module with Definition
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4295 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | doc/syntax-v8.tex | 5 | ||||
| -rw-r--r-- | parsing/g_vernacnew.ml4 | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/syntax-v8.tex b/doc/syntax-v8.tex index 6f59f53f2d..454f87ca65 100644 --- a/doc/syntax-v8.tex +++ b/doc/syntax-v8.tex @@ -818,7 +818,10 @@ $$ \nlsep \NT{mod-type}~\KWD{with}~\NT{with-declaration} \SEPDEF \DEFNT{with-declaration} - \TERM{Definition}~\NT{ident}~\KWD{:=}~\NTL{constr}{100} + %on forcera les ( ) + %si exceptionnellemt + %un fixpoint ici + \TERM{Definition}~\NT{ident}~\KWD{:=}~\NTL{constr}{} %{100} \nlsep \TERM{Module}~\NT{ident}~\KWD{:=}~\NT{reference} \SEPDEF \DEFNT{of-mod-type} diff --git a/parsing/g_vernacnew.ml4 b/parsing/g_vernacnew.ml4 index d73ba26eaf..fb952a4e9a 100644 --- a/parsing/g_vernacnew.ml4 +++ b/parsing/g_vernacnew.ml4 @@ -365,8 +365,8 @@ GEXTEND Gram (* Module binder *) module_binder: - [ [ "("; id = base_ident; ":"; mty = module_type; ")" -> - ([id],mty) ] ] + [ [ "("; idl = LIST1 base_ident; ":"; mty = module_type; ")" -> + (idl,mty) ] ] ; (* Module expressions *) @@ -378,7 +378,7 @@ GEXTEND Gram ] ] ; with_declaration: - [ [ "Definition"; id = base_ident; ":="; c = Constr.constr -> + [ [ "Definition"; id = base_ident; ":="; c = Constr.lconstr -> CWith_Definition (id,c) | IDENT "Module"; id = base_ident; ":="; qid = qualid -> CWith_Module (id,qid) |