Soft'N'Design Software
/
projects
/
calc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem without argument returns size
[calc.git]
/
parser.c
diff --git
a/parser.c
b/parser.c
index 223b173bafd76faf34ba7ac0eca01f7b438d1965..f566fbe4dd905384f7d5e8ca96516e274f034d79 100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-160,7
+160,7
@@
keyword_t functions[NB_FUNCTIONS] = {
{ "inc", Inc, 1, 3, 5},
{ "dec", Dec, 1, 3, 5},
{ "disp", Disp, 0, 4, 9},
{ "inc", Inc, 1, 3, 5},
{ "dec", Dec, 1, 3, 5},
{ "disp", Disp, 0, 4, 9},
- { "mem", Mem, 1, 3, 5},
+ { "mem", Mem
ory
, 1, 3, 5},
{ "clr", Clear, 0, 3, 9},
{ "quit", Quit, 0, 4, 9},
{ "help", Help, 0, 4, 9},
{ "clr", Clear, 0, 3, 9},
{ "quit", Quit, 0, 4, 9},
{ "help", Help, 0, 4, 9},
@@
-556,7
+556,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 Inc: func = "Increase"; break;
case Dec: func = "Decrease"; break;
case Disp: func = "Display"; break;
- case Mem: func = "Memory"; break;
+ case Mem
ory
: func = "Memory"; break;
case Clear: func = "Clear"; break;
case Quit: func = "Quit"; break;
case Help: func = "Help"; break;
case Clear: func = "Clear"; break;
case Quit: func = "Quit"; break;
case Help: func = "Help"; break;
@@
-615,11
+615,11
@@
void print_element (element_t *root, int level)
/* storage functions */
/* storage functions */
-
void
memory (int nb)
+
int
memory (int nb)
{
int i, l;
double *tmp = NULL;
{
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++) {
l = (nb < storage_size) ? nb : storage_size;
tmp = (double *) callocordie (nb, sizeof (double));
for (i = 0; i < l; i++) {
@@
-631,6
+631,10
@@
void memory (int nb)
storage = tmp;
storage_size = nb;
}
storage = tmp;
storage_size = nb;
}
+ if (storage_size == -1) {
+ memory (DEFAULT_STORAGE_SIZE);
+ }
+ return storage_size;
}
double store (int index, double value)
}
double store (int index, double value)
@@
-1345,7
+1349,6
@@
double evaluate_element (element_t *root, char mask)
case Div:
case Mod:
case Pow:
case Div:
case Mod:
case Pow:
- case Store:
case Equal:
case Diff:
case Ge:
case Equal:
case Diff:
case Ge:
@@
-1356,7
+1359,7
@@
double evaluate_element (element_t *root, char mask)
case Or:
if (root->ops[1]) {
op1 = evaluate_element (root->ops[1], nextmask);
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;
}
VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[1])\n"));
return 0;
}
@@
-1380,7
+1383,6
@@
double evaluate_element (element_t *root, char mask)
case Inc:
case Dec:
case Not:
case Inc:
case Dec:
case Not:
- case Mem:
case Cond:
case Prog:
case Arg:
case Cond:
case Prog:
case Arg:
@@
-1419,10
+1421,22
@@
double evaluate_element (element_t *root, char mask)
return 0;
}
break;
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 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 Put:
if (root->ops[0]) {
op0 = evaluate_element (root->ops[0], 0);
@@
-1466,12
+1480,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 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 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 Mem
ory: return memory ((root->ops[0]) ? (int)op0 : -1)
;
case Clear: clear (); break;
case Quit: quit (); break;
case Help: help (); break;
case Clear: clear (); break;
case Quit: quit (); break;
case Help: help (); break;