/* gobal variables */
char *progname = NULL;
+int precision = 6;
/* help function */
int fd = ret ? stdfderr : stdfdout;
fdprintf (fd, "usage: %s\n", progname);
fdprintf (fd, " -h : help message\n");
+ fdprintf (fd, " -p : precision (%d)\n", precision);
fdprintf (fd, " -v : verbose level (%d)\n", verbose);
return ret;
}
char c = arg[1];
switch (c) {
+ case 'p':
+ arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+ if (arg == NULL) {
+ PRINTERR ("%s: missing precision\n", progname);
+ return usage (1);
+ }
+ precision = atoi (arg);
+ break;
case 'v':
arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
if (arg == NULL) {
return usage (c != 'h');
}
}
+
+ /* format */
+ char format[8] = "=> %.f\n";
+ format[4] = '0' + precision;
/* read from input stream */
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 (format, evaluate_element (element, 0));
+ delelement (element);
ret = 0;
}
//fsync (stdfdout);
// 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: calc.exe error 2>&1 | grep -q 'invalid option'
+// test: calc.exe -p 2>&1 | grep -q 'missing precision'
+// test: calc.exe -v 2>&1 | grep -q 'missing verbose'
// 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 "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 '=> -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'
+// test: echo "1.23456789" | calc.exe -p 3 | grep -q '1\.234'
+// test: echo . | calc.exe
+// 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 6.4e1
+// 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)\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 =
/* vim: set ts=4 sw=4 et: */