From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 12 Oct 2009 13:53:52 +0000 (+0100)
Subject: Re-order a conditional with ckWARN() last, as it is a function call.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=df71d98f99064b8112949a5b051443ab812b2911;p=p5sagit%2Fp5-mst-13.2.git

Re-order a conditional with ckWARN() last, as it is a function call.
---

diff --git a/toke.c b/toke.c
index c0eed00..4ace11f 100644
--- a/toke.c
+++ b/toke.c
@@ -7172,10 +7172,10 @@ S_pending_ident(pTHX)
         GV *const gv = gv_fetchpvn_flags(PL_tokenbuf + 1, tokenbuf_len - 1, 0,
 					 SVt_PVAV);
         if ((!gv || ((PL_tokenbuf[0] == '@') ? !GvAV(gv) : !GvHV(gv)))
-		&& ckWARN(WARN_AMBIGUOUS)
 		/* DO NOT warn for @- and @+ */
 		&& !( PL_tokenbuf[2] == '\0' &&
 		    ( PL_tokenbuf[1] == '-' || PL_tokenbuf[1] == '+' ))
+		&& ckWARN(WARN_AMBIGUOUS)
 	   )
         {
             /* Downgraded from fatal to warning 20000522 mjd */