diff options
| author |  Samuel Mimram <smimram@debian.org> | 2006-11-21 21:38:49 +0000 |
|---|---|---|
| committer | Samuel Mimram <smimram@debian.org> | 2006-11-21 21:38:49 +0000 |
| commit | 70b9be8acc1d1ada178a95c1cd4013506e9d0d1b (patch) | |
| tree | f672a286d962cc67c95874b3b60402fc957870b6 /parsing/argextend.ml4 | |
| parent | a5bd4e097a94cc4f863bf4d4bcc5ce592c30ba47 (diff) | |
| parent | 208a0f7bfa5249f9795e6e225f309cbe715c0fad (diff) | |
Merge commit 'upstream/8.1.gamma' into 8.1
Diffstat (limited to 'parsing/argextend.ml4')
| -rw-r--r-- | parsing/argextend.ml4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/parsing/argextend.ml4 b/parsing/argextend.ml4 index 638a8d65..12c0ea1d 100644 --- a/parsing/argextend.ml4 +++ b/parsing/argextend.ml4 @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: argextend.ml4 8976 2006-06-23 10:03:54Z herbelin $ *) +(* $Id: argextend.ml4 9265 2006-10-24 08:35:38Z herbelin $ *) open Genarg open Q_util @@ -213,7 +213,7 @@ EXTEND [ e = argtype; LIDENT "list" -> List0ArgType e | e = argtype; LIDENT "option" -> OptArgType e ] | "0" - [ e = LIDENT -> fst (interp_entry_name loc e) + [ e = LIDENT -> fst (interp_entry_name loc e "") | "("; e = argtype; ")" -> e ] ] ; argrule: @@ -221,7 +221,9 @@ EXTEND ; genarg: [ [ e = LIDENT; "("; s = LIDENT; ")" -> - let t, g = interp_entry_name loc e in (g, Some (s,t)) + let t, g = interp_entry_name loc e "" in (g, Some (s,t)) + | e = LIDENT; "("; s = LIDENT; ","; sep = STRING; ")" -> + let t, g = interp_entry_name loc e sep in (g, Some (s,t)) | s = STRING -> if String.length s > 0 && Util.is_letter s.[0] then Pcoq.lexer.Token.using ("", s); |