summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2012-02-14 11:55:46 +0000
committerDavid Mitchell <davem@iabyn.com>2012-06-13 13:25:47 +0100
commit1d0d6c5386b9438c57fc85bfc821556bd215e664 (patch)
tree0bfe61027b6c1e1dd7c9b70acd2a26b9c2218a84
parentd50a8e9e45e1b056e6d0d504d124b987ef3989c1 (diff)
downloadperl-1d0d6c5386b9438c57fc85bfc821556bd215e664.tar.gz
Revert two commits to make rebasing easier
These two commits will be added back later after rebasing "[perl #108780] Make /foo$qr/ work under ‘no overloading’" 37c07a4b201c9f799808d346817c4685e3e9002a. "regcomp.c: Silence valgrind warning" 44bed85634c450533d59ae9e371037dde0101d51.
-rw-r--r--lib/overloading.t12
-rw-r--r--pp_ctl.c7
-rw-r--r--regcomp.c6
3 files changed, 2 insertions, 23 deletions
diff --git a/lib/overloading.t b/lib/overloading.t
index 85fc7e2c94..787edb1b9d 100644
--- a/lib/overloading.t
+++ b/lib/overloading.t
@@ -1,6 +1,6 @@
#./perl
-use Test::More tests => 50;
+use Test::More tests => 46;
use Scalar::Util qw(refaddr);
@@ -50,16 +50,6 @@ is( cos($x), "far side of overload table", "cosinusfies" );
is( 0 + $x, 42, "numifies" );
is( cos($x), "far side of overload table", "cosinusfies" );
- my $q = qr/abc/;
- ok "abc" =~ $q, '=~ qr// with no "" overloading';
- ok "abcd" =~ /${q}d/, '=~ /foo$qr/ with no "" overloading';
- {
- no overloading 'qr';
- my $q = qr/abc/;
- ok "abc" =~ $q, '=~ qr// with no "" or qr overloading';
- ok "abcd" =~ /${q}d/, '=~ /foo$qr/ with no "" or qr overloading';
- }
-
{
no overloading;
is( "$x", overload::StrVal($x), "no stringification" );
diff --git a/pp_ctl.c b/pp_ctl.c
index e196022fc4..669fb2776a 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -130,13 +130,6 @@ PP(pp_regcomp)
sv_setsv(tmpstr, sv);
continue;
}
-
- if (SvROK(msv) && SvTYPE(SvRV(msv)) == SVt_REGEXP) {
- msv = SvRV(msv);
- PL_reginterp_cnt +=
- RX_SEEN_EVALS((REGEXP *)MUTABLE_PTR(msv));
- }
-
sv_catsv_nomg(tmpstr, msv);
}
SvSETMAGIC(tmpstr);
diff --git a/regcomp.c b/regcomp.c
index 906add7313..5ffce1d34e 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -5144,11 +5144,7 @@ Perl_re_compile(pTHX_ SV * const pattern, U32 orig_pm_flags)
* Clever compilers notice this and complain. --jhi */
REGC((U8)REG_MAGIC, (char*)RExC_emit);
#endif
- DEBUG_PARSE_r(
- PerlIO_printf(Perl_debug_log, "Starting first pass (sizing)\n");
- RExC_lastnum=0;
- RExC_lastparse=NULL;
- );
+ DEBUG_PARSE_r(PerlIO_printf(Perl_debug_log, "Starting first pass (sizing)\n"));
if (reg(pRExC_state, 0, &flags,1) == NULL) {
RExC_precomp = NULL;
return(NULL);