allow ? without : in CALC as in 3.14.8

2011-12-13 16:01:36 +00:00
parent 2239c639e4
commit 4f6f807203
1 changed files with 42 additions and 0 deletions
@@ -0,0 +1,42 @@
+Index: src/libCom/calc/postfix.c
+===================================================================
+RCS file: /cvs/G/EPICS/base-3.14.12/src/libCom/calc/postfix.c,v
+retrieving revision 1.1
+retrieving revision 1.3
+diff -u -r1.1 -r1.3
+--- src/libCom/calc/postfix.c	29 Nov 2010 10:38:07 -0000	1.1
+++ src/libCom/calc/postfix.c	9 Dec 2011 17:34:10 -0000	1.3
+@@ -405,10 +405,12 @@
+ 		pstacktop--;
+ 	    }
+ 
+-	    if (cond_count != 0) {
+-		*perror = CALC_ERR_CONDITIONAL;
+-		goto bad;
+-	    }
+/*
+ * 	    if (cond_count != 0) {
+ * 		*perror = CALC_ERR_CONDITIONAL;
+ * 		goto bad;
+ * 	    }
+ */
+ 	    if (runtime_depth > 1) {
+ 		*perror = CALC_ERR_TOOMANY;
+ 		goto bad;
+@@ -452,10 +454,12 @@
+     }
+     *pout = END_EXPRESSION;
+ 
+-    if (cond_count != 0) {
+-	*perror = CALC_ERR_CONDITIONAL;
+-	goto bad;
+-    }
+/*
+ *     if (cond_count != 0) {
+ * 	*perror = CALC_ERR_CONDITIONAL;
+ * 	goto bad;
+ *     }
+ */
+     if (operand_needed || runtime_depth != 1) {
+ 	*perror = CALC_ERR_INCOMPLETE;
+ 	goto bad;