Skip to content

toke.c: Tidy up, mostly white space #23763

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 4 commits into from
Sep 25, 2025
Merged

toke.c: Tidy up, mostly white space #23763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1470230
toke.c: Remove C89 braces, and outdent
khwilliamson Sep 5, 2025
2d94365
toke.c: Remove C89 braces, and outdent
khwilliamson Sep 5, 2025
e9ec819
S_intuit_method: Move code to earlier
khwilliamson Sep 21, 2025
aeea77d
toke.c: Remove trailing blank
khwilliamson Sep 21, 2025
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
2 changes: 1 addition & 1 deletion embed.fnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6078,7 +6078,7 @@ RS |SV * |get_and_check_backslash_N_name_wrapper \
|NN const char * const e
S |void |incline |NN const char *s \
|NN const char *end
S |int |intuit_method |NN char *s \
S |int |intuit_method |NN char *start \
|NULLOK SV *ioname \
|NULLOK NOCHECK CV *cv
S |int |intuit_more |NN char *s \
Expand Down
4 changes: 2 additions & 2 deletions proto.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

307 changes: 153 additions & 154 deletions toke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4774,6 +4774,11 @@ S_intuit_more(pTHX_ char *s, char *e)
STATIC int
S_intuit_method(pTHX_ char *start, SV *ioname, CV *cv)
{
PERL_ARGS_ASSERT_INTUIT_METHOD;

if (!FEATURE_INDIRECT_IS_ENABLED)
return 0;

char *s = start + (*start == '$');
char tmpbuf[sizeof PL_tokenbuf];
STRLEN len;
Expand All @@ -4785,11 +4790,6 @@ S_intuit_method(pTHX_ char *start, SV *ioname, CV *cv)
GV * const gv =
ioname ? gv_fetchsv(ioname, GV_NOADD_NOINIT, SVt_PVCV) : NULL;

PERL_ARGS_ASSERT_INTUIT_METHOD;

if (!FEATURE_INDIRECT_IS_ENABLED)
return 0;

if (gv && SvTYPE(gv) == SVt_PVGV && GvIO(gv))
return 0;
if (cv && SvPOK(cv)) {
Expand Down Expand Up @@ -5381,150 +5381,150 @@ yyl_dollar(pTHX_ char *s)
PREREF(PERLY_DOLLAR);
}

{
const char tmp = *s;
if (PL_lex_state == LEX_NORMAL || PL_lex_brackets)
s = skipspace(s);
const char tmp = *s;
if (PL_lex_state == LEX_NORMAL || PL_lex_brackets)
s = skipspace(s);

if ( (PL_expect != XREF || PL_oldoldbufptr == PL_last_lop)
&& intuit_more(s, PL_bufend)) {
if (*s == '[') {
PL_tokenbuf[0] = '@';
if (ckWARN(WARN_SYNTAX)) {
char *t = s+1;

while ( t < PL_bufend ) {
if (isSPACE(*t)) {
do { t++; } while (t < PL_bufend && isSPACE(*t));
/* consumed one or more space chars */
} else if (*t == '$' || *t == '@') {
/* could be more than one '$' like $$ref or @$ref */
do { t++; } while (t < PL_bufend && *t == '$');

/* could be an abigail style identifier like $ foo */
while (t < PL_bufend && *t == ' ') t++;

/* strip off the name of the var */
Size_t advance;
while ((advance = (isWORDCHAR_lazy_if_safe(t,
PL_bufend,
UTF))))
t += advance;
/* consumed a varname */
} else if (isDIGIT(*t)) {
/* deal with hex constants like 0x11 */
if (t[0] == '0' && t[1] == 'x') {
t += 2;
while (t < PL_bufend && isXDIGIT(*t)) t++;
} else {
/* deal with decimal/octal constants like 1 and 0123 */
if ( (PL_expect != XREF || PL_oldoldbufptr == PL_last_lop)
&& intuit_more(s, PL_bufend)) {
if (*s == '[') {
PL_tokenbuf[0] = '@';
if (ckWARN(WARN_SYNTAX)) {
char *t = s+1;

while ( t < PL_bufend ) {
if (isSPACE(*t)) {
do { t++; } while (t < PL_bufend && isSPACE(*t));
/* consumed one or more space chars */
} else if (*t == '$' || *t == '@') {
/* could be more than one '$' like $$ref or @$ref */
do { t++; } while (t < PL_bufend && *t == '$');

/* could be an abigail style identifier like $ foo */
while (t < PL_bufend && *t == ' ') t++;

/* strip off the name of the var */
Size_t advance;
while ((advance = (isWORDCHAR_lazy_if_safe(t,
PL_bufend,
UTF))))
t += advance;
/* consumed a varname */
} else if (isDIGIT(*t)) {
/* deal with hex constants like 0x11 */
if (t[0] == '0' && t[1] == 'x') {
t += 2;
while (t < PL_bufend && isXDIGIT(*t)) t++;
} else {
/* deal with decimal/octal constants like 1 and
* 0123 */
do { t++; } while (isDIGIT(*t));
if (t<PL_bufend && *t == '.') {
do { t++; } while (isDIGIT(*t));
if (t<PL_bufend && *t == '.') {
do { t++; } while (isDIGIT(*t));
}
}
/* consumed a number */
} else {
/* not a var nor a space nor a number */
break;
}
}
if (t < PL_bufend && *t++ == ',') {
PL_bufptr = skipspace(PL_bufptr); /* XXX can realloc */
while (t < PL_bufend && *t != ']')
t++;
warner(packWARN(WARN_SYNTAX),
"Multidimensional syntax %" UTF8f " not supported",
UTF8fARG(UTF,(int)((t - PL_bufptr) + 1), PL_bufptr));
/* consumed a number */
} else {
/* not a var nor a space nor a number */
break;
}
}
}
else if (*s == '{') {
char *t;
PL_tokenbuf[0] = '%';
if ( strEQ(PL_tokenbuf+1, "SIG")
&& ckWARN(WARN_SYNTAX)
&& (t = (char *) memchr(s, '}', PL_bufend - s))
&& (t = (char *) memchr(t, '=', PL_bufend - t)))
{
char tmpbuf[sizeof PL_tokenbuf];
do {
if (t < PL_bufend && *t++ == ',') {
PL_bufptr = skipspace(PL_bufptr); /* XXX can realloc */
while (t < PL_bufend && *t != ']')
t++;
} while (isSPACE(*t));
if (isIDFIRST_lazy_if_safe(t, PL_bufend, UTF)) {
STRLEN len;
t = scan_word(t, tmpbuf, sizeof tmpbuf, TRUE, &len);
while (isSPACE(*t))
t++;
if ( *t == ';'
&& get_cvn_flags(tmpbuf, len, UTF
? SVf_UTF8
: 0))
{
warner(packWARN(WARN_SYNTAX),
"You need to quote \"%" UTF8f "\"",
UTF8fARG(UTF, len, tmpbuf));
}
}
warner(packWARN(WARN_SYNTAX),
"Multidimensional syntax %" UTF8f " not supported",
UTF8fARG(UTF,(int)((t - PL_bufptr) + 1), PL_bufptr));
}
}
}

PL_expect = XOPERATOR;
if ((PL_lex_state == LEX_NORMAL || PL_lex_brackets) && isSPACE((char)tmp)) {
const bool islop = (PL_last_lop == PL_oldoldbufptr);
if (!islop || PL_last_lop_op == OP_GREPSTART)
PL_expect = XOPERATOR;
else if (memCHRs("$@\"'`q", *s))
PL_expect = XTERM; /* e.g. print $fh "foo" */
else if ( memCHRs("&*<%", *s)
&& isIDFIRST_lazy_if_safe(s+1, PL_bufend, UTF))
else if (*s == '{') {
char *t;
PL_tokenbuf[0] = '%';
if ( strEQ(PL_tokenbuf+1, "SIG")
&& ckWARN(WARN_SYNTAX)
&& (t = (char *) memchr(s, '}', PL_bufend - s))
&& (t = (char *) memchr(t, '=', PL_bufend - t)))
{
PL_expect = XTERM; /* e.g. print $fh &sub */
}
else if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) {
char tmpbuf[sizeof PL_tokenbuf];
int t2;
STRLEN len;
scan_word(s, tmpbuf, sizeof tmpbuf, TRUE, &len);
if ((t2 = keyword(tmpbuf, len, 0))) {
/* binary operators exclude handle interpretations */
switch (t2) {
case -KEY_x:
case -KEY_eq:
case -KEY_ne:
case -KEY_gt:
case -KEY_lt:
case -KEY_ge:
case -KEY_le:
case -KEY_cmp:
break;
default:
PL_expect = XTERM; /* e.g. print $fh length() */
break;
do {
t++;
} while (isSPACE(*t));
if (isIDFIRST_lazy_if_safe(t, PL_bufend, UTF)) {
STRLEN len;
t = scan_word(t, tmpbuf, sizeof tmpbuf, TRUE, &len);
while (isSPACE(*t))
t++;
if ( *t == ';'
&& get_cvn_flags(tmpbuf, len, UTF
? SVf_UTF8
: 0))
{
warner(packWARN(WARN_SYNTAX),
"You need to quote \"%" UTF8f "\"",
UTF8fARG(UTF, len, tmpbuf));
}
}
else {
PL_expect = XTERM; /* e.g. print $fh subr() */
}
}
else if (isDIGIT(*s))
PL_expect = XTERM; /* e.g. print $fh 3 */
else if (*s == '.' && isDIGIT(s[1]))
PL_expect = XTERM; /* e.g. print $fh .3 */
else if ((*s == '?' || *s == '-' || *s == '+')
&& !isSPACE(s[1]) && s[1] != '=')
PL_expect = XTERM; /* e.g. print $fh -1 */
else if (*s == '/' && !isSPACE(s[1]) && s[1] != '='
&& s[1] != '/')
PL_expect = XTERM; /* e.g. print $fh /.../
XXX except DORDOR operator
*/
else if (*s == '<' && s[1] == '<' && !isSPACE(s[2])
&& s[2] != '=')
PL_expect = XTERM; /* print $fh <<"EOF" */
}
}

PL_expect = XOPERATOR;
if ((PL_lex_state == LEX_NORMAL || PL_lex_brackets) && isSPACE((char)tmp)) {
const bool islop = (PL_last_lop == PL_oldoldbufptr);
if (!islop || PL_last_lop_op == OP_GREPSTART)
PL_expect = XOPERATOR;
else if (memCHRs("$@\"'`q", *s))
PL_expect = XTERM; /* e.g. print $fh "foo" */
else if ( memCHRs("&*<%", *s)
&& isIDFIRST_lazy_if_safe(s+1, PL_bufend, UTF))
{
PL_expect = XTERM; /* e.g. print $fh &sub */
}
else if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) {
char tmpbuf[sizeof PL_tokenbuf];
int t2;
STRLEN len;
scan_word(s, tmpbuf, sizeof tmpbuf, TRUE, &len);
if ((t2 = keyword(tmpbuf, len, 0))) {
/* binary operators exclude handle interpretations */
switch (t2) {
case -KEY_x:
case -KEY_eq:
case -KEY_ne:
case -KEY_gt:
case -KEY_lt:
case -KEY_ge:
case -KEY_le:
case -KEY_cmp:
break;
default:
PL_expect = XTERM; /* e.g. print $fh length() */
break;
}
}
else {
PL_expect = XTERM; /* e.g. print $fh subr() */
}
}
else if (isDIGIT(*s))
PL_expect = XTERM; /* e.g. print $fh 3 */
else if (*s == '.' && isDIGIT(s[1]))
PL_expect = XTERM; /* e.g. print $fh .3 */
else if ((*s == '?' || *s == '-' || *s == '+')
&& !isSPACE(s[1]) && s[1] != '=')
PL_expect = XTERM; /* e.g. print $fh -1 */
else if (*s == '/' && !isSPACE(s[1]) && s[1] != '='
&& s[1] != '/')
PL_expect = XTERM; /* e.g. print $fh /.../
XXX except DORDOR operator
*/
else if (*s == '<' && s[1] == '<' && !isSPACE(s[2])
&& s[2] != '=')
PL_expect = XTERM; /* print $fh <<"EOF" */
}

force_ident_maybe_lex('$');
TOKEN(PERLY_DOLLAR);
}
Expand Down Expand Up @@ -6464,7 +6464,7 @@ yyl_leftcurly(pTHX_ char *s, const U8 formbrack)
}
else {
/* skip plain q word */
while ( t < PL_bufend
while ( t < PL_bufend
&& (advance = isWORDCHAR_lazy_if_safe(t,
PL_bufend,
UTF)))
Expand Down Expand Up @@ -9926,29 +9926,28 @@ Perl_yylex(pTHX)
return yyl_sigvar(aTHX_ s);
}

{
/* yyl_try() and its callees might consult PL_parser->saw_infix_sigil.
On its return, we then need to set it to indicate whether the token
we just encountered was an infix operator that (if we hadn't been
expecting an operator) have been a sigil.
*/
bool expected_operator = (PL_expect == XOPERATOR);
int ret = yyl_try(aTHX_ s);
switch (pl_yylval.ival) {
case OP_BIT_AND:
case OP_MODULO:
case OP_MULTIPLY:
case OP_NBIT_AND:
if (expected_operator) {
PL_parser->saw_infix_sigil = 1;
break;
}
/* FALLTHROUGH */
default:
PL_parser->saw_infix_sigil = 0;
/* yyl_try() and its callees might consult PL_parser->saw_infix_sigil.
On its return, we then need to set it to indicate whether the token we
just encountered was an infix operator that (if we hadn't been expecting
an operator) have been a sigil.
*/
bool expected_operator = (PL_expect == XOPERATOR);
int ret = yyl_try(aTHX_ s);
switch (pl_yylval.ival) {
case OP_BIT_AND:
case OP_MODULO:
case OP_MULTIPLY:
case OP_NBIT_AND:
if (expected_operator) {
PL_parser->saw_infix_sigil = 1;
break;
}
return ret;
/* FALLTHROUGH */
default:
PL_parser->saw_infix_sigil = 0;
}

return ret;
}


Expand Down
Loading