diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2020-03-23 09:18:44 -0700 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2020-03-23 09:18:44 -0700 |
| commit | 3fe2924287628a02d9c5f7d208a5af4623588034 (patch) | |
| tree | 5ce54174fbb6e6c05e362dff659f7a7905a9e5e4 | |
| parent | 9a4b5f2e6122ea261ce90fcab3f7361f76580bc8 (diff) | |
evaluate #if expressions using vlong
#if expressions are expected to be evaluated using intmax_t,
according to the C99 spec, 6.10.1 p3. On plan9, intmax_t maps
to vlong.
| -rw-r--r-- | sys/src/cmd/cpp/cpp.h | 2 | ||||
| -rw-r--r-- | sys/src/cmd/cpp/eval.c | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/src/cmd/cpp/cpp.h b/sys/src/cmd/cpp/cpp.h index d5472a52a..64520af1d 100644 --- a/sys/src/cmd/cpp/cpp.h +++ b/sys/src/cmd/cpp/cpp.h @@ -123,7 +123,7 @@ void peektokens(Tokenrow *, char *); void glue(Tokenrow *, Token *, Token *); Tokenrow *stringify(Tokenrow *); int lookuparg(Nlist *, Token *); -long eval(Tokenrow *, int); +vlong eval(Tokenrow *, int); void genline(void); void setempty(Tokenrow *); void makespace(Tokenrow *); diff --git a/sys/src/cmd/cpp/eval.c b/sys/src/cmd/cpp/eval.c index 4ebf38dcf..9e8dc21b5 100644 --- a/sys/src/cmd/cpp/eval.c +++ b/sys/src/cmd/cpp/eval.c @@ -10,7 +10,7 @@ #define UNSMARK 0x1000 struct value { - long val; + vlong val; int type; }; @@ -99,7 +99,7 @@ enum toktype ops[NSTAK], *op; /* * Evaluate an #if #elif #ifdef #ifndef line. trp->tp points to the keyword. */ -long +vlong eval(Tokenrow *trp, int kw) { Token *tp; @@ -217,7 +217,7 @@ int evalop(struct pri pri) { struct value v1, v2; - long rv1, rv2; + vlong rv1, rv2; int rtype, oper; rv2=0; @@ -277,21 +277,21 @@ evalop(struct pri pri) case GT: rv1 = rv1>rv2; break; case LEQ|UNSMARK: - rv1 = (unsigned long)rv1<=rv2; break; + rv1 = (uvlong)rv1<=rv2; break; case GEQ|UNSMARK: - rv1 = (unsigned long)rv1>=rv2; break; + rv1 = (uvlong)rv1>=rv2; break; case LT|UNSMARK: - rv1 = (unsigned long)rv1<rv2; break; + rv1 = (uvlong)rv1<rv2; break; case GT|UNSMARK: - rv1 = (unsigned long)rv1>rv2; break; + rv1 = (uvlong)rv1>rv2; break; case LSH: rv1 <<= rv2; break; case LSH|UNSMARK: - rv1 = (unsigned long)rv1<<rv2; break; + rv1 = (uvlong)rv1<<rv2; break; case RSH: rv1 >>= rv2; break; case RSH|UNSMARK: - rv1 = (unsigned long)rv1>>rv2; break; + rv1 = (uvlong)rv1>>rv2; break; case LAND: rtype = UND; if (v1.type==UND) @@ -342,7 +342,7 @@ evalop(struct pri pri) break; } if (rtype==UNS) - rv1 /= (unsigned long)rv2; + rv1 /= (uvlong)rv2; else rv1 /= rv2; break; @@ -352,7 +352,7 @@ evalop(struct pri pri) break; } if (rtype==UNS) - rv1 %= (unsigned long)rv2; + rv1 %= (uvlong)rv2; else rv1 %= rv2; break; @@ -386,7 +386,7 @@ tokval(Token *tp) struct value v; Nlist *np; int i, base, c, longcc; - unsigned long n; + uvlong n; Rune r; uchar *p; @@ -426,7 +426,7 @@ tokval(Token *tp) n *= base; n += i; } - if (n>=0x80000000 && base!=10) + if (n>=(1ULL<<63) && base!=10) v.type = UNS; for (; *p; p++) { if (*p=='u' || *p=='U') |