{ "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},
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;
/* storage functions */
-void memory (int nb)
+int memory (int nb)
{
int i, l;
double *tmp = NULL;
- if (nb != storage_size) {
+ if ((nb != -1) && (nb != storage_size)) {
l = (nb < storage_size) ? nb : storage_size;
tmp = (double *) callocordie (nb, sizeof (double));
for (i = 0; i < l; i++) {
storage = tmp;
storage_size = nb;
}
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
+ return storage_size;
}
double store (int index, double value)
case Div:
case Mod:
case Pow:
- case Store:
case Equal:
case Diff:
case Ge:
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;
}
case Inc:
case Dec:
case Not:
- case Mem:
case Cond:
case Prog:
case Arg:
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);
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;