Hello community,
here is the log from the commit of package ocaml-migrate-parsetree for
openSUSE:Factory checked in at 2019-05-22 11:15:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-migrate-parsetree (Old)
and /work/SRC/openSUSE:Factory/.ocaml-migrate-parsetree.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-migrate-parsetree"
Wed May 22 11:15:38 2019 rev:6 rq:704381 version:1.3.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/ocaml-migrate-parsetree/ocaml-migrate-parsetree.changes
2019-05-16 22:10:01.698283380 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-migrate-parsetree.new.5148/ocaml-migrate-parsetree.changes
2019-05-22 11:15:42.646537344 +0200
@@ -1,0 +2,8 @@
+Tue May 21 08:11:02 UTC 2019 - [email protected]
+
+- New upstream release (1.3.1).
+ * Make sure opening Ast_408 doesn't shadow Int or Misc.
+ * Fix a couple of issues related to upgrading the AST from 4.07
+ to 4.08.
+
+-------------------------------------------------------------------
Old:
----
ocaml-migrate-parsetree-1.3.0.tar.gz
New:
----
ocaml-migrate-parsetree-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-migrate-parsetree.spec ++++++
--- /var/tmp/diff_new_pack.lfpkx0/_old 2019-05-22 11:15:44.806536947 +0200
+++ /var/tmp/diff_new_pack.lfpkx0/_new 2019-05-22 11:15:44.850536938 +0200
@@ -17,7 +17,7 @@
Name: ocaml-migrate-parsetree
-Version: 1.3.0
+Version: 1.3.1
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Library for conversion between different OCaml parsetrees
versions
++++++ ocaml-migrate-parsetree-1.3.0.tar.gz ->
ocaml-migrate-parsetree-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-migrate-parsetree-1.3.0/CHANGES.md
new/ocaml-migrate-parsetree-1.3.1/CHANGES.md
--- old/ocaml-migrate-parsetree-1.3.0/CHANGES.md 2019-05-08
14:59:07.000000000 +0200
+++ new/ocaml-migrate-parsetree-1.3.1/CHANGES.md 2019-05-20
11:06:41.000000000 +0200
@@ -1,3 +1,12 @@
+v1.3.1 2019-05-20 London
+------------------------
+
+- Make sure opening `Ast_408` doesn't shadow `Int` or `Misc` (#71,
+ @hhugo)
+
+- Fix a couple of issues related to upgrading the AST from 4.07 to
+ 4.08 (#71, @hhugo)
+
v1.3.0 2019-05-08 London
------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-migrate-parsetree-1.3.0/src/ast_408.ml
new/ocaml-migrate-parsetree-1.3.1/src/ast_408.ml
--- old/ocaml-migrate-parsetree-1.3.0/src/ast_408.ml 2019-05-08
14:59:07.000000000 +0200
+++ new/ocaml-migrate-parsetree-1.3.1/src/ast_408.ml 2019-05-20
11:06:41.000000000 +0200
@@ -28,29 +28,8 @@
Actually run all lib-unix tests [4.08]
*)
-module Int = struct
- let to_string = string_of_int
-end
-module Misc = struct
- module Stdlib = struct
- module String = struct
- include String
- module Map = Map.Make (String)
- end
- end
- let find_in_path = Misc.find_in_path
- let find_in_path_uncap = Misc.find_in_path_uncap
- type ref_and_value = R : 'a ref * 'a -> ref_and_value
- let protect_refs =
- let set_refs l = List.iter (fun (R (r, v)) -> r := v) l in
- fun refs f ->
- let backup = List.map (fun (R (r, _)) -> R (r, !r)) refs in
- set_refs refs;
- match f () with
- | x -> set_refs backup; x
- | exception e -> set_refs backup; raise e
- let may_map f o = match o with None -> None | Some v -> Some (f v)
-end
+
+open Ast_408_helper
module Location = Location
module Longident = Longident
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-migrate-parsetree-1.3.0/src/ast_408_helper.ml
new/ocaml-migrate-parsetree-1.3.1/src/ast_408_helper.ml
--- old/ocaml-migrate-parsetree-1.3.0/src/ast_408_helper.ml 1970-01-01
01:00:00.000000000 +0100
+++ new/ocaml-migrate-parsetree-1.3.1/src/ast_408_helper.ml 2019-05-20
11:06:41.000000000 +0200
@@ -0,0 +1,23 @@
+module Int = struct
+ let to_string = string_of_int
+end
+module Misc = struct
+ module Stdlib = struct
+ module String = struct
+ include String
+ module Map = Map.Make (String)
+ end
+ end
+ let find_in_path = Misc.find_in_path
+ let find_in_path_uncap = Misc.find_in_path_uncap
+ type ref_and_value = R : 'a ref * 'a -> ref_and_value
+ let protect_refs =
+ let set_refs l = List.iter (fun (R (r, v)) -> r := v) l in
+ fun refs f ->
+ let backup = List.map (fun (R (r, _)) -> R (r, !r)) refs in
+ set_refs refs;
+ match f () with
+ | x -> set_refs backup; x
+ | exception e -> set_refs backup; raise e
+ let may_map f o = match o with None -> None | Some v -> Some (f v)
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-migrate-parsetree-1.3.0/src/migrate_parsetree_407_408_migrate.ml
new/ocaml-migrate-parsetree-1.3.1/src/migrate_parsetree_407_408_migrate.ml
--- old/ocaml-migrate-parsetree-1.3.0/src/migrate_parsetree_407_408_migrate.ml
2019-05-08 14:59:07.000000000 +0200
+++ new/ocaml-migrate-parsetree-1.3.1/src/migrate_parsetree_407_408_migrate.ml
2019-05-20 11:06:41.000000000 +0200
@@ -483,10 +483,15 @@
To.Parsetree.Pstr_typext
(copy_type_extension x0)
| From.Parsetree.Pstr_exception x0 ->
- To.Parsetree.Pstr_exception
- { To.Parsetree.ptyexn_constructor = (copy_extension_constructor x0);
- To.Parsetree.ptyexn_loc = x0.From.Parsetree.pext_loc;
- To.Parsetree.ptyexn_attributes = []; }
+ let atat, at = List.partition (function
+ | {Location.txt=("ocaml.deprecated"|"deprecated");_},_ -> false
+ | _ -> true) x0.pext_attributes
+ in
+ let x0 = { x0 with pext_attributes = at } in
+ To.Parsetree.Pstr_exception
+ { To.Parsetree.ptyexn_constructor = (copy_extension_constructor x0);
+ To.Parsetree.ptyexn_loc = x0.From.Parsetree.pext_loc;
+ To.Parsetree.ptyexn_attributes = copy_attributes atat }
| From.Parsetree.Pstr_module x0 ->
To.Parsetree.Pstr_module
(copy_module_binding x0)
@@ -602,12 +607,18 @@
fun
{ From.Parsetree.pcstr_self = pcstr_self;
From.Parsetree.pcstr_fields = pcstr_fields }
- ->
+ ->
+ let fields =
+ List.sort
+ (fun (a : From.Parsetree.class_field) (b :
From.Parsetree.class_field) ->
+ compare a.pcf_loc.loc_start.pos_cnum b.pcf_loc.loc_start.pos_cnum)
+ pcstr_fields
+ in
{
To.Parsetree.pcstr_self =
(copy_pattern pcstr_self);
To.Parsetree.pcstr_fields =
- (List.map copy_class_field pcstr_fields)
+ (List.map copy_class_field fields)
}
and copy_class_field :
@@ -820,10 +831,16 @@
To.Parsetree.Psig_typext
(copy_type_extension x0)
| From.Parsetree.Psig_exception x0 ->
+ let atat, at = List.partition (function
+ | {Location.txt=("ocaml.deprecated"|"deprecated");_},_ -> false
+ | _ -> true) x0.pext_attributes
+ in
+ let x0 = { x0 with pext_attributes = at } in
+
To.Parsetree.Psig_exception
{ To.Parsetree.ptyexn_constructor = (copy_extension_constructor x0);
To.Parsetree.ptyexn_loc = x0.From.Parsetree.pext_loc;
- To.Parsetree.ptyexn_attributes = []; }
+ To.Parsetree.ptyexn_attributes = copy_attributes atat; }
| From.Parsetree.Psig_module x0 ->
To.Parsetree.Psig_module
(copy_module_declaration x0)
@@ -910,12 +927,19 @@
fun
{ From.Parsetree.pcsig_self = pcsig_self;
From.Parsetree.pcsig_fields = pcsig_fields }
- ->
+ ->
+ let fields =
+ List.sort
+ (fun (a : From.Parsetree.class_type_field) (b :
From.Parsetree.class_type_field) ->
+ compare a.pctf_loc.loc_start.pos_cnum
b.pctf_loc.loc_start.pos_cnum)
+ pcsig_fields
+ in
+
{
To.Parsetree.pcsig_self =
(copy_core_type pcsig_self);
To.Parsetree.pcsig_fields =
- (List.map copy_class_type_field pcsig_fields)
+ (List.map copy_class_type_field fields)
}
and copy_class_type_field :
