commit 1f63e445a37c428242250327573febd38851454e Author: Bertram Felgenhauer Date: Thu Jan 8 03:49:42 2026 +0100 initialize variable for me, it's initialized at 0 which results in ;assert 1 &= 1 being accepted, with the `&=` interpreted as EQUAL (which is 0) diff --git a/src/eval.c b/src/eval.c index ec478e8..07765a0 100644 --- a/src/eval.c +++ b/src/eval.c @@ -298,7 +298,7 @@ eval(prevPrec, val1, oper1, expr, result) #endif { long result2, val2; - char oper2; + char oper2 = -1; int prec1, prec2; #ifdef DEBUG commit 5e8fad876c514c7a4173f8036d1d5d9760bf6518 Author: Bertram Felgenhauer Date: Fri Jan 9 02:46:02 2026 +0100 on second thought, fix getop() instead diff --git a/src/eval.c b/src/eval.c index 07765a0..69cb2f5 100644 --- a/src/eval.c +++ b/src/eval.c @@ -194,39 +194,43 @@ getop(expr, oper) char ch; switch (ch = *(expr++)) { case '&': - if (*(expr++) == '&') - *oper = AND; + if (*expr == '&') { + ++expr; + ch = AND; + } break; case '|': - if (*(expr++) == '|') - *oper = OR; + if (*expr == '|') { + ++expr; + ch = OR; + } break; case '=': - if (*(expr++) == '=') - *oper = EQUAL; + if (*expr == '=') { + ++expr; + ch = EQUAL; + } break; case '!': - if (*(expr++) == '=') - *oper = NEQU; + if (*expr == '=') { + ++expr; + ch = NEQU; + } break; case '<': if (*expr == '=') { ++expr; - *oper = LTE; - } else - *oper = '<'; + ch = LTE; + } break; case '>': if (*expr == '=') { ++expr; - *oper = GTE; - } else - *oper = '>'; - break; - default: - *oper = ch; + ch = GTE; + } break; } + *oper = ch; return expr; } /*--------------------*/ @@ -298,7 +302,7 @@ eval(prevPrec, val1, oper1, expr, result) #endif { long result2, val2; - char oper2 = -1; + char oper2; int prec1, prec2; #ifdef DEBUG commit f9ef982f3470b97a0670cc42e96e1c5dcbd40a00 Author: Bertram Felgenhauer Date: Fri Jan 9 02:53:50 2026 +0100 compress code (is this a good idea?) diff --git a/src/eval.c b/src/eval.c index 69cb2f5..758a699 100644 --- a/src/eval.c +++ b/src/eval.c @@ -193,42 +193,24 @@ getop(expr, oper) { char ch; switch (ch = *(expr++)) { - case '&': - if (*expr == '&') { - ++expr; - ch = AND; - } - break; - case '|': - if (*expr == '|') { - ++expr; - ch = OR; - } - break; - case '=': - if (*expr == '=') { - ++expr; - ch = EQUAL; - } - break; - case '!': - if (*expr == '=') { - ++expr; - ch = NEQU; - } - break; - case '<': - if (*expr == '=') { - ++expr; - ch = LTE; - } - break; - case '>': - if (*expr == '=') { - ++expr; - ch = GTE; - } - break; + +#define DIGRAM(c1, c2, op)\ + case c1:\ + if (*expr == c2) {\ + ++expr;\ + ch = op;\ + }\ + break + + DIGRAM('&', '&', AND); + DIGRAM('|', '|', OR); + DIGRAM('=', '=', EQUAL); + DIGRAM('!', '=', NEQU); + DIGRAM('<', '=', LTE); + DIGRAM('>', '=', GTE); + +#undef DIGRAM + } *oper = ch; return expr;