[Pkg-ocaml-maint-commits] [mikmatch] 01/04: Imported Upstream version 1.0.7

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository mikmatch.

commit deff5c54b71ee45fd85a9eb25d184207a1290d10
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu May 8 20:15:11 2014 +0200

    Imported Upstream version 1.0.7
---
 VERSION                 |  2 +-
 common/syntax_common.ml | 12 ++++++------
 pcre/test.ml            |  8 ++++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index 7f9e7b9..3acc00b 100755
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,3 @@
 #!/bin/sh
-mikmatch_version="1.0.6"
+mikmatch_version="1.0.7"
 echo -n $mikmatch_version
diff --git a/common/syntax_common.ml b/common/syntax_common.ml
index 4a46e84..9106650 100644
--- a/common/syntax_common.ml
+++ b/common/syntax_common.ml
@@ -23,27 +23,27 @@ let seq _loc e =
 
 let extend_common () =
   (try DELETE_RULE Gram patt: LIDENT END
-   with Not_found -> ());
+   with _rule_not_found -> ());
 
   (try 
      DELETE_RULE Gram 
        expr: "let"; opt_rec; binding; "in"; expr LEVEL ";" 
      END
-   with Not_found -> 
+   with _rule_not_found -> 
      Messages.cannot_delete_rule "(1)");
 
   (try
      DELETE_RULE Gram
        str_item: "let"; opt_rec; binding; "in"; expr
      END
-   with Not_found -> 
+   with _rule_not_found -> 
      Messages.cannot_delete_rule "(2)");
 
   (try
      DELETE_RULE Gram
        str_item: "let"; opt_rec; binding
      END
-   with Not_found -> 
+   with _rule_not_found -> 
      Messages.cannot_delete_rule "(3)");
 
 
@@ -223,14 +223,14 @@ let extend_regular () =
      DELETE_RULE Gram
        expr: "function"; match_case
      END
-   with Not_found -> 
+   with _rule_not_found -> 
      Messages.cannot_delete_rule "(reg 1)");
 
   (try
      DELETE_RULE Gram
        expr: "match"; sequence; "with"; match_case
      END
-   with Not_found -> 
+   with _rule_not_found -> 
      Messages.cannot_delete_rule "(reg 2)");
 
   EXTEND Gram
diff --git a/pcre/test.ml b/pcre/test.ml
index 64b408e..8e7dab3 100644
--- a/pcre/test.ml
+++ b/pcre/test.ml
@@ -251,8 +251,10 @@ let _ =
   List.iter print_endline ((SPLIT ",") "a,b,c")
 
 let _ =
-  let l = 
-    List.filter (FILTER _* ".ml" eos) (Array.to_list (Sys.readdir ".")) in
+  let l =
+    List.filter
+      (fun s -> (FILTER _* ".ml" eos) s)
+      (Array.to_list (Sys.readdir ".")) in
   printf "*.ml: %s\n%!" (String.concat " " l)
 
 
@@ -566,6 +568,8 @@ let () =
           assert false
     | _ -> assert false
 
+type test = { x : int; y : int }
+
 let f x =
   match x with
     | {x = 1; _} -> ()

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