[Pkg-ocaml-maint-commits] [jocaml] 09/15: Refresh remaining patch which removes Otyp_proc in order to have an outcometree.mli compatible with OCaml's.

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository jocaml.

commit fa67fd5d42572f1d9d6d17aa22a10099d210f9b5
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu May 8 21:38:07 2014 +0200

    Refresh remaining patch which removes Otyp_proc in order to have an outcometree.mli compatible with OCaml's.
---
 debian/changelog                                   |  2 ++
 ...p_proc-with-Otyp_stuff-to-make-outcometre.patch | 27 +++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d39b7a..e480d90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ jocaml (4.01.0-1) UNRELEASED; urgency=medium
   * New upstream release
     - Remove 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
       (applied upstream).
+    - Refresh remaining patch which removes Otyp_proc in order to have
+      an outcometree.mli compatible with OCaml's.
   * Keep only JoCaml specific patches, and import OCaml patches from
     ocaml-source package. This lets jocaml package benefit from work
     done on the ocaml package, automatically.
diff --git a/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch b/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
index 3a42b83..3000ed1 100644
--- a/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
+++ b/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
@@ -1,30 +1,31 @@
 From: Mehdi Dogguy <mehdi at debian.org>
 Date: Sun, 17 Apr 2011 13:37:18 +0200
-Subject: [PATCH] Replace Otyp_proc with Otyp_stuff "" to make outcometree.mli compatible with the one from OCaml
+Subject: Replace Otyp_proc with Otyp_stuff "" to make outcometree.mli
+ compatible with the one from OCaml
 
 ---
  typing/oprint.ml       |    1 -
  typing/outcometree.mli |    1 -
  typing/printtyp.ml     |    2 +-
- 3 files changed, 1 insertions(+), 3 deletions(-)
+ 3 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/typing/oprint.ml b/typing/oprint.ml
-index cd4cfa5..4ad2e3e 100644
+index 3eeb654..d74468e 100644
 --- a/typing/oprint.ml
 +++ b/typing/oprint.ml
-@@ -213,7 +213,6 @@ and print_simple_out_type ppf =
-   | Otyp_alias _ | Otyp_poly _ | Otyp_arrow _ | Otyp_tuple _ as ty ->
-       fprintf ppf "@[<1>(%a)@]" print_out_type ty
+@@ -224,7 +224,6 @@ and print_simple_out_type ppf =
+       pp_print_char ppf ')';
+       pp_close_box ppf ()
    | Otyp_abstract | Otyp_sum _ | Otyp_record _ | Otyp_manifest (_, _) -> ()
 -  | Otyp_proc -> ()
    | Otyp_module (p, n, tyl) ->
        fprintf ppf "@[<1>(module %s" p;
        let first = ref true in
 diff --git a/typing/outcometree.mli b/typing/outcometree.mli
-index b68f0a7..7c41091 100644
+index 158a696..13b0e6f 100644
 --- a/typing/outcometree.mli
 +++ b/typing/outcometree.mli
-@@ -61,7 +61,6 @@ type out_type =
+@@ -59,7 +59,6 @@ type out_type =
        bool * out_variant * bool * (string list) option
    | Otyp_poly of string list * out_type
    | Otyp_module of string * string list * out_type list
@@ -33,16 +34,16 @@ index b68f0a7..7c41091 100644
  and out_variant =
    | Ovar_fields of (string * bool * out_type list) list
 diff --git a/typing/printtyp.ml b/typing/printtyp.ml
-index 6178561..acccb3a 100644
+index 6c7a62c..61b05d1 100644
 --- a/typing/printtyp.ml
 +++ b/typing/printtyp.ml
-@@ -399,7 +399,7 @@ let rec tree_of_typexp sch ty =
+@@ -636,7 +636,7 @@ let rec tree_of_typexp sch ty =
          end
-     | Tunivar ->
+     | Tunivar _ ->
          Otyp_var (false, name_of_type ty)
 -    | Tproc _ -> Otyp_proc
 +    | Tproc _ -> Otyp_stuff ""
      | Tpackage (p, n, tyl) ->
-         Otyp_module (Path.name p, n, tree_of_typlist sch tyl)
-   in
+         let n =
+           List.map (fun li -> String.concat "." (Longident.flatten li)) n in
 -- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/jocaml.git