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

skip R/O check in an unevaluated ternary part; 10x jilles

Browse Source
This commit is contained in:
tg 2011-12-16 20:03:02 +00:00
parent 4748739523
commit 5070ea2387
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
expr.c
View File

@ -22,7 +22,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.51 2011/12/11 01:56:43 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/expr.c,v 1.52 2011/12/16 20:03:02 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 {
@ -284,7 +284,7 @@ evalerr(Expr_state *es, enum error_type type, const char *str)
case ET_RDONLY: case ET_RDONLY:
warningf(true, "%s: %s %s", warningf(true, "%s: %s %s",
es->expression, str, "applied to read only variable"); es->expression, str, "applied to read-only variable");
break; break;
default: /* keep gcc happy */ default: /* keep gcc happy */
@ -347,7 +347,8 @@ evalexpr(Expr_state *es, int prec)
/* vl may not have a value yet */ /* vl may not have a value yet */
vl = intvar(es, vl); vl = intvar(es, vl);
if (IS_ASSIGNOP(op)) { if (IS_ASSIGNOP(op)) {
assign_check(es, op, vasn); if (!es->noassign)
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, prec - 1)); vr = intvar(es, evalexpr(es, prec - 1));
@ -609,7 +610,8 @@ do_ppmm(Expr_state *es, enum token op, struct tbl *vasn, bool is_prefix)
setint_v(vasn, vl, es->arith); setint_v(vasn, vl, es->arith);
else else
setint(vasn, vl->val.i); setint(vasn, vl->val.i);
if (!is_prefix) /* undo the inc/dec */ if (!is_prefix)
/* undo the increment/decrement */
vl->val.i = oval; vl->val.i = oval;
return (vl); return (vl);