oublie tools

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

1 files changed, 88 insertions, 48 deletions

diff --git a/testlabl/valvirt.diffs b/testlabl/valvirt.diffs
index 6941c25d5..4e4db0281 100644
--- a/testlabl/valvirt.diffs
+++ b/testlabl/valvirt.diffs
@@ -4,7 +4,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/utils/warnings.ml,v
 retrieving revision 1.23
 diff -u -r1.23 warnings.ml
 --- utils/warnings.ml	15 Sep 2005 03:09:26 -0000	1.23
-+++ utils/warnings.ml	10 Mar 2006 06:19:21 -0000
++++ utils/warnings.ml	10 Mar 2006 06:41:24 -0000
 @@ -26,7 +26,7 @@
    | Statement_type                   (* S *)
    | Unused_match                     (* U *)
@@ -42,7 +42,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/utils/warnings.mli,v
 retrieving revision 1.16
 diff -u -r1.16 warnings.mli
 --- utils/warnings.mli	15 Sep 2005 03:09:26 -0000	1.16
-+++ utils/warnings.mli	10 Mar 2006 06:19:21 -0000
++++ utils/warnings.mli	10 Mar 2006 06:41:24 -0000
 @@ -26,7 +26,7 @@
    | Statement_type                   (* S *)
    | Unused_match                     (* U *)
@@ -58,7 +58,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/parsing/parser.mly,v
 retrieving revision 1.123
 diff -u -r1.123 parser.mly
 --- parsing/parser.mly	23 Mar 2005 03:08:37 -0000	1.123
-+++ parsing/parser.mly	10 Mar 2006 06:19:21 -0000
++++ parsing/parser.mly	10 Mar 2006 06:41:24 -0000
 @@ -623,6 +623,8 @@
        { [] }
    | class_fields INHERIT class_expr parent_binder
@@ -116,7 +116,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/parsing/parsetree.mli,v
 retrieving revision 1.42
 diff -u -r1.42 parsetree.mli
 --- parsing/parsetree.mli	23 Mar 2005 03:08:37 -0000	1.42
-+++ parsing/parsetree.mli	10 Mar 2006 06:19:21 -0000
++++ parsing/parsetree.mli	10 Mar 2006 06:41:24 -0000
 @@ -152,7 +152,7 @@
  
  and class_type_field =
@@ -140,7 +140,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/parsing/printast.ml,v
 retrieving revision 1.29
 diff -u -r1.29 printast.ml
 --- parsing/printast.ml	4 Jan 2006 16:55:50 -0000	1.29
-+++ parsing/printast.ml	10 Mar 2006 06:19:21 -0000
++++ parsing/printast.ml	10 Mar 2006 06:41:24 -0000
 @@ -353,10 +353,11 @@
    | Pctf_inher (ct) ->
        line i ppf "Pctf_inher\n";
@@ -173,7 +173,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/btype.ml,v
 retrieving revision 1.38
 diff -u -r1.38 btype.ml
 --- typing/btype.ml	4 Jan 2006 16:55:50 -0000	1.38
-+++ typing/btype.ml	10 Mar 2006 06:19:21 -0000
++++ typing/btype.ml	10 Mar 2006 06:41:24 -0000
 @@ -330,7 +330,7 @@
  
  let unmark_class_signature sign =
@@ -189,7 +189,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/ctype.ml,v
 retrieving revision 1.200
 diff -u -r1.200 ctype.ml
 --- typing/ctype.ml	6 Jan 2006 02:16:24 -0000	1.200
-+++ typing/ctype.ml	10 Mar 2006 06:19:22 -0000
++++ typing/ctype.ml	10 Mar 2006 06:41:25 -0000
 @@ -857,7 +857,7 @@
          Tcty_signature
            {cty_self = copy sign.cty_self;
@@ -329,7 +329,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/ctype.mli,v
 retrieving revision 1.53
 diff -u -r1.53 ctype.mli
 --- typing/ctype.mli	9 Dec 2004 12:40:53 -0000	1.53
-+++ typing/ctype.mli	10 Mar 2006 06:19:22 -0000
++++ typing/ctype.mli	10 Mar 2006 06:41:25 -0000
 @@ -170,10 +170,11 @@
    | CM_Val_type_mismatch of string * (type_expr * type_expr) list
    | CM_Meth_type_mismatch of string * (type_expr * type_expr) list
@@ -349,7 +349,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/includeclass.ml,v
 retrieving revision 1.7
 diff -u -r1.7 includeclass.ml
 --- typing/includeclass.ml	6 Mar 2000 22:11:57 -0000	1.7
-+++ typing/includeclass.ml	10 Mar 2006 06:19:22 -0000
++++ typing/includeclass.ml	10 Mar 2006 06:41:25 -0000
 @@ -78,14 +78,17 @@
    | CM_Non_mutable_value lab ->
        fprintf ppf
@@ -376,7 +376,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/oprint.ml,v
 retrieving revision 1.22
 diff -u -r1.22 oprint.ml
 --- typing/oprint.ml	23 Mar 2005 03:08:37 -0000	1.22
-+++ typing/oprint.ml	10 Mar 2006 06:19:22 -0000
++++ typing/oprint.ml	10 Mar 2006 06:41:25 -0000
 @@ -291,8 +291,10 @@
        fprintf ppf "@[<2>method %s%s%s :@ %a@]"
          (if priv then "private " else "") (if virt then "virtual " else "")
@@ -396,7 +396,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/outcometree.mli,v
 retrieving revision 1.14
 diff -u -r1.14 outcometree.mli
 --- typing/outcometree.mli	23 Mar 2005 03:08:37 -0000	1.14
-+++ typing/outcometree.mli	10 Mar 2006 06:19:22 -0000
++++ typing/outcometree.mli	10 Mar 2006 06:41:25 -0000
 @@ -71,7 +71,7 @@
  and out_class_sig_item =
    | Ocsg_constraint of out_type * out_type
@@ -412,7 +412,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/printtyp.ml,v
 retrieving revision 1.140
 diff -u -r1.140 printtyp.ml
 --- typing/printtyp.ml	4 Jan 2006 16:55:50 -0000	1.140
-+++ typing/printtyp.ml	10 Mar 2006 06:19:22 -0000
++++ typing/printtyp.ml	10 Mar 2006 06:41:25 -0000
 @@ -650,7 +650,7 @@
          Ctype.flatten_fields (Ctype.object_fields sign.cty_self)
        in
@@ -458,7 +458,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/subst.ml,v
 retrieving revision 1.49
 diff -u -r1.49 subst.ml
 --- typing/subst.ml	4 Jan 2006 16:55:50 -0000	1.49
-+++ typing/subst.ml	10 Mar 2006 06:19:22 -0000
++++ typing/subst.ml	10 Mar 2006 06:41:25 -0000
 @@ -178,7 +178,8 @@
  
  let class_signature s sign =
@@ -475,7 +475,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typeclass.ml,v
 retrieving revision 1.85
 diff -u -r1.85 typeclass.ml
 --- typing/typeclass.ml	22 Jul 2005 06:42:36 -0000	1.85
-+++ typing/typeclass.ml	10 Mar 2006 06:19:22 -0000
++++ typing/typeclass.ml	10 Mar 2006 06:41:25 -0000
 @@ -24,7 +24,7 @@
  
  type error =
@@ -868,7 +868,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typeclass.mli,v
 retrieving revision 1.18
 diff -u -r1.18 typeclass.mli
 --- typing/typeclass.mli	1 Dec 2003 00:32:11 -0000	1.18
-+++ typing/typeclass.mli	10 Mar 2006 06:19:22 -0000
++++ typing/typeclass.mli	10 Mar 2006 06:41:25 -0000
 @@ -49,7 +49,7 @@
  
  type error =
@@ -901,7 +901,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typecore.ml,v
 retrieving revision 1.178
 diff -u -r1.178 typecore.ml
 --- typing/typecore.ml	6 Jan 2006 02:25:37 -0000	1.178
-+++ typing/typecore.ml	10 Mar 2006 06:19:22 -0000
++++ typing/typecore.ml	10 Mar 2006 06:41:26 -0000
 @@ -611,11 +611,11 @@
        List.for_all
          (function
@@ -931,7 +931,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typecore.mli,v
 retrieving revision 1.37
 diff -u -r1.37 typecore.mli
 --- typing/typecore.mli	4 Mar 2005 14:51:31 -0000	1.37
-+++ typing/typecore.mli	10 Mar 2006 06:19:22 -0000
++++ typing/typecore.mli	10 Mar 2006 06:41:26 -0000
 @@ -38,7 +38,8 @@
          string -> type_expr -> Env.t -> Env.t -> Env.t -> Parsetree.pattern ->
          Typedtree.pattern *
@@ -948,7 +948,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typedtree.ml,v
 retrieving revision 1.36
 diff -u -r1.36 typedtree.ml
 --- typing/typedtree.ml	25 Nov 2003 09:20:43 -0000	1.36
-+++ typing/typedtree.ml	10 Mar 2006 06:19:22 -0000
++++ typing/typedtree.ml	10 Mar 2006 06:41:26 -0000
 @@ -106,7 +106,7 @@
  
  and class_field =
@@ -974,7 +974,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typedtree.mli,v
 retrieving revision 1.34
 diff -u -r1.34 typedtree.mli
 --- typing/typedtree.mli	25 Nov 2003 09:20:43 -0000	1.34
-+++ typing/typedtree.mli	10 Mar 2006 06:19:22 -0000
++++ typing/typedtree.mli	10 Mar 2006 06:41:26 -0000
 @@ -107,7 +107,8 @@
  and class_field =
      Cf_inher of class_expr * (string * Ident.t) list * (string * Ident.t) list
@@ -1001,7 +1001,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/typemod.ml,v
 retrieving revision 1.73
 diff -u -r1.73 typemod.ml
 --- typing/typemod.ml	8 Aug 2005 09:41:51 -0000	1.73
-+++ typing/typemod.ml	10 Mar 2006 06:19:22 -0000
++++ typing/typemod.ml	10 Mar 2006 06:41:26 -0000
 @@ -17,6 +17,7 @@
  open Misc
  open Longident
@@ -1028,7 +1028,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/types.ml,v
 retrieving revision 1.25
 diff -u -r1.25 types.ml
 --- typing/types.ml	9 Dec 2004 12:40:53 -0000	1.25
-+++ typing/types.ml	10 Mar 2006 06:19:22 -0000
++++ typing/types.ml	10 Mar 2006 06:41:26 -0000
 @@ -90,7 +90,8 @@
    | Val_prim of Primitive.description   (* Primitive *)
    | Val_ivar of mutable_flag * string   (* Instance variable (mutable ?) *)
@@ -1055,7 +1055,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/types.mli,v
 retrieving revision 1.25
 diff -u -r1.25 types.mli
 --- typing/types.mli	9 Dec 2004 12:40:53 -0000	1.25
-+++ typing/types.mli	10 Mar 2006 06:19:22 -0000
++++ typing/types.mli	10 Mar 2006 06:41:26 -0000
 @@ -91,7 +91,8 @@
    | Val_prim of Primitive.description   (* Primitive *)
    | Val_ivar of mutable_flag * string   (* Instance variable (mutable ?) *)
@@ -1082,7 +1082,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/typing/unused_var.ml,v
 retrieving revision 1.5
 diff -u -r1.5 unused_var.ml
 --- typing/unused_var.ml	4 Jan 2006 16:55:50 -0000	1.5
-+++ typing/unused_var.ml	10 Mar 2006 06:19:22 -0000
++++ typing/unused_var.ml	10 Mar 2006 06:41:26 -0000
 @@ -245,7 +245,7 @@
    match cf with
    | Pcf_inher (ce, _) -> class_expr ppf tbl ce;
@@ -1098,7 +1098,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/bytecomp/translclass.ml,v
 retrieving revision 1.38
 diff -u -r1.38 translclass.ml
 --- bytecomp/translclass.ml	13 Aug 2005 20:59:37 -0000	1.38
-+++ bytecomp/translclass.ml	10 Mar 2006 06:19:22 -0000
++++ bytecomp/translclass.ml	10 Mar 2006 06:41:26 -0000
 @@ -133,10 +133,10 @@
                         (fun _ -> lambda_unit) cl
                     in
@@ -1297,7 +1297,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/bytecomp/translclass.mli,v
 retrieving revision 1.11
 diff -u -r1.11 translclass.mli
 --- bytecomp/translclass.mli	12 Aug 2004 12:55:11 -0000	1.11
-+++ bytecomp/translclass.mli	10 Mar 2006 06:19:22 -0000
++++ bytecomp/translclass.mli	10 Mar 2006 06:41:26 -0000
 @@ -16,7 +16,8 @@
  open Lambda
  
@@ -1314,7 +1314,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/bytecomp/translmod.ml,v
 retrieving revision 1.51
 diff -u -r1.51 translmod.ml
 --- bytecomp/translmod.ml	12 Aug 2004 12:55:11 -0000	1.51
-+++ bytecomp/translmod.ml	10 Mar 2006 06:19:22 -0000
++++ bytecomp/translmod.ml	10 Mar 2006 06:41:26 -0000
 @@ -317,10 +317,10 @@
    | Tstr_open path :: rem ->
        transl_structure fields cc rootpath rem
@@ -1378,7 +1378,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/driver/main_args.ml,v
 retrieving revision 1.48
 diff -u -r1.48 main_args.ml
 --- driver/main_args.ml	4 Jan 2006 16:55:49 -0000	1.48
-+++ driver/main_args.ml	10 Mar 2006 06:19:22 -0000
++++ driver/main_args.ml	10 Mar 2006 06:41:26 -0000
 @@ -136,11 +136,11 @@
        \032    E/e enable/disable fragile match\n\
        \032    F/f enable/disable partially applied function\n\
@@ -1399,7 +1399,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/driver/optmain.ml,v
 retrieving revision 1.87
 diff -u -r1.87 optmain.ml
 --- driver/optmain.ml	4 Jan 2006 16:55:49 -0000	1.87
-+++ driver/optmain.ml	10 Mar 2006 06:19:22 -0000
++++ driver/optmain.ml	10 Mar 2006 06:41:26 -0000
 @@ -173,7 +173,7 @@
           \032    P/p enable/disable partial match\n\
           \032    S/s enable/disable non-unit statement\n\
@@ -1415,7 +1415,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/stdlib/camlinternalOO.ml,v
 retrieving revision 1.14
 diff -u -r1.14 camlinternalOO.ml
 --- stdlib/camlinternalOO.ml	25 Oct 2005 18:34:07 -0000	1.14
-+++ stdlib/camlinternalOO.ml	10 Mar 2006 06:19:22 -0000
++++ stdlib/camlinternalOO.ml	10 Mar 2006 06:41:26 -0000
 @@ -206,7 +206,11 @@
       (table.methods_by_name, table.methods_by_label, table.hidden_meths,
        table.vars, virt_meth_labs, vars)
@@ -1489,7 +1489,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/stdlib/camlinternalOO.mli,v
 retrieving revision 1.9
 diff -u -r1.9 camlinternalOO.mli
 --- stdlib/camlinternalOO.mli	25 Oct 2005 18:34:07 -0000	1.9
-+++ stdlib/camlinternalOO.mli	10 Mar 2006 06:19:22 -0000
++++ stdlib/camlinternalOO.mli	10 Mar 2006 06:41:26 -0000
 @@ -46,8 +46,7 @@
  val init_class : table -> unit
  val inherits :
@@ -1522,20 +1522,60 @@ RCS file: /net/yquem/devel/caml/repository/csl/stdlib/sys.ml,v
 retrieving revision 1.141
 diff -u -r1.141 sys.ml
 --- stdlib/sys.ml	24 Jan 2006 11:12:26 -0000	1.141
-+++ stdlib/sys.ml	10 Mar 2006 06:19:22 -0000
++++ stdlib/sys.ml	10 Mar 2006 06:41:26 -0000
 @@ -78,4 +78,4 @@
  
  (* OCaml version string, must be in the format described in sys.mli. *)
  
 -let ocaml_version = "3.10+dev3 (2006-01-24)";;
 +let ocaml_version = "3.10+dev4 (2006-03-09)";;
+Index: tools/depend.ml
+===================================================================
+RCS file: /net/yquem/devel/caml/repository/csl/tools/depend.ml,v
+retrieving revision 1.9
+diff -u -r1.9 depend.ml
+--- tools/depend.ml	23 Mar 2005 03:08:37 -0000	1.9
++++ tools/depend.ml	10 Mar 2006 06:41:26 -0000
+@@ -87,7 +87,7 @@
+ 
+ and add_class_type_field bv = function
+     Pctf_inher cty -> add_class_type bv cty
+-  | Pctf_val(_, _, oty, _) -> add_opt add_type bv oty
++  | Pctf_val(_, _, _, ty, _) -> add_type bv ty
+   | Pctf_virt(_, _, ty, _) -> add_type bv ty
+   | Pctf_meth(_, _, ty, _) -> add_type bv ty
+   | Pctf_cstr(ty1, ty2, _) -> add_type bv ty1; add_type bv ty2
+@@ -280,6 +280,7 @@
+ and add_class_field bv = function
+     Pcf_inher(ce, _) -> add_class_expr bv ce
+   | Pcf_val(_, _, e, _) -> add_expr bv e
++  | Pcf_valvirt(_, _, ty, _)
+   | Pcf_virt(_, _, ty, _) -> add_type bv ty
+   | Pcf_meth(_, _, e, _) -> add_expr bv e
+   | Pcf_cstr(ty1, ty2, _) -> add_type bv ty1; add_type bv ty2
+Index: tools/ocamlprof.ml
+===================================================================
+RCS file: /net/yquem/devel/caml/repository/csl/tools/ocamlprof.ml,v
+retrieving revision 1.38
+diff -u -r1.38 ocamlprof.ml
+--- tools/ocamlprof.ml	24 Mar 2005 17:20:54 -0000	1.38
++++ tools/ocamlprof.ml	10 Mar 2006 06:41:26 -0000
+@@ -328,7 +328,7 @@
+       rewrite_patexp_list iflag spat_sexp_list
+   | Pcf_init sexp ->
+       rewrite_exp iflag sexp
+-  | Pcf_virt _ | Pcf_cstr _  -> ()
++  | Pcf_valvirt _ | Pcf_virt _ | Pcf_cstr _  -> ()
+ 
+ and rewrite_class_expr iflag cexpr =
+   match cexpr.pcl_desc with
 Index: otherlibs/labltk/browser/searchpos.ml
 ===================================================================
 RCS file: /net/yquem/devel/caml/repository/csl/otherlibs/labltk/browser/searchpos.ml,v
 retrieving revision 1.48
 diff -u -r1.48 searchpos.ml
 --- otherlibs/labltk/browser/searchpos.ml	23 Mar 2005 03:08:37 -0000	1.48
-+++ otherlibs/labltk/browser/searchpos.ml	10 Mar 2006 06:19:22 -0000
++++ otherlibs/labltk/browser/searchpos.ml	10 Mar 2006 06:41:26 -0000
 @@ -141,9 +141,8 @@
          List.iter cfl ~f:
            begin function
@@ -1572,7 +1612,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/ocamldoc/Makefile,v
 retrieving revision 1.61
 diff -u -r1.61 Makefile
 --- ocamldoc/Makefile	4 Jan 2006 16:55:49 -0000	1.61
-+++ ocamldoc/Makefile	10 Mar 2006 06:19:23 -0000
++++ ocamldoc/Makefile	10 Mar 2006 06:41:26 -0000
 @@ -31,7 +31,7 @@
  MKDIR=mkdir -p
  CP=cp -f
@@ -1602,7 +1642,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/ocamldoc/odoc_ast.ml,v
 retrieving revision 1.27
 diff -u -r1.27 odoc_ast.ml
 --- ocamldoc/odoc_ast.ml	4 Jan 2006 16:55:49 -0000	1.27
-+++ ocamldoc/odoc_ast.ml	10 Mar 2006 06:19:23 -0000
++++ ocamldoc/odoc_ast.ml	10 Mar 2006 06:41:26 -0000
 @@ -88,7 +88,7 @@
              ident_type_decl_list
        | Typedtree.Tstr_class info_list ->
@@ -1646,7 +1686,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/ocamldoc/odoc_sig.ml,v
 retrieving revision 1.37
 diff -u -r1.37 odoc_sig.ml
 --- ocamldoc/odoc_sig.ml	4 Jan 2006 16:55:50 -0000	1.37
-+++ ocamldoc/odoc_sig.ml	10 Mar 2006 06:19:23 -0000
++++ ocamldoc/odoc_sig.ml	10 Mar 2006 06:41:26 -0000
 @@ -107,7 +107,7 @@
        | _ -> assert false
  
@@ -1680,7 +1720,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/camlp4/ast2pt.ml,v
 retrieving revision 1.36
 diff -u -r1.36 ast2pt.ml
 --- camlp4/camlp4/ast2pt.ml	29 Jun 2005 04:11:26 -0000	1.36
-+++ camlp4/camlp4/ast2pt.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/camlp4/ast2pt.ml	10 Mar 2006 06:41:26 -0000
 @@ -244,6 +244,7 @@
  ;
  value mkmutable m = if m then Mutable else Immutable;
@@ -1717,7 +1757,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/camlp4/mLast.mli,v
 retrieving revision 1.18
 diff -u -r1.18 mLast.mli
 --- camlp4/camlp4/mLast.mli	29 Jun 2005 04:11:26 -0000	1.18
-+++ camlp4/camlp4/mLast.mli	10 Mar 2006 06:19:23 -0000
++++ camlp4/camlp4/mLast.mli	10 Mar 2006 06:41:26 -0000
 @@ -180,7 +180,7 @@
    | CgDcl of loc and list class_sig_item
    | CgInh of loc and class_type
@@ -1743,7 +1783,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/camlp4/reloc.ml,v
 retrieving revision 1.18
 diff -u -r1.18 reloc.ml
 --- camlp4/camlp4/reloc.ml	29 Jun 2005 04:11:26 -0000	1.18
-+++ camlp4/camlp4/reloc.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/camlp4/reloc.ml	10 Mar 2006 06:41:26 -0000
 @@ -350,7 +350,7 @@
      | CgDcl loc x1 -> let nloc = floc loc in CgDcl nloc (List.map (class_sig_item floc sh) x1)
      | CgInh loc x1 -> let nloc = floc loc in CgInh nloc (class_type floc sh x1)
@@ -1767,7 +1807,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/etc/pa_o.ml,v
 retrieving revision 1.66
 diff -u -r1.66 pa_o.ml
 --- camlp4/etc/pa_o.ml	29 Jun 2005 04:11:26 -0000	1.66
-+++ camlp4/etc/pa_o.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/etc/pa_o.ml	10 Mar 2006 06:41:26 -0000
 @@ -1037,8 +1037,14 @@
    class_str_item:
      [ [ "inherit"; ce = class_expr; pb = OPT [ "as"; i = LIDENT -> i ] ->
@@ -1803,7 +1843,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/etc/pr_o.ml,v
 retrieving revision 1.51
 diff -u -r1.51 pr_o.ml
 --- camlp4/etc/pr_o.ml	5 Jan 2006 10:44:29 -0000	1.51
-+++ camlp4/etc/pr_o.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/etc/pr_o.ml	10 Mar 2006 06:41:26 -0000
 @@ -1768,10 +1768,11 @@
                    [: `S LR "method"; private_flag pf; `label lab;
                       `S LR ":" :];
@@ -1824,7 +1864,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/meta/pa_r.ml,v
 retrieving revision 1.64
 diff -u -r1.64 pa_r.ml
 --- camlp4/meta/pa_r.ml	29 Jun 2005 04:11:26 -0000	1.64
-+++ camlp4/meta/pa_r.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/meta/pa_r.ml	10 Mar 2006 06:41:27 -0000
 @@ -658,7 +658,9 @@
        | "inherit"; ce = class_expr; pb = OPT as_lident ->
            <:class_str_item< inherit $ce$ $opt:pb$ >>
@@ -1854,7 +1894,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/meta/q_MLast.ml,v
 retrieving revision 1.60
 diff -u -r1.60 q_MLast.ml
 --- camlp4/meta/q_MLast.ml	29 Jun 2005 04:11:26 -0000	1.60
-+++ camlp4/meta/q_MLast.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/meta/q_MLast.ml	10 Mar 2006 06:41:27 -0000
 @@ -947,6 +947,8 @@
            Qast.Node "CrDcl" [Qast.Loc; st]
        | "inherit"; ce = class_expr; pb = SOPT as_lident ->
@@ -1882,7 +1922,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/ocaml_src/camlp4/ast2pt.ml
 retrieving revision 1.36
 diff -u -r1.36 ast2pt.ml
 --- camlp4/ocaml_src/camlp4/ast2pt.ml	29 Jun 2005 04:11:26 -0000	1.36
-+++ camlp4/ocaml_src/camlp4/ast2pt.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/ocaml_src/camlp4/ast2pt.ml	10 Mar 2006 06:41:27 -0000
 @@ -227,6 +227,7 @@
  ;;
  let mkmutable m = if m then Mutable else Immutable;;
@@ -1917,7 +1957,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/ocaml_src/camlp4/mLast.mli
 retrieving revision 1.20
 diff -u -r1.20 mLast.mli
 --- camlp4/ocaml_src/camlp4/mLast.mli	29 Jun 2005 04:11:26 -0000	1.20
-+++ camlp4/ocaml_src/camlp4/mLast.mli	10 Mar 2006 06:19:23 -0000
++++ camlp4/ocaml_src/camlp4/mLast.mli	10 Mar 2006 06:41:27 -0000
 @@ -180,7 +180,7 @@
    | CgDcl of loc * class_sig_item list
    | CgInh of loc * class_type
@@ -1941,7 +1981,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/ocaml_src/camlp4/reloc.ml,
 retrieving revision 1.20
 diff -u -r1.20 reloc.ml
 --- camlp4/ocaml_src/camlp4/reloc.ml	29 Jun 2005 04:11:26 -0000	1.20
-+++ camlp4/ocaml_src/camlp4/reloc.ml	10 Mar 2006 06:19:23 -0000
++++ camlp4/ocaml_src/camlp4/reloc.ml	10 Mar 2006 06:41:27 -0000
 @@ -430,8 +430,8 @@
          let nloc = floc loc in CgInh (nloc, class_type floc sh x1)
      | CgMth (loc, x1, x2, x3) ->
@@ -1968,7 +2008,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/ocaml_src/meta/pa_r.ml,v
 retrieving revision 1.59
 diff -u -r1.59 pa_r.ml
 --- camlp4/ocaml_src/meta/pa_r.ml	29 Jun 2005 04:11:26 -0000	1.59
-+++ camlp4/ocaml_src/meta/pa_r.ml	10 Mar 2006 06:19:24 -0000
++++ camlp4/ocaml_src/meta/pa_r.ml	10 Mar 2006 06:41:27 -0000
 @@ -2161,6 +2161,15 @@
          (fun (t : 'ctyp) _ (l : 'label) (pf : string option) _ _
             (_loc : Lexing.position * Lexing.position) ->
@@ -2009,7 +2049,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/ocaml_src/meta/q_MLast.ml,
 retrieving revision 1.65
 diff -u -r1.65 q_MLast.ml
 --- camlp4/ocaml_src/meta/q_MLast.ml	12 Jan 2006 08:54:21 -0000	1.65
-+++ camlp4/ocaml_src/meta/q_MLast.ml	10 Mar 2006 06:19:24 -0000
++++ camlp4/ocaml_src/meta/q_MLast.ml	10 Mar 2006 06:41:27 -0000
 @@ -3152,9 +3152,9 @@
                   Gramext.action
                     (fun (x : string)
@@ -2294,7 +2334,7 @@ RCS file: /net/yquem/devel/caml/repository/csl/camlp4/top/rprint.ml,v
 retrieving revision 1.18
 diff -u -r1.18 rprint.ml
 --- camlp4/top/rprint.ml	29 Jun 2005 04:11:26 -0000	1.18
-+++ camlp4/top/rprint.ml	10 Mar 2006 06:19:24 -0000
++++ camlp4/top/rprint.ml	10 Mar 2006 06:41:27 -0000
 @@ -288,8 +288,9 @@
        fprintf ppf "@[<2>method %s%s%s :@ %a;@]"
          (if priv then "private " else "") (if virt then "virtual " else "")