Glob: match zero or more directories

lib/glob.ml

@@ -75,23 +75,30 @@ let of_string ~double_asterisk s : t =
   in
 
   let piece () =
-    if read '*'
-    then if double_asterisk && read '*'
-      then ManyMany
-      else Many
+    if read '/' then
+      if read '*' then
+        if double_asterisk && read '*' then
+          if eos () then [ManyMany; Exactly('/')]
+          else [ManyMany]
+        else [Many; Exactly('/')]
+      else [Exactly('/')]
+    else if read '*'
+      then if double_asterisk && read '*'
+        then [ManyMany]
+        else [Many]
     else if read '?'
-    then One
+    then [One]
     else if not (read '[')
-    then Exactly (char ())
+    then [Exactly (char ())]
     else if read '^' || read '!'
-    then Any_but (enclosed ())
-    else Any_of (enclosed ())
+    then [Any_but (enclosed ())]
+    else [Any_of (enclosed ())]
   in
 
   let rec loop pieces =
     if eos ()
     then List.rev pieces
-    else loop (piece () :: pieces)
+    else loop (piece () @ pieces)
   in
 
   loop []

lib_test/test_glob.ml

@@ -101,6 +101,16 @@ let _ =
   assert (re_match    (glob ~anchored "/**") "//foo");
   assert (re_match    (glob ~anchored "**") "foo//bar");
 
+  assert (re_match    (glob ~anchored "foo/bar/**/*.ml") "foo/bar/baz/foobar.ml");
+  assert (re_match    (glob ~anchored "foo/bar/**/*.ml") "foo/bar/foobar.ml");
+
+  assert (re_match    (glob ~anchored "foo/**/bar/**/baz") "foo/bar/baz");
+  assert (re_match    (glob ~anchored "foo/**/bar/**/baz") "foo/bar/x/y/z/baz");
+  assert (re_match    (glob ~anchored "foo/**/bar/**/baz") "foo/x/y/z/bar/baz");
+  assert (re_match    (glob ~anchored "foo/**/bar/**/baz") "foo/bar/x/bar/x/baz");
+  assert (re_mismatch (glob ~anchored "foo/**/bar/**/baz") "foo/bar/../x/baz");
+  assert (re_mismatch (glob ~anchored "foo/**/bar/**/baz") "foo/bar/./x/baz");
+
   (* Interaction with [~period] *)
   let period = true in
   assert (re_mismatch (glob ~anchored ~period "**") ".foobar");