#include "parser.h"
+/* external definition */
+
+extern void history ();
+
/* global variables */
double answer = 0;
+double anglefactor = 1;
+
/* compare codes */
int codecmp (char *ref, char *str)
return 0;
}
-/* functions */
-
-#define MAX_ARGS 100
-
-#define NB_OPERATORS 14
-keyword_t operators[NB_OPERATORS] = {
- { "+\t", Add, 2, 1, 1},
- { "-\t", Sub, 2, 1, 1},
- { "*", Mul, 2, 1, 2},
- { "/", Div, 2, 1, 2},
- { "%", Mod, 2, 1, 3},
- { "^", 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 52
-keyword_t functions[NB_FUNCTIONS] = {
- { "sqrt", Sqr, 1, 4, 5},
- { "pow", Pow, 2, 3, 5},
- { "cos", Cos, 1, 3, 5},
- { "sin", Sin, 1, 3, 5},
- { "tan", Tan, 1, 3, 5},
- { "acos", Acos, 1, 4, 5},
- { "asin", Asin, 1, 4, 5},
- { "atan", Atan, 1, 4, 5},
- { "ln", Ln, 1, 2, 5},
- { "log", Log, 1, 3, 5},
- { "exp", Exp, 1, 3, 5},
- { "erfc", Erfc, 1, 4, 5},
- { "erf", Erf, 1, 3, 5},
- { "abs", Abs, 1, 3, 5},
- { "floor", Floor, 1, 5, 5},
- { "ceil", Ceil, 1, 4, 5},
- { "sto", Store, 2, 3, 5},
- { "rcl", Recall, 1, 3, 5},
- { "inc", Inc, 1, 3, 5},
- { "dec", Dec, 1, 3, 5},
- { "disp", Disp, 0, 4, 9},
- { "mem", Memory, 1, 3, 5},
- { "clr", Clear, 0, 3, 9},
- { "quit", Quit, 0, 4, 9},
- { "help", Help, 0, 4, 9},
- { "!", Not, 1, 1, 6},
- { "cond", Cond, 3, 4, 5},
- { "while", While, 2, 5, 5},
- { "print", Print, 1, 5, 5},
- { "prog", Prog, 2, 4, 9},
- { "arg", Arg, 1, 3, 5},
- { "call", Call, MAX_ARGS, 4, 5},
- { "ls", List, 0, 2, 9},
- { "edit", Edit, 1, 4, 9},
- { "del", Del, 1, 3, 9},
- { "get", Get, 1, 3, 5},
- { "len", Length, 0, 3, 5},
- { "pop", Pop, 0, 3, 5},
- { "push", Push, 1, 4, 5},
- { "put", Put, 2, 3, 5},
- { "set", Set, MAX_ARGS, 3, 5},
- { "show", Show, 0, 4, 5},
- { "max", Max, 2, 3, 5},
- { "mean", Mean, 2, 4, 5},
- { "med", Median, 0, 3, 5},
- { "min", Min, 2, 3, 5},
- { "ord", Order, 0, 3, 5},
- { "prod", Prod, 0, 4, 5},
- { "sum", Sum, 0, 3, 5},
- { "var", Variance, 2, 3, 5},
- { "format", Precision, 1, 6, 9},
- { "base", Base, 2, 4, 9}
-};
-
-#define NB_CONSTANTS 3
-keyword_t constants[NB_CONSTANTS] = {
- { "ans", Ans, 0, 3, 5},
- { "e", E, 0, 1, 5},
- { "pi", Pi, 0, 2, 5}
-};
-
-#define NB_SYMBOLS 4
-char *symbols[NB_SYMBOLS] = {
- "(", ")", "{", "}"
-};
-
/* subparser function */
element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, int prio)
if (*str == '(') {
VERBOSE (DEBUG, fprintf (stdout, "start processing bracket\n"));
if (root) {
+ if (root->func == Val) {
+ delelement (root);
+ return ERROR_OP;
+ }
do {
found = 0;
new = parser (str + 1, &str, 0);
}
} while (*str == ',');
} else {
- root = newelement (Val, 1, 5);
+ root = newelement (Id, 1, 5);
new = parser (str + 1, &str, 0);
if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
delelement (new);
VERBOSE (DEBUG, fprintf (stdout, "start processing value\n"));
char *pt;
- double value = (get_ibase () == 10) ? strtod (str, &pt) : strtoul (str, &pt, get_ibase ());
+ double value = (get_ibase () == 10) ? strtod (str, &pt) : strtol (str, &pt, get_ibase ());
VERBOSE (INFO, fprintf (stdout, "Value: %f\n", value));
if (str != pt) {
if ((root == NULL) || (root->prio == 6)) {
switch (root->func) {
case Val: func = "Value"; break;
+ case Id: func = "Ident"; break;
case Sig: func = "Sign"; break;
case Add: func = "Addition"; break;
case Sub: func = "Subtraction"; break;
case Clear: func = "Clear"; break;
case Quit: func = "Quit"; break;
case Help: func = "Help"; break;
+ case History: func = "History"; break;
case Ans: func = "Ans"; break;
case Pi: func = "Pi"; break;
case E: func = "E"; break;
case Variance: func = "Variance"; break;
case Precision: func = "Precision"; break;
case Base: func = "Base"; break;
+ case Deg: func = "Degree"; break;
+ case Grad: func = "Gradian"; break;
+ case Rad: func = "Radian"; break;
}
printf ("Function: %s\n", func);
printf ("stack func.:");
printf (" max mean med min ord prod sum var\n");
printf ("control management:");
- printf (" base format help quit\n");
+ printf (" base format help hist quit\n");
+ printf ("angle management:");
+ printf (" deg grad rad\n");
printf ("constants:");
printf (" ans e pi\n");
}
return 0;
}
/* fallthrough */
+ case Id:
case Sqr:
case Cos:
case Sin:
case Clear:
case Quit:
case Help:
+ case History:
case Ans:
case Pi:
case E:
case Order:
case Prod:
case Sum:
+ case Deg:
+ case Grad:
+ case Rad:
break;
case While:
if (root->ops[0] == NULL) {
switch (root->func) {
case Val: return op0;
+ case Id: return op0;
case Sig: return -op0;
case Add: return ((mask & MASK_SUB) == 0) ? op0 + op1 : op0 - op1;
case Sub: return ((mask & MASK_SUB) == 0) ? op0 - op1 : op0 + op1;
case Mod: return fmod (op0, op1);
case Pow: return pow (op0, op1);
case Sqr: return sqrt (op0);
- case Cos: return cos (op0);
- case Sin: return sin (op0);
- case Tan: return tan (op0);
- case Acos: return acos (op0);
- case Asin: return asin (op0);
- case Atan: return atan (op0);
+ case Cos: return cos (op0 / anglefactor);
+ case Sin: return sin (op0 / anglefactor);
+ case Tan: return tan (op0 / anglefactor);
+ case Acos: return acos (op0) * anglefactor;
+ case Asin: return asin (op0) * anglefactor;
+ case Atan: return atan (op0) * anglefactor;
case Ln: return log (op0);
case Log: return log10 (op0);
case Exp: return exp (op0);
case Clear: clear (); break;
case Quit: quit (); break;
case Help: help (); break;
+ case History: history (); break;
case Ans: return answer;
case Pi: return M_PI;
case E: return M_E;
case Base:
base ((int)op0, (int)op1);
break;
+ case Deg:
+ anglefactor = 180 / M_PI;
+ break;
+ case Grad:
+ anglefactor = 200 / M_PI;
+ break;
+ case Rad:
+ anglefactor = 1;
+ break;
}
return 0;
}
-char **generate_completion_list ()
-{
- int i, j, l = 0;
- char **list = (char **) callocordie (NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1, sizeof (char *));
-
- for (i = 0; i < NB_OPERATORS; i++) {
- list[l] = strdup ((operators + i)->keyword);
- for (j = 0; j < (int)strlen (list[l]); j++) {
- if (list[i][j] == '\t') {
- list[i][j] = '\0';
- }
- }
- if (list[l] != NULL) {
- l++;
- }
- }
-
- for (i = 0; i < NB_FUNCTIONS; i++) {
- list[l] = strdup ((functions + i)->keyword);
- if (list[l] != NULL) {
- l++;
- }
- }
-
- for (i = 0; i < NB_CONSTANTS; i++) {
- list[l] = strdup ((constants + i)->keyword);
- if (list[l] != NULL) {
- l++;
- }
- }
-
- for (i = 0; i < NB_SYMBOLS; i++) {
- list[l] = strdup (symbols[i]);
- if (list[l] != NULL) {
- l++;
- }
- }
-
- return (list);
-}
-
-void free_completion_list (char **list)
-{
- int i;
-
- if (list) {
- for (i = 0; i < NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1; i++) {
- if (list[i] != NULL) {
- free (list[i]);
- }
- }
- free (list);
- }
-}
-
/* vim: set ts=4 sw=4 et: */