bugfix: allow #, ", and ' to be escaped by a backslash.

zhangyuan · Apr 5, 2016 · 7eca2ad · 7eca2ad
1 parent 767c0fa
commit 7eca2ad
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 0 deletions.
diff --git a/src/sregex/sre_yyparser.c b/src/sregex/sre_yyparser.c
@@ -2641,6 +2641,13 @@ yylex(YYSTYPE *lvalp, YYLTYPE *locp, sre_pool_t *pool, sre_char **src)
             locp->last = *src;
             return SRE_REGEX_TOKEN_CHAR;
 
+        case '"':
+        case '\'':
+        case '#':
+            lvalp->ch = c;
+            locp->last = *src;
+            return SRE_REGEX_TOKEN_CHAR;
+
         default:
             break;
         }
@@ -2918,6 +2925,11 @@ yylex(YYSTYPE *lvalp, YYLTYPE *locp, sre_pool_t *pool, sre_char **src)
                     locp->last = *src;
                     return SRE_REGEX_TOKEN_BAD;
 
+                case '"':
+                case '\'':
+                case '#':
+                    goto process_char;
+
                 default:
                     break;
                 }

diff --git a/src/sregex/sre_yyparser.y b/src/sregex/sre_yyparser.y
@@ -1050,6 +1050,13 @@ yylex(YYSTYPE *lvalp, YYLTYPE *locp, sre_pool_t *pool, sre_char **src)
             locp->last = *src;
             return SRE_REGEX_TOKEN_CHAR;
 
+        case '"':
+        case '\'':
+        case '#':
+            lvalp->ch = c;
+            locp->last = *src;
+            return SRE_REGEX_TOKEN_CHAR;
+
         default:
             break;
         }
@@ -1327,6 +1334,11 @@ yylex(YYSTYPE *lvalp, YYLTYPE *locp, sre_pool_t *pool, sre_char **src)
                     locp->last = *src;
                     return SRE_REGEX_TOKEN_BAD;
 
+                case '"':
+                case '\'':
+                case '#':
+                    goto process_char;
+
                 default:
                     break;
                 }

diff --git a/t/01-sanity-06.t b/t/01-sanity-06.t
@@ -0,0 +1,29 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+use t::SRegex 'no_plan';
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: \&
+--- re: a\&b
+--- s eval: 'a&b'
+
+
+
+=== TEST 2: [\&]
+--- re: a[\&]b
+--- s eval: 'a&b'
+
+
+
+=== TEST 3: \# \" \'
+--- re: a\#\"\'b
+--- s eval: 'a#"\'b'
+
+
+
+=== TEST 4: [\#\"\']
+--- re: [a\#\"\'b]{4}
+--- s eval: 'a#"\'b'
diff --git a/t/01-sanity.t_ b/t/01-sanity.t_
@@ -1566,3 +1566,15 @@ re1 and re2 are wrong here.
 === TEST 252: [\&]
 --- re: a[\&]b
 --- s eval: 'a&b'
+
+
+
+=== TEST 253: \# \" \'
+--- re: a\#\"\'b
+--- s eval: 'a#"\'b'
+
+
+
+=== TEST 254: [\#\"\']
+--- re: [a\#\"\'b]{4}
+--- s eval: 'a#"\'b'