X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.c;h=77013e389665d0968da61faa83f8575e14d3d59f;hb=0b69fdfbcd1174e83284c2bf984fd334b0ba679e;hp=1e9b9861731ac2ccbc81f844afbd9c80f91859d6;hpb=c91672f948d371d3ba2b1a47db9a31fcabb763f5;p=calc.git diff --git a/parser.c b/parser.c index 1e9b986..77013e3 100644 --- a/parser.c +++ b/parser.c @@ -62,7 +62,7 @@ keyword_t operators[NB_OPERATORS] = { { "|", Or, 2, 1, -2} }; -#define NB_FUNCTIONS 50 +#define NB_FUNCTIONS 52 keyword_t functions[NB_FUNCTIONS] = { { "sqrt", Sqr, 1, 4, 5}, { "pow", Pow, 2, 3, 5}, @@ -85,7 +85,7 @@ keyword_t functions[NB_FUNCTIONS] = { { "inc", Inc, 1, 3, 5}, { "dec", Dec, 1, 3, 5}, { "disp", Disp, 0, 4, 9}, - { "mem", Mem, 1, 3, 5}, + { "mem", Memory, 1, 3, 5}, { "clr", Clear, 0, 3, 9}, { "quit", Quit, 0, 4, 9}, { "help", Help, 0, 4, 9}, @@ -114,6 +114,8 @@ keyword_t functions[NB_FUNCTIONS] = { { "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 @@ -370,51 +372,48 @@ element_t *parser (char *str, char **next, int prio) /* look for number */ - if (((*str >= '0') && (*str <= '9')) || - (*str == '.') || (*str == '+') || (*str == '-')) { - VERBOSE (DEBUG, fprintf (stdout, "start processing value\n")); - char *pt; - double value = strtod (str, &pt); - VERBOSE (INFO, fprintf (stdout, "Value: %f\n", value)); - if (str != pt) { - if ((root == NULL) || (root->prio == 6)) { - new = newelement (Val, 1, 5); - new->value = value; - if (root == NULL) { - root = new; - } else { - for (i = 0; i < root->nbops; i++) { - if (root->ops[i] == NULL) { - root->ops[i] = new; - found = 1; - break; - } - } - if (!found) { - delelement (new); - delelement (root); - return ERROR_OP; + VERBOSE (DEBUG, fprintf (stdout, "start processing value\n")); + char *pt; + double value = (get_ibase () == 10) ? strtod (str, &pt) : strtoul (str, &pt, get_ibase ()); + VERBOSE (INFO, fprintf (stdout, "Value: %f\n", value)); + if (str != pt) { + if ((root == NULL) || (root->prio == 6)) { + new = newelement (Val, 1, 5); + new->value = value; + if (root == NULL) { + root = new; + } else { + for (i = 0; i < root->nbops; i++) { + if (root->ops[i] == NULL) { + root->ops[i] = new; + found = 1; + break; } } - str = pt; - } else if ((*str == '+') || (*str == '-')) { - if ((prio) && (prio > 1)) { - VERBOSE (DEBUG, fprintf (stdout, "stop because operator priority\n")); - *next = str; - return root; - } - if (subparser (&root, &str, Add, 2, 1) == ERROR_OP) { + if (!found) { + delelement (new); delelement (root); return ERROR_OP; } - } else { + } + str = pt; + } else if ((*str == '+') || (*str == '-')) { + if ((prio) && (prio > 1)) { + VERBOSE (DEBUG, fprintf (stdout, "stop because operator priority\n")); + *next = str; + return root; + } + if (subparser (&root, &str, Add, 2, 1) == ERROR_OP) { delelement (root); return ERROR_OP; } - found = 1; + } else { + delelement (root); + return ERROR_OP; } - VERBOSE (DEBUG, fprintf (stdout, "stop processing value\n")); + found = 1; } + VERBOSE (DEBUG, fprintf (stdout, "stop processing value\n")); /* error */ @@ -481,7 +480,7 @@ void print_element (element_t *root, int level) case Inc: func = "Increase"; break; case Dec: func = "Decrease"; break; case Disp: func = "Display"; break; - case Mem: func = "Memory"; break; + case Memory: func = "Memory"; break; case Clear: func = "Clear"; break; case Quit: func = "Quit"; break; case Help: func = "Help"; break; @@ -522,6 +521,8 @@ void print_element (element_t *root, int level) case Prod: func = "Product"; break; case Sum: func = "Sum"; break; case Variance: func = "Variance"; break; + case Precision: func = "Precision"; break; + case Base: func = "Base"; break; } fprintf (stdout, "Function: %s\n", func); @@ -617,11 +618,43 @@ void help (void) fprintf (stdout, "stack func.:"); fprintf (stdout, " max mean med min ord prod sum var\n"); fprintf (stdout, "control management:"); - fprintf (stdout, " help quit\n"); + fprintf (stdout, " base format help quit\n"); fprintf (stdout, "constants:"); fprintf (stdout, " ans e pi\n"); } +/* format function */ + +int format (int precision) +{ + if (precision > 0) { + set_precision (precision); + set_format (); + } else if (precision != -1) { + VERBOSE (WARNING, fprintf (stdout, "error incorrect precision (%d)\n", precision)); + return 0; + } + return get_precision (); +} + +/* base function */ + +void base (int in, int out) +{ + if ((in > 0) && (in < 37)) { + set_base (in, in); + if ((out > 0) && (out < 37)) { + set_base (in, out); + } else if (out != - 1) { + VERBOSE (WARNING, fprintf (stdout, "error incorrect output base (%d)\n", out)); + } + } else if (in != -1 ) { + VERBOSE (WARNING, fprintf (stdout, "error incorrect input base (%d)\n", in)); + } else { + printf ("base (I/O): %s\n", show_base ()); + } +} + /* evaluate element tree */ #define MASK_SUB 0x1 @@ -669,7 +702,6 @@ double evaluate_element (element_t *root, char mask) case Div: case Mod: case Pow: - case Store: case Equal: case Diff: case Ge: @@ -680,7 +712,7 @@ double evaluate_element (element_t *root, char mask) case Or: if (root->ops[1]) { op1 = evaluate_element (root->ops[1], nextmask); - } else if (root->func != Store) { + } else { VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[1])\n")); return 0; } @@ -704,7 +736,6 @@ double evaluate_element (element_t *root, char mask) case Inc: case Dec: case Not: - case Mem: case Cond: case Prog: case Arg: @@ -743,10 +774,22 @@ double evaluate_element (element_t *root, char mask) return 0; } break; + case Memory: + if (root->ops[0] == NULL) { + op0 = -1; + } else { + op0 = (int)evaluate_element (root->ops[0], 0); + if (op0 < 0) { + VERBOSE (WARNING, fprintf (stdout, "error incorrect memory size (%d)\n", (int)op0)); + return 0; + } + } + break; case Push: case Print: op0 = (root->ops[0]) ? evaluate_element (root->ops[0], 0) : answer; break; + case Store: case Put: if (root->ops[0]) { op0 = evaluate_element (root->ops[0], 0); @@ -764,6 +807,14 @@ double evaluate_element (element_t *root, char mask) op0 = evaluate_element (root->ops[0], 0); op1 = (root->ops[1]) ? evaluate_element (root->ops[1], 0) : answer; } + break; + case Precision: + op0 = (root->ops[0]) ? evaluate_element (root->ops[0], 0) : -1; + break; + case Base: + op0 = (root->ops[0]) ? evaluate_element (root->ops[0], 0) : -1; + op1 = (root->ops[1]) ? evaluate_element (root->ops[1], 0) : -1; + break; } switch (root->func) { @@ -790,12 +841,12 @@ double evaluate_element (element_t *root, char mask) case Abs: return fabs (op0); case Ceil: return ceil (op0); case Floor: return floor (op0); - case Store: return store ((int)op0, (op1) ? op1 : answer); + case Store: return store ((int)op0, op1); case Recall: return recall ((int)op0); case Inc: return increase ((int)op0); case Dec: return decrease ((int)op0); case Disp: display (); break; - case Mem: memory ((int)op0); break; + case Memory: return memory ((root->ops[0]) ? (int)op0 : -1); case Clear: clear (); break; case Quit: quit (); break; case Help: help (); break; @@ -828,7 +879,7 @@ double evaluate_element (element_t *root, char mask) break; case Arg: return arg ((int)op0); case Call: - for (i = 1, nb =0; i < root->nbops; i++) { + for (i = 1, nb = 0; i < root->nbops; i++) { if (root->ops[i]) { nb++; } @@ -877,6 +928,11 @@ double evaluate_element (element_t *root, char mask) return op0 * op0 + op1 * op1; } return variance (); + case Precision: + return format ((int)op0); + case Base: + base ((int)op0, (int)op1); + break; } return 0;