Skip to content

toke.c: S_intuit_more: More effectively use S_scan_ident #23880

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

Open
wants to merge 12 commits into
base: blead
Choose a base branch
from
+175 −105
Open

toke.c: S_intuit_more: More effectively use S_scan_ident #23880

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3b86b9c
toke.c: S_intuit_more: Simplify a bit of code
khwilliamson Aug 17, 2025
b302a19
intuit_more: Handle easy thing first
khwilliamson Sep 5, 2025
eb6d467
intuit_more: White space only
khwilliamson Sep 5, 2025
5eeec5e
intuit_more: Reserve first byte of buffer
khwilliamson Oct 27, 2025
2aeccb9
intuit_more: Move declaration to first use
khwilliamson Oct 27, 2025
5d79145
intuit_more: Look for more variable types.
khwilliamson Oct 27, 2025
26848f0
intuit_more: White-space only
khwilliamson Oct 27, 2025
7eb08b7
intuit_more: Remove over allocation of buffer
khwilliamson Oct 27, 2025
b61e5b8
intuit_more: Save scan_ident return
khwilliamson Oct 27, 2025
ac4d84e
intuit_more: 0 length identifier means nothing more
khwilliamson Oct 27, 2025
5e9f082
intuit_more: Handle numeric identifiers
khwilliamson Oct 27, 2025
9f31304
intuit_more: Check if identifier exists
khwilliamson Oct 27, 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
28 changes: 14 additions & 14 deletions toke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4732,7 +4732,6 @@ S_intuit_more(pTHX_ char *s, char *e,
* looks for.
*
*/
if (isWORDCHAR_lazy_if_safe(s+1, PL_bufend, UTF)) {

/* khw: where did the magic number 4 come from?. This buffer
* was 4 times as large as tokenbuf in 1997, and had not
Expand Down Expand Up @@ -4772,6 +4771,20 @@ S_intuit_more(pTHX_ char *s, char *e,
* like $subscripts{$which}. We should advance past the
* braces and key */
}
else if (len == 1) {
if ( s[0] == '$'
&& s[1]
&& memCHRs("[#!%*<>()-=", tmpbuf[1]))
{
/* Here we have what could be a punctuation variable. If the
* next character after it is a closing bracket, it makes it
* quite likely to be that, and hence a subscript. If it is
* something else, more mildly a subscript */
if (/*{*/ memCHRs("])} =", tmpbuf[2]))
Copy link

@happy-barney happy-barney Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accidentally deleted previous comment :(

little bit confused: this happens in branch when strlen of tmpbuf is already checked to be 1, so tmpbuf[2] should \0

weight -= 10;
else
weight -= 1;
}
else {
/* Not a multi-char identifier already known in the
* program; is somewhat likely to be a subscript.
Expand All @@ -4787,19 +4800,6 @@ S_intuit_more(pTHX_ char *s, char *e,
weight -= 10;
}
}
else if ( s[0] == '$'
&& s[1]
&& memCHRs("[#!%*<>()-=", s[1]))
{
/* Here we have what could be a punctuation variable. If the
* next character after it is a closing bracket, it makes it
* quite likely to be that, and hence a subscript. If it is
* something else, more mildly a subscript */
if (/*{*/ memCHRs("])} =", s[2]))
weight -= 10;
else
weight -= 1;
}
break;

/* khw: [:blank:] strongly indicates a charclass */
Expand Down