From 0a42a19b02c92fba515088425ff0c251e0b54099 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 1 Nov 2013 20:15:21 +0100 Subject: [PATCH] xpressn.c, fix `truth' for ternary_fcn() 0.0 is `false', everything else is `true' --- src/frontend/numparam/xpressn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 350da5b49..976e586ec 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -40,9 +40,9 @@ extern long dynsubst; /* see inpcom.c */ static double -ternary_fcn(int conditional, double if_value, double else_value) +ternary_fcn(double conditional, double if_value, double else_value) { - if (conditional) + if (conditional != 0.0) return if_value; else return else_value; @@ -1219,7 +1219,7 @@ formula(tdico *dico, const char *s, const char *s_end, bool *perror) state = S_atom; if (fu > 0) { if ((fu == 18)) - u = ternary_fcn((int) v, w, u); + u = ternary_fcn(v, w, u); else if ((fu == 20)) u = agauss(v, w, u); else if ((fu == 22))