Merge branch 'master' of https://secure.softndesign.org/git/calc

[calc.git] / calc.c

diff --git a/calc.c b/calc.c
index a57137475d7f4a8c7dc83ff251eef54d6224f4aa..e255bd2ca421baf948ee8400f8685859555d1960 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -98,13 +98,14 @@ int main (int argc, char *argv[])
             if (buffer[i] == '\n') {
                 buffer[i] = 0;
                 VERBOSE (INFO, PRINTOUT ("line(%d): %s\n", j, buffer + j));
-                element_t *element = parser (buffer, NULL, 0);
-                if (element == (void *)(-1)) {
+                element_t *element = parser (buffer + j, NULL, 0);
+                if (element == ERROR_OP) {
                     VERBOSE (WARNING, PRINTOUT ("error while parsing: %s\n", buffer));
                     ret = 1;
-               } else {
+                       } else {
                     VERBOSE (INFO, print_element (element, 0));
                     PRINTOUT ("=> %f\n", evaluate_element (element, 0));
+                    delelement (element);
                     ret = 0;
                 }
                 //fsync (stdfdout);
@@ -162,9 +163,16 @@ int main (int argc, char *argv[])
 // 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 '=> -5.000028e-1'
-// test: echo "95 - 6.3 * 15 - 1" | calc.exe | grep -q '=> -5.000028e-1'
+// 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 "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 "sqrt 2" | calc.exe | grep -q 'error'
+// test: echo "pow (2)" | calc.exe | grep -q 'error'
 
 /* vim: set ts=4 sw=4 et: */