JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don’t do arithmetics on an enumerated type, sez the MIPSpro complainer

Browse Source
This commit is contained in:
tg 2008-03-28 13:33:37 +00:00
parent 66f433ace0
commit 5d41a86e86
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
expr.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.13 2007/10/25 15:19:16 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/expr.c,v 1.14 2008/03/28 13:33:37 tg Exp $");
/* The order of these enums is constrained by the order of opinfo[] */ /* The order of these enums is constrained by the order of opinfo[] */
enum token { enum token {
@ -35,28 +35,27 @@ enum token {
#define IS_BINOP(op) (((int)op) >= (int)O_EQ && ((int)op) <= (int)O_COMMA) #define IS_BINOP(op) (((int)op) >= (int)O_EQ && ((int)op) <= (int)O_COMMA)
#define IS_ASSIGNOP(op) ((int)(op) >= (int)O_ASN && (int)(op) <= (int)O_BORASN) #define IS_ASSIGNOP(op) ((int)(op) >= (int)O_ASN && (int)(op) <= (int)O_BORASN)
enum prec { /* precisions; used to be enum prec but we do arithmetics on it */
P_PRIMARY = 0, /* VAR, LIT, (), ~ ! - + */ #define P_PRIMARY 0 /* VAR, LIT, (), ~ ! - + */
P_MULT, /* * / % */ #define P_MULT 1 /* * / % */
P_ADD, /* + - */ #define P_ADD 2 /* + - */
P_SHIFT, /* << >> */ #define P_SHIFT 3 /* << >> */
P_RELATION, /* < <= > >= */ #define P_RELATION 4 /* < <= > >= */
P_EQUALITY, /* == != */ #define P_EQUALITY 5 /* == != */
P_BAND, /* & */ #define P_BAND 6 /* & */
P_BXOR, /* ^ */ #define P_BXOR 7 /* ^ */
P_BOR, /* | */ #define P_BOR 8 /* | */
P_LAND, /* && */ #define P_LAND 9 /* && */
P_LOR, /* || */ #define P_LOR 10 /* || */
P_TERN, /* ?: */ #define P_TERN 11 /* ?: */
P_ASSIGN, /* = *= /= %= += -= <<= >>= &= ^= |= */ #define P_ASSIGN 12 /* = *= /= %= += -= <<= >>= &= ^= |= */
P_COMMA /* , */ #define P_COMMA 13 /* , */
};
#define MAX_PREC P_COMMA #define MAX_PREC P_COMMA
struct opinfo { struct opinfo {
char name[4]; char name[4];
int len; /* name length */ int len; /* name length */
enum prec prec; /* precedence: lower is higher */ int prec; /* precedence: lower is higher */
}; };
/* Tokens in this table must be ordered so the longest are first /* Tokens in this table must be ordered so the longest are first
@ -124,7 +123,7 @@ enum error_type {
static void evalerr(Expr_state *, enum error_type, const char *) static void evalerr(Expr_state *, enum error_type, const char *)
__attribute__((noreturn)); __attribute__((noreturn));
static struct tbl *evalexpr(Expr_state *, enum prec); static struct tbl *evalexpr(Expr_state *, int);
static void exprtoken(Expr_state *); static void exprtoken(Expr_state *);
static struct tbl *do_ppmm(Expr_state *, enum token, struct tbl *, bool); static struct tbl *do_ppmm(Expr_state *, enum token, struct tbl *, bool);
static void assign_check(Expr_state *, enum token, struct tbl *); static void assign_check(Expr_state *, enum token, struct tbl *);
@ -260,7 +259,7 @@ evalerr(Expr_state *es, enum error_type type, const char *str)
} }
static struct tbl * static struct tbl *
evalexpr(Expr_state *es, enum prec prec) evalexpr(Expr_state *es, int prec)
{ {
struct tbl *vl, *vr = NULL, *vasn; struct tbl *vl, *vr = NULL, *vasn;
enum token op; enum token op;
@ -302,7 +301,7 @@ evalexpr(Expr_state *es, enum prec prec)
} }
return (vl); return (vl);
} }
vl = evalexpr(es, ((int) prec) - 1); vl = evalexpr(es, prec - 1);
for (op = es->tok; IS_BINOP(op) && opinfo[(int) op].prec == prec; for (op = es->tok; IS_BINOP(op) && opinfo[(int) op].prec == prec;
op = es->tok) { op = es->tok) {
exprtoken(es); exprtoken(es);
@ -313,7 +312,7 @@ evalexpr(Expr_state *es, enum prec prec)
assign_check(es, op, vasn); assign_check(es, op, vasn);
vr = intvar(es, evalexpr(es, P_ASSIGN)); vr = intvar(es, evalexpr(es, P_ASSIGN));
} else if (op != O_TERN && op != O_LAND && op != O_LOR) } else if (op != O_TERN && op != O_LAND && op != O_LOR)
vr = intvar(es, evalexpr(es, ((int) prec) - 1)); vr = intvar(es, evalexpr(es, prec - 1));
if ((op == O_DIV || op == O_MOD || op == O_DIVASN || if ((op == O_DIV || op == O_MOD || op == O_DIVASN ||
op == O_MODASN) && vr->val.i == 0) { op == O_MODASN) && vr->val.i == 0) {
if (es->noassign) if (es->noassign)
@ -383,7 +382,7 @@ evalexpr(Expr_state *es, enum prec prec)
case O_LAND: case O_LAND:
if (!vl->val.i) if (!vl->val.i)
es->noassign++; es->noassign++;
vr = intvar(es, evalexpr(es, ((int) prec) - 1)); vr = intvar(es, evalexpr(es, prec - 1));
res = vl->val.i && vr->val.i; res = vl->val.i && vr->val.i;
if (!vl->val.i) if (!vl->val.i)
es->noassign--; es->noassign--;
@ -391,7 +390,7 @@ evalexpr(Expr_state *es, enum prec prec)
case O_LOR: case O_LOR:
if (vl->val.i) if (vl->val.i)
es->noassign++; es->noassign++;
vr = intvar(es, evalexpr(es, ((int) prec) - 1)); vr = intvar(es, evalexpr(es, prec - 1));
res = vl->val.i || vr->val.i; res = vl->val.i || vr->val.i;
if (vl->val.i) if (vl->val.i)
es->noassign--; es->noassign--;