@@ -1,7 +1,7 @@ CC=gcc CFLAGS=-g -Wall -OBJECTS=rpn.o stack.o lex.o functions.o +OBJECTS=rpn.o stack.o lex.o all: $(OBJECTS) $(CC) -o rpn $(OBJECTS) Makefile @@ -14,9 +14,9 @@ Usage * __addition__ - 10 2 1 + . + 10 2 + . - Prints 13, the sum of 10, 2, and 1. + Prints 12, the sum of 10 and 2. * __subtraction__ @@ -38,6 +38,11 @@ Usage Note that you can 'peek' the top of the stack anywhere in an expression, ie: - 10 2 + . 2 / . + 1 2 + . 4 * . 5 + . 3 - . - Prints "12" and then "6" +Prints: + + 3 + 12 + 17 + 14 README.markdown @@ -2,7 +2,6 @@ #include <stdlib.h> #include "lex.h" #include "stack.h" -#include "functions.h" int main(int argc, char *argv[]) { @@ -12,16 +11,21 @@ int main(int argc, char *argv[]) { if(t.type == T_VALUE) { stack_push(&s, t.value); } else { + float arg1,arg2; switch(t.symbol[0]) { - case '+': f_add(&s); + case '+': stack_push(&s, stack_pop(&s)+stack_pop(&s)); break; - case '-': f_subtract(&s); + case '-': arg1 = stack_pop(&s); + arg2 = stack_pop(&s); + stack_push(&s, arg2-arg1); break; - case '*': f_multiply(&s); + case '*': stack_push(&s, stack_pop(&s)*stack_pop(&s)); break; - case '/': f_divide(&s); + case '/': arg1 = stack_pop(&s); + arg2 = stack_pop(&s); + stack_push(&s, arg2/arg1); break; - case '.': f_print(&s); + case '.': printf("%g\n", stack_peek(&s)); break; case 'q': free_stack(&s); printf("Exiting\n"); rpn.c functions.c functions.h 32190002a82181cef658b1f992bc4349a0a64ea4 Alan Dipert alan.dipert@gmail.com http://github.com/alandipert/minirpn/commit/87eb2d25e2f5ab9f98f4a0f8f69cc9e480c16e38 87eb2d25e2f5ab9f98f4a0f8f69cc9e480c16e38 2009-11-07T12:39:34-08:00 2009-11-07T12:39:34-08:00 extensive simplification 9e0718fec39532b7f05b924434a99bfd64d58c3c Alan Dipert alan.dipert@gmail.com