digitalmars.D.bugs - [Issue 1394] New: Regex does not support forgetfull matching (?:.......
- d-bugmail puremagic.com (103/103) Aug 01 2007 http://d.puremagic.com/issues/show_bug.cgi?id=1394
- d-bugmail puremagic.com (12/12) Jun 02 2010 http://d.puremagic.com/issues/show_bug.cgi?id=1394
- d-bugmail puremagic.com (16/16) Nov 08 2010 http://d.puremagic.com/issues/show_bug.cgi?id=1394
- d-bugmail puremagic.com (11/11) Jun 06 2011 http://d.puremagic.com/issues/show_bug.cgi?id=1394
http://d.puremagic.com/issues/show_bug.cgi?id=1394
Summary: Regex does not support forgetfull matching (?:.......
Product: D
Version: 1.021
Platform: All
OS/Version: All
Status: NEW
Severity: normal
Priority: P2
Component: Phobos
AssignedTo: bugzilla digitalmars.com
ReportedBy: alan akbkhome.com
Excuse the slight CS issues - but this fixes it.
testcase:
auto g = new
Regex("/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i;");
--- dmd/src/phobos/std/regexp.d 2007-02-27 18:45:28.000000000 +0800
+++ /usr/src/dmd/src/phobos/std/regexp.d 2007-08-02 12:47:16.000000000
+0800
-747,6 +747,7
REbol, // beginning of line
REeol, // end of line
REparen, // parenthesized subexpression
+ REparenforget, // forgetfull parenthesized subexpression (?:
REgoto, // goto offset
REwordboundary,
-1372,11 +1397,13
break;
case REparen:
+ case REparenforget:
+
// len, n, ()
puint = cast(uint *)&prog[pc + 1];
len = puint[0];
n = puint[1];
- printf("\tREparen len=%d n=%d, pc=>%d\n", len, n, pc + 1 +
uint.sizeof * 2 + len);
+ printf("\t%s len=%d n=%d, pc=>%d\n", (prog[pc] == REparen ?
"REparen" : "REparenforget") , len, n, pc + 1 + uint.sizeof * 2 + len);
pc += 1 + uint.sizeof * 2;
break;
-1835,6 +1862,7
pc = pop + len;
break;
+ case REparenforget:
case REparen:
// len, ()
debug(regexp) printf("\tREparen\n");
-1845,8 +1873,10
ss = src;
if (!trymatch(pop, pop + len))
goto Lnomatch;
+ if (program[pc] == REparen) {
pmatch[n + 1].rm_so = ss;
pmatch[n + 1].rm_eo = src;
+ }
pc = pop + len;
break;
-2150,16 +2180,25
case '(':
p++;
+
+ if (
+ ((p + 2) < pattern.length) &&
+ (pattern[p] == '?') &&
+ (pattern[p+1] == ':')
+ ) {
+ p+=2;
+ buf.write(REparenforget);
+ } else {
buf.write(REparen);
+ }
offset = buf.offset;
buf.write(cast(uint)0); // reserve space for length
- buf.write(re_nsub);
+ buf.write(re_nsub); // match number..
re_nsub++;
- parseRegexp();
+ parseRegexp(); // get all the sub pieces...
*cast(uint *)&buf.data[offset] =
buf.offset - (offset + uint.sizeof * 2);
- if (p == pattern.length || pattern[p] != ')')
- {
+ if (p == pattern.length || pattern[p] != ')') {
error("')' expected");
return 0;
}
-2738,6 +2777,7
case REnm:
case REnmq:
case REparen:
+ case REparenforget:
case REgoto:
{
auto bitbuf = new OutBuffer;
-2880,6 +2920,7
i += 1 + uint.sizeof * 3 + len;
break;
+ case REparenforget:
case REparen:
// len, ()
len = (cast(uint *)&prog[i + 1])[0];
--
Aug 01 2007
d-bugmail puremagic.com
http://d.puremagic.com/issues/show_bug.cgi?id=1394
Jesse Phillips <Jesse.K.Phillips+D gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Keywords| |patch
CC| |Jesse.K.Phillips+D gmail.co
| |m
--- Comment #1 from Jesse Phillips <Jesse.K.Phillips+D gmail.com> 2010-06-02
10:59:39 PDT ---
Adding the patch keyword as the original comment contained one.
--
Configure issuemail: http://d.puremagic.com/issues/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
Jun 02 2010
http://d.puremagic.com/issues/show_bug.cgi?id=1394
Dmitry Olshansky <dmitry.olsh gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |dmitry.olsh gmail.com
--- Comment #2 from Dmitry Olshansky <dmitry.olsh gmail.com> 2010-11-08
06:19:48 PST ---
The same thing and less fussy patch for D2 and std.regex:
http://d.puremagic.com/issues/show_bug.cgi?id=5169
works with aforementioned test case:
auto g =
regex("^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$","i");
I've got the same patch for std.regexp, but I'm not a patch master, I'd like
this one verifed first.
--
Configure issuemail: http://d.puremagic.com/issues/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
Nov 08 2010
http://d.puremagic.com/issues/show_bug.cgi?id=1394
Dmitry Olshansky <dmitry.olsh gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |DUPLICATE
--- Comment #3 from Dmitry Olshansky <dmitry.olsh gmail.com> 2011-06-06
02:17:15 PDT ---
*** This issue has been marked as a duplicate of issue 5673 ***
--
Configure issuemail: http://d.puremagic.com/issues/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
Jun 06 2011