Functions for matching pathnames.

prelexer.cpp

@@ -202,9 +202,11 @@ namespace Sass {
     
     // Path matching functions.
     char* folder(char* src) {
-      return sequence< zero_plus< negate< exactly<'/'> > >,
+      return sequence< zero_plus< any_char_except<'/'> >,
                        exactly<'/'> >(src);
     }
-
+    char* folders(char* src) {
+      return zero_plus< folder >(src);
+    }
   }
 }
\ No newline at end of file

prelexer.hpp

@@ -85,7 +85,12 @@ namespace Sass {
     }
     
     // Match any single character.
-    char *any_char(char* src);
+    char* any_char(char* src);
+    // Match any single character except the supplied one.
+    template <char c>
+    char* any_char_except(char* src) {
+      return (*src && *src != c) ? src+1 : 0;
+    }
     
     // Matches zero characters (always succeeds without consuming input).
     char* epsilon(char*);
@@ -313,6 +318,7 @@ namespace Sass {
     
     // Path matching functions.
     char* folder(char* src);
+    char* folders(char* src);
     
     // Utility functions for finding and counting characters in a string.
     template<char c>

unit-test-prelexer.cpp

@@ -106,6 +106,8 @@ int main() {
   check_twice(binomial, bi2, nonbi1);
   check_twice(folder, fld1, nonfld1);
   check_twice(folder, fld2, nonfld1);
+  check_twice(folders, fld1, nonfld1);
+  check_twice(folders, fld2, nonfld1);
   cout << count_interval<'\n'>(ws1, spaces_and_comments(ws1)) << endl;
   cout << count_interval<'*'>(ws1, spaces_and_comments(ws1)) << endl;
   cout << count_interval<exactly<slash_star> >(ws1, spaces_and_comments(ws1)) << endl;