fix converage tests

[calc.git] / parser.c

diff --git a/parser.c b/parser.c
index b3f370d0c059f6715fdf0b7141027809ec643f3e..9e7e51013e3a050f04a8c48c9e28aa1e971be542 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -83,9 +83,7 @@ void delelement (element_t *root)
     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);
@@ -206,6 +204,7 @@ element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, in
 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"));
@@ -240,10 +239,7 @@ element_t *parser (char *str, char **next, int prio)
                 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);
@@ -255,14 +251,14 @@ element_t *parser (char *str, char **next, int prio)
                     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 != '}') {
@@ -478,6 +474,11 @@ element_t *parser (char *str, char **next, int prio)
         *next = str;
     }
 
+    /* save string */
+    if (root != NULL) {
+        root->string = string;
+    }
+
     return root;
 }
 
@@ -669,12 +670,15 @@ double while_do (element_t *cond, element_t *action)
         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);
         }
     }
 
@@ -691,7 +695,6 @@ double execute_code (element_t **prog, int nbcalls)
     int i;
     for (i = 0; i < nbcalls; i++) {
         ret = evaluate_element (prog[i], 0);
-        prog[i] = NULL;
     }
     return ret;
 }
@@ -776,6 +779,7 @@ void prog (int id, int nbmems, element_t *root)
             }
             if ((programs + n)->string) {
                 free ((programs + n)->string);
+                (programs + n)->string = NULL;
             }
         }
     }
@@ -822,8 +826,8 @@ double call (int id, int nbops, element_t **ops)
         double *tmp = (double *) callocordie (nbops, sizeof (double));
         memcpy (tmp, storage, storage_size * sizeof (double));
         free (storage);
-        storage = tmp;
-        storage_size = nbops;
+        (programs + n)->storage = storage = tmp;
+        (programs + n)->storage_size = storage_size = nbops;
     }
     for (i = 0; i < nbops; i++) {
         double val = evaluate_element (ops[i], 0);
@@ -833,6 +837,7 @@ double call (int id, int nbops, element_t **ops)
     /* evaluate program */
     element_t *elements = dupelement ((programs + n)->root);
     ret = evaluate_element (elements, 0);
+    delelement (elements);
 
     /* restore context */
     answer = tmp.answer;
@@ -872,11 +877,10 @@ void edit (int id)
     }
 
     /* 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;
 
@@ -890,15 +894,16 @@ void save_string (int id, char *string)
             }
         }
     }
-    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);
 }
 
@@ -1138,7 +1143,10 @@ double evaluate_element (element_t *root, char mask)
     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]) {
@@ -1200,7 +1208,7 @@ void free_completion_list (char **list)
     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]);
             }