efficient priority solution

[calc.git] / calc.c

diff --git a/calc.c b/calc.c
index 9811642f46e6bfe07559a3c1e3e1f3447837cdbd..b83bbd6af9f91ab16a971a6cb0339305e1de0950 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -98,7 +98,7 @@ 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);
+                element_t *element = parser (buffer, NULL, 0);
                 if (element == (void *)(-1)) {
                     VERBOSE (WARNING, PRINTOUT ("error while parsing: %s\n", buffer));
                     ret = 1;
@@ -145,6 +145,7 @@ int main (int argc, char *argv[])
 // test: echo "log (2)" | calc.exe
 // test: echo "1 + 2 - 3" | calc.exe
 // test: echo "1 + cos (2 - 3)" | calc.exe
+// test: echo "cos (1 / 2) * 3" | calc.exe
 // test: echo "1 + 4 * (2 - 3)" | calc.exe
 // test: echo "(2 - 3) / 4" | calc.exe
 // test: echo "pow (2 - 3, 8 / 3)" | calc.exe
@@ -154,6 +155,8 @@ int main (int argc, char *argv[])
 // test: echo "-1+2" | calc.exe
 // test: echo "1-2" | calc.exe
 // test: echo "1 * 2 / 3 + 4" | calc.exe
-// test: echo "2 ^ 3 * 4 + cos (5)" | calc.exe
+// test: echo "2 ^ 3 * 4 + 5" | calc.exe
+// test: echo "2 + 3 * 4 ^ 5" | calc.exe
+// test: echo "2 ^ 3 * 4 + cos(5/6)" | calc.exe
 
 /* vim: set ts=4 sw=4 et: */