Fix issue 12367 - std.regex: Recognize (?# ... ) comment syntax

dlang · Apr 10, 2016 · 12c7d68 · 12c7d68
1 parent 401158d
commit 12c7d68
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/std/regex/internal/parser.d b/std/regex/internal/parser.d
@@ -432,6 +432,20 @@ struct Parser(R)
                     next();
                     switch(current)
                     {
+                    case '#':
+                        nesting--;
+                        fixupStack.pop();
+                        for(;;)
+                        {
+                            if(!next())
+                                error("Unexpected end of pattern");
+                            if(current == ')')
+                            {
+                                next();
+                                break;
+                            }
+                        }
+                        break;
                     case ':':
                         put(Bytecode(IR.Nop, 0));
                         next();

diff --git a/std/regex/internal/tests.d b/std/regex/internal/tests.d
@@ -1003,3 +1003,10 @@ unittest
     auto rx = regex("[c d]", "x");
     assert("a b".matchFirst(rx));
 }
+
+unittest
+{
+    auto r = regex("(?# comment)abc(?# comment2)");
+    assert("abc".matchFirst(r));
+    assertThrown(regex("(?#..."));
+}