diff options
| author | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2002-01-25 16:37:51 +0000 |
|---|---|---|
| committer | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2002-01-25 16:37:51 +0000 |
| commit | b1c3793f6c95d31480ad8fb17594d3bb5dcd6440 (patch) | |
| tree | a76d70d2b9f9cd4cc0fdaa8a8630b52a6c761e5e /camlp4/meta/pa_r.ml | |
| parent | 2e85741214d066cae069cd3f53270c24ac0885dd (diff) | |
-
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4315 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'camlp4/meta/pa_r.ml')
| -rw-r--r-- | camlp4/meta/pa_r.ml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/camlp4/meta/pa_r.ml b/camlp4/meta/pa_r.ml index 4ccb0a7e4..47edd970c 100644 --- a/camlp4/meta/pa_r.ml +++ b/camlp4/meta/pa_r.ml @@ -5,7 +5,7 @@ (* *) (* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *) (* *) -(* Copyright 2001 Institut National de Recherche en Informatique et *) +(* Copyright 2002 Institut National de Recherche en Informatique et *) (* Automatique. Distributed only by permission. *) (* *) (***********************************************************************) @@ -756,8 +756,8 @@ EXTEND (* Labels *) ctyp: AFTER "arrow" [ NONA - [ i = TILDEIDENTCOLON; t = SELF -> <:ctyp< ~ $i$ : $t$ >> - | i = QUESTIONIDENTCOLON; t = SELF -> <:ctyp< ? $i$ : $t$ >> ] ] + [ i = TILDEIDENT; ":"; t = SELF -> <:ctyp< ~ $i$ : $t$ >> + | i = QUESTIONIDENT; ":"; t = SELF -> <:ctyp< ? $i$ : $t$ >> ] ] ; ctyp: LEVEL "simple" [ [ "[|"; rfl = LIST0 row_field SEP "|"; "|]" -> @@ -784,17 +784,17 @@ EXTEND patt: LEVEL "simple" [ [ "`"; s = ident -> <:patt< ` $s$ >> | "#"; sl = mod_ident -> <:patt< # $list:sl$ >> - | i = TILDEIDENTCOLON; p = SELF -> + | i = TILDEIDENT; ":"; p = SELF -> <:patt< ~ $i$ : $p$ >> | i = TILDEIDENT -> <:patt< ~ $i$ >> - | i = QUESTIONIDENTCOLON; "("; p = patt; ")" -> + | i = QUESTIONIDENT; ":"; "("; p = patt; ")" -> <:patt< ? $i$ : ( $p$ ) >> - | i = QUESTIONIDENTCOLON; "("; p = patt; "="; e = expr; ")" -> + | i = QUESTIONIDENT; ":"; "("; p = patt; "="; e = expr; ")" -> <:patt< ? $i$ : ( $p$ = $e$ ) >> - | i = QUESTIONIDENTCOLON; "("; p = patt; ":"; t = ctyp; ")" -> + | i = QUESTIONIDENT; ":"; "("; p = patt; ":"; t = ctyp; ")" -> <:patt< ? $i$ : ( $p$ : $t$ ) >> - | i = QUESTIONIDENTCOLON; "("; p = patt; ":"; t = ctyp; "="; + | i = QUESTIONIDENT; ":"; "("; p = patt; ":"; t = ctyp; "="; e = expr; ")" -> <:patt< ? $i$ : ( $p$ : $t$ = $e$ ) >> | i = QUESTIONIDENT -> @@ -805,17 +805,17 @@ EXTEND <:patt< ? ( $i$ : $t$ = $e$ ) >> ] ] ; ipatt: - [ [ i = TILDEIDENTCOLON; p = SELF -> + [ [ i = TILDEIDENT; ":"; p = SELF -> <:patt< ~ $i$ : $p$ >> | i = TILDEIDENT -> <:patt< ~ $i$ >> - | i = QUESTIONIDENTCOLON; "("; p = ipatt; ")" -> + | i = QUESTIONIDENT; ":"; "("; p = ipatt; ")" -> <:patt< ? $i$ : ( $p$ ) >> - | i = QUESTIONIDENTCOLON; "("; p = ipatt; "="; e = expr; ")" -> + | i = QUESTIONIDENT; ":"; "("; p = ipatt; "="; e = expr; ")" -> <:patt< ? $i$ : ( $p$ = $e$ ) >> - | i = QUESTIONIDENTCOLON; "("; p = ipatt; ":"; t = ctyp; ")" -> + | i = QUESTIONIDENT; ":"; "("; p = ipatt; ":"; t = ctyp; ")" -> <:patt< ? $i$ : ( $p$ : $t$ ) >> - | i = QUESTIONIDENTCOLON; "("; p = ipatt; ":"; t = ctyp; "="; + | i = QUESTIONIDENT; ":"; "("; p = ipatt; ":"; t = ctyp; "="; e = expr; ")" -> <:patt< ? $i$ : ( $p$ : $t$ = $e$ ) >> | i = QUESTIONIDENT -> @@ -827,9 +827,9 @@ EXTEND ; expr: AFTER "apply" [ "label" NONA - [ i = TILDEIDENTCOLON; e = SELF -> <:expr< ~ $i$ : $e$ >> + [ i = TILDEIDENT; ":"; e = SELF -> <:expr< ~ $i$ : $e$ >> | i = TILDEIDENT -> <:expr< ~ $i$ >> - | i = QUESTIONIDENTCOLON; e = SELF -> <:expr< ? $i$ : $e$ >> + | i = QUESTIONIDENT; ":"; e = SELF -> <:expr< ? $i$ : $e$ >> | i = QUESTIONIDENT -> <:expr< ? $i$ >> ] ] ; expr: LEVEL "simple" |