Merge pull request ocaml#125 from rgrinberg/release-170

Prepare 1.7.0 Release

CHANGES

@@ -1,3 +1,10 @@
+1.7.0 (18-Sep-2016)
+
+* Fix stack overflow in Re_str.full_split
+* Use correct exceptions in Re_str group functions
+* Add experimental Re.witness
+* Add experimental Re.Group.nb_groups
+
 1.6.1 (20-Jun-2016)
 
 * Fix Re.pp (#101)

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        re
-Version:     1.6.1
+Version:     1.7.0
 Synopsis:    Pure OCaml regular expression library
 Authors:     Jerome Vouillon, Thomas Gazagnaire, Anil Madhavapeddy
 License:     LGPL-2.0 with OCaml linking exception

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 4756dd5c9ea312db675eba1ab9b127a5)
-version = "1.6.1"
+# DO NOT EDIT (digest: 39d4873c6e7dc4da81f1426d7f08c2b3)
+version = "1.7.0"
 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.6.1"
+ version = "1.7.0"
  description = "Str-compatible regexps"
  requires = "re re.emacs"
  archive(byte) = "re_str.cma"
@@ -20,7 +20,7 @@ package "str" (
 )
 
 package "posix" (
- version = "1.6.1"
+ version = "1.7.0"
  description = "POSIX-compatible regexps"
  requires = "re"
  archive(byte) = "re_posix.cma"
@@ -31,7 +31,7 @@ package "posix" (
 )
 
 package "perl" (
- version = "1.6.1"
+ version = "1.7.0"
  description = "Perl-compatible regexps"
  requires = "re"
  archive(byte) = "re_perl.cma"
@@ -42,7 +42,7 @@ package "perl" (
 )
 
 package "pcre" (
- version = "1.6.1"
+ version = "1.7.0"
  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.6.1"
+ version = "1.7.0"
  description = "Shell glob regexps"
  requires = "re"
  archive(byte) = "re_glob.cma"
@@ -64,7 +64,7 @@ package "glob" (
 )
 
 package "emacs" (
- version = "1.6.1"
+ version = "1.7.0"
  description = "Emacs-compatible regexps"
  requires = "re"
  archive(byte) = "re_emacs.cma"

lib/re.mli

@@ -96,7 +96,8 @@ module Group : sig
   (** Test whether a group matched *)
 
   val nb_groups : t -> int
-  (** Returns the total number of groups defined - matched or not. *)
+  (** Returns the total number of groups defined - matched or not.
+      This function is experimental. *)
 
   val pp : Format.formatter -> t -> unit
 

lib_test/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 0e2484619fa18a2ca074b6cf5c7c2631)
-version = "1.6.1"
+# DO NOT EDIT (digest: 76d92ec95c88c4838fc5c5c07c09afb7)
+version = "1.7.0"
 description = "Pure OCaml regular expression library"
 requires = "oUnit"
 archive(byte) = "fort_unit.cma"

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: c480b7094c67f7d7a37b1bc72660a8a5) *)
+(* DO NOT EDIT (digest: 423072e27633ac83004abeef4885e9ff) *)
 (*
    Regenerated by OASIS v0.4.7
    Visit https://oasis.forge.ocamlcore.org for more information and
@@ -7205,7 +7205,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = None;
-          version = "1.6.1";
+          version = "1.7.0";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -9931,7 +9931,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.7";
-     oasis_digest = Some "Nv\180s(\227\138\248\b\147\005\252\133\163^'";
+     oasis_digest = Some "\243X\001\r\203\232z>\t\209\203\246d\251\221\170";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false