generate error on mixing terminal functions

diff --git a/calc.c b/calc.c
index 8aa124a959db68faadbe7cff587e2faa4490db64..a10f53ef6d9183cf17fc48932a3eac7f5148228c 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -277,5 +277,8 @@ int main (int argc, char *argv[])
 // test: echo -e '1 & 1\n1 | 1\n!1\nquit' | calc.exe -v 3 | grep -q bye
 // test: echo -e '(3 == 3) & (4 > 2)' | calc.exe | grep -q '=> 1'
 // test: echo -e '3 == 3 & 4 > 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 + quit' | calc.exe 2>&1 | grep -q error
+// test: echo -e 'cos (quit)' | calc.exe 2>&1 | grep -q error
+// test: echo -e '(quit)' | calc.exe 2>&1 | grep -q error
 
 /* vim: set ts=4 sw=4 et: */

diff --git a/parser.c b/parser.c
index ad246cdcde676807a7769893dcb82b304af347e8..d6cb7728a720810699c1a42bada851f18d947903 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -122,6 +122,10 @@ element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, in
     }
     new->ops[0] = *proot;
     new->ops[1] = parser (*pstr, pstr, new->prio);
+    if ((new->ops[1] != NULL) && (new->ops[1] != ERROR_OP) && (new->ops[1]->prio == 9)) {
+        delelement (new->ops[1]);
+        new->ops[1] = ERROR_OP;
+    }
     if (new->ops[1] == ERROR_OP) {
         delelement (new);
         *proot = NULL;
@@ -167,6 +171,10 @@ element_t *parser (char *str, char **next, int prio)
                 do {
                     found = 0;
                     new = parser (str + 1, &str, 0);
+                    if ((new != NULL) && (new != ERROR_OP) && (new->prio == 9)) {
+                        delelement (new);
+                        new = ERROR_OP;
+                    }
                     if (new == ERROR_OP) {
                         delelement (root);
                         return ERROR_OP;
@@ -190,6 +198,10 @@ element_t *parser (char *str, char **next, int prio)
                     return ERROR_OP;
                 }
                 new = parser (str + 1, &str, 0);
+                if ((new != NULL) && (new != ERROR_OP) && (new->prio == 9)) {
+                    delelement (new);
+                    new = ERROR_OP;
+                }
                 if ((new == ERROR_OP) || (*str == ',')) {
                     delelement (new);
                     delelement (root);