enhance store feature

[calc.git] / calc.c

diff --git a/calc.c b/calc.c
index 960bc1495e8b616493dba4838e005eeec59044e3..fe752407871ae429ab4a4a91aa8df1abdbb02059 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -71,7 +71,7 @@ int main (int argc, char *argv[])
      while (argc-- > 1) {
         char *arg = *(++argv);
         if (arg[0] != '-') {
-            fprintf (stderr, "%s: invalid option -- %s\n", progname, arg);
+            fprintf (stderr, "%s: invalid option -- '%s'\n", progname, arg);
             return usage (1);
         }
         char c = arg[1];
@@ -142,11 +142,12 @@ int main (int argc, char *argv[])
             }
             nb = 0;
             char *pt = line[nb++] = buffer;
-            while (*pt++ != '\0') {
+            while (*pt != '\0') {
                 if (*pt == '\n') {
                     *pt = '\0';
-                    line[nb++] = ++pt;
+                    line[nb++] = pt + 1;
                 }
+                pt++;
             }
             VERBOSE (INFO, fprintf (stdout, "line: '%s'\n", buffer));
         }
@@ -158,7 +159,7 @@ int main (int argc, char *argv[])
             }
             element_t *element = parser (line[i], NULL, 0);
             if (element == ERROR_OP) {
-                VERBOSE (WARNING, fprintf (stdout, "error while parsing: %s\n", line[i]); fflush (stdout));
+                VERBOSE (WARNING, fprintf (stdout, "error while parsing: '%s'\n", line[i]); fflush (stdout));
                 ret = 1;
             } else {
                 VERBOSE (INFO, print_element (element, 0));
@@ -222,6 +223,7 @@ int main (int argc, char *argv[])
 // 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'
@@ -235,10 +237,15 @@ int main (int argc, char *argv[])
 // 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 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)\nans\ne\n\pi\nhelp\nquit' | calc.exe -v 3 | grep -q bye
+// 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 + (' | calc.exe | grep -c error | xargs test 11 =
-// test: echo -e '1 + 1\nans' | calc.exe | grep -c 2 | xargs test 2 =
-// test: echo -e 'sin (pi / 2)' | calc.exe | grep -q 1
+// 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'
 
 /* vim: set ts=4 sw=4 et: */