unrolling forests without recursion
[sbp.git] / Makefile
index c2dd714..8cf95ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
 
 java = java
 
-doc: edu.berkeley.sbp.jar
+tibdoc: edu.berkeley.sbp.jar
        $(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
                tests/tibdoc.g \
                tests/input.tibdoc
 
+demo: edu.berkeley.sbp.jar
+       $(java) -cp $< edu.berkeley.sbp.misc.Demo \
+               tests/demo.g \
+               tests/demo.in
+
 regress:
        make boot
        rm edu.berkeley.sbp.jar
@@ -41,16 +46,36 @@ javatest: edu.berkeley.sbp.jar
                tests/testcase.g \
                tests/java.tc
 
+loop: edu.berkeley.sbp.jar
+       $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
+               -graph \
+               tests/meta.g \
+               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 \
                ../tests/meta.g \
-               edu.berkeley.sbp.misc.MetaGrammar
+               edu.berkeley.sbp.misc.MetaGrammarTree
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
        mkdir -p bin
-       javac -cp tests/ArchSimA3.jar:tests/grappa.jar -d bin -sourcepath src $^
+       javac -cp javax.servlet.jar:tests/ArchSimA3.jar:tests/grappa.jar -d bin -sourcepath src $^
        cd bin; jar cf ../$@ .
 
 javadoc:
@@ -67,3 +92,4 @@ upload:
        darcs dist
        echo '<html><head><meta HTTP-EQUIV="Refresh" CONTENT="0;URL=doc/sbp.html"></head></html>' > index.html
        rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+