[Pkg-ocaml-maint-commits] [ocaml-re] 04/15: Imported Upstream version 1.4.1
Stéphane Glondu
glondu at moszumanska.debian.org
Fri Aug 5 11:15:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-re.
commit 7f45c59374ca332c0355beb47a95076d2047c43c
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Aug 5 12:50:00 2016 +0200
Imported Upstream version 1.4.1
---
CHANGES | 4 ++++
_oasis | 2 +-
lib/META | 16 ++++++++--------
lib_test/META | 4 ++--
lib_test/test_pcre.ml | 10 +++++-----
lib_test/test_re.ml | 6 +++---
setup.ml | 6 +++---
7 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/CHANGES b/CHANGES
index ce32718..bf91f72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.4.1 (06-Jun-2015)
+
+* Fix 4.00.1 compatibilty with tests.
+
1.4.0 (12-May-2015)
* Add Re.{mark,marked,mark_set}. Regexps can now be "marked" to query post
diff --git a/_oasis b/_oasis
index 55bae28..f400a93 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: re
-Version: 1.4.0
+Version: 1.4.1
Synopsis: Pure OCaml regular expression library
Authors: Jerome Vouillon, Thomas Gazagnaire, Anil Madhavapeddy
License: LGPL-2.0 with OCaml linking exception
diff --git a/lib/META b/lib/META
index 50a0f19..b031353 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 0ec3f389164db7817d6321d87434419c)
-version = "1.4.0"
+# DO NOT EDIT (digest: 3829b972ce2515d362590b234cf3757c)
+version = "1.4.1"
description = "Pure OCaml regular expression library"
requires = "bytes"
archive(byte) = "re.cma"
@@ -9,7 +9,7 @@ archive(native) = "re.cmxa"
archive(native, plugin) = "re.cmxs"
exists_if = "re.cma"
package "str" (
- version = "1.4.0"
+ version = "1.4.1"
description = "Str-compatible regexps"
requires = "re re.emacs"
archive(byte) = "re_str.cma"
@@ -20,7 +20,7 @@ package "str" (
)
package "posix" (
- version = "1.4.0"
+ version = "1.4.1"
description = "POSIX-compatible regexps"
requires = "re"
archive(byte) = "re_posix.cma"
@@ -31,7 +31,7 @@ package "posix" (
)
package "perl" (
- version = "1.4.0"
+ version = "1.4.1"
description = "Perl-compatible regexps"
requires = "re"
archive(byte) = "re_perl.cma"
@@ -42,7 +42,7 @@ package "perl" (
)
package "pcre" (
- version = "1.4.0"
+ version = "1.4.1"
description = "subset of PCRE using the Re engine"
requires = "re re.perl"
archive(byte) = "re_pcre.cma"
@@ -53,7 +53,7 @@ package "pcre" (
)
package "glob" (
- version = "1.4.0"
+ version = "1.4.1"
description = "Shell glob regexps"
requires = "re"
archive(byte) = "re_glob.cma"
@@ -64,7 +64,7 @@ package "glob" (
)
package "emacs" (
- version = "1.4.0"
+ version = "1.4.1"
description = "Emacs-compatible regexps"
requires = "re"
archive(byte) = "re_emacs.cma"
diff --git a/lib_test/META b/lib_test/META
index 5ee983b..8caad66 100644
--- a/lib_test/META
+++ b/lib_test/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 47d093767821af6123fc65ec99e824e0)
-version = "1.4.0"
+# DO NOT EDIT (digest: 2dd16160b3df1fd1cca5ed887a253007)
+version = "1.4.1"
description = "Pure OCaml regular expression library"
requires = "oUnit"
archive(byte) = "fort_unit.cma"
diff --git a/lib_test/test_pcre.ml b/lib_test/test_pcre.ml
index b9376a4..5d2db6f 100644
--- a/lib_test/test_pcre.ml
+++ b/lib_test/test_pcre.ml
@@ -9,18 +9,18 @@ let string_of_group = function
| Group (x, s) -> sp "Group (%d %s)" x s
| NoGroup -> "NoGroup"
-let list_printer f xs = xs |> List.map f |> String.concat " ; "
+let list_printer f xs = String.concat " ; " (List.map f xs)
let test_blank_class _ =
let re = Re_perl.compile_pat "\\d[[:blank:]]\\d[[:blank:]]+[a-z]" in
let successes = ["1 2 a"; "2\t3 z"; "9\t0 \t a"] in
let failures = [""; "123"; " "; "1 3z"] in
- successes |> List.iter (fun s ->
+ List.iter (fun s ->
assert_bool ("String " ^ s ^ " should match") (Re.execp re s)
- );
- failures |> List.iter (fun s ->
+ ) successes;
+ List.iter (fun s ->
assert_bool ("String " ^ s ^ " should not match") (not (Re.execp re s))
- )
+ ) failures
let rex = regexp "[:_]"
diff --git a/lib_test/test_re.ml b/lib_test/test_re.ml
index 1d8174c..07df015 100644
--- a/lib_test/test_re.ml
+++ b/lib_test/test_re.ml
@@ -25,7 +25,7 @@ let correct_mark ?pos ?len r s il1 il2 =
(fun () ->
let subs = exec ?pos ?len (compile r) s in
List.for_all (marked subs) il1 &&
- List.for_all (fun x -> not @@ marked subs x) il2
+ List.for_all (fun x -> not (marked subs x)) il2
) ()
;;
@@ -370,8 +370,8 @@ let _ =
);
expect_pass "mark alt" (fun () ->
- let ia, ra = mark @@ char 'a' in
- let ib, rb = mark @@ char 'b' in
+ let ia, ra = mark (char 'a') in
+ let ib, rb = mark (char 'b') in
let r = alt [ra ; rb] in
correct_mark r "a" [ia] [ib];
correct_mark r "b" [ib] [ia];
diff --git a/setup.ml b/setup.ml
index 22d86b9..1aad8e7 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.2.1~alpha1 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 3e45a4ad95116e03dae9381533aa4371) *)
+(* DO NOT EDIT (digest: 4e1a0fa186fe5ea2b3110b3cb2557249) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6981,7 +6981,7 @@ let setup_t =
alpha_features = ["compiled_setup_ml"];
beta_features = [];
name = "re";
- version = "1.4.0";
+ version = "1.4.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -7681,7 +7681,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
- oasis_digest = Some "�\027�\145)�\158\016�\135�\011�`\012�";
+ oasis_digest = Some "mzPi\156�hkҨb%b�\144�";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-re.git
More information about the Pkg-ocaml-maint-commits
mailing list