correct manage cascade minus and divide

[calc.git] / calc.c

diff --git a/calc.c b/calc.c
index 945bdddbc250e0089c04e6534099b9326c363243..a57137475d7f4a8c7dc83ff251eef54d6224f4aa 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -104,7 +104,7 @@ int main (int argc, char *argv[])
                     ret = 1;
                } else {
                     VERBOSE (INFO, print_element (element, 0));
-                    PRINTOUT ("=> %f\n", evaluate_element (element));
+                    PRINTOUT ("=> %f\n", evaluate_element (element, 0));
                     ret = 0;
                 }
                 //fsync (stdfdout);
@@ -129,12 +129,15 @@ int main (int argc, char *argv[])
 
 // test: calc.exe -h
 // test: calc.exe -h | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
+// test: echo 1 | calc.exe -v3 | grep -q value
 // test: calc.exe -_ 2> /dev/null | awk 'END { if (NR == 0) { exit(0) } else exit (1) }'
 // test: calc.exe -_ 2>&1 | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
 // 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 "8 % 3" | calc.exe | grep -q '=> 2'
+// 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'
@@ -159,5 +162,9 @@ 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" | calc.exe | grep -q '=> 1.037e2'
+// test: echo "-cos (0) + 1" | calc.exe | grep -q '=> 0'
 
 /* vim: set ts=4 sw=4 et: */