* PATCH: 1.1: fix bug assigning to scalar in math
@ 2001-07-06 18:08 Peter Stephenson
2001-07-06 18:27 ` Peter Stephenson
0 siblings, 1 reply; 2+ messages in thread
From: Peter Stephenson @ 2001-07-06 18:08 UTC (permalink / raw)
To: Zsh hackers list
This is supposed to fix the bug that unconditional assignnment to a scalar
in math mode fails if the scalar contains a string math mode doesn't like.
It makes the math stack 100 words longer during each evaluation of an
expression, so I was toying with turning the stack into a linked list
instead of a fixed array of 100 structures. However, that is likely to
have an adverse effect on execution time, whereas this ought to be
relatively benign. So I haven't decided.
Index: Src/math.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/math.c,v
retrieving revision 1.9
diff -u -r1.9 math.c
--- Src/math.c 2001/04/20 06:13:36 1.9
+++ Src/math.c 2001/07/06 18:04:29
@@ -470,13 +470,14 @@
struct mathvalue {
char *lval;
mnumber val;
+ int getme;
};
static struct mathvalue *stack;
/**/
static void
-push(mnumber val, char *lval)
+push(mnumber val, char *lval, int getme)
{
if (sp == STACKSZ - 1)
zerr("stack overflow", NULL, 0);
@@ -484,8 +485,22 @@
sp++;
stack[sp].val = val;
stack[sp].lval = lval;
+ stack[sp].getme = getme;
}
+/**/
+static mnumber
+pop(int noget)
+{
+ struct mathvalue *mv = stack+sp;
+
+ if (mv->getme && !noget) {
+ mv->val = getnparam(mv->lval);
+ mv->getme = 0;
+ }
+ sp--;
+ return mv->val;
+}
/**/
static mnumber
@@ -615,8 +630,8 @@
if (tp & (OP_A2|OP_A2IR|OP_A2IO|OP_E2|OP_E2IO)) {
/* Make sure anyone seeing this message reports it. */
DPUTS(sp < 1, "BUG: math: not enough wallabies in outback.");
- b = stack[sp--].val;
- a = stack[sp--].val;
+ b = pop(0);
+ a = pop(what == EQ);
if (tp & (OP_A2IO|OP_E2IO)) {
/* coerce to integers */
@@ -785,13 +800,17 @@
}
if (tp & (OP_E2|OP_E2IO)) {
lv = stack[sp+1].lval;
- push(setvar(lv,c), lv);
+ push(setvar(lv,c), lv, 0);
} else
- push(c,NULL);
+ push(c,NULL, 0);
return;
}
spval = &stack[sp].val;
+ if (stack[sp].getme) {
+ *spval = getnparam(stack[sp].lval);
+ stack[sp].getme = 0;
+ }
switch (what) {
case NOT:
if (spval->type & MN_FLOAT) {
@@ -837,11 +856,11 @@
break;
case QUEST:
DPUTS(sp < 2, "BUG: math: three shall be the number of the counting.");
- c = stack[sp--].val;
- b = stack[sp--].val;
- a = stack[sp--].val;
+ c = pop(0);
+ b = pop(0);
+ a = pop(0);
/* b and c can stay different types in this case. */
- push(((a.type & MN_FLOAT) ? a.u.d : a.u.l) ? b : c, NULL);
+ push(((a.type & MN_FLOAT) ? a.u.d : a.u.l) ? b : c, NULL, 0);
break;
case COLON:
zerr("':' without '?'", NULL, 0);
@@ -872,7 +891,13 @@
bop(int tk)
{
mnumber *spval = &stack[sp].val;
- int tst = (spval->type & MN_FLOAT) ? (zlong)spval->u.d : spval->u.l;
+ int tst;
+
+ if (stack[sp].getme) {
+ *spval = getnparam(stack[sp].lval);
+ stack[sp].getme = 0;
+ }
+ tst = (spval->type & MN_FLOAT) ? (zlong)spval->u.d : spval->u.l;
switch (tk) {
case DAND:
@@ -938,7 +963,15 @@
DPUTS(!errflag && sp,
"BUG: math: wallabies roaming too freely in outback");
- ret = stack[0].val;
+ if (errflag) {
+ ret.type = MN_INTEGER;
+ ret.u.l = errflag;
+ } else {
+ if (stack[0].getme)
+ ret = getnparam(stack[0].lval);
+ else
+ ret = stack[0].val;
+ }
if (--mlevel) {
lastbase = xlastbase;
@@ -1056,16 +1089,16 @@
return;
switch (mtok) {
case NUM:
- push(yyval, NULL);
+ push(yyval, NULL, 0);
break;
case ID:
- push((noeval ? zero_mnumber : getnparam(yylval)), yylval);
+ push(zero_mnumber, yylval, !noeval);
break;
case CID:
- push((noeval ? zero_mnumber : getcvar(yylval)), yylval);
+ push((noeval ? zero_mnumber : getcvar(yylval)), yylval, 0);
break;
case FUNC:
- push((noeval ? zero_mnumber : callmathfunc(yylval)), yylval);
+ push((noeval ? zero_mnumber : callmathfunc(yylval)), yylval, 0);
break;
case M_INPAR:
mathparse(TOPPREC);
Index: Test/C01arith.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/C01arith.ztst,v
retrieving revision 1.1
diff -u -r1.1 C01arith.ztst
--- Test/C01arith.ztst 2001/04/02 12:32:11 1.1
+++ Test/C01arith.ztst 2001/07/06 18:05:36
@@ -88,3 +88,13 @@
print ${(t)newarray} ${#newarray} ${newarray[1]}
0:setting array elements in math context
>array 1 2
+
+ print $(( 13 = 42 ))
+1:bad lvalue
+?ZTST_execchunk:2: lvalue required
+
+ x=/bar
+ (( x = 32 ))
+ print $x
+0:assigning to scalar which contains non-math string
+>32
--
Peter Stephenson <pws@csr.com> Software Engineer
CSR Ltd., Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070
**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential
and/or privileged material.
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by
persons or entities other than the intended recipient is
prohibited.
If you received this in error, please contact the sender and
delete the material from any computer.
**********************************************************************
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PATCH: 1.1: fix bug assigning to scalar in math
2001-07-06 18:08 PATCH: 1.1: fix bug assigning to scalar in math Peter Stephenson
@ 2001-07-06 18:27 ` Peter Stephenson
0 siblings, 0 replies; 2+ messages in thread
From: Peter Stephenson @ 2001-07-06 18:27 UTC (permalink / raw)
To: Zsh hackers list
Peter Stephenson wrote:
> It makes the math stack 100 words longer during each evaluation of an
> expression, so I was toying with turning the stack into a linked list
> instead of a fixed array of 100 structures. However, that is likely to
> have an adverse effect on execution time, whereas this ought to be
> relatively benign. So I haven't decided.
Brainwave. Use the type discriminator to flag that it's unset. This
replaces the previous version.
Index: Src/math.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/math.c,v
retrieving revision 1.9
diff -u -r1.9 math.c
--- Src/math.c 2001/04/20 06:13:36 1.9
+++ Src/math.c 2001/07/06 18:24:55
@@ -476,7 +476,7 @@
/**/
static void
-push(mnumber val, char *lval)
+push(mnumber val, char *lval, int getme)
{
if (sp == STACKSZ - 1)
zerr("stack overflow", NULL, 0);
@@ -484,8 +484,21 @@
sp++;
stack[sp].val = val;
stack[sp].lval = lval;
+ if (getme)
+ stack[sp].val.type = MN_UNSET;
}
+/**/
+static mnumber
+pop(int noget)
+{
+ struct mathvalue *mv = stack+sp;
+
+ if (mv->val.type == MN_UNSET && !noget)
+ mv->val = getnparam(mv->lval);
+ sp--;
+ return mv->val;
+}
/**/
static mnumber
@@ -615,8 +628,8 @@
if (tp & (OP_A2|OP_A2IR|OP_A2IO|OP_E2|OP_E2IO)) {
/* Make sure anyone seeing this message reports it. */
DPUTS(sp < 1, "BUG: math: not enough wallabies in outback.");
- b = stack[sp--].val;
- a = stack[sp--].val;
+ b = pop(0);
+ a = pop(what == EQ);
if (tp & (OP_A2IO|OP_E2IO)) {
/* coerce to integers */
@@ -785,13 +798,15 @@
}
if (tp & (OP_E2|OP_E2IO)) {
lv = stack[sp+1].lval;
- push(setvar(lv,c), lv);
+ push(setvar(lv,c), lv, 0);
} else
- push(c,NULL);
+ push(c,NULL, 0);
return;
}
spval = &stack[sp].val;
+ if (stack[sp].val.type == MN_UNSET)
+ *spval = getnparam(stack[sp].lval);
switch (what) {
case NOT:
if (spval->type & MN_FLOAT) {
@@ -837,11 +852,11 @@
break;
case QUEST:
DPUTS(sp < 2, "BUG: math: three shall be the number of the counting.");
- c = stack[sp--].val;
- b = stack[sp--].val;
- a = stack[sp--].val;
+ c = pop(0);
+ b = pop(0);
+ a = pop(0);
/* b and c can stay different types in this case. */
- push(((a.type & MN_FLOAT) ? a.u.d : a.u.l) ? b : c, NULL);
+ push(((a.type & MN_FLOAT) ? a.u.d : a.u.l) ? b : c, NULL, 0);
break;
case COLON:
zerr("':' without '?'", NULL, 0);
@@ -872,8 +887,12 @@
bop(int tk)
{
mnumber *spval = &stack[sp].val;
- int tst = (spval->type & MN_FLOAT) ? (zlong)spval->u.d : spval->u.l;
+ int tst;
+ if (stack[sp].val.type == MN_UNSET)
+ *spval = getnparam(stack[sp].lval);
+ tst = (spval->type & MN_FLOAT) ? (zlong)spval->u.d : spval->u.l;
+
switch (tk) {
case DAND:
case DANDEQ:
@@ -938,7 +957,15 @@
DPUTS(!errflag && sp,
"BUG: math: wallabies roaming too freely in outback");
- ret = stack[0].val;
+ if (errflag) {
+ ret.type = MN_INTEGER;
+ ret.u.l = errflag;
+ } else {
+ if (stack[0].val.type == MN_UNSET)
+ ret = getnparam(stack[0].lval);
+ else
+ ret = stack[0].val;
+ }
if (--mlevel) {
lastbase = xlastbase;
@@ -1056,16 +1083,16 @@
return;
switch (mtok) {
case NUM:
- push(yyval, NULL);
+ push(yyval, NULL, 0);
break;
case ID:
- push((noeval ? zero_mnumber : getnparam(yylval)), yylval);
+ push(zero_mnumber, yylval, !noeval);
break;
case CID:
- push((noeval ? zero_mnumber : getcvar(yylval)), yylval);
+ push((noeval ? zero_mnumber : getcvar(yylval)), yylval, 0);
break;
case FUNC:
- push((noeval ? zero_mnumber : callmathfunc(yylval)), yylval);
+ push((noeval ? zero_mnumber : callmathfunc(yylval)), yylval, 0);
break;
case M_INPAR:
mathparse(TOPPREC);
Index: Src/zsh.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.h,v
retrieving revision 1.32
diff -u -r1.32 zsh.h
--- Src/zsh.h 2001/06/27 11:22:05 1.32
+++ Src/zsh.h 2001/07/06 18:24:55
@@ -75,6 +75,7 @@
#define MN_INTEGER 1 /* mnumber is integer */
#define MN_FLOAT 2 /* mnumber is floating point */
+#define MN_UNSET 4 /* mnumber not yet retrieved */
typedef struct mathfunc *MathFunc;
typedef mnumber (*NumMathFunc)(char *, int, mnumber *, int);
Index: Test/C01arith.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/C01arith.ztst,v
retrieving revision 1.1
diff -u -r1.1 C01arith.ztst
--- Test/C01arith.ztst 2001/04/02 12:32:11 1.1
+++ Test/C01arith.ztst 2001/07/06 18:24:55
@@ -88,3 +88,13 @@
print ${(t)newarray} ${#newarray} ${newarray[1]}
0:setting array elements in math context
>array 1 2
+
+ print $(( 13 = 42 ))
+1:bad lvalue
+?ZTST_execchunk:2: lvalue required
+
+ x=/bar
+ (( x = 32 ))
+ print $x
+0:assigning to scalar which contains non-math string
+>32
--
Peter Stephenson <pws@csr.com> Software Engineer
CSR Ltd., Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070
**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential
and/or privileged material.
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by
persons or entities other than the intended recipient is
prohibited.
If you received this in error, please contact the sender and
delete the material from any computer.
**********************************************************************
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2001-07-06 18:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-07-06 18:08 PATCH: 1.1: fix bug assigning to scalar in math Peter Stephenson
2001-07-06 18:27 ` Peter Stephenson
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).