/* functions */
-#define NB_OPERATORS 6
+#define NB_OPERATORS 14
keyword_t operators[NB_OPERATORS] = {
{ "+\t", Add, 2, 1, 1},
{ "*", 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},
{ "atan", Atan, 1, 4, 5},
{ "exp", Exp, 1, 3, 5},
{ "log", Log, 1, 3, 5},
- { "sto", Store, 1, 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
}
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;
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;
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);
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);
/* storage functions */
-double store (int index)
+double store (int index, double value)
{
if ((index > 0) && (index <= STORAGE_SIZE)) {
- storage[index - 1] = answer;
+ storage[index - 1] = value;
} else {
VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, STORAGE_SIZE));
}
- return answer;
+ return value;
}
double recall (int index)
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");
case Div:
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 {
+ } else if (root->func != Store) {
VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[1])\n"));
return 0;
}
case Atan:
case Log:
case Exp:
- case Store:
case Recall:
+ case Not:
if (root->ops[0]) {
op0 = evaluate_element (root->ops[0], 0);
} else {
case Atan: return atan (op0);
case Log: return log (op0);
case Exp: return exp (op0);
- case Store: return store ((int)op0);
+ case Store: return store ((int)op0, (op1) ? op1 : answer);
case Recall: return recall ((int)op0);
case Disp: display (); break;
case Quit: quit (); break;
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;