X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=calc.c;h=60cdad3596dc84c259b0ae12aab3b85d57d96838;hb=7929d3688354bd50348b41ea7ddcf5a66ebe9ae4;hp=d36111580c42dd49f1688850cc8aa732466bea9b;hpb=5898ff24ff8bbfbc4e8526d5c9810b24eb6bed54;p=calc.git

diff --git a/calc.c b/calc.c
index d361115..60cdad3 100644
--- a/calc.c
+++ b/calc.c
@@ -1,22 +1,23 @@
 /* depend: */
 /* cflags: */
-/* linker: debug.o fdprintf.o parser.o -lm -lreadline */
+/* linker: debug.o parser.o -lm -lreadline */
 
 #include <malloc.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include <readline/readline.h>
 #include <readline/history.h>
 
 #include "debug.h"
-#include "fdprintf.h"
 #include "parser.h"
 
 /* constants */
 
 #define BUFFER_SIZE 4096
+#define HISTORY_LEN 10
 
 /* macros */
 
@@ -34,12 +35,12 @@ int precision = 6;
 
 int usage (int ret)
 {
-    int fd = ret ? stdfderr : stdfdout;
-    fdprintf (fd, "usage: %s\n", progname);
-    fdprintf (fd, " -h : help message\n");
-    fdprintf (fd, " -n : no readline mode (%s)\n", mode ? "yes" : "no");
-    fdprintf (fd, " -p : precision (%d)\n", precision);
-    fdprintf (fd, " -v : verbose level (%d)\n", verbose);
+    FILE *fid = ret ? stderr : stdout;
+    fprintf (fid, "usage: %s\n", progname);
+    fprintf (fid, " -h : help message\n");
+    fprintf (fid, " -n : no readline mode (%s)\n", mode ? "yes" : "no");
+    fprintf (fid, " -p : precision (%d)\n", precision);
+    fprintf (fid, " -v : verbose level (%d)\n", verbose);
 
     return ret;
 }
@@ -70,8 +71,8 @@ int main (int argc, char *argv[])
      while (argc-- > 1) {
         char *arg = *(++argv);
         if (arg[0] != '-') {
-            PRINTERR ("%s: invalid option -- %s\n", progname, arg);
-            return usage (1);
+            VERBOSE (ERROR, fprintf (stderr, "%s: invalid option -- '%s'\n", progname, arg); usage (1));
+            return 1;
         }
         char c = arg[1];
         switch (c) {
@@ -82,16 +83,16 @@ int main (int argc, char *argv[])
         case 'p':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
-                PRINTERR ("%s: missing precision\n", progname);
-                return usage (1);
+                VERBOSE (ERROR, fprintf (stderr, "%s: missing precision\n", progname); usage (1));
+                return 1;
             }
             precision = atoi (arg);
             break;
         case 'v':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
-                PRINTERR ("%s: missing verbose level\n", progname);
-                return usage (1);
+                VERBOSE (ERROR, fprintf (stderr, "%s: missing verbose level\n", progname); usage (1));
+                return 1;
             }
             verbose = atoi (arg);
             break;
@@ -102,8 +103,8 @@ int main (int argc, char *argv[])
     }
 
     /* format */
-    char format[8] = "=> %.f\n";
-    format[4] = '0' + precision;
+    char format[9] = "=> %..g\n";
+    format[5] = '0' + precision;
 
     /* read from input stream */
 
@@ -123,43 +124,48 @@ int main (int argc, char *argv[])
                 break;
             }
             line[0] = buffer;
+            nb = 1;
 
             /* add line into history */
             add_history (buffer);
-            VERBOSE (INFO, PRINTOUT ("line (%d): '%s'\n", where_history (), buffer));
-            if (where_history () == 10) {
+            VERBOSE (INFO, fprintf (stdout, "line (%d/%d): '%s'\n",
+                                    where_history (), history_length, buffer));
+            if (history_length > HISTORY_LEN) {
                 HIST_ENTRY *last = remove_history (0);
                 if (last) {
                     free_history_entry (last);
                 }
             }
         } else {
-           if (read (stdfdin, buffer, BUFFER_SIZE) == 0) {
-               break;
-           }
-           nb = 0;
-           char *pt = line[nb++] = buffer;
-           while (*pt++ != '\0') {
-               if (*pt == '\n') {
-                   *pt = '\0';
-                   line[nb++] = ++pt;
-               }
-           }
-           VERBOSE (INFO, PRINTOUT ("line: '%s'\n", buffer));
+            if (read (STDIN_FILENO, buffer, BUFFER_SIZE) == 0) {
+                break;
+            }
+            nb = 0;
+            char *pt = line[nb++] = buffer;
+            while (*pt != '\0') {
+                if (*pt == '\n') {
+                    *pt = '\0';
+                    line[nb++] = pt + 1;
+                }
+                pt++;
+            }
+            VERBOSE (INFO, fprintf (stdout, "line: '%s'\n", buffer));
         }
 
         /* look for end of line */
-        for (i = 0; (i < nb) && (ret != 1); i++) {
+        for (i = 0; i < nb; i++) {
             if (*line[i] == '\0') {
                 continue;
             }
             element_t *element = parser (line[i], NULL, 0);
             if (element == ERROR_OP) {
-                VERBOSE (WARNING, PRINTOUT ("error while parsing: %s\n", line[i]));
+                VERBOSE (WARNING, fprintf (stdout, "error while parsing: '%s'\n", line[i]); fflush (stdout));
                 ret = 1;
             } else {
                 VERBOSE (INFO, print_element (element, 0));
-                PRINTOUT (format, evaluate_element (element, 0));
+                answer = evaluate_element (element, 0);
+                fprintf (stdout, format, answer);
+                fflush (stdout);
                 delelement (element);
                 ret = 0;
             }
@@ -186,51 +192,110 @@ int main (int argc, char *argv[])
 // test: echo "1 + 2" | calc.exe | grep -q '=> 3'
 // test: echo "1 - 2" | calc.exe | grep -q '=> -1'
 // test: echo "2 * 3" | calc.exe | grep -q '=> 6'
-// test: echo "1 / 2" | calc.exe | grep -q '=> 5e-1'
+// test: echo "1 / 2" | calc.exe | grep -q '=> 0\.5'
 // test: echo "8 % 3" | calc.exe | grep -q '=> 2'
-// test: echo "-9 % 3.1" | calc.exe | grep -q '=> -2.8'
+// test: echo "-9 % 3.1" | calc.exe | grep -q '=> -2\.8'
 // test: echo "2 ^ 3" | calc.exe | grep -q '=> 8'
-// test: echo "1e-1 + 2.34e3" | calc.exe | grep -q '=> 2.3401'
-// test: echo "sqrt (2)" | calc.exe | grep -q '=> 1.414213'
+// test: echo "1e-1 + 2.34e3" | calc.exe | grep -q '=> 2340\.1'
+// test: echo "sqrt (2)" | calc.exe | grep -q '=> 1\.41421'
 // test: echo "pow (2, 3)" | calc.exe | grep -q '=> 8'
-// test: echo "cos (2)" | calc.exe | grep -q '=> -4.161468e-1'
-// test: echo "sin (2)" | calc.exe | grep -q '=> 9.092974e-1'
-// test: echo "atan (2)" | calc.exe | grep -q '=> 1.107148'
-// test: echo "exp (2)" | calc.exe | grep -q '=> 7.389056'
-// test: echo "log (2)" | calc.exe | grep -q '=> 6.931471e-1'
+// test: echo "cos (2)" | calc.exe | grep -q '=> -0\.416147'
+// test: echo "sin (2)" | calc.exe | grep -q '=> 0\.909297'
+// test: echo "atan (2)" | calc.exe | grep -q '=> 1\.10715'
+// test: echo "exp (2)" | calc.exe | grep -q '=> 7\.38906'
+// test: echo "log (2)" | calc.exe | grep -q '=> 0\.693147'
 // test: echo "2 + 3 - 4" | calc.exe | grep -q '=> 1'
-// test: echo "1 + cos (2 - 3)" | calc.exe | grep -q '=> 1.54030'
-// test: echo "cos (1 / 2) * 3" | calc.exe | grep -q '=> 2.63274'
+// test: echo "1 + cos (2 - 3)" | calc.exe | grep -q '=> 1\.5403'
+// test: echo "cos (1 / 2) * 3" | calc.exe | grep -q '=> 2\.63275'
 // test: echo "1 + 4 * (2 - 3)" | calc.exe | grep -q '=> -3'
-// test: echo "(2 - 3) / 4" | calc.exe | grep -q '=> -2.5e-1'
-// test: echo "pow (8 - 3, 4 / 3)" | calc.exe | grep -q '=> 8.549879'
+// test: echo "(2 - 3) / 4" | calc.exe | grep -q '=> -0\.25'
+// test: echo "pow (8 - 3, 4 / 3)" | calc.exe | grep -q '=> 8\.54988'
 // test: echo "1 + -2" | calc.exe | grep -q '=> -1'
 // test: echo "1 - +2" | calc.exe | grep -q '=> -1'
 // test: echo "-1 + +2" | calc.exe | grep -q '=> 1'
 // test: echo "-1+2" | calc.exe | grep -q '=> 1'
 // test: echo "1-2" | calc.exe | grep -q '=> -1'
-// test: echo "1 * 2 / 3 + 4" | calc.exe | grep -q '=> 4.666666'
-// test: echo "2 ^ 3 * 4 + 5" | calc.exe | grep -q '=> 3.7e1'
-// test: echo "2 + 3 * 4 ^ 5" | calc.exe | grep -q '=> 3.074e3'
-// test: echo "2 ^ 3 * 4 + cos(5/6)" | calc.exe | grep -q '=> 3.267241e1'
-// test: echo "95-6.3*15-1" | calc.exe | grep -q '=> -5e-1'
-// test: echo "95 - 6.3 * 15 - 1" | calc.exe | grep -q '=> -5e-1'
-// test: echo "95-6.3+15" | calc.exe | grep -q '=> 1.037e2'
-// test: echo "-cos (0) + 1" | calc.exe | grep -q '=> 0'
+// test: echo "1 * 2 / 3 + 4" | calc.exe | grep -q '=> 4\.66667'
+// test: echo "2 ^ 3 * 4 + 5" | calc.exe | grep -q '=> 37'
+// test: echo "2 + 3 * 4 ^ 5" | calc.exe | grep -q '=> 3074'
+// test: echo "2 ^ 3 * 4 + cos(5/6)" | calc.exe | grep -q '=> 32\.6724'
+// test: echo "95-6.3*15-1" | calc.exe | grep -q '=> -0.5'
+// test: echo "95 - 6.3 * 15 - 1" | calc.exe | grep -q '=> -0\.5'
+// test: echo "95-6.3+15" | calc.exe | grep -q '=> 103.7'
+// test: echo "-cos (0) + 1" | calc.exe | grep -q '=> -0'
+// test: echo "-cos(0)+1" | calc.exe | grep -q '=> -0'
 // test: echo "quit" | calc.exe | grep -q 'bye'
 // test: echo "help" | calc.exe | grep -q 'miscellaneous'
 // test: echo "1 + 2 *" | calc.exe | grep -q 'error'
 // test: echo "* 1 - 2" | calc.exe | grep -q 'error'
 // test: echo "2 + * 3" | calc.exe | grep -q 'error'
+// test: echo "2 + cos(3 *)" | calc.exe | grep -q 'error'
+// test: echo "2 + (foo)" | calc.exe | grep -q 'error'
+// test: echo "2 + cos (pi +" | calc.exe | grep -q 'error'
+// test: echo "2 + cos (pi" | calc.exe | grep -q 'error'
+// test: echo "(2 + " | calc.exe | grep -q 'error'
+// test: echo "cos (1, 2)" | calc.exe | grep -q 'error'
 // test: echo "sqrt 2" | calc.exe | grep -q 'error'
 // test: echo "pow (2)" | calc.exe | grep -q 'error'
 // test: echo "1.23456789" | calc.exe -p 3 | grep -q '1\.234'
 // test: echo . | calc.exe
-// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe -n | grep -q 6.4e1
+// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe -n | grep -q 64
 // test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe -n | grep -q 2
-// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe | grep -q 6.4e1
+// test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe | grep -q 64
 // test: echo -e '1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1\n1 + 1' | calc.exe | grep -q 2
-// test: echo -e '-cos (1)\n1 + 1\n1 - 1\n1 * 1\n1 / 1\n3%2\n2^2\nsqrt (2)\ncos (0)\nsin (0)\natan (0)\nlog (1)\nexp (1)\nhelp\nquit' | calc.exe -v 3 | grep -q bye
-// test: echo -e '1 +\n1 -\n1 * 1\n1 /\n3%\n2^\nsqrt ()\ncos ()\nsin ()\natan ()\nlog ()\nexp ()\n1 + (' | calc.exe |grep -c error |xargs test 11 =
+// test: echo -e '-cos (1)\n1 + 1\n1 - 1\n1 * 1\n1 / 1\n3%2\n2^2\nsqrt (2)\ncos (0)\nsin (0)\natan (0)\nlog (1)\nexp (1)\nans\ne\npi\nsto (1)\nrcl (2)\ndisp\nhelp\nquit' | calc.exe -v 3 | grep -q bye
+// test: echo -e '1 +\n1 -\n1 * 1\n1 /\n3%\n2^\nsqrt ()\ncos ()\nsin ()\natan ()\nlog ()\nexp ()\n1 + (\n1+2(\n1+2cos\n1+2pi' | calc.exe | grep -c error | xargs test 15 =
+// test: echo -e '1 + 1\nans' | calc.exe -p 3 | grep -c 2 | xargs test 2 =
+// test: echo -e 'sin (pi / 2)' | calc.exe -p 4 | grep -q 1
+// test: echo -e 'e ^ 2' | calc.exe | grep -q '7\.38906'
+// test: echo -e '\n\n\n' | calc.exe | grep -qv 'error'
+// test: echo -e '\n\n\n' | calc.exe -n
+// test: echo -e '1.5\nsto (2)\n3 + rcl(2) * 4\nsto (5)' | calc.exe | grep -q 9
+// test: echo -e '1\nsto (0)\nsto (11)\nrcl (0)\nrcl (11)' | calc.exe | grep -c invalid | xargs test 4 =
+// test: echo -e '1\nsto (2)\n3\nsto (5, 7)\nsto(9)\ndisp' | calc.exe | grep -q '0 1 0 0 7 0 0 0 7 0'
+// test: echo -e '1+1 == 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 + 1 == 2 - 0' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 == 1 + 1 == 1' | calc.exe | grep -q '=> 0'
+// test: echo -e '1-cos(3*pi/4) != 0.5^-2' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 >= 2' | calc.exe | grep -q '=> 0'
+// test: echo -e '2 >= 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 <= 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '2 <= 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 > 2' | calc.exe | grep -q '=> 0'
+// test: echo -e '2 > 2' | calc.exe | grep -q '=> 0'
+// test: echo -e '1 < 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '2 < 2' | calc.exe | grep -q '=> 0'
+// test: echo -e '1 == 1\n1 != 1\n1 >= 1\n1 <= 1\n1 > 1\n1 < 1\nquit' | calc.exe -v 3 | grep -q bye
+// test: echo -e '(3 == 3) & (2 > 1)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 4) & (2 > 1)' | calc.exe | grep -q '=> 0'
+// test: echo -e '(3 == 3) & (2 > 2)' | calc.exe | grep -q '=> 0'
+// test: echo -e '(3 == 4) & (2 > 2)' | calc.exe | grep -q '=> 0'
+// test: echo -e '(3 == 3) | (2 > 1)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 4) | (2 > 1)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 3) | (2 > 2)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 4) | (2 > 2)' | calc.exe | grep -q '=> 0'
+// test: echo -e '!(3 == 4)' | calc.exe | grep -q '=> 1'
+// test: echo -e '!(3 == 3)' | calc.exe | grep -q '=> 0'
+// test: echo -e '1 & 1\n1 | 1\n!1\nquit' | calc.exe -v 3 | grep -qv error
+// test: echo -e '(3 == 3) & (4 > 2)' | calc.exe | grep -q '=> 1'
+// test: echo -e '3 == 3 & 4 > 2' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 + quit' | calc.exe 2>&1 | grep -q error
+// test: echo -e 'cos (quit)' | calc.exe 2>&1 | grep -q error
+// test: echo -e '(quit)' | calc.exe 2>&1 | grep -q error
+// test: echo -e 'cos 3.14\n!\n! 3 4' | calc.exe 2>&1 | grep -c error | xargs test 3 =
+// test: echo -e 'sto (2, 3)\ncond (rcl (2) > 2, log (64), exp (75 / 10))' | calc.exe  | grep -q '=> 4\.15888'
+// test: echo -e 'sto (2, 1)\ncond (rcl (2) > 2, log (64), exp (75 / 10))' | calc.exe  | grep -q '=> 1808\.04'
+// test: echo -e 'sto (2, 1)\ncond (rcl (2) > 2, log (64))' | calc.exe  | grep -q '=> 0'
+// test: echo -e 'cond (0, 1, 2)' | calc.exe -v 3 | grep -q Cond
+// test: echo -e 'cond\ncond (\ncond (1 >0,'| calc.exe 2>&1 | grep -c error | xargs test 3 =
+// test: echo -e 'sto (1, 4)\ninc (1)\ninc (1)\ndec (1)\ninc (1)\nrcl (1) == 6' | calc.exe -v 3 | grep -q '=> 1'
+// test: echo -e 'inc\ninc (\ndec\ndec (' | calc.exe 2>&1 | grep -c error | xargs test 4 =
+// test: echo -e 'inc (11)\ndec (0)' | calc.exe 2>&1 | grep -c invalid | xargs test 2 =
+// test: echo -e 'whl (inc (1) < 100, sto (2, rcl (1) + rcl (2)))' | calc.exe | grep -q '=> 5050'
+// test: echo -e 'whl\nwhl (inc (1) < 3,\nwhl (inc (1) < 100, sto (2, rcl (1) + rcl (2))' 2>&1 | calc.exe | grep -c error | xargs test 3 =
+// test: echo -e 'whl (0, 1)' | calc.exe -v 3 | grep -q While
+// test: echo -e '{sto (1, 1 + 1), rcl (1) * 3}' | calc.exe -v 3 | grep -q 'Program'
+// test: echo -e '{sto (1, 1 + 1), rcl (1) * 3}' | calc.exe | grep -q '=> 6'
+// test: echo -e '{\n{}\n{1, 2\n{sto (1, 1 + 1),\npow(2, {sto (1, 1 + 2), 2}, {rcl(2)})\n2 {sto (1, 1 + 1)}' 2>&1 | calc.exe | grep -c error | xargs test 6 =
 
 /* vim: set ts=4 sw=4 et: */