commit - d2fae53d17c120530a6d12facd8e0fc297331821
commit + eb4aea5072dcca2dfee2ff4d551352dae73a821c
blob - 7558bf3ba8bbcf10592e5edb4151e1aa1b16a4ab
blob + 32698c2a97d5a3735d521fc82d3a6426d6f5c6c2
--- src/cmd/yacc.c
+++ src/cmd/yacc.c
int defin(int, char*);
void defout(int);
char* cstash(char*);
+int isvalidchar(long);
long gettok(void);
int fdtype(int);
int chfind(int, char*);
return temp;
}
+int
+isvalidchar(long i)
+{
+ return (i & ~0xffUL) == 0;
+}
+
long
gettok(void)
{
default:
/* number */
+ if(!isvalidchar(c))
+ return c;
if(isdigit(c)) {
numbval = c-'0';
base = (c=='0')? 8: 10;
}
if(islower(c) || isupper(c) || c=='_' || c=='.' || c=='$') {
i = 0;
- while(islower(c) || isupper(c) || isdigit(c) ||
- c == '-' || c=='_' || c=='.' || c=='$') {
+ while(isvalidchar(c) && (islower(c) || isupper(c) || isdigit(c) ||
+ c == '-' || c=='_' || c=='.' || c=='$')) {
if(reserve && isupper(c))
c += 'a'-'A';
rune = c;
s = -s;
c = Bgetrune(finput);
}
- if(isdigit(c)) {
+ if(isvalidchar(c) && isdigit(c)) {
j = 0;
while(isdigit(c)) {
j = j*10 + (c-'0');
}
goto loop;
}
- if(isupper(c) || islower(c) || c == '_' || c == '.') {
+ if(isvalidchar(c) && (isupper(c) || islower(c) || c == '_' || c == '.')) {
int tok; /* tok used oustide for type info */
/* look for $name */
sign = 0;
val = 0;
while((c=Bgetrune(finput)) != Beof) {
- if(isdigit(c)) {
+ if(isvalidchar(c) && isdigit(c)) {
val = val*10 + c-'0';
continue;
}