smarter Makefile, fixed grammar

git-svn-id: svn://anubis/gvsu@113 45c1a28c-8058-47b2-ae61-ca45b979098e

cs675/bottomup/Makefile

@@ -1,12 +1,13 @@
 
 PKG := jholtrop.gvsu.cs675.bottomup
 PKGPATH := $(subst .,/,$(PKG))
+PARSER := $(PKGPATH)/parser/Parser.java
+GRAMMAR := arithmetic.grammar
 
-all: sablecc prog
+all: $(PARSER) prog
 
-.PHONY: sablecc
-sablecc:
-	sablecc arithmetic.grammar
+$(PARSER): $(GRAMMAR)
+	sablecc $(GRAMMAR)
 
 .PHONY: prog
 prog:

cs675/bottomup/arithmetic.grammar

@@ -3,7 +3,7 @@ Package jholtrop.gvsu.cs675.bottomup;
 
 Tokens
     blank = (' ' | 9 | 10 | 13);
-    number = ['0' .. '9']+ ('.' ['0' .. '9']+)?;
+    number = ['0' .. '9']+;
     plus = '+';
     minus = '-';
     multiply = '*';
@@ -22,7 +22,8 @@ Productions
 
     term =
         {multiplication} term multiply factor |
-        {division} term divide factor;
+        {division} term divide factor |
+        {factor} factor;
 
     factor =
         {number} number |

cs675/bottomup/jholtrop/gvsu/cs675/bottomup/Evaluator.java

@@ -26,7 +26,7 @@ public class Evaluator
         }
         catch (Exception e)
         {
-            System.out.println(e.getMessage());
+            System.out.println("Error: " + e.getMessage());
         }
     }
 }