X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.c;h=4e360ddaf70bec25ea4cb46ad72bd2bb12aa276e;hb=a9a3da22ab3f1bf022fc02443494006bca82ed45;hp=4b4fab7678dd65352e28a2922fe2e94a56ba4810;hpb=e7d5c144993fb113e2f009c06cd4341b38b89fbe;p=calc.git

diff --git a/parser.c b/parser.c
index 4b4fab7..4e360dd 100644
--- a/parser.c
+++ b/parser.c
@@ -14,9 +14,11 @@ double answer = 0;
 
 #define DEFAULT_STORAGE_SIZE 10
 int storage_size = -1;
-
 double *storage = NULL;
 
+int stack_size = 0;
+double *stack = NULL;
+
 #define DEFAULT_FORMAT "=> %.6g\n"
 char *format = NULL;
 char *minform = NULL;
@@ -46,21 +48,28 @@ int codecmp (char *ref, char *str)
     return 0;
 }
 
-/* allocate new element */
+/* calloc or die function */
 
-element_t *newelement (func_t function, int nbops, int prio)
+void *callocordie (size_t count, size_t size)
 {
-    element_t *new = (element_t *) calloc (1, sizeof (element_t));
+    if (count * size == 0) {
+        return NULL;
+    }
+    void *new = calloc (count, size);
     if (new == NULL) {
         VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
         exit (1);
     }
+    return new;
+}
+
+/* allocate new element */
+
+element_t *newelement (func_t function, int nbops, int prio)
+{
+    element_t *new = (element_t *) callocordie (1, sizeof (element_t));
     if (nbops) {
-        new->ops = (element_t **) calloc (nbops, sizeof (element_t *));
-        if (new->ops == NULL) {
-            VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
-            exit (1);
-        }
+        new->ops = (element_t **) callocordie (nbops, sizeof (element_t *));
     }
     new->func = function;
     new->nbops = nbops;
@@ -76,9 +85,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);
@@ -107,6 +114,8 @@ element_t *dupelement (element_t *root)
 
 /* functions */
 
+#define MAX_ARGS 100
+
 #define NB_OPERATORS 14
 keyword_t operators[NB_OPERATORS] = {
     { "+\t", Add, 2, 1, 1},
@@ -125,7 +134,7 @@ keyword_t operators[NB_OPERATORS] = {
     { "|",   Or, 2, 1, -2}
 };
 
-#define NB_FUNCTIONS 31
+#define NB_FUNCTIONS 41
 keyword_t functions[NB_FUNCTIONS] = {
     { "sqrt", Sqr, 1, 4, 5},
     { "pow",  Pow, 2, 3, 5},
@@ -135,8 +144,11 @@ keyword_t functions[NB_FUNCTIONS] = {
     { "acos", Acos, 1, 4, 5},
     { "asin", Asin, 1, 4, 5},
     { "atan", Atan, 1, 4, 5},
+    { "ln",   Ln, 1, 2, 5},
     { "log",  Log, 1, 3, 5},
     { "exp",  Exp, 1, 3, 5},
+    { "erfc", Erfc, 1, 4, 5},
+    { "erf",  Erf, 1, 3, 5},
     { "abs",  Abs, 1, 3, 5},
     { "floor", Floor, 1, 5, 5},
     { "ceil", Ceil, 1, 4, 5},
@@ -154,10 +166,17 @@ keyword_t functions[NB_FUNCTIONS] = {
     { "while", While, 2, 5, 5},
     { "print", Print, 1, 5, 5},
     { "prog", Prog, 3, 4, 9},
-    { "call", Call, 10, 4, 5},
+    { "call", Call, MAX_ARGS, 4, 5},
     { "ls",   List, 0, 2, 9},
     { "edit", Edit, 1, 4, 9},
-    { "del",  Del, 1, 3, 9}
+    { "del",  Del, 1, 3, 9},
+    { "get",  Get, 1, 3, 5},
+    { "len",  Length, 0, 3, 5},
+    { "pop",  Pop, 0, 3, 5},
+    { "push", Push, 1, 4, 5},
+    { "put",  Put, 2, 3, 5},
+    { "set",  Set, MAX_ARGS, 3, 9},
+    { "show",  Show, 0, 4, 9},
 };
 
 #define NB_CONSTANTS 3
@@ -199,6 +218,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"));
@@ -233,10 +253,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);
@@ -248,14 +265,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 != '}') {
@@ -471,6 +488,11 @@ element_t *parser (char *str, char **next, int prio)
         *next = str;
     }
 
+    /* save string */
+    if (root != NULL) {
+        root->string = string;
+    }
+
     return root;
 }
 
@@ -505,8 +527,11 @@ void print_element (element_t *root, int level)
     case Acos: func = "Arc Cosine"; break;
     case Asin: func = "Arc Sine"; break;
     case Atan: func = "Arc Tangent"; break;
-    case Log: func = "Logarithm"; break;
+    case Ln: func = "Logarithm (natural)"; break;
+    case Log: func = "Logarithm (10 base)"; break;
     case Exp: func = "Exponantial"; break;
+    case Erfc: func = "Complementary Error Function"; break;
+    case Erf: func = "Error Function"; break;
     case Abs: func = "Absolute value"; break;
     case Ceil: func = "Ceil value"; break;
     case Floor: func = "Floor value"; break;
@@ -540,6 +565,13 @@ void print_element (element_t *root, int level)
     case List: func = "List"; break;
     case Edit: func = "Edit"; break;
     case Del: func = "Del"; break;
+    case Get: func = "Get"; break;
+    case Length: func = "Length"; break;
+    case Pop: func = "Pop"; break;
+    case Push: func = "Push"; break;
+    case Put: func = "Put"; break;
+    case Set: func = "Set"; break;
+    case Show: func = "Show"; break;
     }
 
     fprintf (stdout, "Function: %s\n", func);
@@ -564,11 +596,7 @@ void memory (int nb)
     double *tmp = NULL;
     if (nb != storage_size) {
         l = (nb < storage_size) ? nb : storage_size;
-        tmp = (double *) calloc (nb, sizeof (double));
-        if (tmp == NULL) {
-            VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
-            exit (1);
-        }
+        tmp = (double *) callocordie (nb, sizeof (double));
         for (i = 0; i < l; i++) {
             tmp[i] = storage[i];
         }
@@ -666,12 +694,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);
         }
     }
 
@@ -688,7 +719,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;
 }
@@ -741,11 +771,7 @@ void prog (int id, int nbmems, element_t *root)
     if (programs == NULL) {
 
         /* initial memory allocation */
-        programs = (workspace_t *) calloc (1, sizeof (workspace_t));
-        if (programs == NULL) {
-            VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
-            exit (1);
-        }
+        programs = (workspace_t *) callocordie (1, sizeof (workspace_t));
         nb_programs = 1;
         n = 0;
 
@@ -762,28 +788,36 @@ void prog (int id, int nbmems, element_t *root)
 
             /* new program */
             n = nb_programs++;
-            programs = (workspace_t *) realloc (programs, nb_programs * sizeof (workspace_t));
+            workspace_t *tmp = (workspace_t *) callocordie (nb_programs, sizeof (workspace_t));
+            memcpy (tmp, programs, (nb_programs - 1) * sizeof (workspace_t));
+            free (programs);
+            programs = tmp;
         } else {
 
             /* clean old program */
             if ((programs + n)->storage) {
                 free ((programs + n)->storage);
             }
+            if ((programs + n)->stack) {
+                free ((programs + n)->stack);
+            }
             if ((programs + n)->root) {
                 delelement ((programs + n)->root);
             }
+            if ((programs + n)->string) {
+                free ((programs + n)->string);
+                (programs + n)->string = NULL;
+            }
         }
     }
 
     /* set program */
     (programs + n)->id = id;
     (programs + n)->answer = 0;
-    (programs + n)->storage = (double *) calloc (nbmems, sizeof (double));
-    if ((programs + n)->storage == NULL) {
-        VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
-        exit (1);
-    }
+    (programs + n)->storage = (double *) callocordie (nbmems, sizeof (double));
     (programs + n)->storage_size = nbmems;
+    (programs + n)->stack = NULL;
+    (programs + n)->stack_size = 0;
     (programs + n)->root = dupelement (root);
 }
 
@@ -802,38 +836,48 @@ double call (int id, int nbops, element_t **ops)
                 break;
             }
         }
-        if (n == -1) {
-            VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
-            return 0;
-        }
+    }
+    if (n == -1) {
+        VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+        return 0;
+    }
 
-        /* store context */
-        tmp.answer = answer;
-        tmp.storage = storage;
-        tmp.storage_size = storage_size;
-
-        /* change context */
-        answer = 0;
-        storage = (programs + n)->storage;
-        storage_size = (programs + n)->storage_size;
-        if (nbops > storage_size) {
-            storage = realloc (storage, nbops * sizeof (double));
-            storage_size = nbops;
-        }
-        for (i = 0; i < nbops; i++) {
-            double val = evaluate_element (ops[i], 0);
-            store (i + 1, val);
-        }
+    /* store context */
+    tmp.answer = answer;
+    tmp.storage = storage;
+    tmp.storage_size = storage_size;
+    tmp.stack = stack;
+    tmp.stack_size = stack_size;
+
+    /* change context */
+    answer = 0;
+    storage = (programs + n)->storage;
+    storage_size = (programs + n)->storage_size;
+    stack = (programs + n)->stack;
+    stack_size = (programs + n)->stack_size;
+    if (nbops > storage_size) {
+        double *tmp = (double *) callocordie (nbops, sizeof (double));
+        memcpy (tmp, storage, storage_size * sizeof (double));
+        free (storage);
+        (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);
+        store (i + 1, val);
+    }
 
-        /* evaluate program */
-        element_t *elements = dupelement ((programs + n)->root);
-        ret = evaluate_element (elements, 0);
+    /* evaluate program */
+    element_t *elements = dupelement ((programs + n)->root);
+    ret = evaluate_element (elements, 0);
+    delelement (elements);
 
-        /* restore context */
-        answer = tmp.answer;
-        storage = tmp.storage;
-        storage_size = tmp.storage_size;
-    }
+    /* restore context */
+    answer = tmp.answer;
+    storage = tmp.storage;
+    storage = tmp.storage;
+    stack_size = tmp.stack_size;
+    stack_size = tmp.stack_size;
 
     return ret;
 }
@@ -841,46 +885,231 @@ double call (int id, int nbops, element_t **ops)
 void list ()
 {
     int i;
-    if (programs != NULL) {
-        fprintf (stdout, "programs:");
+    fprintf (stdout, "programs:");
+    for (i = 0; i < nb_programs; i++) {
+        fprintf (stdout, " %d", (programs + i)->id);
+    }
+    fprintf (stdout, "\n");
+}
+
+void edit (int id)
+{
+    int i, n = -1;
+
+    if (programs) {
+
+        /* look for program */
         for (i = 0; i < nb_programs; i++) {
-            fprintf (stdout, " %d", (programs + i)->id);
+            if ((programs + i)->id == id) {
+                n = i;
+                break;
+            }
         }
-        fprintf (stdout, "\n");
     }
+    if (n == -1) {
+        VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+        return;
+    }
+
+    /* set string program */
+    fprintf (stdout, "edit: %s\n", (programs + n)->string);
 }
 
-void edit (int id)
-{ }
+void savestring (int id, char *string)
+{
+    int i, n = -1;
+
+    if (programs) {
+
+        /* look for program */
+        for (i = 0; i < nb_programs; i++) {
+            if ((programs + i)->id == id) {
+                n = i;
+                break;
+            }
+        }
+    }
+
+    /* 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);
+}
 
 void del (int id)
-{ }
+{
+    int i, j, n = -1;
+
+    if (programs) {
+
+        /* look for program */
+        for (i = 0; i < nb_programs; i++) {
+            if ((programs + i)->id == id) {
+                n = i;
+                break;
+            }
+        }
+    }
+    if (n == -1) {
+        VERBOSE (WARNING, fprintf (stdout, "error unknown program (%d)\n", id));
+        return;
+    }
+
+    /* clean program */
+    if ((programs + n)->storage) {
+        free ((programs + n)->storage);
+    }
+    if ((programs + n)->stack) {
+        free ((programs + n)->stack);
+    }
+    if ((programs + n)->root) {
+        delelement ((programs + n)->root);
+    }
+    if ((programs + n)->string) {
+        free ((programs + n)->string);
+    }
+
+    /* remove entry */
+    workspace_t *tmp = (workspace_t *) callocordie (nb_programs - 1, sizeof (workspace_t));
+    for (i = 0, j = 0; i < nb_programs; i++) {
+        if (i != n) {
+            memcpy (tmp + j, programs + i, sizeof (workspace_t));
+            j++;
+        }
+    }
+    free (programs);
+    programs = tmp;
+    nb_programs--;
+}
+
+/* stack management */
+
+double get (int n)
+{
+    double ret = 0;
+    if ((n <= 0) || (n > stack_size)) {
+        VERBOSE (WARNING, fprintf (stdout, "error out of bound (%d/%d)\n", n, stack_size));
+    } else {
+        ret = stack[n - 1];
+    }
+    return ret;
+}
+
+double length ()
+{
+    return stack_size;
+}
+
+double pop ()
+{
+    double ret = 0;
+    if (stack_size > 0) {
+        ret = stack[--stack_size];
+        double *tmp = (double *) callocordie (stack_size, sizeof (double));
+        memcpy (tmp, stack, stack_size * sizeof (double));
+        free (stack);
+        stack = tmp;
+    } else {
+        VERBOSE (WARNING, fprintf (stdout, "error stack empty\n"));
+    }
+    return ret;
+}
+
+double push (double val)
+{
+    double *tmp = (double *) callocordie (stack_size + 1, sizeof (double));
+    memcpy (tmp, stack, stack_size * sizeof (double));
+    if (stack) {
+        free (stack);
+    }
+    stack = tmp;
+    stack[stack_size++] = val;
+    return val;
+}
+
+double put (int n, double val)
+{
+    if (n <= 0) {
+        VERBOSE (WARNING, fprintf (stdout, "error out of bound (%d/%d)\n", n, stack_size));
+        return 0;
+    }
+    if (n > stack_size) {
+        double *tmp = (double *) callocordie (n, sizeof (double));
+        memcpy (tmp, stack, stack_size * sizeof (double));
+        free (stack);
+        stack = tmp;
+        stack_size = n;
+    }
+    stack[n - 1] = val;
+    return val;
+}
+
+double set (int nbops, element_t **ops)
+{
+    int i;
+    if (stack) {
+        free (stack);
+    }
+    stack = NULL;
+    stack_size = 0;
+    if (nbops != 0) {
+         stack = (double *) callocordie (nbops, sizeof (double));
+         for (i = 0; i < nbops; i++) {
+             stack[i] = evaluate_element (ops[i], 0);
+         }
+         stack_size = nbops;
+    }
+    return stack_size;
+}
+
+void show (void)
+{
+    int i;
+    fprintf (stdout, "stack:");
+    for (i = 0; i < stack_size; i++) {
+        fprintf (stdout, " ");
+        fprintf (stdout, minform, stack[i]);
+    }
+    fprintf (stdout, "\n");
+}
 
 /* help message */
 
 void help (void)
 {
     fprintf (stdout, "calc is a simple calculator\n\n");
-    fprintf (stdout, "supported operators:");
+    fprintf (stdout, "arithmetic op.:");
     fprintf (stdout, " + - * / %% ^\n");
-    fprintf (stdout, "camparison operators:");
+    fprintf (stdout, "comparison op.:");
     fprintf (stdout, " == != >= <= > <\n");
-    fprintf (stdout, "logical operators:");
+    fprintf (stdout, "logical op.:");
     fprintf (stdout, " & | !\n");
-    fprintf (stdout, "mathematic functions:");
-    fprintf (stdout, " pow sqrt log exp\n");
-    fprintf (stdout, "trig. func.:");
-    fprintf (stdout, " cos sin tan acos asin atan\n");
-    fprintf (stdout, "supported functions:");
+    fprintf (stdout, "mathematic func.:");
+    fprintf (stdout, " exp ln log pow sqrt\n");
+    fprintf (stdout, "trigonometric func.:");
+    fprintf (stdout, " acos asin atan cos sin tan\n");
+    fprintf (stdout, "error functions:");
+    fprintf (stdout, " erf erfc\n");
+    fprintf (stdout, "miscellaneous func.:");
     fprintf (stdout, " abs ceil floor\n");
-    fprintf (stdout, "storage functions:");
-    fprintf (stdout, " mem sto rcl inc dec disp\n");
-    fprintf (stdout, "prog. functions:");
-    fprintf (stdout, " cond while print {} ;\n");
-    fprintf (stdout, "misc. functions:");
-    fprintf (stdout, " quit help\n");
-    fprintf (stdout, "supported constants:");
-    fprintf (stdout, " e pi\n");
+    fprintf (stdout, "storage func.:");
+    fprintf (stdout, " clear dec disp inc mem rcl sto\n");
+    fprintf (stdout, "control flow prim.:");
+    fprintf (stdout, " cond print while {} ;\n");
+    fprintf (stdout, "program management:");
+    fprintf (stdout, " call del edit ls prog\n");
+    fprintf (stdout, "stack management:");
+    fprintf (stdout, " get len pop push put set show\n");
+    fprintf (stdout, "control management:");
+    fprintf (stdout, " help quit\n");
+    fprintf (stdout, "constants:");
+    fprintf (stdout, " ans e pi\n");
 }
 
 /* evaluate element tree */
@@ -954,8 +1183,11 @@ double evaluate_element (element_t *root, char mask)
     case Acos:
     case Asin:
     case Atan:
+    case Ln:
     case Log:
     case Exp:
+    case Erfc:
+    case Erf:
     case Abs:
     case Ceil:
     case Floor:
@@ -968,6 +1200,7 @@ double evaluate_element (element_t *root, char mask)
     case Call:
     case Edit:
     case Del:
+    case Get:
         if (root->ops[0]) {
             op0 = evaluate_element (root->ops[0], 0);
         } else {
@@ -984,6 +1217,10 @@ double evaluate_element (element_t *root, char mask)
     case E:
     case Code:
     case List:
+    case Length:
+    case Pop:
+    case Set:
+    case Show:
         break;
     case While:
         if (root->ops[0] == NULL) {
@@ -991,9 +1228,19 @@ double evaluate_element (element_t *root, char mask)
             return 0;
         }
         break;
+    case Push:
     case Print:
         op0 = (root->ops[0]) ? evaluate_element (root->ops[0], 0) : answer;
         break;
+    case Put:
+        if (root->ops[0]) {
+            op0 = evaluate_element (root->ops[0], 0);
+        } else {
+            VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[0])\n"));
+            return 0;
+        }
+        op1 = (root->ops[1]) ? evaluate_element (root->ops[1], 0) : answer;
+        break;
     }
 
     switch (root->func) {
@@ -1012,8 +1259,11 @@ double evaluate_element (element_t *root, char mask)
     case Acos: return acos (op0);
     case Asin: return asin (op0);
     case Atan: return atan (op0);
-    case Log: return log (op0);
+    case Ln: return log (op0);
+    case Log: return log10 (op0);
     case Exp: return exp (op0);
+    case Erfc: return erfc (op0);
+    case Erf: return erf (op0);
     case Abs: return fabs (op0);
     case Ceil: return ceil (op0);
     case Floor: return floor (op0);
@@ -1049,7 +1299,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]) {
@@ -1060,6 +1313,19 @@ double evaluate_element (element_t *root, char mask)
     case List: list (); break;
     case Edit: edit ((int)op0); break;
     case Del: del ((int)op0); break;
+    case Get: return get ((int)op0);
+    case Length: return length ();
+    case Pop: return pop ();
+    case Push: return push (op0);
+    case Put: return put ((int)op0, op1);
+    case Set:
+        for (i = 0, nb =0; i < root->nbops; i++) {
+            if (root->ops[i]) {
+                nb++;
+            }
+        }
+        return set (nb, root->ops);
+    case Show: show (); break;
     }
 
     return 0;
@@ -1068,11 +1334,7 @@ double evaluate_element (element_t *root, char mask)
 char **generate_completion_list ()
 {
     int i, j, l = 0;
-    char **list = (char **) calloc (NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1, sizeof (char *));
-    if (list == NULL) {
-        VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
-        exit (1);
-    }
+    char **list = (char **) callocordie (NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1, sizeof (char *));
 
     for (i = 0; i < NB_OPERATORS; i++) {
         list[l] = strdup ((operators + i)->keyword);
@@ -1115,7 +1377,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]);
             }