This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository camlp5.
commit 85bae0365a625e3678ef63f46354c96464eae409
Author: Mehdi Dogguy <me...@debian.org>
Date: Wed Jan 20 20:00:19 2016 +0100
Fix bug on methods wrongly interpreted as vals (Closes: #802264)
---
debian/changelog | 7 ++
...x-for-methods-wrongly-interpreted-as-vals.patch | 81 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 89 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index aa54e21..1a676e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlp5 (6.14-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Fix bug on methods wrongly interpreted as vals (Closes: #802264)
+
+ -- Mehdi Dogguy <me...@debian.org> Wed, 20 Jan 2016 19:59:02 +0100
+
camlp5 (6.14-1) unstable; urgency=medium
* New upstream release
diff --git
a/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch
b/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch
new file mode 100644
index 0000000..a56e810
--- /dev/null
+++ b/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch
@@ -0,0 +1,81 @@
+From: Mehdi Dogguy <me...@debian.org>
+Date: Wed, 20 Jan 2016 19:58:12 +0100
+Subject: fix for methods wrongly interpreted as vals
+
+See
https://scm.gforge.inria.fr/anonscm/gitweb?p=camlp5/camlp5.git;a=commit;h=caca3dd0643ec5aae9df4399fa73eb280808ef18
+---
+ lib/versdep.ml | 2 +-
+ main/ast2pt.ml | 4 ----
+ ocaml_src/lib/versdep/4.02.3.ml | 2 +-
+ ocaml_src/lib/versdep/4.02.4.ml | 2 +-
+ ocaml_src/main/ast2pt.ml | 3 ---
+ 5 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/lib/versdep.ml b/lib/versdep.ml
+index 184b988..0cd2233 100644
+--- a/lib/versdep.ml
++++ b/lib/versdep.ml
+@@ -1091,7 +1091,7 @@ value ocaml_pcf_valvirt =
+ value ocaml_pcf_virt (s, pf, t, loc) =
+ IFDEF OCAML_VERSION < OCAML_4_00 THEN Pcf_virt (s, pf, t, loc)
+ ELSIFDEF OCAML_VERSION < OCAML_4_02_0 THEN Pcf_virt (mkloc loc s, pf, t)
+- ELSE Pcf_val (mkloc loc s, Immutable, Cfk_virtual t) END
++ ELSE Pcf_method (mkloc loc s, pf, Cfk_virtual t) END
+ ;
+
+ value ocaml_pcl_apply =
+diff --git a/main/ast2pt.ml b/main/ast2pt.ml
+index d221dff..bd3c321 100644
+--- a/main/ast2pt.ml
++++ b/main/ast2pt.ml
+@@ -261,10 +261,6 @@ value rec ctyp =
+ | TyArr loc (TyLab loc1 lab t1) t2 →
+ mktyp loc (ocaml_ptyp_arrow (uv lab) (ctyp t1) (ctyp t2))
+ | TyArr loc (TyOlb loc1 lab t1) t2 →
+- let t1 =
+- let loc = loc1 in
+- <:ctyp< option $t1$ >>
+- in
+ mktyp loc (ocaml_ptyp_arrow ("?" ^ uv lab) (ctyp t1) (ctyp t2))
+ | TyArr loc t1 t2 → mktyp loc (ocaml_ptyp_arrow "" (ctyp t1) (ctyp t2))
+ | TyObj loc fl v → mktyp loc (ocaml_ptyp_object (meth_list loc (uv fl) v))
+diff --git a/ocaml_src/lib/versdep/4.02.3.ml b/ocaml_src/lib/versdep/4.02.3.ml
+index cbe5f5b..54bfd10 100644
+--- a/ocaml_src/lib/versdep/4.02.3.ml
++++ b/ocaml_src/lib/versdep/4.02.3.ml
+@@ -524,7 +524,7 @@ let ocaml_pcf_valvirt =
+ ;;
+
+ let ocaml_pcf_virt (s, pf, t, loc) =
+- Pcf_val (mkloc loc s, Immutable, Cfk_virtual t)
++ Pcf_method (mkloc loc s, pf, Cfk_virtual t)
+ ;;
+
+ let ocaml_pcl_apply = Some (fun ce lel -> Pcl_apply (ce, lel));;
+diff --git a/ocaml_src/lib/versdep/4.02.4.ml b/ocaml_src/lib/versdep/4.02.4.ml
+index cbe5f5b..54bfd10 100644
+--- a/ocaml_src/lib/versdep/4.02.4.ml
++++ b/ocaml_src/lib/versdep/4.02.4.ml
+@@ -524,7 +524,7 @@ let ocaml_pcf_valvirt =
+ ;;
+
+ let ocaml_pcf_virt (s, pf, t, loc) =
+- Pcf_val (mkloc loc s, Immutable, Cfk_virtual t)
++ Pcf_method (mkloc loc s, pf, Cfk_virtual t)
+ ;;
+
+ let ocaml_pcl_apply = Some (fun ce lel -> Pcl_apply (ce, lel));;
+diff --git a/ocaml_src/main/ast2pt.ml b/ocaml_src/main/ast2pt.ml
+index 776c2a1..a534dd0 100644
+--- a/ocaml_src/main/ast2pt.ml
++++ b/ocaml_src/main/ast2pt.ml
+@@ -276,9 +276,6 @@ let rec ctyp =
+ | TyArr (loc, TyLab (loc1, lab, t1), t2) ->
+ mktyp loc (ocaml_ptyp_arrow (uv lab) (ctyp t1) (ctyp t2))
+ | TyArr (loc, TyOlb (loc1, lab, t1), t2) ->
+- let t1 =
+- let loc = loc1 in MLast.TyApp (loc, MLast.TyLid (loc, "option"), t1)
+- in
+ mktyp loc (ocaml_ptyp_arrow ("?" ^ uv lab) (ctyp t1) (ctyp t2))
+ | TyArr (loc, t1, t2) -> mktyp loc (ocaml_ptyp_arrow "" (ctyp t1) (ctyp t2))
+ | TyObj (loc, fl, v) ->
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f38e374
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-for-methods-wrongly-interpreted-as-vals.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camlp5.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
