rpn passes test cases

Author: Joshua Goller

ch-4/Makefile

@@ -13,11 +13,11 @@ endif
 rpc: clean
 	$(COMPILE) -I ch-4/rpc/include/ ch-4/rpc/src/*.c -o bin/$@
 ifdef RUN_TESTS
-	printf "4 5 +" | $(VALGRIND) ./bin/$@
-	@#printf "4 5 + 5 6 + -\n" | $(VALGRIND) ./bin/$@
-	@#printf "5 SIN" | $(VALGRIND) ./bin/$@
-	@#printf "b 6 = \n b 10 *\n" | $(VALGRIND) ./bin/$@
-	@#printf "" | $(VALGRIND) ./bin/$@
+	printf "4 5 +" | $(VALGRIND) ./bin/$@ | grep "9"
+	printf "4 5 + 5 6 + -\n" | $(VALGRIND) ./bin/$@ | grep "\-2"
+	printf "5 SIN" | $(VALGRIND) ./bin/$@ | grep "\-0.95892427"
+	printf "b 6 = \n b 10 *\n" | $(VALGRIND) ./bin/$@ | grep "60"
+	printf "" | $(VALGRIND) ./bin/$@
 endif
 
 4.11: 4.11-build

ch-4/rpc/include/rpc.h

@@ -97,7 +97,7 @@ operand pop(void);
 operand peek(void);
 void duplicate_top(void);
 void swap_top(void);
-int get_stack_size(void);
+int get_stack_top(void);
 
 // vars.c
 void assign(operand val1, operand val2);

ch-4/rpc/src/main.c

@@ -8,7 +8,6 @@ int main() {
   char token[MAX_TOKEN_SIZE];
 
   while ((type = lex(token, MAX_TOKEN_SIZE))) {
-    printf("main() | evaluating type %d, token %s\n", type, token);
     switch (type) {
       case VAL:
         op1.type = VAL;
@@ -106,12 +105,14 @@ int main() {
         return -1;
     }
   }
-  if (get_stack_size() == 0) {
+  int top = get_stack_top();
+  if (top == 0) {
     operand final = pop();
     printf("%8.8g\n", final.dvalue);
     return 0;
+  } else if (top == -1) {
+    return 0;
   } else {
-    printf("stack size: %d\n", get_stack_size());
     printf("Error: invalid expression; quitting.\n");
     return -1;
   }

ch-4/rpc/src/stack.c

@@ -7,8 +7,6 @@ static operand stack[MAX_STACK_SIZE];
 int push(const operand op) {
   if (sp < MAX_STACK_SIZE) {
     stack[++sp] = op;
-    printf("push() | pushed (%d, %c, %lf)\n", stack[sp].type, stack[sp].cvalue,
-           stack[sp].dvalue);
     return 0;
   } else {
     printf("Error; stack full.\n");
@@ -26,8 +24,6 @@ operand pop(void) {
     printf("Error: stack invalid.\n");
     return (operand){GARBAGE, 0, 0.0};
   } else {
-    printf("pop() | popping (%d, %c, %lf)\n", stack[sp].type, stack[sp].cvalue,
-           stack[sp].dvalue);
     return stack[sp--];
   }
 }
@@ -63,4 +59,4 @@ void swap_top() {
   push(second);
 }
 
-int get_stack_size() { return sp; }
+int get_stack_top() { return sp; }