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));
+ PRINTOUT ("=> %f\n", evaluate_element (element, 0));
+ delelement (element);
ret = 0;
}
//fsync (stdfdout);
// 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 "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" | calc.exe | grep -q '=> 4.999971e-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: */