regex: The first range in a character class can start with a left bracket

diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs
index b7313ff6c1a1f17adac333795f4a59e2e7d9a2e6..35583be372cb34f65ae86cb62b33f5a0d916114c 100644 (file)
--- a/src/libregex/parse.rs
+++ b/src/libregex/parse.rs
@@ -374,10 +374,6 @@ fn parse_class(&mut self) -> Result<(), Error> {
         let mut ranges: Vec<(char, char)> = vec!();
         let mut alts: Vec<Ast> = vec!();
 
-        if self.peek_is(1, ']') {
-            try!(self.expect(']'));
-            ranges.push((']', ']'))
-        }
         while self.peek_is(1, '-') {
             try!(self.expect('-'));
             ranges.push(('-', '-'))
@@ -411,7 +407,7 @@ fn parse_class(&mut self) -> Result<(), Error> {
                         ast => fail!("Unexpected AST item '{}'", ast),
                     }
                 }
-                ']' => {
+                ']' if ranges.len() > 0 || alts.len() > 0 => {
                     if ranges.len() > 0 {
                         let flags = negated | (self.flags & FLAG_NOCASE);
                         let mut ast = AstClass(combine_ranges(ranges), flags);

diff --git a/src/libregex/test/tests.rs b/src/libregex/test/tests.rs
index 4f4137265c0311730e7aaf0907e445352f6f8a53..06f7db274189d74680d0e4c559ad831b78c2b56c 100644 (file)
--- a/src/libregex/test/tests.rs
+++ b/src/libregex/test/tests.rs
@@ -53,6 +53,13 @@ fn quoted_bracket_set() {
     assert_eq!(ms, vec![(0, 1), (1, 2)]);
 }
 
+#[test]
+fn first_range_starts_with_left_bracket() {
+    let re = regex!(r"([[-z])");
+    let ms = re.find_iter("[]").collect::<Vec<(uint, uint)>>();
+    assert_eq!(ms, vec![(0, 1), (1, 2)]);
+}
+
 #[test]
 fn range_ends_with_escape() {
     let re = regex!(r"([\[-\x{5d}])");