diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 1999-10-04 15:58:03 -0400 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 1999-10-05 23:03:46 +0000 |
| commit | 30382c73ff93b57b951492a5a0d1cba2de577e49 (patch) | |
| tree | b8078411cc92420896150789efbb4b5d0909b865 /regexec.c | |
| parent | d790c045735c0bdbf37ccd2827e8fc572aaeae88 (diff) | |
| download | perl-30382c73ff93b57b951492a5a0d1cba2de577e49.tar.gz | |
Re: Strange RE engine breakage in 5_61
To: François Désarménien <desar@club-internet.fr>
Cc: "perl5-porters@perl.org" <perl5-porters@perl.org>
Message-ID: <19991004195803.A21760@monk.mps.ohio-state.edu>
(had to apply pat.t part manually because there
already were more tests than there was in _61)
p4raw-id: //depot/cfgperl@4301
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 22 |
1 files changed, 13 insertions, 9 deletions
@@ -739,19 +739,23 @@ Perl_regexec_flags(pTHX_ register regexp *prog, char *stringarg, register char * /* If there is a "must appear" string, look for it. */ s = startpos; - if (prog->reganch & ROPT_GPOS_SEEN) { + if (prog->reganch & ROPT_GPOS_SEEN) { /* Need to have PL_reg_ganch */ MAGIC *mg; - if (!(flags & REXEC_IGNOREPOS) && sv && SvTYPE(sv) >= SVt_PVMG - && SvMAGIC(sv) && (mg = mg_find(sv, 'g')) && mg->mg_len >= 0) - PL_reg_ganch = strbeg + mg->mg_len; - else + if (flags & REXEC_IGNOREPOS) /* Means: check only at start */ PL_reg_ganch = startpos; - if (prog->reganch & ROPT_ANCH_GPOS) { - if (s > PL_reg_ganch) - goto phooey; - s = PL_reg_ganch; + else if (sv && SvTYPE(sv) >= SVt_PVMG + && SvMAGIC(sv) + && (mg = mg_find(sv, 'g')) && mg->mg_len >= 0) { + PL_reg_ganch = strbeg + mg->mg_len; /* Defined pos() */ + if (prog->reganch & ROPT_ANCH_GPOS) { + if (s > PL_reg_ganch) + goto phooey; + s = PL_reg_ganch; + } } + else /* pos() not defined */ + PL_reg_ganch = strbeg; } if (!(flags & REXEC_CHECKED) && prog->check_substr != Nullsv) { |