This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Commit 5c85b638cb45ea2b inadvertently broke the -DDEBUGGING build.
authorNicholas Clark <nick@ccl4.org>
Sat, 1 Mar 2014 12:35:16 +0000 (13:35 +0100)
committerNicholas Clark <nick@ccl4.org>
Sat, 1 Mar 2014 12:35:16 +0000 (13:35 +0100)
The macros assert_not_ROK(sv) and assert_not_glob(sv) are intended to be used
in expressions, and finish with a trailing comma, so they shouldn't have a ;
after them.

scope.c

diff --git a/scope.c b/scope.c
index 4c4f527..de90b1d 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -1095,8 +1095,11 @@ Perl_leave_scope(pTHX_ I32 base)
                         break;
                     }
                     default:
-                        assert_not_ROK(sv);
-                        assert_not_glob(sv);
+                        /* This looks odd, but these two macros are for use in
+                           expressions and finish with a trailing comma, so
+                           adding a ; after them would be wrong. */
+                        assert_not_ROK(sv)
+                        assert_not_glob(sv)
                         SvFLAGS(sv) &=~ (SVf_OK|SVf_IVisUV|SVf_UTF8);
                         break;
                     }