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

diff --git a/Makefile b/Makefile
index 8b46585..da56cde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 
-java = java
+java = java -Xmx900m
 
 tibdoc: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
 		tests/tibdoc.g \
-		tests/tib.in
+		tests/bitstream.tib
 
 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.MetaGrammar
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
 	mkdir -p bin