-

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3891 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

camlp4/CHANGES

@@ -1,8 +1,8 @@
 Camlp4 Version 3.04
 -------------------
 
-- [15 Oct 01] Fixed parsing differences in parsers between pa_o and
-  ocamlyacc.
+- [15 Oct 01] Fixed parsing differences between pa_o and ocamlyacc:
+  in parsers, in labels.
 - [12 Oct 01] Added missing bigarray syntax a.{b} (and Cie) in standard
   syntax (pa_o).
 

camlp4/etc/pa_o.ml

@@ -1156,6 +1156,8 @@ EXTEND
            <:patt< ~ $i$ : $p$ >>
       | i = TILDEIDENT ->
            <:patt< ~ $i$ >>
+      | "~"; "("; i = LIDENT; ")" ->
+           <:patt< ~ $i$ >>
       | "~"; "("; i = LIDENT; ":"; t = ctyp; ")" ->
            <:patt< ~ $i$ : ($lid:i$ : $t$) >>
       | i = QUESTIONIDENTCOLON; j = LIDENT ->

camlp4/etc/pr_r.ml

@@ -745,7 +745,7 @@ and fun_binding b fb k =
   | e -> HVbox [: `HVbox [: b; `S LR "=" :]; `expr e k :] ]
 and simple_patt p k =
   match p with
-  [ <:patt< $lid:_$ >> -> patt p k
+  [ <:patt< $lid:_$ >> | <:patt< ~ $_$ : $_$ >> | <:patt< ~ $_$ >> -> patt p k
   | _ -> HVbox [: `S LO "("; `patt p [: `S RO ")"; k :] :] ]
 and class_type ct k =
   match ct with