This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert uses of isALNUM_lazy_if to isWORDCHAR_lazy_if
[perl5.git]
/
toke.c
diff --git
a/toke.c
b/toke.c
index
4f671cc
..
a0b50f7
100644
(file)
--- a/
toke.c
+++ b/
toke.c
@@
-544,7
+544,7
@@
S_no_op(pTHX_ const char *const what, char *s)
"\t(Missing semicolon on previous line?)\n");
else if (PL_oldoldbufptr && isIDFIRST_lazy_if(PL_oldoldbufptr,UTF)) {
const char *t;
"\t(Missing semicolon on previous line?)\n");
else if (PL_oldoldbufptr && isIDFIRST_lazy_if(PL_oldoldbufptr,UTF)) {
const char *t;
- for (t = PL_oldoldbufptr; (is
ALNUM
_lazy_if(t,UTF) || *t == ':');
+ for (t = PL_oldoldbufptr; (is
WORDCHAR
_lazy_if(t,UTF) || *t == ':');
t += UTF ? UTF8SKIP(t) : 1)
NOOP;
if (t < PL_bufptr && isSPACE(*t))
t += UTF ? UTF8SKIP(t) : 1)
NOOP;
if (t < PL_bufptr && isSPACE(*t))
@@
-1891,7
+1891,7
@@
S_check_uni(pTHX)
while (isSPACE(*PL_last_uni))
PL_last_uni++;
s = PL_last_uni;
while (isSPACE(*PL_last_uni))
PL_last_uni++;
s = PL_last_uni;
- while (is
ALNUM
_lazy_if(s,UTF) || *s == '-')
+ while (is
WORDCHAR
_lazy_if(s,UTF) || *s == '-')
s++;
if ((t = strchr(s, '(')) && t < PL_bufptr)
return;
s++;
if ((t = strchr(s, '(')) && t < PL_bufptr)
return;
@@
-3173,7
+3173,7
@@
S_scan_const(pTHX_ char *start)
(@foo, @::foo, @'foo, @{foo}, @$foo, @+, @-)
*/
else if (*s == '@' && s[1]) {
(@foo, @::foo, @'foo, @{foo}, @$foo, @+, @-)
*/
else if (*s == '@' && s[1]) {
- if (is
ALNUM
_lazy_if(s+1,UTF))
+ if (is
WORDCHAR
_lazy_if(s+1,UTF))
break;
if (strchr(":'{$", s[1]))
break;
break;
if (strchr(":'{$", s[1]))
break;
@@
-3834,7
+3834,7
@@
S_intuit_more(pTHX_ char *s)
case '&':
case '$':
weight -= seen[un_char] * 10;
case '&':
case '$':
weight -= seen[un_char] * 10;
- if (is
ALNUM
_lazy_if(s+1,UTF)) {
+ if (is
WORDCHAR
_lazy_if(s+1,UTF)) {
int len;
scan_ident(s, send, tmpbuf, sizeof tmpbuf, FALSE);
len = (int)strlen(tmpbuf);
int len;
scan_ident(s, send, tmpbuf, sizeof tmpbuf, FALSE);
len = (int)strlen(tmpbuf);
@@
-6031,12
+6031,12
@@
Perl_yylex(pTHX)
}
else
/* skip plain q word */
}
else
/* skip plain q word */
- while (t < PL_bufend && is
ALNUM
_lazy_if(t,UTF))
+ while (t < PL_bufend && is
WORDCHAR
_lazy_if(t,UTF))
t += UTF8SKIP(t);
}
t += UTF8SKIP(t);
}
- else if (is
ALNUM
_lazy_if(t,UTF)) {
+ else if (is
WORDCHAR
_lazy_if(t,UTF)) {
t += UTF8SKIP(t);
t += UTF8SKIP(t);
- while (t < PL_bufend && is
ALNUM
_lazy_if(t,UTF))
+ while (t < PL_bufend && is
WORDCHAR
_lazy_if(t,UTF))
t += UTF8SKIP(t);
}
while (t < PL_bufend && isSPACE(*t))
t += UTF8SKIP(t);
}
while (t < PL_bufend && isSPACE(*t))
@@
-6411,7
+6411,7
@@
Perl_yylex(pTHX)
if (ckWARN(WARN_SYNTAX)) {
char *t = s+1;
if (ckWARN(WARN_SYNTAX)) {
char *t = s+1;
- while (isSPACE(*t) || is
ALNUM
_lazy_if(t,UTF) || *t == '$')
+ while (isSPACE(*t) || is
WORDCHAR
_lazy_if(t,UTF) || *t == '$')
t++;
if (*t++ == ',') {
PL_bufptr = PEEKSPACE(PL_bufptr); /* XXX can realloc */
t++;
if (*t++ == ',') {
PL_bufptr = PEEKSPACE(PL_bufptr); /* XXX can realloc */
@@
-6522,7
+6522,7
@@
Perl_yylex(pTHX)
if (*s == '[' || *s == '{') {
if (ckWARN(WARN_SYNTAX)) {
const char *t = s + 1;
if (*s == '[' || *s == '{') {
if (ckWARN(WARN_SYNTAX)) {
const char *t = s + 1;
- while (*t && (is
ALNUM
_lazy_if(t,UTF) || strchr(" \t$#+-'\"", *t)))
+ while (*t && (is
WORDCHAR
_lazy_if(t,UTF) || strchr(" \t$#+-'\"", *t)))
t += UTF ? UTF8SKIP(t) : 1;
if (*t == '}' || *t == ']') {
t++;
t += UTF ? UTF8SKIP(t) : 1;
if (*t == '}' || *t == ']') {
t++;
@@
-6590,7
+6590,7
@@
Perl_yylex(pTHX)
if (PL_oldoldbufptr == PL_last_uni
&& (*PL_last_uni != 's' || s - PL_last_uni < 5
|| memNE(PL_last_uni, "study", 5)
if (PL_oldoldbufptr == PL_last_uni
&& (*PL_last_uni != 's' || s - PL_last_uni < 5
|| memNE(PL_last_uni, "study", 5)
- || is
ALNUM
_lazy_if(PL_last_uni+5,UTF)
+ || is
WORDCHAR
_lazy_if(PL_last_uni+5,UTF)
))
check_uni();
if (*s == '?')
))
check_uni();
if (*s == '?')
@@
-8073,7
+8073,7
@@
Perl_yylex(pTHX)
s = SKIPSPACE1(s);
if (isIDFIRST_lazy_if(s,UTF)) {
const char *t;
s = SKIPSPACE1(s);
if (isIDFIRST_lazy_if(s,UTF)) {
const char *t;
- for (d = s; is
ALNUM
_lazy_if(d,UTF);) {
+ for (d = s; is
WORDCHAR
_lazy_if(d,UTF);) {
d += UTF ? UTF8SKIP(d) : 1;
if (UTF) {
while (UTF8_IS_CONTINUED(*d) && _is_utf8_mark((U8*)d)) {
d += UTF ? UTF8SKIP(d) : 1;
if (UTF) {
while (UTF8_IS_CONTINUED(*d) && _is_utf8_mark((U8*)d)) {
@@
-8994,7
+8994,7
@@
S_checkcomma(pTHX_ const char *s, const char *name, const char *what)
if (isIDFIRST_lazy_if(s,UTF)) {
const char * const w = s;
s += UTF ? UTF8SKIP(s) : 1;
if (isIDFIRST_lazy_if(s,UTF)) {
const char * const w = s;
s += UTF ? UTF8SKIP(s) : 1;
- while (is
ALNUM
_lazy_if(s,UTF))
+ while (is
WORDCHAR
_lazy_if(s,UTF))
s += UTF ? UTF8SKIP(s) : 1;
while (s < PL_bufend && isSPACE(*s))
s++;
s += UTF ? UTF8SKIP(s) : 1;
while (s < PL_bufend && isSPACE(*s))
s++;
@@
-9261,7
+9261,7
@@
S_scan_ident(pTHX_ char *s, const char *send, char *dest, STRLEN destlen, I32 ck
return s;
}
if (*s == '$' && s[1] &&
return s;
}
if (*s == '$' && s[1] &&
- (is
ALNUM
_lazy_if(s+1,UTF) || s[1] == '$' || s[1] == '{' || strnEQ(s+1,"::",2)) )
+ (is
WORDCHAR
_lazy_if(s+1,UTF) || s[1] == '$' || s[1] == '{' || strnEQ(s+1,"::",2)) )
{
return s;
}
{
return s;
}
@@
-9302,7
+9302,7
@@
S_scan_ident(pTHX_ char *s, const char *send, char *dest, STRLEN destlen, I32 ck
d += UTF8SKIP(d);
if (UTF) {
char *end = s;
d += UTF8SKIP(d);
if (UTF) {
char *end = s;
- while ((end < send && is
ALNUM
_lazy_if(end,UTF)) || *end == ':') {
+ while ((end < send && is
WORDCHAR
_lazy_if(end,UTF)) || *end == ':') {
end += UTF8SKIP(end);
while (end < send && UTF8_IS_CONTINUED(*end) && _is_utf8_mark((U8*)end))
end += UTF8SKIP(end);
end += UTF8SKIP(end);
while (end < send && UTF8_IS_CONTINUED(*end) && _is_utf8_mark((U8*)end))
end += UTF8SKIP(end);
@@
-9397,7
+9397,7
@@
S_pmflag(pTHX_ const char* const valid_flags, U32 * pmfl, char** s, char* charse
STRLEN charlen = UTF ? UTF8SKIP(*s) : 1;
if ( charlen != 1 || ! strchr(valid_flags, c) ) {
STRLEN charlen = UTF ? UTF8SKIP(*s) : 1;
if ( charlen != 1 || ! strchr(valid_flags, c) ) {
- if (is
ALNUM
_lazy_if(*s, UTF)) {
+ if (is
WORDCHAR
_lazy_if(*s, UTF)) {
yyerror_pv(Perl_form(aTHX_ "Unknown regexp modifier \"/%.*s\"", (int)charlen, *s),
UTF ? SVf_UTF8 : 0);
(*s) += charlen;
yyerror_pv(Perl_form(aTHX_ "Unknown regexp modifier \"/%.*s\"", (int)charlen, *s),
UTF ? SVf_UTF8 : 0);
(*s) += charlen;
@@
-9832,9
+9832,9
@@
S_scan_heredoc(pTHX_ char *s)
s++, term = '\'';
else
term = '"';
s++, term = '\'';
else
term = '"';
- if (!is
ALNUM
_lazy_if(s,UTF))
+ if (!is
WORDCHAR
_lazy_if(s,UTF))
deprecate("bare << to mean <<\"\"");
deprecate("bare << to mean <<\"\"");
- for (; is
ALNUM
_lazy_if(s,UTF); s++) {
+ for (; is
WORDCHAR
_lazy_if(s,UTF); s++) {
if (d < e)
*d++ = *s;
}
if (d < e)
*d++ = *s;
}
@@
-10142,7
+10142,7
@@
S_scan_inputsymbol(pTHX_ char *start)
if (*d == '$' && d[1]) d++;
/* allow <Pkg'VALUE> or <Pkg::VALUE> */
if (*d == '$' && d[1]) d++;
/* allow <Pkg'VALUE> or <Pkg::VALUE> */
- while (*d && (is
ALNUM
_lazy_if(d,UTF) || *d == '\'' || *d == ':'))
+ while (*d && (is
WORDCHAR
_lazy_if(d,UTF) || *d == '\'' || *d == ':'))
d += UTF ? UTF8SKIP(d) : 1;
/* If we've tried to read what we allow filehandles to look like, and
d += UTF ? UTF8SKIP(d) : 1;
/* If we've tried to read what we allow filehandles to look like, and