summaryrefslogtreecommitdiff
path: root/toke.c
diff options
context:
space:
mode:
authorDagfinn Ilmari Mannsåker <ilmari@ilmari.org>2019-11-05 12:29:39 +0000
committerKarl Williamson <khw@cpan.org>2019-11-05 08:11:55 -0800
commit1edf42931bd0ef5d49f95e21e6db67f27158becb (patch)
tree37757acaf78ceac92cf6b65980b991978260922c /toke.c
parent493bab27b671e28ee6ed6856588fa55af45084cf (diff)
downloadperl-1edf42931bd0ef5d49f95e21e6db67f27158becb.tar.gz
Rename `tmp` local to `key` in `yyl_keylookup`
Also only initialise it just before it's actually used.
Diffstat (limited to 'toke.c')
-rw-r--r--toke.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/toke.c b/toke.c
index f04238e9b0..e97ec41389 100644
--- a/toke.c
+++ b/toke.c
@@ -8385,7 +8385,7 @@ yyl_keylookup(pTHX_ char *s, GV *gv)
{
STRLEN len;
bool anydelim;
- I32 tmp = 0;
+ I32 key;
struct code c = no_code;
I32 orig_keyword = 0;
char *d;
@@ -8401,7 +8401,7 @@ yyl_keylookup(pTHX_ char *s, GV *gv)
/* x::* is just a word, unless x is "CORE" */
if (!anydelim && *s == ':' && s[1] == ':') {
if (memEQs(PL_tokenbuf, len, "CORE"))
- return yyl_key_core(aTHX_ s, len, tmp, 0, c);
+ return yyl_key_core(aTHX_ s, len, 0, 0, c);
return yyl_just_a_word(aTHX_ s, len, 0, c);
}
@@ -8440,9 +8440,6 @@ yyl_keylookup(pTHX_ char *s, GV *gv)
}
}
- /* Check for built-in keyword */
- tmp = keyword(PL_tokenbuf, len, 0);
-
/* Is this a label? */
if (!anydelim && PL_expect == XSTATE
&& d < PL_bufend && *d == ':' && *(d + 1) != ':') {
@@ -8489,10 +8486,13 @@ yyl_keylookup(pTHX_ char *s, GV *gv)
c.off = 0;
}
- if (tmp < 0)
- tmp = yyl_secondclass_keyword(aTHX_ s, len, tmp, &orig_keyword, &c.gv, &c.gvp);
+ /* Check for built-in keyword */
+ key = keyword(PL_tokenbuf, len, 0);
+
+ if (key < 0)
+ key = yyl_secondclass_keyword(aTHX_ s, len, key, &orig_keyword, &c.gv, &c.gvp);
- if (tmp && tmp != KEY___DATA__ && tmp != KEY___END__
+ if (key && key != KEY___DATA__ && key != KEY___END__
&& (!anydelim || *s != '#')) {
/* no override, and not s### either; skipspace is safe here
* check for => on following line */
@@ -8507,7 +8507,7 @@ yyl_keylookup(pTHX_ char *s, GV *gv)
return yyl_fatcomma(aTHX_ s, len);
}
- return yyl_word_or_keyword(aTHX_ s, len, tmp, orig_keyword, c);
+ return yyl_word_or_keyword(aTHX_ s, len, key, orig_keyword, c);
}
static int