Change 27458 by [EMAIL PROTECTED] on 2006/03/10 10:50:29

        Tease apart the keyword/subroutine test in S_checkcomma.

Affected files ...

... //depot/perl/toke.c#658 edit

Differences ...

==== //depot/perl/toke.c#658 (text) ====
Index: perl/toke.c
--- perl/toke.c#657~27452~      2006-03-09 14:01:28.000000000 -0800
+++ perl/toke.c 2006-03-10 02:50:29.000000000 -0800
@@ -10202,11 +10202,17 @@
            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);
        }
     }
End of Patch.

Reply via email to