X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=daaf62505965f35f7831963f4b5545d54ce4e376;hp=8b465850c0fac21d52a15f5d5fb393c03c4d03ec;hb=f699bd804e3216b451aba17bc79f94504ff98612;hpb=8abe88ea7a5d7b1fc20c45b05e6397dad81e7cdb

diff --git a/Makefile b/Makefile
index 8b46585..daaf625 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ tibdoc: edu.berkeley.sbp.jar
 
 demo: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.misc.Demo \
-		tests/meta.g \
-		tests/meta.g
+		tests/demo.g \
+		'(11+2*3)-44'
 
 regress:
 	make boot
@@ -69,16 +69,9 @@ ifthen: edu.berkeley.sbp.jar
 boot: edu.berkeley.sbp.jar
 	cd src; \
 	$(java) -cp ../$< \
-		edu.berkeley.sbp.misc.MetaGrammar \
-		../tests/meta.g \
-		edu.berkeley.sbp.misc.MetaGrammarTree
-
-newboot: edu.berkeley.sbp.jar
-	cd src; \
-	$(java) -cp ../$< \
-		edu.berkeley.sbp.misc.Demo \
+		edu.berkeley.sbp.meta.MetaGrammar \
 		../tests/meta.g \
-		edu.berkeley.sbp.misc.DemoMetaGrammarTree
+		edu.berkeley.sbp.meta.MetaGrammarTree
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
 	mkdir -p bin