summaryrefslogtreecommitdiff
path: root/x2p
diff options
context:
space:
mode:
authorKarl Williamson <public@khwilliamson.com>2012-05-05 08:09:41 -0600
committerKarl Williamson <public@khwilliamson.com>2012-06-17 11:35:05 -0600
commit67240697e05c5f3813fe1d93bac503c45fa81613 (patch)
tree886fe2ea321587d263e7b5c9b9e1c86e4fe4d1db /x2p
parentd5294b8de19a9f7f003d708072317ee11088af98 (diff)
downloadperl-67240697e05c5f3813fe1d93bac503c45fa81613.tar.gz
walk.c: Combine macro calls
Replace combinations of macro calls with single ones that mean the same thing.
Diffstat (limited to 'x2p')
-rw-r--r--x2p/walk.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/x2p/walk.c b/x2p/walk.c
index 86419c1faa..03cc5944b5 100644
--- a/x2p/walk.c
+++ b/x2p/walk.c
@@ -69,7 +69,7 @@ walk(int useval, int level, register int node, int *numericptr, int minprec)
if (namelist) {
while (isALPHA(*namelist)) {
for (d = tokenbuf,s=namelist;
- isALPHA(*s) || isDIGIT(*s) || *s == '_';
+ isWORDCHAR(*s);
*d++ = *s++) ;
*d = '\0';
while (*s && !isALPHA(*s)) s++;
@@ -584,7 +584,7 @@ sub Pick {\n\
*t &= 127;
if (isLOWER(*t))
*t = toUPPER(*t);
- if (!isALPHA(*t) && !isDIGIT(*t))
+ if (!isALNUMC(*t))
*t = '_';
}
if (!strchr(tokenbuf,'_'))
@@ -1112,7 +1112,7 @@ sub Pick {\n\
*t &= 127;
if (isLOWER(*t))
*t = toUPPER(*t);
- if (!isALPHA(*t) && !isDIGIT(*t))
+ if (!isALNUMC(*t))
*t = '_';
}
if (!strchr(tokenbuf,'_'))
@@ -1149,7 +1149,7 @@ sub Pick {\n\
*t &= 127;
if (isLOWER(*t))
*t = toUPPER(*t);
- if (!isALPHA(*t) && !isDIGIT(*t))
+ if (!isALNUMC(*t))
*t = '_';
}
if (!strchr(tokenbuf,'_'))
@@ -1420,7 +1420,7 @@ sub Pick {\n\
i = numarg;
if (i) {
t = s = tmpstr->str_ptr;
- while (isALPHA(*t) || isDIGIT(*t) || *t == '$' || *t == '_')
+ while (isWORDCHAR(*t) || *t == '$')
t++;
i = t - s;
if (i < 2)