diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-08-05 02:29:46 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-08-05 02:29:46 +0000 |
| commit | afe2cf94ca69dfa43c28629844e3530526559af4 (patch) | |
| tree | eb53671829ee0a74bdc50cb8c4643eedade346d5 /regexec.c | |
| parent | a696a92a8c17fd674222340fecaac0639e6ef16b (diff) | |
| download | perl-afe2cf94ca69dfa43c28629844e3530526559af4.tar.gz | |
back out change#1703 that break bincompat with PERL_OBJECT and
MULTIPLICITY
p4raw-link: @1703 on //depot/maint-5.005/perl: af819cba4f44bf2074ec4808e403dedf8c3ce2b2
p4raw-id: //depot/maint-5.005/perl@1735
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -318,14 +318,11 @@ regexec_flags(register regexp *prog, char *stringarg, register char *strend, DEBUG_r( PerlIO_printf(Perl_debug_log, - "%sMatching%s `%s%.60s%s%s' against `%s%.*s%s%s'\n", - PL_colors[4],PL_colors[5],PL_colors[0], - prog->precomp, - PL_colors[1], + "Matching `%.60s%s' against `%.*s%s'\n", + prog->precomp, (strlen(prog->precomp) > 60 ? "..." : ""), - PL_colors[0], (strend - startpos > 60 ? 60 : strend - startpos), - startpos, PL_colors[1], + startpos, (strend - startpos > 60 ? "..." : "")) ); @@ -797,21 +794,15 @@ regmatch(regnode *prog) int l = (PL_regeol - locinput > taill ? taill : PL_regeol - locinput); int pref_len = (locinput - PL_bostr > (5 + taill) - l ? (5 + taill) - l : locinput - PL_bostr); - int pref0_len = pref_len - (locinput - PL_reginput); if (l + pref_len < (5 + taill) && l < PL_regeol - locinput) l = ( PL_regeol - locinput > (5 + taill) - pref_len ? (5 + taill) - pref_len : PL_regeol - locinput); - if (pref0_len < 0) - pref0_len = 0; regprop(prop, scan); PerlIO_printf(Perl_debug_log, - "%4i <%s%.*s%s%s%.*s%s%s%s%.*s%s>%*s|%3d:%*s%s\n", + "%4i <%s%.*s%s%s%s%.*s%s>%*s|%3d:%*s%s\n", locinput - PL_bostr, - PL_colors[4], pref0_len, - locinput - pref_len, PL_colors[5], - PL_colors[2], pref_len - pref0_len, - locinput - pref_len + pref0_len, PL_colors[3], + PL_colors[2], pref_len, locinput - pref_len, PL_colors[3], (docolor ? "" : "> <"), PL_colors[0], l, locinput, PL_colors[1], 15 - l - pref_len + 1, |