This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository mikmatch.
commit 6572e6e216796344871e277e3bd8629471719666 Author: Stephane Glondu <st...@glondu.net> Date: Thu Aug 4 13:41:20 2016 +0200 Imported Upstream version 1.0.8 --- .gitignore | 8 ++++++++ README.md | 4 +++- VERSION | 2 +- common/match.ml | 7 ++++++- pcre/Makefile | 10 ++++------ pcre/run_mikmatch_pcre.ml | 4 ++-- str/META.template | 2 +- 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac48fad --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*~ +*.cm[ioxa] +*.[oa] +*.annot +*.top +._d +._bcdi +*.ppo diff --git a/README.md b/README.md index 153b0f9..72393da 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ Mikmatch ======== +** This project is looking for new owners. ** + See `INSTALL` for the installation instructions. See http://mjambon.com/micmatch.html for the tutorial. See `pcre/test1.ml` for a complete set of examples. -Please send bug reports, comments or feature requests to +Please send bug reports, comments or feature requests to Martin Jambon <mar...@mjambon.com> diff --git a/VERSION b/VERSION index 3acc00b..22b2c19 100755 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ #!/bin/sh -mikmatch_version="1.0.7" +mikmatch_version="1.0.8" echo -n $mikmatch_version diff --git a/common/match.ml b/common/match.ml index c939daa..d09d093 100644 --- a/common/match.ml +++ b/common/match.ml @@ -588,7 +588,12 @@ let rec names patt = | Ast.PaMod _ (* (module M) *) | Ast.PaOlb _ (* ?s or ?s:(p) *) | Ast.PaOlbi _ (* ?s:(p = e) or ?(p = e) *) - | Ast.PaLab _ -> (* label *) + | Ast.PaLab _ (* label *) +(* (* OCaml >= 4.02 *) + | Ast.PaAtt _ + | Ast.PaExc _ +*) + | _ -> Messages.invalid_pattern _loc and recons_patt1 _loc p1 f = diff --git a/pcre/Makefile b/pcre/Makefile index c18b590..cfad2c1 100644 --- a/pcre/Makefile +++ b/pcre/Makefile @@ -84,7 +84,7 @@ install: topinstall $(MAKE) "LIBINSTALL_FILES=$(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES)" libinstall; \ fi -uninstall: +uninstall: $(MAKE) libuninstall version: @@ -94,11 +94,9 @@ misc-bc: ocamlc -c mikmatch.mli ocamlc -a -o run_mikmatch_pcre.cma -I $(PCRE_DIR) \ mikmatch.ml run_mikmatch_pcre.ml - ocamlmktop -o mikmatch_pcre.top \ - -I +camlp4 -I $(PCRE_DIR) \ - dynlink.cma \ - camlp4o.cma \ - pa_mikmatch_pcre.cma pcre.cma unix.cma run_mikmatch_pcre.cma + ocamlfind ocamlmktop -o mikmatch_pcre.top \ + -linkpkg -package camlp4.lib,pcre,unix \ + pa_mikmatch_pcre.cma run_mikmatch_pcre.cma misc-nc: ocamlc -c mikmatch.mli diff --git a/pcre/run_mikmatch_pcre.ml b/pcre/run_mikmatch_pcre.ml index 34f82ff..50db948 100644 --- a/pcre/run_mikmatch_pcre.ml +++ b/pcre/run_mikmatch_pcre.ml @@ -16,7 +16,7 @@ let search rex f ?(pos = 0) subj = if try unsafe_pcre_exec - irflags rex cur_pos subj subgroup_offsets offset_vector None; true + irflags rex ~pos:cur_pos ~subj_start:0 ~subj ~subgroups2:subgroup_offsets offset_vector None; true with Not_found -> false then (f substrings; @@ -34,7 +34,7 @@ let scan ~full rex pos ~ftext ~fmatch subj = if try unsafe_pcre_exec - irflags rex cur_pos subj subgroup_offsets offset_vector None; true + irflags rex ~pos:cur_pos ~subj_start:0 ~subj ~subgroups2:subgroup_offsets offset_vector None; true with Not_found -> let last = String.length subj in if full || last > previous_last then diff --git a/str/META.template b/str/META.template index b692995..961e89b 100644 --- a/str/META.template +++ b/str/META.template @@ -2,7 +2,7 @@ name = "mikmatch_str" version = "VERSION" description = "Pattern matching extended with regexps in Ocamllex syntax" -requires = "camlp4 pcre unix" +requires = "camlp4 str unix" requires(toploop) += "tophide" archive(syntax,toploop) = "pa_mikmatch_str.cma run_mikmatch_str.cma" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mikmatch.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