Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Even smaller toke #17241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Nov 4, 2019
Merged

Even smaller toke #17241

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4cfd4be
toke.c: factor out static yyl_fake_eof()
arc Oct 21, 2019
20b318f
toke.c: factor out static yyl_fatcomma()
arc Oct 21, 2019
0ac6054
toke.c: fold some initialisations into the corresponding declarations
arc Oct 21, 2019
f5417bd
toke.c: factor out static yyl_safe_bareword()
arc Oct 21, 2019
305b85e
toke.c: factor out static yyl_constant_op()
arc Oct 21, 2019
1fd0b21
toke.c: remove the really_sub goto label
arc Oct 21, 2019
be24a7d
toke.c: factor out static yyl_strictwarn_bareword()
arc Oct 21, 2019
eac79f6
toke.c: stop passing around several needless local variables
arc Oct 22, 2019
cd77589
toke.c: factor out static yyl_just_a_word()
arc Oct 23, 2019
539c839
toke.c: bundle some yyl_just_a_word() params into a struct
arc Oct 23, 2019
941cf49
toke.c: factor out static yyl_key_core() and yyl_word_or_keyword()
arc Oct 23, 2019
a5ed768
toke.c: factor out static yyl_keylookup()
arc Oct 23, 2019
c2b7184
toke.c: delete weird initial_state arg to yyl_try()
arc Oct 23, 2019
6e93a30
toke.c: remove formbrack argument from yyl_try()
arc Oct 23, 2019
d333554
toke.c: remove some spurious orig_keyword uses
arc Oct 23, 2019
b6c215b
toke.c: don't pass around a copy of PL_parser->saw_infix_sigil
arc Oct 25, 2019
3fca6a0
toke.c: delete unused bof parameters
arc Oct 25, 2019
6a78cc1
toke.c: replace recursive calls to yyl_try() with goto
arc Nov 1, 2019
1732dbb
toke.c: const-ify formbrack parameters
arc Nov 1, 2019
18828ce
perldelta for recent toke.c refactoring
arc Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
toke.c: delete unused bof parameters
  • Loading branch information
@arc
arc committed Nov 4, 2019
commit 3fca6a09620a15cb89ce73ca304720e626da8454
27 changes: 13 additions & 14 deletions toke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7444,7 +7444,7 @@ yyl_just_a_word(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct cod
}

static int
yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct code c, bool bof)
yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct code c)
{
switch (key) {
default: /* not a keyword */
Expand All @@ -7470,7 +7470,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct
case KEY___END__:
if (PL_rsfp && (!PL_in_eval || PL_tokenbuf[2] == 'D'))
yyl_data_handle(aTHX);
return yyl_fake_eof(aTHX_ LEX_FAKE_EOF, bof, s, len);
return yyl_fake_eof(aTHX_ LEX_FAKE_EOF, FALSE, s, len);

case KEY___SUB__:
FUN0OP(CvCLONE(PL_compcv)
Expand Down Expand Up @@ -8352,7 +8352,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct
}

static int
yyl_key_core(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct code c, bool bof)
yyl_key_core(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct code c)
{
STRLEN olen = len;
char *d = s;
Expand All @@ -8375,11 +8375,11 @@ yyl_key_core(pTHX_ char *s, STRLEN len, I32 key, I32 orig_keyword, struct code c
orig_keyword = key;

/* Known to be a reserved word at this point */
return yyl_word_or_keyword(aTHX_ s, len, key, orig_keyword, c, bof);
return yyl_word_or_keyword(aTHX_ s, len, key, orig_keyword, c);
}

static int
yyl_keylookup(pTHX_ char *s, GV *gv, bool bof)
yyl_keylookup(pTHX_ char *s, GV *gv)
{
STRLEN len;
bool anydelim;
Expand All @@ -8399,7 +8399,7 @@ yyl_keylookup(pTHX_ char *s, GV *gv, bool bof)
/* 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, bof);
return yyl_key_core(aTHX_ s, len, tmp, 0, c);
return yyl_just_a_word(aTHX_ s, len, 0, 0, c);
}

Expand Down Expand Up @@ -8505,20 +8505,19 @@ yyl_keylookup(pTHX_ char *s, GV *gv, bool bof)
return yyl_fatcomma(aTHX_ s, len);
}

return yyl_word_or_keyword(aTHX_ s, len, tmp, orig_keyword, c, bof);
return yyl_word_or_keyword(aTHX_ s, len, tmp, orig_keyword, c);
}

static int
yyl_try(pTHX_ char *s, STRLEN len)
{
char *d;
bool bof = FALSE;
GV *gv = NULL;

switch (*s) {
default:
if (UTF ? isIDFIRST_utf8_safe(s, PL_bufend) : isALNUMC(*s))
return yyl_keylookup(aTHX_ s, gv, bof);
return yyl_keylookup(aTHX_ s, gv);
yyl_croak_unrecognised(aTHX_ s);

case 4:
Expand Down Expand Up @@ -8910,12 +8909,12 @@ yyl_try(pTHX_ char *s, STRLEN len)
}
else if ((*start == ':' && start[1] == ':')
|| (PL_expect == XSTATE && *start == ':'))
return yyl_keylookup(aTHX_ s, gv, bof);
return yyl_keylookup(aTHX_ s, gv);
else if (PL_expect == XSTATE) {
d = start;
while (d < PL_bufend && isSPACE(*d)) d++;
if (*d == ':')
return yyl_keylookup(aTHX_ s, gv, bof);
return yyl_keylookup(aTHX_ s, gv);
}
/* avoid v123abc() or $h{v1}, allow C<print v10;> */
if (!isALPHA(*start) && (PL_expect == XTERM
Expand All @@ -8929,14 +8928,14 @@ yyl_try(pTHX_ char *s, STRLEN len)
}
}
}
return yyl_keylookup(aTHX_ s, gv, bof);
return yyl_keylookup(aTHX_ s, gv);

case 'x':
if (isDIGIT(s[1]) && PL_expect == XOPERATOR) {
s++;
Mop(OP_REPEAT);
}
return yyl_keylookup(aTHX_ s, gv, bof);
return yyl_keylookup(aTHX_ s, gv);

case '_':
case 'a': case 'A':
Expand Down Expand Up @@ -8965,7 +8964,7 @@ yyl_try(pTHX_ char *s, STRLEN len)
case 'X':
case 'y': case 'Y':
case 'z': case 'Z':
return yyl_keylookup(aTHX_ s, gv, bof);
return yyl_keylookup(aTHX_ s, gv);
}
}

Expand Down