X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.c;h=9e7e51013e3a050f04a8c48c9e28aa1e971be542;hb=a67f1cfd7bb89dfd00cdc099651b81456ca4c327;hp=b7b74e230834129a77d98175ce20769930148c10;hpb=e9e9e919ce16217e92fd99ed95ba100074796d4c;p=calc.git

diff --git a/parser.c b/parser.c
index b7b74e2..9e7e510 100644
--- a/parser.c
+++ b/parser.c
@@ -1,12 +1,29 @@
 #include <malloc.h>
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "debug.h"
-#include "fdprintf.h"
 
 #include "parser.h"
 
+/* global variables */
+
+double answer = 0;
+
+#define DEFAULT_STORAGE_SIZE 10
+int storage_size = -1;
+
+double *storage = NULL;
+
+#define DEFAULT_FORMAT "=> %.6g\n"
+char *format = NULL;
+char *minform = NULL;
+
+workspace_t *programs = NULL;
+int nb_programs = 0;
+
 /* compare codes */
 
 int codecmp (char *ref, char *str)
@@ -29,14 +46,28 @@ int codecmp (char *ref, char *str)
     return 0;
 }
 
+/* calloc or die function */
+
+void *callocordie (size_t count, size_t size)
+{
+    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 *) calloc (1, sizeof (element_t));
-    if (new == NULL) {
-        VERBOSE (ERROR, fdprintf (stdfderr, "can't allocate memory\n"));
-        return NULL;
+    element_t *new = (element_t *) callocordie (1, sizeof (element_t));
+    if (nbops) {
+        new->ops = (element_t **) callocordie (nbops, sizeof (element_t *));
     }
     new->func = function;
     new->nbops = nbops;
@@ -49,41 +80,101 @@ element_t *newelement (func_t function, int nbops, int prio)
 
 void delelement (element_t *root)
 {
-    int i;
     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);
         }
         free (root);
     }
 }
 
-/* functions */
+/* duplicate element */
+
+element_t *dupelement (element_t *root)
+{
+    element_t *tmp = NULL;
+    int i;
 
-#define NB_OPERATORS 6
+    if ((root == NULL) || (root == ERROR_OP)) {
+        return root;
+    }
+    tmp = newelement (root->func, root->nbops, root->prio);
+    tmp->value = root->value;
+    for (i = 0; i < root->nbops; i++) {
+        tmp->ops[i] = dupelement (root->ops[i]);
+    }
+    return tmp;
+}
 
+/* functions */
+
+#define NB_OPERATORS 14
 keyword_t operators[NB_OPERATORS] = {
     { "+\t", Add, 2, 1, 1},
     { "-\t", Sub, 2, 1, 1},
     { "*",   Mul, 2, 1, 2},
     { "/",   Div, 2, 1, 2},
     { "%",   Mod, 2, 1, 3},
-    { "^",   Pow, 2, 1, 4}
+    { "^",   Pow, 2, 1, 4},
+    { "==",  Equal, 2, 2, -1},
+    { "!=",  Diff, 2, 2, -1},
+    { ">=",  Ge, 2, 2, -1},
+    { "<=",  Le, 2, 2, -1},
+    { ">",   Gt, 2, 1, -1},
+    { "<",   Lt, 2, 1, -1},
+    { "&",   And, 2, 1, -2},
+    { "|",   Or, 2, 1, -2}
 };
 
-#define NB_FUNCTIONS 9
+#define NB_FUNCTIONS 31
 keyword_t functions[NB_FUNCTIONS] = {
     { "sqrt", Sqr, 1, 4, 5},
     { "pow",  Pow, 2, 3, 5},
     { "cos",  Cos, 1, 3, 5},
     { "sin",  Sin, 1, 3, 5},
-    { "atan", Atn, 1, 4, 5},
-    { "exp",  Exp, 1, 3, 5},
+    { "tan",  Tan, 1, 3, 5},
+    { "acos", Acos, 1, 4, 5},
+    { "asin", Asin, 1, 4, 5},
+    { "atan", Atan, 1, 4, 5},
     { "log",  Log, 1, 3, 5},
-    { "quit", Qui, 0, 4, 5},
-    { "help", Hel, 0, 4, 5}
+    { "exp",  Exp, 1, 3, 5},
+    { "abs",  Abs, 1, 3, 5},
+    { "floor", Floor, 1, 5, 5},
+    { "ceil", Ceil, 1, 4, 5},
+    { "sto",  Store, 2, 3, 5},
+    { "rcl",  Recall, 1, 3, 5},
+    { "inc",  Inc, 1, 3, 5},
+    { "dec",  Dec, 1, 3, 5},
+    { "disp", Disp, 0, 4, 9},
+    { "mem",  Mem, 1, 3, 9},
+    { "clr",  Clear, 0, 3, 9},
+    { "quit", Quit, 0, 4, 9},
+    { "help", Help, 0, 4, 9},
+    { "!",    Not, 1, 1, 6},
+    { "cond", Cond, 3, 4, 5},
+    { "while", While, 2, 5, 5},
+    { "print", Print, 1, 5, 5},
+    { "prog", Prog, 3, 4, 9},
+    { "call", Call, 10, 4, 5},
+    { "ls",   List, 0, 2, 9},
+    { "edit", Edit, 1, 4, 9},
+    { "del",  Del, 1, 3, 9}
+};
+
+#define NB_CONSTANTS 3
+keyword_t constants[NB_CONSTANTS] = {
+    { "ans", Ans, 0, 3, 5},
+    { "e",   E, 0, 1, 5},
+    { "pi",  Pi, 0, 2, 5}
+};
+
+#define NB_SYMBOLS 4
+char *symbols[NB_SYMBOLS] = {
+    "(", ")", "{", "}"
 };
 
 /* subparser function */
@@ -91,21 +182,18 @@ keyword_t functions[NB_FUNCTIONS] = {
 element_t *subparser (element_t **proot, char **pstr, func_t func, int nbops, int prio)
 {
     element_t *new = newelement (func, nbops, prio);
-    if (new == NULL) {
-        return ERROR_OP;
-    }
     new->ops[0] = *proot;
     new->ops[1] = parser (*pstr, pstr, new->prio);
+    if ((new->ops[1] == NULL) || ((new->ops[1] != ERROR_OP) && (new->ops[1]->prio == 9))) {
+        delelement (new->ops[1]);
+        new->ops[1] = ERROR_OP;
+    }
     if (new->ops[1] == ERROR_OP) {
         delelement (new);
         *proot = NULL;
         return ERROR_OP;
     }
     *proot = newelement (Val, 1, 5);
-    if (*proot == NULL) {
-        delelement (new);
-        return ERROR_OP;
-    }
     (*proot)->ops[0] = new;
 
     return *proot;
@@ -116,15 +204,25 @@ 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, PRINTOUT ("Starting parsing\n"));
+    VERBOSE (DEBUG, fprintf (stdout, "Starting parsing\n"));
 
     /* main loop */
     while (*str != '\0') {
         int found = 0;
         element_t *new = NULL;
-        VERBOSE (INFO, PRINTOUT ("Processing: %s\n", str));
+        VERBOSE (INFO, fprintf (stdout, "Processing: %s\n", str));
+
+        /* end without printing */
+
+        if (*str == ';') {
+            if (root) {
+                root->hidden = 1;
+            }
+            break;
+        }
 
         /* skip spaces and tabs */
 
@@ -133,15 +231,58 @@ element_t *parser (char *str, char **next, int prio)
             continue;
         }
 
+        /* check for open brace */
+
+        if (*str == '{') {
+            VERBOSE (DEBUG, fprintf (stdout, "start processing brace\n"));
+            if (root != NULL) {
+                delelement (root);
+                return ERROR_OP;
+            }
+            root = newelement (Code, 0, 5);
+
+            do {
+                new = parser (str + 1, &str, 0);
+                if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
+                    delelement (new);
+                    new = ERROR_OP;
+                }
+                if (new == ERROR_OP) {
+                    delelement (root);
+                    return ERROR_OP;
+                }
+                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[root->nbops] = new;
+                delelement (root);
+                root = newprog;
+            } while (*str == ',');
+
+            if (*str != '}') {
+                delelement (root);
+                return ERROR_OP;
+            }
+            str++;
+            VERBOSE (DEBUG, fprintf (stdout, "stop processing brace\n"));
+            continue;
+        }
+
         /* check for open bracket */
 
         if (*str == '(') {
-            VERBOSE (DEBUG, PRINTOUT ("start processing bracket\n"));
+            VERBOSE (DEBUG, fprintf (stdout, "start processing bracket\n"));
             if (root) {
                 do {
                     found = 0;
                     new = parser (str + 1, &str, 0);
-                    if (new == ERROR_OP) {
+                    if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
+                        delelement (new);
+                        new = ERROR_OP;
+                    }
+                    if ((new == NULL) || (new == ERROR_OP)) {
                         delelement (root);
                         return ERROR_OP;
                     }
@@ -160,25 +301,34 @@ element_t *parser (char *str, char **next, int prio)
                 } while (*str == ',');
             } else {
                 root = newelement (Val, 1, 5);
-                if (root == NULL) {
-                    return ERROR_OP;
-                }
                 new = parser (str + 1, &str, 0);
-                if ((new == ERROR_OP) || (*str == ',')) {
+                if ((new == NULL) || ((new != ERROR_OP) && (new->prio == 9))) {
+                    delelement (new);
+                    new = ERROR_OP;
+                }
+                if ((new == NULL) || (new == ERROR_OP) || (*str == ',')) {
                     delelement (new);
                     delelement (root);
                     return ERROR_OP;
                 }
                 root->ops[0] = new;
             }
+            if (*str != ')') {
+                delelement (root);
+                return ERROR_OP;
+            }
             str++;
-            VERBOSE (DEBUG, PRINTOUT ("stop processing bracket\n"));
+            VERBOSE (DEBUG, fprintf (stdout, "stop processing bracket\n"));
             continue;
         }
 
-        /* check for closing bracket or koma */
+        /* check for closing bracket, closing brace or koma */
 
-        if ((*str == ')') || (*str == ',')) {
+        if ((*str == ')') || (*str == '}') || (*str == ',')) {
+            if (prio == -9) {
+                delelement (root);
+                return ERROR_OP;
+            }
             if (next != NULL) {
                 *next = str;
             }
@@ -190,30 +340,26 @@ element_t *parser (char *str, char **next, int prio)
         for (i = 0; i < NB_OPERATORS; i++) {
             keyword_t *operator = operators + i;
             if (codecmp (operator->keyword, str) == 0) {
-                VERBOSE (DEBUG, PRINTOUT ("start processing operator\n"));
+                VERBOSE (DEBUG, fprintf (stdout, "start processing operator\n"));
                 if (root) {
                     if ((prio) && (prio > operator->prio)) {
-                        VERBOSE (DEBUG, PRINTOUT ("stop because operator priority\n"));
+                        VERBOSE (DEBUG, fprintf (stdout, "stop because operator priority\n"));
                         *next = str;
                         return root;
                     }
                     str += operator->offset;
-                    VERBOSE (INFO, PRINTOUT ("Oper: %d\n", operator->func));
+                    VERBOSE (INFO, fprintf (stdout, "Oper: %d\n", operator->func));
                     if (subparser (&root, &str, operator->func, operator->nbops, operator->prio) == ERROR_OP) {
                         delelement (root);
                         return ERROR_OP;
                     }
                 } else if (*str == '-') {
-                    new = newelement (Sig, 1, 9);
-                    if (new == NULL) {
-                        return ERROR_OP;
-                    }
-                    root = new;
+                    root = newelement (Sig, 1, 9);
                 } else {
                     return ERROR_OP;
                 }
                 found = 1;
-                VERBOSE (DEBUG, PRINTOUT ("stop processing operator\n"));
+                VERBOSE (DEBUG, fprintf (stdout, "stop processing operator\n"));
                 break;
             }
         }
@@ -226,21 +372,40 @@ element_t *parser (char *str, char **next, int prio)
         for (i = 0; i < NB_FUNCTIONS; i++) {
             keyword_t *function = functions + i;
             if (codecmp (function->keyword, str) == 0) {
-                VERBOSE (DEBUG, PRINTOUT ("start processing function\n"));
+                VERBOSE (DEBUG, fprintf (stdout, "start processing function\n"));
                 if (root == NULL) {
-                    VERBOSE (INFO, PRINTOUT ("Func: %d\n", function->func));
-                    new = newelement (function->func, function->nbops, function->prio);
-                    if (new == NULL) {
-                        return ERROR_OP;
-                    }
-                    root = new;
+                    VERBOSE (INFO, fprintf (stdout, "Func: %d\n", function->func));
+                    root = newelement (function->func, function->nbops, function->prio);
                 } else {
                     delelement (root);
                     return ERROR_OP;
                 }
                 str += function->offset;
                 found = 1;
-                VERBOSE (DEBUG, PRINTOUT ("stop processing function\n"));
+                VERBOSE (DEBUG, fprintf (stdout, "stop processing function\n"));
+                break;
+            }
+        }
+        if (found) {
+            continue;
+        }
+
+        /* look for constant */
+
+        for (i = 0; i < NB_CONSTANTS; i++) {
+            keyword_t *constant = constants + i;
+            if (codecmp (constant->keyword, str) == 0) {
+                VERBOSE (DEBUG, fprintf (stdout, "start processing constant\n"));
+                if (root == NULL) {
+                    VERBOSE (INFO, fprintf (stdout, "Const: %d\n", constant->func));
+                    root = newelement (constant->func, constant->nbops, constant->prio);
+                } else {
+                    delelement (root);
+                    return ERROR_OP;
+                }
+                str += constant->offset;
+                found = 1;
+                VERBOSE (DEBUG, fprintf (stdout, "stop processing constant\n"));
                 break;
             }
         }
@@ -252,31 +417,38 @@ element_t *parser (char *str, char **next, int prio)
 
         if (((*str >= '0') && (*str <= '9')) ||
             (*str == '.') || (*str == '+') || (*str == '-')) {
-            VERBOSE (DEBUG, PRINTOUT ("start processing value\n"));
+            VERBOSE (DEBUG, fprintf (stdout, "start processing value\n"));
             char *pt;
             double value = strtod (str, &pt);
-            VERBOSE (INFO, PRINTOUT ("Value: %f\n", value));
+            VERBOSE (INFO, fprintf (stdout, "Value: %f\n", value));
             if (str != pt) {
-                if (root == NULL) {
+                if ((root == NULL) || (root->prio == 6)) {
                     new = newelement (Val, 1, 5);
-                    if (new == NULL) {
-                        return ERROR_OP;
-                    }
                     new->value = value;
-                    root = new;
-                    str = pt;
-                } else if (root->func == Val) {
-                    if ((*str == '+') || (*str == '-')) {
-                        if ((prio) && (prio > 1)) {
-                            VERBOSE (DEBUG, PRINTOUT ("stop because operator priority\n"));
-                            *next = str;
-                            return root;
+                    if (root == NULL) {
+                        root = new;
+                    } else {
+                        for (i = 0; i < root->nbops; i++) {
+                            if (root->ops[i] == NULL) {
+                                root->ops[i] = new;
+                                found = 1;
+                                break;
+                            }
                         }
-                        if (subparser (&root, &str, Add, 2, 1) == ERROR_OP) {
+                        if (!found) {
+                            delelement (new);
                             delelement (root);
                             return ERROR_OP;
                         }
-                    } else {
+                    }
+                    str = pt;
+                } else if ((*str == '+') || (*str == '-')) {
+                    if ((prio) && (prio > 1)) {
+                        VERBOSE (DEBUG, fprintf (stdout, "stop because operator priority\n"));
+                        *next = str;
+                        return root;
+                    }
+                    if (subparser (&root, &str, Add, 2, 1) == ERROR_OP) {
                         delelement (root);
                         return ERROR_OP;
                     }
@@ -286,7 +458,7 @@ element_t *parser (char *str, char **next, int prio)
                 }
                 found = 1;
             }
-            VERBOSE (DEBUG, PRINTOUT ("stop processing value\n"));
+            VERBOSE (DEBUG, fprintf (stdout, "stop processing value\n"));
         }
 
         /* error */
@@ -302,6 +474,11 @@ element_t *parser (char *str, char **next, int prio)
         *next = str;
     }
 
+    /* save string */
+    if (root != NULL) {
+        root->string = string;
+    }
+
     return root;
 }
 
@@ -317,7 +494,7 @@ void print_element (element_t *root, int level)
     }
 
     for (i = 0; i < level; i++) {
-        PRINTOUT (" ");
+        fprintf (stdout, " ");
     }
 
     switch (root->func) {
@@ -332,20 +509,54 @@ void print_element (element_t *root, int level)
     case Sqr: func = "Square Root"; break;
     case Cos: func = "Cosine"; break;
     case Sin: func = "Sine"; break;
-    case Atn: func = "Arc Tangent"; break;
+    case Tan: func = "Tangent"; break;
+    case Acos: func = "Arc Cosine"; break;
+    case Asin: func = "Arc Sine"; break;
+    case Atan: func = "Arc Tangent"; break;
     case Log: func = "Logarithm"; break;
     case Exp: func = "Exponantial"; break;
-    case Qui: func = "Quit"; break;
-    case Hel: func = "Help"; break;
+    case Abs: func = "Absolute value"; break;
+    case Ceil: func = "Ceil value"; break;
+    case Floor: func = "Floor value"; break;
+    case Store: func = "Store"; break;
+    case Recall: func = "Recall"; break;
+    case Inc: func = "Increase"; break;
+    case Dec: func = "Decrease"; break;
+    case Disp: func = "Display"; break;
+    case Mem: func = "Memory"; break;
+    case Clear: func = "Clear"; break;
+    case Quit: func = "Quit"; break;
+    case Help: func = "Help"; break;
+    case Ans: func = "Ans"; break;
+    case Pi: func = "Pi"; break;
+    case E: func = "E"; break;
+    case Equal: func = "Equal"; break;
+    case Diff: func = "Different"; break;
+    case Ge: func = "Greater or equal"; break;
+    case Le: func = "Lesser or equal"; break;
+    case Gt: func = "Greater"; break;
+    case Lt: func = "Lesser"; break;
+    case And: func = "And"; break;
+    case Or: func = "Or"; break;
+    case Not: func = "Not"; break;
+    case Cond: func = "Condition"; break;
+    case While: func = "While"; break;
+    case Code: func = "Code"; break;
+    case Print: func = "Print"; break;
+    case Prog: func = "Program"; break;
+    case Call: func = "Call"; break;
+    case List: func = "List"; break;
+    case Edit: func = "Edit"; break;
+    case Del: func = "Del"; break;
     }
 
-    PRINTOUT ("Function: %s\n", func);
+    fprintf (stdout, "Function: %s\n", func);
 
     if ((root->func == Val) && (root->ops[0] == NULL)) {
         for (i = 0; i < level; i++) {
-            PRINTOUT (" ");
+            fprintf (stdout, " ");
         }
-        PRINTOUT ("value: %f\n", root->value);
+        fprintf (stdout, "value: %f\n", root->value);
     } else {
         for (i = 0; i < root->nbops; i++) {
             print_element (root->ops[i], level + 1);
@@ -353,25 +564,417 @@ void print_element (element_t *root, int level)
     }
 }
 
+/* storage functions */
+
+void memory (int nb)
+{
+    int i, l;
+    double *tmp = NULL;
+    if (nb != storage_size) {
+        l = (nb < storage_size) ? nb : storage_size;
+        tmp = (double *) callocordie (nb, sizeof (double));
+        for (i = 0; i < l; i++) {
+            tmp[i] = storage[i];
+        }
+        if (storage != NULL) {
+            free (storage);
+        }
+        storage = tmp;
+        storage_size = nb;
+    }
+}
+
+double store (int index, double value)
+{
+    if (storage_size == -1) {
+        memory (DEFAULT_STORAGE_SIZE);
+    }
+    if ((index > 0) && (index <= storage_size)) {
+        storage[index - 1] = value;
+    } else {
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
+    }
+    return value;
+}
+
+double recall (int index)
+{
+    if (storage_size == -1) {
+        memory (DEFAULT_STORAGE_SIZE);
+    }
+    if ((index > 0) && (index <= storage_size)) {
+        return storage[index - 1];
+    } else {
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
+    }
+    return 0;
+}
+
+double increase (int index)
+{
+    if (storage_size == -1) {
+        memory (DEFAULT_STORAGE_SIZE);
+    }
+    if ((index > 0) && (index <= storage_size)) {
+        return storage[index - 1]++;
+    } else {
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
+    }
+    return 0;
+}
+
+double decrease (int index)
+{
+    if (storage_size == -1) {
+        memory (DEFAULT_STORAGE_SIZE);
+    }
+    if ((index > 0) && (index <= storage_size)) {
+        return storage[index - 1]--;
+    } else {
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
+    }
+    return 0;
+}
+
+void display (void)
+{
+    int i;
+    if (storage_size == -1) {
+        memory (DEFAULT_STORAGE_SIZE);
+    }
+    fprintf (stdout, "storage:");
+    for (i = 0; i < storage_size; i++) {
+        fprintf (stdout, " ");
+        fprintf (stdout, minform, storage[i]);
+    }
+    fprintf (stdout, "\n");
+}
+
+void clear ()
+{
+    int i;
+    for (i = 0; i < storage_size; i++) {
+        storage[i] = 0;
+    }
+}
+
+/* While do function */
+
+double while_do (element_t *cond, element_t *action)
+{
+    double ret = 0;
+    element_t *temp = NULL;
+
+    VERBOSE (DEBUG, fprintf (stdout, "starting while loop\n"));
+    while (1) {
+        VERBOSE (DEBUG, fprintf (stdout, "loop...\n"));
+
+        temp = dupelement (cond);
+        double test = evaluate_element (temp, 0);
+        delelement (temp);
+        if (!test) {
+            break;
+        }
+        if (action) {
+            temp = dupelement (action);
+            ret = evaluate_element (temp, 0);
+            delelement (temp);
+        }
+    }
+
+    VERBOSE (DEBUG, fprintf (stdout, "ending while loop\n"));
+
+    return ret;
+}
+
+/* program function */
+
+double execute_code (element_t **prog, int nbcalls)
+{
+    double ret = 0;
+    int i;
+    for (i = 0; i < nbcalls; i++) {
+        ret = evaluate_element (prog[i], 0);
+    }
+    return ret;
+}
+
+/* print function */
+
+void set_format (char *prompt, int precision)
+{
+    char buffer[128] = {0};
+    free_format ();
+    sprintf (buffer, "%s%%.%dg\n", prompt, precision);
+    format = strdup (buffer);
+    sprintf (buffer, "%%.%dg", precision);
+    minform = strdup (buffer);
+}
+
+void free_format ()
+{
+    if (format) {
+        free (format);
+        format = NULL;
+    }
+    if (minform) {
+        free (minform);
+        minform = NULL;
+    }
+}
+
+double print (double value)
+{
+    fprintf (stdout, format ? format : DEFAULT_FORMAT, value);
+    fflush (stdout);
+    return value;
+}
+
 /* quit function */
 
 void quit (void)
 {
-    PRINTOUT ("bye\n");
+    fprintf (stdout, "bye\n");
     exit (0);
 }
 
+/* program function */
+
+void prog (int id, int nbmems, element_t *root)
+{
+    int i, n = -1;
+
+    if (programs == NULL) {
+
+        /* initial memory allocation */
+        programs = (workspace_t *) callocordie (1, sizeof (workspace_t));
+        nb_programs = 1;
+        n = 0;
+
+    } else {
+
+        /* look for existing program */
+        for (i = 0; i < nb_programs; i++) {
+            if ((programs + i)->id == id) {
+                n = i;
+                break;
+            }
+        }
+        if (n == -1) {
+
+            /* new program */
+            n = nb_programs++;
+            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)->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 *) callocordie (nbmems, sizeof (double));
+    (programs + n)->storage_size = nbmems;
+    (programs + n)->root = dupelement (root);
+}
+
+double call (int id, int nbops, element_t **ops)
+{
+    workspace_t tmp = {0};
+    int i, n = -1;
+    double ret = 0;
+
+    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 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) {
+        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);
+    delelement (elements);
+
+    /* restore context */
+    answer = tmp.answer;
+    storage = tmp.storage;
+    storage_size = tmp.storage_size;
+
+    return ret;
+}
+
+void list ()
+{
+    int i;
+    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++) {
+            if ((programs + i)->id == id) {
+                n = i;
+                break;
+            }
+        }
+    }
+    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 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)->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--;
+}
+
 /* help message */
 
 void help (void)
 {
-    PRINTOUT ("calc is a simple calculator\n\n");
-    PRINTOUT ("supported operators:\n");
-    PRINTOUT (" + - * / % ^\n\n");
-    PRINTOUT ("supported functions:\n");
-    PRINTOUT (" pow sqrt cos sin atan log exp\n\n");
-    PRINTOUT ("miscellaneous functions:\n");
-    PRINTOUT (" quit help\n");
+    fprintf (stdout, "calc is a simple calculator\n\n");
+    fprintf (stdout, "supported operators:");
+    fprintf (stdout, " + - * / %% ^\n");
+    fprintf (stdout, "camparison operators:");
+    fprintf (stdout, " == != >= <= > <\n");
+    fprintf (stdout, "logical operators:");
+    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, " 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");
 }
 
 /* evaluate element tree */
@@ -383,9 +986,10 @@ double evaluate_element (element_t *root, char mask)
 {
     double op0 = 0, op1 = 0;
     char nextmask = mask;
+    int i, nb;
 
     if ((root == NULL) || (root == ERROR_OP)) {
-        VERBOSE (WARNING, PRINTOUT ("error while evaluating\n"));
+        VERBOSE (WARNING, fprintf (stdout, "error while evaluating\n"));
         return 0;
     }
 
@@ -420,28 +1024,69 @@ double evaluate_element (element_t *root, char mask)
     case Div:
     case Mod:
     case Pow:
+    case Store:
+    case Equal:
+    case Diff:
+    case Ge:
+    case Le:
+    case Gt:
+    case Lt:
+    case And:
+    case Or:
+    case Prog:
         if (root->ops[1]) {
             op1 = evaluate_element (root->ops[1], nextmask);
-        } else {
-            VERBOSE (WARNING, PRINTOUT ("error while evaluating (op[1])\n"));
+        } else if (root->func != Store) {
+            VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[1])\n"));
             return 0;
         }
         /* fallthrough */
     case Sqr:
     case Cos:
     case Sin:
-    case Atn:
+    case Tan:
+    case Acos:
+    case Asin:
+    case Atan:
     case Log:
     case Exp:
+    case Abs:
+    case Ceil:
+    case Floor:
+    case Recall:
+    case Inc:
+    case Dec:
+    case Not:
+    case Mem:
+    case Cond:
+    case Call:
+    case Edit:
+    case Del:
         if (root->ops[0]) {
             op0 = evaluate_element (root->ops[0], 0);
         } else {
-            VERBOSE (WARNING, PRINTOUT ("error while evaluating (op[0])\n"));
+            VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[0])\n"));
             return 0;
         }
         break;
-    case Qui:
-    case Hel:
+    case Disp:
+    case Clear:
+    case Quit:
+    case Help:
+    case Ans:
+    case Pi:
+    case E:
+    case Code:
+    case List:
+        break;
+    case While:
+        if (root->ops[0] == NULL) {
+            VERBOSE (WARNING, fprintf (stdout, "error while evaluating (op[0])\n"));
+            return 0;
+        }
+        break;
+    case Print:
+        op0 = (root->ops[0]) ? evaluate_element (root->ops[0], 0) : answer;
         break;
     }
 
@@ -457,14 +1102,120 @@ double evaluate_element (element_t *root, char mask)
     case Sqr: return sqrt (op0);
     case Cos: return cos (op0);
     case Sin: return sin (op0);
-    case Atn: return atan (op0);
+    case Tan: return tan (op0);
+    case Acos: return acos (op0);
+    case Asin: return asin (op0);
+    case Atan: return atan (op0);
     case Log: return log (op0);
     case Exp: return exp (op0);
-    case Qui: quit (); break;
-    case Hel: help (); break;
+    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 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 Clear: clear (); break;
+    case Quit: quit (); break;
+    case Help: help (); break;
+    case Ans: return answer;
+    case Pi: return M_PI;
+    case E: return M_E;
+    case Equal: return op0 == op1;
+    case Diff: return op0 != op1;
+    case Ge: return op0 >= op1;
+    case Le: return op0 <= op1;
+    case Gt: return op0 > op1;
+    case Lt: return op0 < op1;
+    case And: return (op0 != 0) && (op1 != 0);
+    case Or: return (op0 != 0) || (op1 != 0);
+    case Not: return (op0 == 0);
+    case Cond:
+        if ((op0) && (root->ops[1])) {
+            return evaluate_element (root->ops[1], 0);
+        } else if ((!op0) && (root->ops[2])) {
+            return evaluate_element (root->ops[2], 0);
+        } else {
+            return 0;
+        }
+    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]);
+        savestring ((int)op0, root->string);
+        break;
+    case Call:
+        for (i = 1, nb =0; i < root->nbops; i++) {
+            if (root->ops[i]) {
+                nb++;
+            }
+        }
+        return call ((int)op0, nb, root->ops + 1);
+    case List: list (); break;
+    case Edit: edit ((int)op0); break;
+    case Del: del ((int)op0); break;
     }
 
     return 0;
 }
 
+char **generate_completion_list ()
+{
+    int i, j, l = 0;
+    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);
+        for (j = 0; j < (int)strlen (list[l]); j++) {
+            if (list[i][j] == '\t') {
+                list[i][j] = '\0';
+            }
+        }
+        if (list[l] != NULL) {
+            l++;
+        }
+    }
+
+    for (i = 0; i < NB_FUNCTIONS; i++) {
+        list[l] = strdup ((functions + i)->keyword);
+        if (list[l] != NULL) {
+            l++;
+        }
+    }
+
+    for (i = 0; i < NB_CONSTANTS; i++) {
+        list[l] = strdup ((constants + i)->keyword);
+        if (list[l] != NULL) {
+            l++;
+        }
+    }
+
+    for (i = 0; i < NB_SYMBOLS; i++) {
+        list[l] = strdup (symbols[i]);
+        if (list[l] != NULL) {
+            l++;
+        }
+    }
+
+    return (list);
+}
+
+void free_completion_list (char **list)
+{
+    int i;
+
+    if (list) {
+        for (i = 0; i < NB_OPERATORS + NB_FUNCTIONS + NB_CONSTANTS + NB_SYMBOLS + 1; i++) {
+            if (list[i] != NULL) {
+                free (list[i]);
+            }
+        }
+        free (list);
+    }
+}
+
+
 /* vim: set ts=4 sw=4 et: */