[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/6.02.1-1-4-g2477533

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 2477533bab0df331433b8801fb38568bc56f8378
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Mar 16 23:56:00 2011 +0100

    Import upstream patch 6.02.2-1

diff --git a/debian/patches/0001-Upstream-patch-6.02.2-1.patch b/debian/patches/0001-Upstream-patch-6.02.2-1.patch
new file mode 100644
index 0000000..8d273ac
--- /dev/null
+++ b/debian/patches/0001-Upstream-patch-6.02.2-1.patch
@@ -0,0 +1,84 @@
+From: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
+Date: Wed, 16 Mar 2011 23:52:48 +0100
+Subject: [PATCH] Upstream patch 6.02.2-1
+
+ * [16 Mar 11] Fixed bug: incorrect compilation of label patterns of
+   the form ~a:b (or ~{a = b} in revised syntax) in class
+   declarations.
+ * [16 Mar 11] Fixed bug: error while printing label patterns ~a:b
+   with pr_o.cmo (error message "labels not pretty printed (in
+   patt)").
+
+Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1
+---
+ etc/pr_o.ml              |    2 +-
+ main/ast2pt.ml           |   10 +++++-----
+ ocaml_src/main/ast2pt.ml |   10 +++++-----
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/etc/pr_o.ml b/etc/pr_o.ml
+index 07c6a7c..12fbf3d 100644
+--- a/etc/pr_o.ml
++++ b/etc/pr_o.ml
+@@ -1363,7 +1363,7 @@ EXTEND_PRINTER
+       | <:patt< _ >> -> pprintf pc "_"
+       | <:patt:< ?{$_$} >> | <:patt:< ?{$_$ = $_$} >> | <:patt:< ?{$_$} >> |
+         <:patt:< ?{$_$ = ?{$_$ = $_$}} >> | <:patt:< ?{$_$ = $_$} >> |
+-        <:patt:< ~{$_$} >> | <:patt:< ~{$_$ = $_$} >> ->
++        <:patt:< ~{$list:_$} >> ->
+           error loc "labels not pretty printed (in patt)"
+       | <:patt< `$s$ >> ->
+           failwith "polymorphic variants not pretty printed; add pr_ro.cmo"
+diff --git a/main/ast2pt.ml b/main/ast2pt.ml
+index 1447c75..e35c8ae 100644
+--- a/main/ast2pt.ml
++++ b/main/ast2pt.ml
+@@ -1326,16 +1326,16 @@ and class_expr =
+       [ Some pcl_fun ->
+           match uv lppo with
+           [ [(p, po)] -> do {
+-              let _ =
+-                match uv po with
+-                [ Some _ -> error loc "label not implemented in that case 1"
+-                | None -> None ]
+-              in
+               let lab =
+                 match p with
+                 [ PaLid _ s -> uv s
+                 | p -> error loc "label not implemented in that case 2" ]
+               in
++              let p =
++                match uv po with
++                [ Some p -> p
++                | None -> p ]
++              in
+               mkpcl loc (pcl_fun lab None (patt p) (class_expr ce))
+           }
+         | [] | [_ :: _] -> error ploc "case class multi lab not yet impl" ]
+diff --git a/ocaml_src/main/ast2pt.ml b/ocaml_src/main/ast2pt.ml
+index 3f62c15..b244699 100644
+--- a/ocaml_src/main/ast2pt.ml
++++ b/ocaml_src/main/ast2pt.ml
+@@ -1522,16 +1522,16 @@ and class_expr =
+         Some pcl_fun ->
+           begin match uv lppo with
+             [p, po] ->
+-              let _ =
+-                match uv po with
+-                  Some _ -> error loc "label not implemented in that case 1"
+-                | None -> None
+-              in
+               let lab =
+                 match p with
+                   PaLid (_, s) -> uv s
+                 | p -> error loc "label not implemented in that case 2"
+               in
++              let p =
++                match uv po with
++                  Some p -> p
++                | None -> p
++              in
+               mkpcl loc (pcl_fun lab None (patt p) (class_expr ce))
+           | [] | _ :: _ -> error ploc "case class multi lab not yet impl"
+           end
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..553ccfc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Upstream-patch-6.02.2-1.patch

-- 
camlp5 packaging