From: Rafael Garcia-Suarez Date: Fri, 4 Nov 2005 18:38:34 +0000 (+0000) Subject: Revert patch #25993. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=973dddac3cae262865053bf44d56f52beac46f92;p=p5sagit%2Fp5-mst-13.2.git Revert patch #25993. p4raw-id: //depot/perl@25998 --- diff --git a/regexec.c b/regexec.c index d4ec7c2..e058216 100644 --- a/regexec.c +++ b/regexec.c @@ -2177,7 +2177,7 @@ S_regtry(pTHX_ regexp *prog, char *startpos) prog->subbeg = PL_bostr; prog->sublen = PL_regeol - PL_bostr; /* strend may have been modified */ } - /* prog->startp[0] = startpos - PL_bostr; */ + prog->startp[0] = startpos - PL_bostr; PL_reginput = startpos; PL_regstartp = prog->startp; PL_regendp = prog->endp; @@ -2221,7 +2221,6 @@ S_regtry(pTHX_ regexp *prog, char *startpos) #endif REGCP_SET(lastcp); if (regmatch(prog->program + 1)) { - prog->startp[0] = startpos - PL_bostr; prog->endp[0] = PL_reginput - PL_bostr; return 1; } diff --git a/t/op/pat.t b/t/op/pat.t index a8d8e3b..10ecaf8 100755 --- a/t/op/pat.t +++ b/t/op/pat.t @@ -3196,7 +3196,7 @@ $_ = "x"; s/x/func "in multiline subst"/em; # bug #19049 $_="abcdef\n"; @x = m/./g; -ok("abcde" eq "$`", '#19049 - global match not setting $`'); +ok("abcde" eq "$`", '# TODO #19049 - global match not setting $`'); ok("123\x{100}" =~ /^.*1.*23\x{100}$/, 'uft8 + multiple floating substr'); @@ -3390,7 +3390,7 @@ ok(("foba ba$s" =~ qr/(foo|BaSS|bar)/i) $s = $1; $s = $2; ok($s eq 'cd', - "# assigning to original string should not corrupt match vars"); + "# TODO assigning to original string should not corrupt match vars"); } # last test 1187