memory feature

diff --git a/calc.c b/calc.c
index cf37f230552f8433e3f057d675e204b9b454c266..6950ad57522676c10055730e805f0baf89681d2e 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -367,6 +367,12 @@ int main (int argc, char *argv[])
 // test: echo -e 'print (1)' | calc.exe -v 3 | grep -q Print
 // test: echo -e 'si\t\t (pi / 2)' | calc.exe | grep -q '=> 1'
 // test: echo -e '1 + 1;\nans + 1' | calc.exe | grep -qv 2
+// test: echo -e 'mem (3)\nsto (4, pi)' | calc.exe | grep -q "invalid index"
+// test: echo -e 'disp' | calc.exe | grep -q "storage: 0 0 0 0 0 0 0 0 0 0"
+// test: echo -e 'sto (3, 10)\ndisp' | calc.exe | grep -q "storage: 0 0 10 0 0 0 0 0 0 0"
+// test: echo -e 'rcl (3)\ndisp' | calc.exe | grep -q "storage: 0 0 0 0 0 0 0 0 0 0"
+// test: echo -e 'inc (2)\ndisp' | calc.exe | grep -q "storage: 0 1 0 0 0 0 0 0 0 0"
+// test: echo -e 'dec (2)\ndisp' | calc.exe | grep -q "storage: 0 -1 0 0 0 0 0 0 0 0"
 
 // Gauss sequence
 // test: echo -e '{sto (1, 0), sto (10, 0), while (inc (10) < 100, {sto (1, rcl (1) + rcl (10)), print (rcl (1))})};' | calc.exe | grep -q '=> 5050'

diff --git a/parser.c b/parser.c
index 013b4f19a4ebcac56bd79ae13deb5d5cea817f49..dcaa55b0d09e8d9b8adc32498a06eb4d7e8a7790 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -12,9 +12,12 @@
 
 double answer = 0;
 
-#define STORAGE_SIZE 10
-double storage[STORAGE_SIZE] = {0};
+#define DEFAULT_STORAGE_SIZE 10
+int storage_size = -1;
 
+double *storage = NULL;
+
+#define DEFAULT_FORMAT "=> %.6g\n"
 char *format = NULL;
 
 /* compare codes */
@@ -118,7 +121,7 @@ keyword_t operators[NB_OPERATORS] = {
     { "|",   Or, 2, 1, -2}
 };
 
-#define NB_FUNCTIONS 24
+#define NB_FUNCTIONS 25
 keyword_t functions[NB_FUNCTIONS] = {
     { "sqrt", Sqr, 1, 4, 5},
     { "pow",  Pow, 2, 3, 5},
@@ -138,6 +141,7 @@ keyword_t functions[NB_FUNCTIONS] = {
     { "inc",  Inc, 1, 3, 5},
     { "dec",  Dec, 1, 3, 5},
     { "disp", Disp, 0, 4, 9},
+    { "mem",  Mem, 1, 3, 9},
     { "quit", Quit, 0, 4, 9},
     { "help", Help, 0, 4, 9},
     { "!",    Not, 1, 1, 6},
@@ -501,6 +505,7 @@ void print_element (element_t *root, int level)
     case Inc: func = "Increase"; break;
     case Dec: func = "Decrease"; break;
     case Disp: func = "Display"; break;
+    case Mem: func = "Memory"; break;
     case Quit: func = "Quit"; break;
     case Help: func = "Help"; break;
     case Ans: func = "Ans"; break;
@@ -537,42 +542,76 @@ 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 *) calloc (nb, sizeof (double));
+        if (tmp == NULL) {
+            VERBOSE (ERROR, fprintf (stderr, "can't allocate memory\n"));
+            exit (1);
+        }
+        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 ((index > 0) && (index <= STORAGE_SIZE)) {
+    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) [1, %d]\n", index, STORAGE_SIZE));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
     }
     return value;
 }
 
 double recall (int index)
 {
-    if ((index > 0) && (index <= STORAGE_SIZE)) {
+    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) [1, %d]\n", index, STORAGE_SIZE));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
     }
     return 0;
 }
 
 double increase (int index)
 {
-    if ((index > 0) && (index <= STORAGE_SIZE)) {
+    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) [1, %d]\n", index, STORAGE_SIZE));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
     }
     return 0;
 }
 
 double decrease (int index)
 {
-    if ((index > 0) && (index <= STORAGE_SIZE)) {
+    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) [1, %d]\n", index, STORAGE_SIZE));
+        VERBOSE (WARNING, fprintf (stdout, "invalid index (%d) [1, %d]\n", index, storage_size));
     }
     return 0;
 }
@@ -580,8 +619,11 @@ double decrease (int index)
 void display (void)
 {
     int i;
+    if (storage_size == -1) {
+        memory (DEFAULT_STORAGE_SIZE);
+    }
     fprintf (stdout, "storage:");
-    for (i = 0; i < STORAGE_SIZE; i++) {
+    for (i = 0; i < storage_size; i++) {
         fprintf (stdout, " %g", storage[i]);
     }
     fprintf (stdout, "\n");
@@ -646,7 +688,7 @@ void free_format ()
 
 double print (double value)
 {
-    fprintf (stdout, format ? format : "=> %.6g\n", value);
+    fprintf (stdout, format ? format : DEFAULT_FORMAT, value);
     fflush (stdout);
     return value;
 }
@@ -677,7 +719,7 @@ void help (void)
     fprintf (stdout, "supported functions:");
     fprintf (stdout, " abs ceil floor\n");
     fprintf (stdout, "storage functions:");
-    fprintf (stdout, " sto rcl inc dec\n");
+    fprintf (stdout, " mem sto rcl inc dec disp\n");
     fprintf (stdout, "prog. functions:");
     fprintf (stdout, " cond while print {} ;\n");
     fprintf (stdout, "misc. functions:");
@@ -764,6 +806,7 @@ double evaluate_element (element_t *root, char mask)
     case Inc:
     case Dec:
     case Not:
+    case Mem:
     case Cond:
         if (root->ops[0]) {
             op0 = evaluate_element (root->ops[0], 0);
@@ -817,6 +860,7 @@ double evaluate_element (element_t *root, char mask)
     case Inc: return increase ((int)op0);
     case Dec: return decrease ((int)op0);
     case Disp: display (); break;
+    case Mem: memory ((int)op0); break;
     case Quit: quit (); break;
     case Help: help (); break;
     case Ans: return answer;

diff --git a/parser.h b/parser.h
index eed45f679d14585706f9e5eca3200143c16ac533..f52112952eb9d73777b9d7a9bfd6d41a9165ebbd 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -15,7 +15,7 @@ typedef enum {
     Cos, Sin, Tan, Acos, Asin, Atan,
     Log, Exp,
     Abs, Ceil, Floor,
-    Store, Recall, Inc, Dec, Disp,
+    Store, Recall, Inc, Dec, Disp, Mem,
     Quit, Help,
     Ans, E, Pi,
     Equal, Diff, Ge, Le, Gt, Lt,