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

diff --git a/Makefile b/Makefile
index 45bddeb..daaf625 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@ java = java
 tibdoc: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
 		tests/tibdoc.g \
-		tests/input.tibdoc
+		tests/tib.in
 
 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,6 +53,13 @@ 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 \
@@ -62,9 +69,9 @@ ifthen: edu.berkeley.sbp.jar
 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.MetaGrammarTree
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
 	mkdir -p bin