From ca3e2a2f00c7ccafb9b01ed89d51b632acc01ea8 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Sun, 22 Jan 2023 22:05:49 +0100 Subject: [PATCH] add logical operators --- calc.c | 17 ++++++++++++++++- parser.c | 36 ++++++++++++++++++++++++------------ parser.h | 5 +++-- 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/calc.c b/calc.c index 0134b74..8aa124a 100644 --- a/calc.c +++ b/calc.c @@ -252,7 +252,9 @@ int main (int argc, char *argv[]) // test: echo -e '1\nsto (0)\nsto (11)\nrcl (0)\nrcl (11)' | calc.exe | grep -c invalid | xargs test 4 = // test: echo -e '1\nsto (2)\n3\nsto (5, 7)\nsto(9)\ndisp' | calc.exe | grep -q '0 1 0 0 7 0 0 0 7 0' // test: echo -e '1+1 == 2' | calc.exe | grep -q '=> 1' -// test: echo -e '1-cos(3*pi/4) != 0.5^-2' | calc.exe | grep -q '=> 0' +// test: echo -e '1 + 1 == 2 - 0' | calc.exe | grep -q '=> 1' +// test: echo -e '1 == 1 + 1 == 1' | calc.exe | grep -q '=> 0' +// test: echo -e '1-cos(3*pi/4) != 0.5^-2' | calc.exe | grep -q '=> 1' // test: echo -e '1 >= 2' | calc.exe | grep -q '=> 0' // test: echo -e '2 >= 2' | calc.exe | grep -q '=> 1' // test: echo -e '1 <= 2' | calc.exe | grep -q '=> 1' @@ -262,5 +264,18 @@ int main (int argc, char *argv[]) // test: echo -e '1 < 2' | calc.exe | grep -q '=> 1' // test: echo -e '2 < 2' | calc.exe | grep -q '=> 0' // test: echo -e '1 == 1\n1 != 1\n1 >= 1\n1 <= 1\n1 > 1\n1 < 1\nquit' | calc.exe -v 3 | grep -q bye +// test: echo -e '(3 == 3) & (2 > 1)' | calc.exe | grep -q '=> 1' +// test: echo -e '(3 == 4) & (2 > 1)' | calc.exe | grep -q '=> 0' +// test: echo -e '(3 == 3) & (2 > 2)' | calc.exe | grep -q '=> 0' +// test: echo -e '(3 == 4) & (2 > 2)' | calc.exe | grep -q '=> 0' +// test: echo -e '(3 == 3) | (2 > 1)' | calc.exe | grep -q '=> 1' +// test: echo -e '(3 == 4) | (2 > 1)' | calc.exe | grep -q '=> 1' +// test: echo -e '(3 == 3) | (2 > 2)' | calc.exe | grep -q '=> 1' +// test: echo -e '(3 == 4) | (2 > 2)' | calc.exe | grep -q '=> 0' +// test: echo -e '!(3 == 4)' | calc.exe | grep -q '=> 1' +// test: echo -e '!(3 == 3)' | calc.exe | grep -q '=> 0' +// 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' /* vim: set ts=4 sw=4 et: */ diff --git a/parser.c b/parser.c index 76f8da9..ad246cd 100644 --- 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; diff --git a/parser.h b/parser.h index fb09da2..80fbd98 100644 --- a/parser.h +++ b/parser.h @@ -17,7 +17,8 @@ typedef enum { Store, Recall, Disp, Quit, Help, Ans, E, Pi, - Equal, Diff, Ge, Le, Gt, Lt + Equal, Diff, Ge, Le, Gt, Lt, + And, Or, Not } func_t; /* keyword type */ @@ -27,7 +28,7 @@ typedef struct _keyword_t { func_t func; int nbops; int offset; - int prio; + float prio; } keyword_t; /* calculus element type */ -- 2.30.2