From 4e30b97c994548e53b69b049d95f34bbbef739dc Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 2 May 2018 10:38:23 +0200
Subject: [PATCH] fix operators after ?
---
expr.c | 2 +-
testscript | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/expr.c b/expr.c
index 7b5f2609..e0da86a4 100644
--- a/expr.c
+++ b/expr.c
@@ -187,7 +187,7 @@ static int parseSubExpr(const char **pp, long *v, int pr, int o)
long val3 = 0;
val2 = 1;
if (exprDebug) printf("parseExpr(%d) if %ld ...\n", pr, val);
- if (parseExpr(&p, &val2) >= 0)
+ if ((o2 = parseExpr(&p, &val2)) >= 0)
{
if (parseSep(&p, ":"))
{
diff --git a/testscript b/testscript
index fe0beb4a..dfda1c51 100644
--- a/testscript
+++ b/testscript
@@ -72,8 +72,8 @@ x=1-1?0?1:2:3?4:5
x=1-1?0?1:2:3-3?4:5
# $(x) should be: 5
-x=0?; 1?; 2?; -4?
-# $(x) should be: 0; 1; 1; 1
+x=0?; 1?; 2?; -4?; 3?+1
+# $(x) should be: 0; 1; 1; 1; 4
x=a030b a(030)b a( 030 )b "a"030"b" a(%x 030)b
# $(x) should be: a030b a24b a24b a24b a18b
--
GitLab