generate error on mixing terminal functions

[calc.git] / parser.c

diff --git a/parser.c b/parser.c
index 43595e53845ade3e2476755fb8d791a620416ecf..d6cb7728a720810699c1a42bada851f18d947903 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -69,7 +69,7 @@ void delelement (element_t *root)
 
 /* functions */
 
-#define NB_OPERATORS 6
+#define NB_OPERATORS 14
 
 keyword_t operators[NB_OPERATORS] = {
     { "+\t", Add, 2, 1, 1},
@@ -77,10 +77,18 @@ keyword_t operators[NB_OPERATORS] = {
     { "*",   Mul, 2, 1, 2},
     { "/",   Div, 2, 1, 2},
     { "%",   Mod, 2, 1, 3},
-    { "^",   Pow, 2, 1, 4}
+    { "^",   Pow, 2, 1, 4},
+    { "==",  Equal, 2, 2, -1},
+    { "!=",  Diff, 2, 2, -1},
+    { ">=",  Ge, 2, 2, -1},
+    { "<=",  Le, 2, 2, -1},
+    { ">",   Gt, 2, 1, -1},
+    { "<",   Lt, 2, 1, -1},
+    { "&",   And, 2, 1, -2},
+    { "|",   Or, 2, 1, -2}
 };
 
-#define NB_FUNCTIONS 12
+#define NB_FUNCTIONS 13
 keyword_t functions[NB_FUNCTIONS] = {
     { "sqrt", Sqr, 1, 4, 5},
     { "pow",  Pow, 2, 3, 5},
@@ -89,11 +97,12 @@ keyword_t functions[NB_FUNCTIONS] = {
     { "atan", Atan, 1, 4, 5},
     { "exp",  Exp, 1, 3, 5},
     { "log",  Log, 1, 3, 5},
-    { "sto",  Store, 2, 3, 5},
+    { "sto",  Store, 2, 3, 9},
     { "rcl",  Recall, 1, 3, 5},
-    { "disp",  Disp, 0, 4, 5},
-    { "quit", Quit, 0, 4, 5},
-    { "help", Help, 0, 4, 5}
+    { "disp", Disp, 0, 4, 9},
+    { "quit", Quit, 0, 4, 9},
+    { "help", Help, 0, 4, 9},
+    { "!",    Not, 1, 1, 5}
 };
 
 #define NB_CONSTANTS 3
@@ -113,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;
@@ -158,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;
@@ -181,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);
@@ -382,6 +403,15 @@ void print_element (element_t *root, int level)
     case Ans: func = "Ans"; break;
     case Pi: func = "Pi"; break;
     case E: func = "E"; break;
+    case Equal: func = "Equal"; break;
+    case Diff: func = "Different"; break;
+    case Ge: func = "Greater or equal"; break;
+    case Le: func = "Lesser or equal"; break;
+    case Gt: func = "Greater"; break;
+    case Lt: func = "Lesser"; break;
+    case And: func = "And"; break;
+    case Or: func = "Or"; break;
+    case Not: func = "Not"; break;
     }
 
     fprintf (stdout, "Function: %s\n", func);
@@ -445,6 +475,8 @@ void help (void)
     fprintf (stdout, "calc is a simple calculator\n\n");
     fprintf (stdout, "supported operators:\n");
     fprintf (stdout, " + - * / %% ^\n\n");
+    fprintf (stdout, "camparison operators:\n");
+    fprintf (stdout, " == != >= <= > <\n\n");
     fprintf (stdout, "supported functions:\n");
     fprintf (stdout, " pow sqrt cos sin atan log exp\n\n");
     fprintf (stdout, "storage functions:\n");
@@ -502,6 +534,14 @@ double evaluate_element (element_t *root, char mask)
     case Mod:
     case Pow:
     case Store:
+    case Equal:
+    case Diff:
+    case Ge:
+    case Le:
+    case Gt:
+    case Lt:
+    case And:
+    case Or:
         if (root->ops[1]) {
             op1 = evaluate_element (root->ops[1], nextmask);
         } else if (root->func != Store) {
@@ -516,6 +556,7 @@ double evaluate_element (element_t *root, char mask)
     case Log:
     case Exp:
     case Recall:
+    case Not:
         if (root->ops[0]) {
             op0 = evaluate_element (root->ops[0], 0);
         } else {
@@ -555,6 +596,15 @@ double evaluate_element (element_t *root, char mask)
     case Ans: return answer;
     case Pi: return M_PI;
     case E: return M_E;
+    case Equal: return op0 == op1;
+    case Diff: return op0 != op1;
+    case Ge: return op0 >= op1;
+    case Le: return op0 <= op1;
+    case Gt: return op0 > op1;
+    case Lt: return op0 < op1;
+    case And: return (op0 != 0) && (op1 != 0);
+    case Or: return (op0 != 0) || (op1 != 0);
+    case Not: return (op0 == 0);
     }
 
     return 0;