From 581585dfc66e2bb18434cdd1ad2f5899b12a86dd Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Sun, 26 Jan 2020 01:17:00 +0000
Subject: 45343: Queue signals around arithmetic evaluations

The queueing added in execarith() in 45083 is reverted since the callee
does this now.
---
 Src/math.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'Src/math.c')

diff --git a/Src/math.c b/Src/math.c
index a38770073..905b910ec 100644
--- a/Src/math.c
+++ b/Src/math.c
@@ -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();
 }
-- 
cgit 1.4.1