From 4f6f807203839345597ee6696e337f451e34592b Mon Sep 17 00:00:00 2001 From: zimoch Date: Tue, 13 Dec 2011 16:01:36 +0000 Subject: [PATCH] allow ? without : in CALC as in 3.14.8 --- calc-unbalanced-if-compat.patch | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 calc-unbalanced-if-compat.patch diff --git a/calc-unbalanced-if-compat.patch b/calc-unbalanced-if-compat.patch new file mode 100644 index 000000000..139853284 --- /dev/null +++ b/calc-unbalanced-if-compat.patch @@ -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;