-

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

camlp4/CHANGES

@@ -1,6 +1,8 @@
 Camlp4 Version 3.04+1
 ---------------------
 
+- [28 Jan 02] Fixed bug in pa_o.cmo: some case of bad recognition in
+  a class_type.
 - [26 Jan 02] The printer pr_extend.cmo try now also to rebuild GEXTEND
   statements (before it tried only the EXTEND).
 - [23 Jan 02] The empty functional stream "fstream [: :]" is now of type

camlp4/etc/pa_o.ml

@@ -238,8 +238,8 @@ value test_not_class_signature =
              match stream_peek_nth lev strm with
              [ Some ("", "]") ->
                  match stream_peek_nth (lev + 1) strm with
-                 [ Some ("UIDENT" | "LIDENT", _) -> raise Stream.Failure
-                 | _ -> () ]
+                 [ Some ("UIDENT" | "LIDENT", _) -> ()
+                 | _ -> raise Stream.Failure ]
              | Some _ -> test (lev + 1)
              | None -> raise Stream.Failure ]
        | _ -> () ])

camlp4/etc/pr_o.ml

@@ -886,6 +886,8 @@ and class_sig_item csf dg k =
         [: `S LR "constraint"; `ctyp t1 "" [: `S LR "=" :]; `ctyp t2 "" k :]
   | MLast.CgDcl _ s ->
       HVbox [: `HVbox [: :]; list class_sig_item s "" [: :] :]
+  | MLast.CgInh _ ce ->
+      HVbox [: `S LR "inherit"; `class_type ce k :]
   | MLast.CgMth _ lab pf t ->
       HVbox
         [: `S LR "method"; private_flag pf; `label lab; `S LR ":";

camlp4/etc/pr_r.ml

@@ -872,6 +872,8 @@ and class_sig_item csf k =
       HVbox [: `S LR "type"; `ctyp t1 [: `S LR "=" :]; `ctyp t2 k :]
   | MLast.CgDcl _ s ->
       HVbox [: `HVbox [: :]; list class_sig_item s k :]
+  | MLast.CgInh _ ce ->
+      HVbox [: `S LR "inherit"; `class_type ce k :]
   | MLast.CgMth _ lab pf t ->
       HVbox
         [: `S LR "method"; flag "private" pf; `label lab; `S LR ":";