X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=da56cde8daa2f149ff9f3d61b59d4fe1f204000a;hp=4ce382cb2672b316439979e4f31b9b8acd8b03bd;hb=189d68c64f7aaec90b7cdef0fb2c358fe4f0dd21;hpb=e5cfb136bf7fd1352eff1bd87a458aa4ff748537

diff --git a/Makefile b/Makefile
index 4ce382c..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/input.tibdoc
+		tests/bitstream.tib
 
 demo: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.misc.Demo \
 		tests/demo.g \
-		tests/demo.in
+		'(11+2*3)-44'
 
 regress:
 	make boot
@@ -53,12 +53,25 @@ loop: edu.berkeley.sbp.jar
 		tests/testcase.g \
 		tests/loop.tc
 
+pain: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
+		-graph \
+		tests/meta.g \
+		tests/testcase.g \
+		tests/pain.tc
+
+ifthen: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
+		tests/meta.g \
+		tests/testcase.g \
+		tests/ifthen.tc
+
 boot: edu.berkeley.sbp.jar
 	cd src; \
 	$(java) -cp ../$< \
-		edu.berkeley.sbp.misc.MetaGrammar \
+		edu.berkeley.sbp.meta.MetaGrammar \
 		../tests/meta.g \
-		edu.berkeley.sbp.misc.MetaGrammarTree
+		edu.berkeley.sbp.meta.MetaGrammar
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
 	mkdir -p bin