From: Sven Luther Date: Fri, 3 Oct 2003 12:25:47 +0000 (+0000) Subject: Moved ocaml 3.07 svn directory to trunk. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~821 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1be7ecc15446c66b620a70d1a004c4e852fe981;p=ocaml.git Moved ocaml 3.07 svn directory to trunk. Updated debian directory to 3.07-4. --- diff --git a/debian/changelog b/debian/changelog index 7f1a5881..de71b002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,30 +1,49 @@ -ocaml (3.07-1) experimental; urgency=low +ocaml (3.07-4) unstable; urgency=low + + * Arg, dh_gencontrol seems to not support putting stuff after the + substitution variable, which seems somewhat broken to me, anyway, let's + put the substitution variable last. + * Forgot to add the camlp4_optional.dpatch to the list of patches to be + applied :(. (Closes: #213881) + + -- Sven Luther Fri, 3 Oct 2003 10:54:26 +0200 + +ocaml (3.07-3) unstable; urgency=low + + * Fixed BestProvide magic, as a space was breaking non-native builds. + + -- Sven Luther Fri, 3 Oct 2003 08:16:18 +0200 - * New upstream version. +ocaml (3.07-2) unstable; urgency=low - -- Sven Luther Tue, 30 Sep 2003 19:35:17 +0200 + * I mistakenly uploaded to experimental, and thus am forced to upload a -2. -ocaml (3.06.99.beta2-2) experimental; urgency=low + -- Sven Luther Thu, 2 Oct 2003 11:41:53 +0200 +ocaml (3.07-1) experimental; urgency=low + + * New upstream release. + - Most debian patches where included upstream. + - Standard library now use .3o suffixes. (Closes: #205391) + * Dpatchification. + * Applied the camlp4 optional arguments fix. * Fixed emacsen-install so that caml-xemacs and caml-emacs get installed only for the corresponding emacs flavors. Thanks go to Jerome Marant. + * Moved ocaml-source into a tarball. - -- Sven Luther Fri, 5 Sep 2003 15:34:48 +0200 + -- Sven Luther Wed, 1 Oct 2003 13:31:23 +0200 -ocaml (3.06.99.beta2-1) experimental; urgency=low +ocaml (3.06-21) unstable; urgency=low - * New ocaml 3.07 beta release. - * Integrated some of the debian patches :))) - * Disabled caml-xemacs.el as it seems broken. + * I botched the debian/rules in the -20 release, fixed it. - -- Sven Luther Tue, 26 Aug 2003 21:10:27 +0200 + -- Sven Luther Wed, 20 Aug 2003 13:57:28 +0200 -ocaml (3.06.99.beta1-1) experimental; urgency=low +ocaml (3.06-20) unstable; urgency=low - * Ocaml 3.07 beta 1 release. - * Dpatchification. + * Fixed BestProvides substvar stuff. (Closes: #205228, #204537) - -- Sven Luther Wed, 6 Aug 2003 13:53:08 +0200 + -- Sven Luther Tue, 19 Aug 2003 18:36:29 +0200 ocaml (3.06-19) unstable; urgency=low diff --git a/debian/control b/debian/control index 0bbf2424..a4c0e4e5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ocaml Section: devel Priority: optional Maintainer: Sven Luther -Build-Depends: debhelper (>> 4.1.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch +Build-Depends: debhelper (>> 4.1.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2 Standards-Version: 3.6.0 Package: ocaml @@ -10,7 +10,7 @@ Architecture: any Depends: ${shlibs:Depends}, libncurses5-dev, ocaml-base (= ${Source-Version}), ocaml-base-3.07 Suggests: xlibs-dev, tcl8.4-dev, tk8.4-dev, ocaml-doc, libgdbm-dev, emacsen Recommends: ledit, file -Provides: ocaml-3.07${F:BestProvides} +Provides: ocaml-3.07 ${F:BestProvides} Replaces: camlp4 Conflicts: camlp4, camlidl (<< 1.04) Description: ML language implementation with a class-based object system diff --git a/debian/ocaml-source.files b/debian/ocaml-source.files index e733b6b5..8a40978c 100644 --- a/debian/ocaml-source.files +++ b/debian/ocaml-source.files @@ -1,4 +1,3 @@ -asmcomp/alpha asmcomp/alpha/emit.mlp asmcomp/alpha/arch.ml asmcomp/alpha/reload.ml @@ -332,7 +331,6 @@ camlp4/camlp4/reloc.ml camlp4/camlp4/reloc.mli camlp4/camlp4/spretty.ml camlp4/camlp4/spretty.mli -camlp4/compile camlp4/compile/Makefile camlp4/compile/comp_head.ml camlp4/compile/comp_trail.ml @@ -444,7 +442,6 @@ camlp4/top/Makefile camlp4/top/camlp4_top.ml camlp4/top/oprint.ml camlp4/top/rprint.ml -config/auto-aux config/auto-aux/async_io.c config/auto-aux/align.c config/auto-aux/ansi.c @@ -963,21 +960,17 @@ otherlibs/num/bignum/c/bztest.c otherlibs/num/bignum/c/KerN.c otherlibs/num/bignum/c/bz.c otherlibs/num/bignum/c/bzf.c -otherlibs/num/bignum/c/bn otherlibs/num/bignum/c/bn/bnDivide.c otherlibs/num/bignum/c/bn/bnCmp.c otherlibs/num/bignum/c/bn/bnInit.c otherlibs/num/bignum/c/bn/bnMult.c otherlibs/num/bignum/c/testKerN.c -otherlibs/num/bignum/h otherlibs/num/bignum/h/BigNum.h otherlibs/num/bignum/h/BigZ.h otherlibs/num/bignum/h/BntoBnn.h otherlibs/num/bignum/Makefile otherlibs/num/bignum/README -otherlibs/num/bignum/o otherlibs/num/bignum/o/EMPTY -otherlibs/num/bignum/s otherlibs/num/bignum/s/68KerN.s otherlibs/num/bignum/s/68KerN_mot.s otherlibs/num/bignum/s/68KerN_sony.s diff --git a/debian/ocaml.override b/debian/ocaml.override index 22b356e4..346481db 100644 --- a/debian/ocaml.override +++ b/debian/ocaml.override @@ -4,6 +4,8 @@ ocaml: binary-without-manpage ocamldoc ocaml: binary-without-manpage ocamldoc.opt ocaml: binary-without-manpage ocamlmklib ocaml: binary-without-manpage ocamltags +ocaml: binary-without-manpage camlp4sch +ocaml: binary-without-manpage ocamldep.opt ocaml: cvsignore-file-in-package usr/share/doc/ocaml/examples_labltk/.cvsignore ocaml: executable-not-elf-or-script ./usr/bin/ocamltags ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.06/stublibs/dllgraphics.so /usr/X11R6/lib @@ -11,3 +13,4 @@ ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.06/stublibs/dlllabltk.so ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.06/stublibs/dlltkanim.so /usr/lib:/usr/X11R6/lib ocaml: menu-icon-has-bad-colors /usr/X11R6/include/X11/pixmaps/JoeCaml.xpm: lime ocaml: postinst-does-not-load-confmodule +ocaml: script-not-executable ./usr/lib/ocaml/3.07/camlheader diff --git a/debian/patches/00list b/debian/patches/00list index 672e2115..1ab5cda8 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,3 @@ versioned_libdir.dpatch objinfo.dpatch +camlp4_optional.dpatch diff --git a/debian/patches/camlp4_optional.dpatch b/debian/patches/camlp4_optional.dpatch new file mode 100755 index 00000000..3c2fe3b7 --- /dev/null +++ b/debian/patches/camlp4_optional.dpatch @@ -0,0 +1,452 @@ +#! /bin/sh -e +## versioned_libdir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Makefiles, configure scripts and other build stuff adapted for +## DP: debian package creation + +if [ $# -ne 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 +@DPATCH@ +diff -ur ocaml-3.07/camlp4/camlp4/ast2pt.ml ocaml.cvs/camlp4/camlp4/ast2pt.ml +--- ocaml-3.07/camlp4/camlp4/ast2pt.ml 2003-07-16 20:59:12.000000000 +0200 ++++ ocaml.cvs/camlp4/camlp4/ast2pt.ml 2003-09-30 16:39:26.000000000 +0200 +@@ -10,7 +10,7 @@ + (* *) + (***********************************************************************) + +-(* $Id: ast2pt.ml,v 1.25 2003/07/16 18:59:12 mauny Exp $ *) ++(* $Id: ast2pt.ml,v 1.26 2003/09/30 14:39:26 mauny Exp $ *) + + open Stdpp; + open MLast; +@@ -177,10 +177,10 @@ + | TyObj loc fl v -> mktyp loc (Ptyp_object (meth_list loc fl v)) + | TyCls loc id -> + mktyp loc (Ptyp_class (long_id_of_string_list loc id) [] []) +- | TyLab loc _ _ -> error loc "labeled type not allowed here" ++ | TyLab loc _ _ -> error loc "labelled type not allowed here" + | TyLid loc s -> mktyp loc (Ptyp_constr (lident s) []) +- | TyMan loc _ _ -> error loc "type manifest not allowed here" +- | TyOlb loc lab _ -> error loc "labeled type not allowed here" ++ | TyMan loc _ _ -> error loc "manifest type not allowed here" ++ | TyOlb loc lab _ -> error loc "labelled type not allowed here" + | TyPol loc pl t -> mktyp loc (Ptyp_poly pl (ctyp t)) + | TyQuo loc s -> mktyp loc (Ptyp_var s) + | TyRec loc _ _ -> error loc "record type not allowed here" +diff -ur ocaml-3.07/camlp4/etc/pa_o.ml ocaml.cvs/camlp4/etc/pa_o.ml +--- ocaml-3.07/camlp4/etc/pa_o.ml 2003-09-25 14:05:05.000000000 +0200 ++++ ocaml.cvs/camlp4/etc/pa_o.ml 2003-09-30 16:39:38.000000000 +0200 +@@ -10,7 +10,7 @@ + (* *) + (***********************************************************************) + +-(* $Id: pa_o.ml,v 1.52 2003/09/25 12:05:05 mauny Exp $ *) ++(* $Id: pa_o.ml,v 1.54 2003/09/30 14:39:38 mauny Exp $ *) + + open Stdpp; + open Pcaml; +@@ -1148,16 +1148,16 @@ + | i = LIDENT -> [i] ] ] + ; + (* Labels *) +- ctyp: AFTER "arrow" +- [ NONA ++ ctyp: LEVEL "arrow" ++ [ RIGHTA + [ i = lident_colon; t1 = ctyp LEVEL "star"; "->"; t2 = SELF -> +- <:ctyp< ~ $i$ : $t1$ -> $t2$ >> ++ <:ctyp< ( ~ $i$ : $t1$ ) -> $t2$ >> + | i = OPTLABEL; t1 = ctyp LEVEL "star"; "->"; t2 = SELF -> +- <:ctyp< ? $i$ : $t1$ -> $t2$ >> ++ <:ctyp< ( ? $i$ : $t1$ ) -> $t2$ >> + | i = QUESTIONIDENT; ":"; t1 = ctyp LEVEL "star"; "->"; t2 = SELF -> +- <:ctyp< ? $i$ : $t1$ -> $t2$ >> ++ <:ctyp< ( ? $i$ : $t1$ ) -> $t2$ >> + | "?"; i=lident_colon;t1 = ctyp LEVEL "star"; "->"; t2 = SELF -> +- <:ctyp< ? $i$ : $t1$ -> $t2$ >> ] ] ++ <:ctyp< ( ? $i$ : $t1$ ) -> $t2$ >> ] ] + ; + ctyp: LEVEL "simple" + [ [ "["; OPT "|"; rfl = LIST1 row_field SEP "|"; "]" -> +Seulement dans ocaml.cvs/camlp4/lib: CVS +Seulement dans ocaml.cvs/camlp4/man: CVS +Seulement dans ocaml.cvs/camlp4/meta: CVS +diff -ur ocaml-3.07/camlp4/meta/pa_r.ml ocaml.cvs/camlp4/meta/pa_r.ml +--- ocaml-3.07/camlp4/meta/pa_r.ml 2003-09-25 14:05:06.000000000 +0200 ++++ ocaml.cvs/camlp4/meta/pa_r.ml 2003-09-30 12:20:06.000000000 +0200 +@@ -10,7 +10,7 @@ + (* *) + (***********************************************************************) + +-(* $Id: pa_r.ml,v 1.53 2003/09/25 12:05:06 mauny Exp $ *) ++(* $Id: pa_r.ml,v 1.54 2003/09/30 10:20:06 mauny Exp $ *) + + open Stdpp; + open Pcaml; +@@ -748,8 +748,8 @@ + | i = LIDENT -> [i] ] ] + ; + (* Labels *) +- ctyp: AFTER "arrow" +- [ NONA ++ ctyp: LEVEL "arrow" ++ [ RIGHTA + [ i = TILDEIDENT; ":"; t = SELF -> <:ctyp< ~ $i$ : $t$ >> + | i = LABEL; t = SELF -> <:ctyp< ~ $i$ : $t$ >> + | i = QUESTIONIDENT; ":"; t = SELF -> <:ctyp< ? $i$ : $t$ >> +diff -ur ocaml-3.07/camlp4/meta/q_MLast.ml ocaml.cvs/camlp4/meta/q_MLast.ml +--- ocaml-3.07/camlp4/meta/q_MLast.ml 2003-07-16 14:50:08.000000000 +0200 ++++ ocaml.cvs/camlp4/meta/q_MLast.ml 2003-09-30 13:38:04.000000000 +0200 +@@ -10,7 +10,7 @@ + (* *) + (***********************************************************************) + +-(* $Id: q_MLast.ml,v 1.51 2003/07/16 12:50:08 mauny Exp $ *) ++(* $Id: q_MLast.ml,v 1.52 2003/09/30 11:38:04 mauny Exp $ *) + + value gram = Grammar.gcreate (Plexer.gmake ()); + +@@ -127,7 +127,9 @@ + value a_STRING = Grammar.Entry.create gram "a_STRING"; + value a_CHAR = Grammar.Entry.create gram "a_CHAR"; + value a_TILDEIDENT = Grammar.Entry.create gram "a_TILDEIDENT"; ++value a_LABEL = Grammar.Entry.create gram "a_LABEL"; + value a_QUESTIONIDENT = Grammar.Entry.create gram "a_QUESTIONIDENT"; ++value a_OPTLABEL = Grammar.Entry.create gram "a_OPTLABEL"; + + value o2b = + fun +@@ -1007,10 +1009,13 @@ + | i = a_LIDENT -> Qast.List [i] ] ] + ; + (* Labels *) +- ctyp: AFTER "arrow" +- [ NONA ++ ctyp: LEVEL "arrow" ++ [ RIGHTA + [ i = a_TILDEIDENT; ":"; t = SELF -> Qast.Node "TyLab" [Qast.Loc; i; t] ++ | i = a_LABEL; t = SELF -> Qast.Node "TyLab" [Qast.Loc; i; t] + | i = a_QUESTIONIDENT; ":"; t = SELF -> ++ Qast.Node "TyOlb" [Qast.Loc; i; t] ++ | i = a_OPTLABEL; t = SELF -> + Qast.Node "TyOlb" [Qast.Loc; i; t] ] ] + ; + ctyp: LEVEL "simple" +@@ -1044,11 +1049,16 @@ + | "#"; sl = mod_ident -> Qast.Node "PaTyp" [Qast.Loc; sl] + | i = a_TILDEIDENT; ":"; p = SELF -> + Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)] ++ | i = a_LABEL; p = SELF -> ++ Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)] + | i = a_TILDEIDENT -> Qast.Node "PaLab" [Qast.Loc; i; Qast.Option None] + | i = a_QUESTIONIDENT; ":"; "("; p = patt_tcon; eo = SOPT eq_expr; + ")" -> + Qast.Node "PaOlb" + [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))] ++ | i = a_OPTLABEL; "("; p = patt_tcon; eo = SOPT eq_expr; ")" -> ++ Qast.Node "PaOlb" ++ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))] + | i = a_QUESTIONIDENT -> + Qast.Node "PaOlb" [Qast.Loc; i; Qast.Option None] + | "?"; "("; p = patt_tcon; eo = SOPT eq_expr; ")" -> +@@ -1063,11 +1073,16 @@ + ipatt: + [ [ i = a_TILDEIDENT; ":"; p = SELF -> + Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)] ++ | i = a_LABEL; p = SELF -> ++ Qast.Node "PaLab" [Qast.Loc; i; Qast.Option (Some p)] + | i = a_TILDEIDENT -> Qast.Node "PaLab" [Qast.Loc; i; Qast.Option None] + | i = a_QUESTIONIDENT; ":"; "("; p = ipatt_tcon; eo = SOPT eq_expr; + ")" -> + Qast.Node "PaOlb" + [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))] ++ | i = a_OPTLABEL; "("; p = ipatt_tcon; eo = SOPT eq_expr; ")" -> ++ Qast.Node "PaOlb" ++ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))] + | i = a_QUESTIONIDENT -> + Qast.Node "PaOlb" [Qast.Loc; i; Qast.Option None] + | "?"; "("; p = ipatt_tcon; eo = SOPT eq_expr; ")" -> +@@ -1086,9 +1101,13 @@ + [ "label" NONA + [ i = a_TILDEIDENT; ":"; e = SELF -> + Qast.Node "ExLab" [Qast.Loc; i; Qast.Option (Some e)] ++ | i = a_LABEL; e = SELF -> ++ Qast.Node "ExLab" [Qast.Loc; i; Qast.Option (Some e)] + | i = a_TILDEIDENT -> Qast.Node "ExLab" [Qast.Loc; i; Qast.Option None] + | i = a_QUESTIONIDENT; ":"; e = SELF -> + Qast.Node "ExOlb" [Qast.Loc; i; Qast.Option (Some e)] ++ | i = a_OPTLABEL; e = SELF -> ++ Qast.Node "ExOlb" [Qast.Loc; i; Qast.Option (Some e)] + | i = a_QUESTIONIDENT -> + Qast.Node "ExOlb" [Qast.Loc; i; Qast.Option None] ] ] + ; +@@ -1335,10 +1354,16 @@ + [ [ "~"; a = ANTIQUOT -> antiquot "" loc a + | s = TILDEIDENT -> Qast.Str s ] ] + ; ++ a_LABEL: ++ [ [ s = LABEL -> Qast.Str s ] ] ++ ; + a_QUESTIONIDENT: + [ [ "?"; a = ANTIQUOT -> antiquot "" loc a + | s = QUESTIONIDENT -> Qast.Str s ] ] + ; ++ a_OPTLABEL: ++ [ [ s = OPTLABEL -> Qast.Str s ] ] ++ ; + END; + + value apply_entry e = +diff -ur ocaml-3.07/camlp4/ocaml_src/camlp4/ast2pt.ml ocaml.cvs/camlp4/ocaml_src/camlp4/ast2pt.ml +--- ocaml-3.07/camlp4/ocaml_src/camlp4/ast2pt.ml 2003-07-24 00:26:18.000000000 +0200 ++++ ocaml.cvs/camlp4/ocaml_src/camlp4/ast2pt.ml 2003-09-30 16:39:38.000000000 +0200 +@@ -169,10 +169,10 @@ + | TyObj (loc, fl, v) -> mktyp loc (Ptyp_object (meth_list loc fl v)) + | TyCls (loc, id) -> + mktyp loc (Ptyp_class (long_id_of_string_list loc id, [], [])) +- | TyLab (loc, _, _) -> error loc "labeled type not allowed here" ++ | TyLab (loc, _, _) -> error loc "labelled type not allowed here" + | TyLid (loc, s) -> mktyp loc (Ptyp_constr (lident s, [])) +- | TyMan (loc, _, _) -> error loc "type manifest not allowed here" +- | TyOlb (loc, lab, _) -> error loc "labeled type not allowed here" ++ | TyMan (loc, _, _) -> error loc "manifest type not allowed here" ++ | TyOlb (loc, lab, _) -> error loc "labelled type not allowed here" + | TyPol (loc, pl, t) -> mktyp loc (Ptyp_poly (pl, ctyp t)) + | TyQuo (loc, s) -> mktyp loc (Ptyp_var s) + | TyRec (loc, _, _) -> error loc "record type not allowed here" +Seulement dans ocaml.cvs/camlp4/ocaml_src/camlp4: CVS +Seulement dans ocaml.cvs/camlp4/ocaml_src: CVS +Seulement dans ocaml.cvs/camlp4/ocaml_src/lib: CVS +Seulement dans ocaml.cvs/camlp4/ocaml_src/meta: CVS +diff -ur ocaml-3.07/camlp4/ocaml_src/meta/pa_r.ml ocaml.cvs/camlp4/ocaml_src/meta/pa_r.ml +--- ocaml-3.07/camlp4/ocaml_src/meta/pa_r.ml 2003-09-25 14:05:07.000000000 +0200 ++++ ocaml.cvs/camlp4/ocaml_src/meta/pa_r.ml 2003-09-30 12:20:06.000000000 +0200 +@@ -2241,8 +2241,8 @@ + (fun (l : 'class_longident) _ (m : string) (loc : int * int) -> + (m :: l : 'class_longident))]]; + Grammar.Entry.obj (ctyp : 'ctyp Grammar.Entry.e), +- Some (Gramext.After "arrow"), +- [None, Some Gramext.NonA, ++ Some (Gramext.Level "arrow"), ++ [None, Some Gramext.RightA, + [[Gramext.Stoken ("OPTLABEL", ""); Gramext.Sself], + Gramext.action + (fun (t : 'ctyp) (i : string) (loc : int * int) -> +diff -ur ocaml-3.07/camlp4/ocaml_src/meta/q_MLast.ml ocaml.cvs/camlp4/ocaml_src/meta/q_MLast.ml +--- ocaml-3.07/camlp4/ocaml_src/meta/q_MLast.ml 2003-07-24 00:26:19.000000000 +0200 ++++ ocaml.cvs/camlp4/ocaml_src/meta/q_MLast.ml 2003-09-30 13:38:04.000000000 +0200 +@@ -153,7 +153,9 @@ + let a_STRING = Grammar.Entry.create gram "a_STRING";; + let a_CHAR = Grammar.Entry.create gram "a_CHAR";; + let a_TILDEIDENT = Grammar.Entry.create gram "a_TILDEIDENT";; ++let a_LABEL = Grammar.Entry.create gram "a_LABEL";; + let a_QUESTIONIDENT = Grammar.Entry.create gram "a_QUESTIONIDENT";; ++let a_OPTLABEL = Grammar.Entry.create gram "a_OPTLABEL";; + + let o2b = + function +@@ -626,7 +628,7 @@ + Qast.Tuple [xx1; xx2; xx3] -> xx1, xx2, xx3 + | _ -> + match () with +- _ -> raise (Match_failure ("q_MLast.ml", 300, 19)) ++ _ -> raise (Match_failure ("q_MLast.ml", 302, 19)) + in + Qast.Node ("StExc", [Qast.Loc; c; tl; b]) : + 'str_item)); +@@ -896,7 +898,7 @@ + Qast.Tuple [xx1; xx2; xx3] -> xx1, xx2, xx3 + | _ -> + match () with +- _ -> raise (Match_failure ("q_MLast.ml", 358, 19)) ++ _ -> raise (Match_failure ("q_MLast.ml", 360, 19)) + in + Qast.Node ("SgExc", [Qast.Loc; c; tl]) : + 'sig_item)); +@@ -3345,9 +3347,15 @@ + (fun (l : 'class_longident) _ (m : 'a_UIDENT) (loc : int * int) -> + (Qast.Cons (m, l) : 'class_longident))]]; + Grammar.Entry.obj (ctyp : 'ctyp Grammar.Entry.e), +- Some (Gramext.After "arrow"), +- [None, Some Gramext.NonA, ++ Some (Gramext.Level "arrow"), ++ [None, Some Gramext.RightA, + [[Gramext.Snterm ++ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e)); ++ Gramext.Sself], ++ Gramext.action ++ (fun (t : 'ctyp) (i : 'a_OPTLABEL) (loc : int * int) -> ++ (Qast.Node ("TyOlb", [Qast.Loc; i; t]) : 'ctyp)); ++ [Gramext.Snterm + (Grammar.Entry.obj + (a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Sself], +@@ -3355,6 +3363,12 @@ + (fun (t : 'ctyp) _ (i : 'a_QUESTIONIDENT) (loc : int * int) -> + (Qast.Node ("TyOlb", [Qast.Loc; i; t]) : 'ctyp)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e)); ++ Gramext.Sself], ++ Gramext.action ++ (fun (t : 'ctyp) (i : 'a_LABEL) (loc : int * int) -> ++ (Qast.Node ("TyLab", [Qast.Loc; i; t]) : 'ctyp)); ++ [Gramext.Snterm + (Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Sself], + Gramext.action +@@ -3518,6 +3532,30 @@ + (fun (i : 'a_QUESTIONIDENT) (loc : int * int) -> + (Qast.Node ("PaOlb", [Qast.Loc; i; Qast.Option None]) : 'patt)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e)); ++ Gramext.Stoken ("", "("); ++ Gramext.Snterm ++ (Grammar.Entry.obj (patt_tcon : 'patt_tcon Grammar.Entry.e)); ++ Gramext.srules ++ [[Gramext.Sopt ++ (Gramext.Snterm ++ (Grammar.Entry.obj (eq_expr : 'eq_expr Grammar.Entry.e)))], ++ Gramext.action ++ (fun (a : 'eq_expr option) (loc : int * int) -> ++ (Qast.Option a : 'a_opt)); ++ [Gramext.Snterm ++ (Grammar.Entry.obj (a_opt : 'a_opt Grammar.Entry.e))], ++ Gramext.action ++ (fun (a : 'a_opt) (loc : int * int) -> (a : 'a_opt))]; ++ Gramext.Stoken ("", ")")], ++ Gramext.action ++ (fun _ (eo : 'a_opt) (p : 'patt_tcon) _ (i : 'a_OPTLABEL) ++ (loc : int * int) -> ++ (Qast.Node ++ ("PaOlb", ++ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]) : ++ 'patt)); ++ [Gramext.Snterm + (Grammar.Entry.obj + (a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Stoken ("", "("); +@@ -3548,6 +3586,13 @@ + (fun (i : 'a_TILDEIDENT) (loc : int * int) -> + (Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option None]) : 'patt)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e)); ++ Gramext.Sself], ++ Gramext.action ++ (fun (p : 'patt) (i : 'a_LABEL) (loc : int * int) -> ++ (Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option (Some p)]) : ++ 'patt)); ++ [Gramext.Snterm + (Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Sself], + Gramext.action +@@ -3606,6 +3651,30 @@ + (fun (i : 'a_QUESTIONIDENT) (loc : int * int) -> + (Qast.Node ("PaOlb", [Qast.Loc; i; Qast.Option None]) : 'ipatt)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e)); ++ Gramext.Stoken ("", "("); ++ Gramext.Snterm ++ (Grammar.Entry.obj (ipatt_tcon : 'ipatt_tcon Grammar.Entry.e)); ++ Gramext.srules ++ [[Gramext.Sopt ++ (Gramext.Snterm ++ (Grammar.Entry.obj (eq_expr : 'eq_expr Grammar.Entry.e)))], ++ Gramext.action ++ (fun (a : 'eq_expr option) (loc : int * int) -> ++ (Qast.Option a : 'a_opt)); ++ [Gramext.Snterm ++ (Grammar.Entry.obj (a_opt : 'a_opt Grammar.Entry.e))], ++ Gramext.action ++ (fun (a : 'a_opt) (loc : int * int) -> (a : 'a_opt))]; ++ Gramext.Stoken ("", ")")], ++ Gramext.action ++ (fun _ (eo : 'a_opt) (p : 'ipatt_tcon) _ (i : 'a_OPTLABEL) ++ (loc : int * int) -> ++ (Qast.Node ++ ("PaOlb", ++ [Qast.Loc; i; Qast.Option (Some (Qast.Tuple [p; eo]))]) : ++ 'ipatt)); ++ [Gramext.Snterm + (Grammar.Entry.obj + (a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Stoken ("", "("); +@@ -3636,6 +3705,13 @@ + (fun (i : 'a_TILDEIDENT) (loc : int * int) -> + (Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option None]) : 'ipatt)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e)); ++ Gramext.Sself], ++ Gramext.action ++ (fun (p : 'ipatt) (i : 'a_LABEL) (loc : int * int) -> ++ (Qast.Node ("PaLab", [Qast.Loc; i; Qast.Option (Some p)]) : ++ 'ipatt)); ++ [Gramext.Snterm + (Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Sself], + Gramext.action +@@ -3669,6 +3745,13 @@ + (fun (i : 'a_QUESTIONIDENT) (loc : int * int) -> + (Qast.Node ("ExOlb", [Qast.Loc; i; Qast.Option None]) : 'expr)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e)); ++ Gramext.Sself], ++ Gramext.action ++ (fun (e : 'expr) (i : 'a_OPTLABEL) (loc : int * int) -> ++ (Qast.Node ("ExOlb", [Qast.Loc; i; Qast.Option (Some e)]) : ++ 'expr)); ++ [Gramext.Snterm + (Grammar.Entry.obj + (a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Sself], +@@ -3682,6 +3765,13 @@ + (fun (i : 'a_TILDEIDENT) (loc : int * int) -> + (Qast.Node ("ExLab", [Qast.Loc; i; Qast.Option None]) : 'expr)); + [Gramext.Snterm ++ (Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e)); ++ Gramext.Sself], ++ Gramext.action ++ (fun (e : 'expr) (i : 'a_LABEL) (loc : int * int) -> ++ (Qast.Node ("ExLab", [Qast.Loc; i; Qast.Option (Some e)]) : ++ 'expr)); ++ [Gramext.Snterm + (Grammar.Entry.obj (a_TILDEIDENT : 'a_TILDEIDENT Grammar.Entry.e)); + Gramext.Stoken ("", ":"); Gramext.Sself], + Gramext.action +@@ -4427,6 +4517,11 @@ + Gramext.action + (fun (a : string) _ (loc : int * int) -> + (antiquot "" loc a : 'a_TILDEIDENT))]]; ++ Grammar.Entry.obj (a_LABEL : 'a_LABEL Grammar.Entry.e), None, ++ [None, None, ++ [[Gramext.Stoken ("LABEL", "")], ++ Gramext.action ++ (fun (s : string) (loc : int * int) -> (Qast.Str s : 'a_LABEL))]]; + Grammar.Entry.obj (a_QUESTIONIDENT : 'a_QUESTIONIDENT Grammar.Entry.e), + None, + [None, None, +@@ -4437,7 +4532,12 @@ + [Gramext.Stoken ("", "?"); Gramext.Stoken ("ANTIQUOT", "")], + Gramext.action + (fun (a : string) _ (loc : int * int) -> +- (antiquot "" loc a : 'a_QUESTIONIDENT))]]];; ++ (antiquot "" loc a : 'a_QUESTIONIDENT))]]; ++ Grammar.Entry.obj (a_OPTLABEL : 'a_OPTLABEL Grammar.Entry.e), None, ++ [None, None, ++ [[Gramext.Stoken ("OPTLABEL", "")], ++ Gramext.action ++ (fun (s : string) (loc : int * int) -> (Qast.Str s : 'a_OPTLABEL))]]];; + + let apply_entry e = + let f s = Grammar.Entry.parse e (Stream.of_string s) in diff --git a/debian/rules b/debian/rules index 16f5bcb1..e0e4fa20 100755 --- a/debian/rules +++ b/debian/rules @@ -93,7 +93,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config/gnu/config.guess endif - dh_clean debian/README.labltk + dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile install: install-indep install-arch install-indep: @@ -104,12 +104,13 @@ install-indep: # Add here commands to install the indep part of the package into # debian/-doc. - for i in `cat debian/ocaml-source.files`; do \ - install -m 644 -D $$i \ - debian/ocaml-source/usr/src/ocaml/ocaml-$(VERSION)/$$i; \ + for i in `cat debian/ocaml-source.files`; do \ + install -m 644 -D $$i \ + debian/ocaml-source/usr/src/ocaml-$(VERSION)/$$i; \ done - install -m 644 debian/ocaml-source.override \ - $(CURDIR)/debian/ocaml-source/usr/share/lintian/overrides/ocaml-source + tar cjf debian/ocaml-source/usr/src/ocaml-source-$(VERSION).tar.bz2 \ + -C debian/ocaml-source/usr/src ocaml-$(VERSION) + rm -rf debian/ocaml-source/usr/src/ocaml-$(VERSION) dh_install -i @@ -139,7 +140,7 @@ install-arch: dh_movefiles -pocaml-base --sourcedir=debian/ocaml install -m 644 debian/ld.conf \ $(CURDIR)/debian/ocaml-base/usr/lib/ocaml/$(VERSION) - #install -m 644 debian/ocaml-base.override \ + install -m 644 debian/ocaml-base.override \ $(CURDIR)/debian/ocaml-base/usr/share/lintian/overrides/ocaml-base # The ocaml-native-compilers, if available. @@ -190,18 +191,19 @@ binary-indep: build-indep install-indep # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + dh_shlibdeps -a if [ ! -e opt-built-stamp ]; then \ dh_gencontrol -pocaml \ - -u-VF:BestProvides=" ,ocaml-best-compilers"; \ + -u-VF:BestProvides=",ocaml-best-compilers"; \ else \ dh_gencontrol -pocaml \ -u-VF:BestProvides=""; \ dh_gencontrol -pocaml-native-compilers; \ fi - dh_gencontrol -pocaml-base; \ - dh_gencontrol -pocaml-source; \ + dh_gencontrol -pocaml-base + dh_gencontrol -pocaml-source dh_md5sums -a dh_builddeb -a -binary: binary-arch binary-indep +binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch