/* depend: */
/* cflags: */
-/* linker: atoi.o fdprintf.o parser.o */
+/* linker: atoi.o debug.o fdprintf.o parser.o */
//#include <malloc.h>
#include <stddef.h>
/* gobal variables */
char *progname = NULL;
-int verbose = 2;
/* help function */
char buffer[BUFFER_SIZE + 1] = {0};
char *pt = buffer;
int i = 0, j = 0, n;
+ int ret = 0;
/* program name */
element_t *element = parser (buffer, NULL);
if (element == (void *)(-1)) {
VERBOSE (WARNING, PRINTOUT ("error while parsing: %s\n", buffer));
+ ret = 1;
} else {
print_element (element, 0);
+ ret = 0;
}
//fsync (stdfdout);
j = i + 1;
}
}
- return 0;
+ return ret;
}
// test: calc.exe -h
// test: calc.exe -h | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
// 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 "foo\nbar\nfoobar" | calc.exe -v3
+// test: echo "1 + 2" | calc.exe
+// test: echo "1 - 2" | calc.exe
+// test: echo "1 * 2" | calc.exe
+// test: echo "1 / 2" | calc.exe
+// test: echo "2 ^ 3" | calc.exe
+// test: echo "1e-1 + 2.34e5" | calc.exe
+// test: echo "sqrt (2)" | calc.exe
+// test: echo "pow (2, 3)" | calc.exe
+// test: echo "cos (2)" | calc.exe
+// test: echo "sin (2)" | calc.exe
+// test: echo "atan (2)" | calc.exe
+// test: echo "exp (2)" | calc.exe
+// test: echo "log (2)" | calc.exe
+// test: echo "1 + 2 - 3" | calc.exe
+// test: echo "1 + cos (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
+// test: echo "1 + -2" | calc.exe
+// test: echo "1 - +2" | calc.exe
+// test: echo "-1 + +2" | calc.exe
+// test: echo "-1 +2" | calc.exe
/* vim: set ts=4 sw=4 et: */
/* skip commas */
if (*str == ',') {
+ VERBOSE (DEBUG, PRINTOUT ("start processing coma\n"));
+ str++;
if (root == NULL) {
- return ERROR_OP;
+ return parser (str, &str);
} else if (root->func != Set) {
new = newelement (Set, MAX_OPERANDS);
+ if (new == NULL) {
+ return ERROR_OP;
+ }
new->ops[0] = root;
root = new;
+ VERBOSE (DEBUG, PRINTOUT ("end processing first coma\n"));
+ } else /* if (root->func == Set) */ {
+ new = parser (str, &str);
+ if (!found){
+ return ERROR_OP;
+ }
+ for (i = 0; i < root->nbops; i++) {
+ if (root->ops[i] == NULL) {
+ root->ops[i] = new;
+ found = 1;
+ }
+ }
+ if (!found){
+ return ERROR_OP;
+ }
+ VERBOSE (DEBUG, PRINTOUT ("end processing other coma\n"));
}
- str++;
continue;
}
if (!found) {
return ERROR_OP;
}
+ } else {
+ if (new->func != Set) {
+ root = new;
+ } else {
+ return ERROR_OP;
+ }
}
VERBOSE (DEBUG, PRINTOUT ("stop processing bracket\n"));
- if (next != NULL) {
- *next = str;
- }
- return root;
+ //if (next != NULL) {
+ // *next = str;
+ //}
+ //return root;
+ continue;
}
if (*str == ')') {
if (next != NULL) {