X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=parser.c;h=395e2aea1e90642757ab4cf6fb2d891058d479a1;hb=c7cbb833c65805634f6e9832b49e4a4680a4a4a6;hp=dcaa55b0d09e8d9b8adc32498a06eb4d7e8a7790;hpb=f438579a2cbd62640bf5478026765baf04099cbb;p=calc.git

diff --git a/parser.c b/parser.c
index dcaa55b..395e2ae 100644
--- a/parser.c
+++ b/parser.c
@@ -19,6 +19,9 @@ double *storage = NULL;
 
 #define DEFAULT_FORMAT "=> %.6g\n"
 char *format = NULL;
+char *minform = NULL;
+
+workspace_t *programs = NULL;
 
 /* compare codes */
 
@@ -121,7 +124,7 @@ keyword_t operators[NB_OPERATORS] = {
     { "|",   Or, 2, 1, -2}
 };
 
-#define NB_FUNCTIONS 25
+#define NB_FUNCTIONS 31
 keyword_t functions[NB_FUNCTIONS] = {
     { "sqrt", Sqr, 1, 4, 5},
     { "pow",  Pow, 2, 3, 5},
@@ -142,12 +145,18 @@ keyword_t functions[NB_FUNCTIONS] = {
     { "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}
+    { "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
@@ -506,6 +515,7 @@ void print_element (element_t *root, int level)
     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;
@@ -524,6 +534,11 @@ void print_element (element_t *root, int level)
     case While: func = "While"; break;
     case Prog: func = "Program"; 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;
     }
 
     fprintf (stdout, "Function: %s\n", func);
@@ -572,7 +587,7 @@ double store (int index, double value)
     if ((index > 0) && (index <= storage_size)) {
         storage[index - 1] = value;
     } else {
-        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
     }
     return value;
 }
@@ -585,7 +600,7 @@ double recall (int index)
     if ((index > 0) && (index <= storage_size)) {
         return storage[index - 1];
     } else {
-        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
     }
     return 0;
 }
@@ -598,7 +613,7 @@ double increase (int index)
     if ((index > 0) && (index <= storage_size)) {
         return storage[index - 1]++;
     } else {
-        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
     }
     return 0;
 }
@@ -611,7 +626,7 @@ double decrease (int index)
     if ((index > 0) && (index <= storage_size)) {
         return storage[index - 1]--;
     } else {
-        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [%d, %d]\n", index, (storage_size) ? 1 : 0, storage_size));
     }
     return 0;
 }
@@ -624,11 +639,20 @@ void display (void)
     }
     fprintf (stdout, "storage:");
     for (i = 0; i < storage_size; i++) {
-        fprintf (stdout, " %g", storage[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)
@@ -673,9 +697,11 @@ double program_do (element_t **prog, int nbcalls)
 void set_format (char *prompt, int precision)
 {
     char buffer[128] = {0};
-    sprintf (buffer, "%s%%.%dg\n", prompt, precision);
     free_format ();
+    sprintf (buffer, "%s%%.%dg\n", prompt, precision);
     format = strdup (buffer);
+    sprintf (buffer, "%%.%dg", precision);
+    minform = strdup (buffer);
 }
 
 void free_format ()
@@ -684,6 +710,10 @@ void free_format ()
         free (format);
         format = NULL;
     }
+    if (minform) {
+        free (minform);
+        minform = NULL;
+    }
 }
 
 double print (double value)
@@ -701,6 +731,25 @@ void quit (void)
     exit (0);
 }
 
+/* program function */
+
+void prog (int id, int nbmems, element_t *root)
+{ }
+
+double call (int id, int nbobs, element_t **ops)
+{
+    return 0;
+}
+
+void list ()
+{ }
+
+void edit (int id)
+{ }
+
+void del (int id)
+{ }
+
 /* help message */
 
 void help (void)
@@ -783,6 +832,7 @@ double evaluate_element (element_t *root, char mask)
     case Lt:
     case And:
     case Or:
+    case Prog:
         if (root->ops[1]) {
             op1 = evaluate_element (root->ops[1], nextmask);
         } else if (root->func != Store) {
@@ -808,6 +858,10 @@ double evaluate_element (element_t *root, char mask)
     case Not:
     case Mem:
     case Cond:
+    case Call:
+    case List:
+    case Edit:
+    case Del:
         if (root->ops[0]) {
             op0 = evaluate_element (root->ops[0], 0);
         } else {
@@ -816,6 +870,7 @@ double evaluate_element (element_t *root, char mask)
         }
         break;
     case Disp:
+    case Clear:
     case Quit:
     case Help:
     case Ans:
@@ -861,6 +916,7 @@ double evaluate_element (element_t *root, char mask)
     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;
@@ -886,6 +942,11 @@ double evaluate_element (element_t *root, char mask)
     case While: return while_do (root->ops[0], root->ops[1]);
     case Prog: return program_do (root->ops, root->nbops);
     case Print: return print (op0);
+    case Prog: prog ((int)op0, (int)op1, root->ops[2]); break;
+    case Call: return call ((int)op0, root->nbops + 1, root->ops + 1);
+    case List: list (); break;
+    case Edit: edit ((int)op0); break;
+    case Del: del (int (op0)); break;
     }
 
     return 0;