if ((root != NULL) && (root != ERROR_OP)) {
int i;
for (i = 0; i < root->nbops; i++) {
- if ((root->ops[i] != NULL) && (root->ops[i] != ERROR_OP)) {
- delelement (root->ops[i]);
- }
+ delelement (root->ops[i]);
}
if (root->nbops) {
free (root->ops);
element_t *parser (char *str, char **next, int prio)
{
element_t *root = NULL;
+ char *string = str;
int i;
VERBOSE (DEBUG, fprintf (stdout, "Starting parsing\n"));
delelement (root);
return ERROR_OP;
}
- element_t **prog = NULL;
- new = newelement (Code, 0, 5);
- root = new;
- prog = &root;
+ root = newelement (Code, 0, 5);
do {
new = parser (str + 1, &str, 0);
delelement (root);
return ERROR_OP;
}
- element_t *newprog = newelement (Code, (*prog)->nbops + 1, 5);
- for (i = 0; i < (*prog)->nbops; i++) {
- newprog->ops[i] = (*prog)->ops[i];
- (*prog)->ops[i] = NULL;
+ element_t *newprog = newelement (Code, root->nbops + 1, 5);
+ for (i = 0; i < root->nbops; i++) {
+ newprog->ops[i] = root->ops[i];
+ root->ops[i] = NULL;
}
- newprog->ops[(*prog)->nbops] = new;
- delelement (*prog);
- (*prog) = newprog;
+ newprog->ops[root->nbops] = new;
+ delelement (root);
+ root = newprog;
} while (*str == ',');
if (*str != '}') {
*next = str;
}
+ /* save string */
+ if (root != NULL) {
+ root->string = string;
+ }
+
return root;
}
VERBOSE (DEBUG, fprintf (stdout, "loop...\n"));
temp = dupelement (cond);
- if (!evaluate_element (temp, 0)) {
+ double test = evaluate_element (temp, 0);
+ delelement (temp);
+ if (!test) {
break;
}
if (action) {
temp = dupelement (action);
ret = evaluate_element (temp, 0);
+ delelement (temp);
}
}
int i;
for (i = 0; i < nbcalls; i++) {
ret = evaluate_element (prog[i], 0);
- prog[i] = NULL;
}
return ret;
}
}
if ((programs + n)->string) {
free ((programs + n)->string);
+ (programs + n)->string = NULL;
}
}
}
/* evaluate program */
element_t *elements = dupelement ((programs + n)->root);
ret = evaluate_element (elements, 0);
+ delelement (elements);
/* restore context */
answer = tmp.answer;
}
/* set string program */
- //rl_insert_text ((programs + n)->string);
- VERBOSE (INFO, fprintf (stdout, "edit: %s\n", (programs + n)->string));
+ fprintf (stdout, "edit: %s\n", (programs + n)->string);
}
-void save_string (int id, char *string)
+void savestring (int id, char *string)
{
int i, n = -1;
}
}
}
- if (n == -1) {
- VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
- return;
- }
- /* save program */
- if ((programs + n)->string) {
- free ((programs + n)->string);
- }
+ /* unnecesary code */
+ //if (n == -1) {
+ // VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+ // return;
+ //}
+ //if ((programs + n)->string) {
+ // free ((programs + n)->string);
+ //}
+
(programs + n)->string = strdup (string);
}
case While: return while_do (root->ops[0], root->ops[1]);
case Code: return execute_code (root->ops, root->nbops);
case Print: return print (op0);
- case Prog: prog ((int)op0, (int)op1, root->ops[2]); break;
+ case Prog:
+ prog ((int)op0, (int)op1, root->ops[2]);
+ savestring ((int)op0, root->string);
+ break;
case Call:
for (i = 1, nb =0; i < root->nbops; i++) {
if (root->ops[i]) {
int i;
if (list) {
- for (i = 0; i < NB_FUNCTIONS + NB_CONSTANTS; i++) {
+ for (i = 0; i < NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1; i++) {
if (list[i] != NULL) {
free (list[i]);
}