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

diff --git a/Makefile b/Makefile
index 45bddeb..7cfc73d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,23 @@
 
-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
+
+java15: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.Java15 \
+		tests/java15.g \
+		tests/java15.test
 
 demo: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.misc.Demo \
 		tests/demo.g \
-		tests/demo.in
+		'(11+2*3)-44'
+
+demo2: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.Demo2
 
 regress:
 	make boot
@@ -53,6 +61,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,19 +77,31 @@ 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.MetaGrammar
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
 	mkdir -p bin
-	javac -cp javax.servlet.jar: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 ../$@ .
-
+#-Xlint:unchecked
 javadoc:
 	rm -rf doc/api
 	mkdir -p doc/api
-	javadoc -sourcepath src -public -d doc/api `find src -name \*.java`
+	javadoc \
+		-linksource \
+		-windowtitle "SBP: the Scannerless Boolean Parser" \
+		-sourcepath src \
+		-header "<b>SBP </b><br>v1.0" \
+		-public \
+		-notree \
+		-noindex \
+		-nonavbar \
+		-stylesheetfile doc/javadoc.css \
+		-noqualifier all \
+		-d doc/api \
+		edu.berkeley.sbp
 
 clean:
 	rm -rf doc/api edu.berkeley.sbp.jar bin edu.berkeley.sbp.tar.gz