From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 29 May 2010 21:22:36 +0000 (+0100)
Subject: Fix the regexp in t/porting/args_assert.t, and add 3 missing macros.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c85ae797ecb755d3bcfabd44aa268e3e6e2e7c13;p=p5sagit%2Fp5-mst-13.2.git

Fix the regexp in t/porting/args_assert.t, and add 3 missing macros.

Resolves RT #72800.
---

diff --git a/mathoms.c b/mathoms.c
index 4322f66..7154245 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -174,6 +174,7 @@ use the macro wrapper C<SvPV_nolen(sv)> instead.
 char *
 Perl_sv_2pv_nolen(pTHX_ register SV *sv)
 {
+    PERL_ARGS_ASSERT_SV_2PV_NOLEN;
     return sv_2pv(sv, NULL);
 }
 
diff --git a/t/porting/args_assert.t b/t/porting/args_assert.t
index 95c24f4..df62755 100644
--- a/t/porting/args_assert.t
+++ b/t/porting/args_assert.t
@@ -26,7 +26,7 @@ unless (-d 't' && -f 'MANIFEST') {
     open my $fh, '<', $proto or die "Can't open $proto: $!";
 
     while (<$fh>) {
-	$declared{$1}++ if /^#define\s+(PERL_ARGS_ASSERT[A-Za-z_]+)\s+/;
+	$declared{$1}++ if /^#define\s+(PERL_ARGS_ASSERT[A-Za-z0-9_]+)\s+/;
     }
 }
 
@@ -42,7 +42,7 @@ if (!@ARGV) {
 }
 
 while (<>) {
-    $used{$1}++ if /^\s+(PERL_ARGS_ASSERT_[A-Za-z_]+);$/;
+    $used{$1}++ if /^\s+(PERL_ARGS_ASSERT_[A-Za-z0-9_]+);$/;
 }
 
 my %unused;
diff --git a/toke.c b/toke.c
index f142ada..a5d5429 100644
--- a/toke.c
+++ b/toke.c
@@ -13669,6 +13669,8 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen)
     const bool reverse = cBOOL(IoLINES(filter));
     I32 retval;
 
+    PERL_ARGS_ASSERT_UTF16_TEXTFILTER;
+
     /* As we're automatically added, at the lowest level, and hence only called
        from this file, we can be sure that we're not called in block mode. Hence
        don't bother writing code to deal with block mode.  */
@@ -13782,6 +13784,8 @@ S_add_utf16_textfilter(pTHX_ U8 *const s, bool reversed)
 {
     SV *filter = filter_add(S_utf16_textfilter, NULL);
 
+    PERL_ARGS_ASSERT_ADD_UTF16_TEXTFILTER;
+
     IoTOP_GV(filter) = MUTABLE_GV(newSVpvn((char *)s, PL_bufend - (char*)s));
     sv_setpvs(filter, "");
     IoLINES(filter) = reversed;