feat: enable negative match patterns

glob.nimble

@@ -7,7 +7,7 @@ skipDirs      = @["docsrc"]
 skipFiles     = @["tests.nim"]
 
 requires "nim >= 1.0.0 & < 2.0.0"
-requires "regex >= 0.17.1 & < 0.18.0"
+requires "regex >= 0.19.0 & < 0.20.0"
 
 task test, "Run the test suite":
   exec "nimble c -y --hints:off --verbosity:0 -r tests.nim"

src/glob.nim

@@ -87,12 +87,9 @@ bash's ``extglob`` flag:
 ``*(...patterns)``   match zero or more occurrences of the given patterns
 ``+(...patterns)``   match one or more occurrences of the given patterns
 ``@(...patterns)``   match one of the given patterns
+``!(...patterns)``   match anything *except* the given patterns
 ===================  =====================================================
 
-Note that the ``!(...patterns)`` form that allows for matching anything *except*
-the given patterns is not currently supported. This is a limitation in the regex
-backend.
-
 Examples
 ********
 

src/glob/regexer.nim

@@ -129,10 +129,9 @@ proc globToRegexString* (
       if inRange:
         add('^')
       elif isNext('('):
-        fail("Negated patterns are currently not supported", pattern, i + 1)
-        # stack.add(c)
-        # add("(?!")
-        # inc i
+        stack.add(c)
+        add("(?!")
+        inc i
       else:
         add('\\' & c)
     of '?':

tests.nim

@@ -33,7 +33,6 @@ proc createStructure (dir: string, files: seq[string]): () -> void =
 
   result = () => removeDir(dir)
 
-
 proc seqsEqual (seq1, seq2: seq[string], ignoreCase = false): bool =
   if ignoreCase:
     seqsEqual(seq1.mapIt(toLower(it)), seq2.mapIt(toLower(it)))
@@ -291,15 +290,12 @@ suite "regex matching":
     check isMatchTest("*(foo|ba[rt]).nim", "baz.nim").not
     check isMatchTest("*(foo|ba[rt]).nim", "fun.nim").not
 
-  test "extended (!) - currently unsupported":
-    # currently unsupported in regex implementation
-    expect GlobSyntaxError: discard globToRegexString("!(boo).txt")
-
-    # check isMatchTest("!(boo).nim", "foo.nim")
-    # check isMatchTest("!(foo|baz)bar.nim", "buzbar.nim")
-    # check isMatchTest("!bar.nim", "!bar.nim")
-    # check isMatchTest("!({foo,bar})baz.nim", "notbaz.nim")
-    # check isMatchTest("!({foo,bar})baz.nim", "foobaz.nim").not
+  test "extended (!)":
+    check isMatchTest("!bar.nim", "!bar.nim")
+    check isMatchTest("!(boo).nim", "foo.nim")
+    check isMatchTest("!(foo|baz)bar.nim", "buzbar.nim")
+    check isMatchTest("!({foo,bar})baz.nim", "notbaz.nim")
+    check isMatchTest("!({foo,bar})baz.nim", "foobaz.nim").not
 
   test "extended (+)":
     check isMatchTest("+foo.nim", "+foo.nim")