mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

45343: Queue signals around arithmetic evaluations 

The queueing added in execarith() in 45083 is reverted since the callee
does this now.
This commit is contained in:
Daniel Shahaf 2020-01-26 01:17:00 +00:00
parent 8dab5bc037
commit 581585dfc6
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2020-01-29 Daniel Shahaf <danielsh@apache.org>
* 45343: Src/exec.c, Src/math.c: Queue signals around arithmetic
evaluations
* 45344: INSTALL: Document where third-party completion functions
should be installed.

3
Src/exec.c
View File

@ -5101,7 +5101,6 @@ execarith(Estate state, UNUSED(int do_exec))
mnumber val = zero_mnumber;
int htok = 0;
queue_signals();
if (isset(XTRACE)) {
printprompt4();
fprintf(xtrerr, "((");
@ -5121,8 +5120,6 @@ execarith(Estate state, UNUSED(int do_exec))
fprintf(xtrerr, " ))\n");
fflush(xtrerr);
}
unqueue_signals();
if (errflag) {
errflag &= ~ERRFLAG_ERROR;
return 2;

15
Src/math.c
View File

@ -1133,8 +1133,7 @@ notzero(mnumber a)
/* macro to pop three values off the value stack */
/**/
void
static void
op(int what)
{
mnumber a, b, c, *spval;
@ -1569,14 +1568,19 @@ mathparse(int pc)
if (errflag)
return;
queue_signals();
mtok = zzlex();
/* Handle empty input */
if (pc == TOPPREC && mtok == EOI)
if (pc == TOPPREC && mtok == EOI) {
unqueue_signals();
return;
}
checkunary(mtok, optr);
while (prec[mtok] <= pc) {
if (errflag)
if (errflag) {
unqueue_signals();
return;
}
switch (mtok) {
case NUM:
push(yyval, NULL, 0);
@ -1595,6 +1599,7 @@ mathparse(int pc)
if (mtok != M_OUTPAR) {
if (!errflag)
zerr("bad math expression: ')' expected");
unqueue_signals();
return;
}
break;
@ -1613,6 +1618,7 @@ mathparse(int pc)
if (mtok != COLON) {
if (!errflag)
zerr("bad math expression: ':' expected");
unqueue_signals();
return;
}
if (q)
@ -1636,4 +1642,5 @@ mathparse(int pc)
mtok = zzlex();
checkunary(mtok, optr);
}
unqueue_signals();
}