add logical operators

[calc.git] / parser.c

diff --git a/parser.c b/parser.c
index 76f8da9f730305edbcccd7644bf0fa5f8de33c03..ad246cdcde676807a7769893dcb82b304af347e8 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -69,7 +69,7 @@ void delelement (element_t *root)
 
 /* functions */
 
-#define NB_OPERATORS 12
+#define NB_OPERATORS 14
 
 keyword_t operators[NB_OPERATORS] = {
     { "+\t", Add, 2, 1, 1},
@@ -78,15 +78,17 @@ keyword_t operators[NB_OPERATORS] = {
     { "/",   Div, 2, 1, 2},
     { "%",   Mod, 2, 1, 3},
     { "^",   Pow, 2, 1, 4},
-    { "==",  Equal, 2, 2, 0},
-    { "!=",  Diff, 2, 2, 0},
-    { ">=",  Ge, 2, 2, 0},
-    { "<=",  Le, 2, 2, 0},
-    { ">",   Gt, 2, 1, 0},
-    { "<",   Lt, 2, 1, 0}
+    { "==",  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},
@@ -95,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
@@ -394,6 +397,9 @@ void print_element (element_t *root, int level)
     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);
@@ -522,6 +528,8 @@ double evaluate_element (element_t *root, char mask)
     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) {
@@ -536,6 +544,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 {
@@ -581,6 +590,9 @@ double evaluate_element (element_t *root, char mask)
     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;