From fcc736bd45ba429bf838707c84d706f7419f5ebf Mon Sep 17 00:00:00 2001
From: curt mayer <curt@zen-room.org>
Date: Wed, 26 Feb 2020 15:05:26 -0800
Subject: [PATCH] fixed expression parser bug : ~(1|2) returned 0xfe

---
 Tools/unix/uz80as/expr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Tools/unix/uz80as/expr.c b/Tools/unix/uz80as/expr.c
index 1de2c7e5..445e36f0 100644
--- a/Tools/unix/uz80as/expr.c
+++ b/Tools/unix/uz80as/expr.c
@@ -156,7 +156,7 @@ static int ashr(int r, int n)
 const char *expr(const char *p, int *v, int linepc, int allowfr,
 	enum expr_ecode *ecode, const char **ep)
 {
-	int si, usi;
+	int si, usi, usl;
 	const char *q;
 	char last;
 	int stack[ESTKSZ2];
@@ -172,6 +172,7 @@ const char *expr(const char *p, int *v, int linepc, int allowfr,
 	si = 0;
 	r = 0;
 	last = 'V';	/* first void */
+	usl = 0;
 loop:
 	p = skipws(p);
 	if (*p == '(') {
@@ -184,6 +185,8 @@ loop:
 			}
 			stack[si++] = last;
 			stack[si++] = r;
+			stack[si++] = usl;
+			usl = usi;
 			p++;
 			r = 0;
 			last = 'v';	/* void */
@@ -197,6 +200,7 @@ loop:
 		} else {
 			p++;
 			n = r;
+			usl = stack[--si];
 			r = stack[--si];
 			last = (char) stack[--si];	
 			goto oper;
@@ -396,7 +400,7 @@ uoper:
 	uopstk[usi++] = *p++;
 	goto loop;
 oper:
-	while (usi > 0) {
+	while (usi > usl) {
 		usi--;
 		switch (uopstk[usi]) {
 		case '~': n = ~n; break;