From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 10 Mar 2006 10:50:29 +0000 (+0000)
Subject: Tease apart the keyword/subroutine test in S_checkcomma.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=abbb319842d03cfdb615b06ae57e058d7e36b88c;p=p5sagit%2Fp5-mst-13.2.git

Tease apart the keyword/subroutine test in S_checkcomma.

p4raw-id: //depot/perl@27458
---

diff --git a/toke.c b/toke.c
index 8ee3b84..11fcb65 100644
--- a/toke.c
+++ b/toke.c
@@ -10202,11 +10202,17 @@ S_checkcomma(pTHX_ register char *s, const char *name, const char *what)
 	    s++;
 	if (*s == ',') {
 	    I32 kw;
+	    CV *cv;
 	    *s = '\0'; /* XXX If we didn't do this, we could const a lot of toke.c */
-	    kw = keyword(w, s - w) || get_cv(w, FALSE) != 0;
+	    kw = keyword(w, s - w);
 	    *s = ',';
 	    if (kw)
 		return;
+	    *s = '\0';
+	    cv = get_cv(w, FALSE);
+	    *s = ',';
+	    if (cv)
+		return;
 	    Perl_croak(aTHX_ "No comma allowed after %s", what);
 	}
     }