From a855a19d2c6a2e57aa49ff4e30577eec5e692802 Mon Sep 17 00:00:00 2001 From: rlar Date: Thu, 7 Nov 2013 21:42:02 +0100 Subject: [PATCH] xpressn.c, drop '&' and '|' operators, (we have '&&' and '||') --- src/frontend/numparam/xpressn.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 2b477091f..68d27da60 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -965,10 +965,10 @@ fetchoperator(tdico *dico, } else if (cpos(c, "=<>#GL") >= 0) { state = S_binop; level = 5; - } else if (c == '&' || c == 'A') { + } else if (c == 'A') { state = S_binop; level = 6; - } else if (c == '|' || c == 'O') { + } else if (c == 'O') { state = S_binop; level = 7; } else if (c == '!') { @@ -1089,14 +1089,6 @@ operate(char op, double x, double y) case 'O': /* || */ x = ((x != 0.0) || (y != 0.0)) ? 1.0 : 0.0; break; - case '&': - if (y < x) - x = y; /*=Min*/ - break; - case '|': - if (y > x) - x = y; /*=Max*/ - break; case '=': if (x == y) x = u;