enforcing a renaming consistently

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@633 ab42f6e0-554d-0410-b580-99e487e6eeb2

topics/java/Makefile

@@ -13,39 +13,39 @@ test:
 	cd jls1 ; make all
 	cd jls2 ; make all
 	cd jls3 ; make all
-	../../shared/tools/gdts jls1/app1.bgf lci/snapshot/app1.bgf
-	../../shared/tools/gdts jls2/app2.bgf lci/snapshot/app2.bgf
-	../../shared/tools/gdts jls3/app3.bgf lci/snapshot/app3.bgf
-	../../shared/tools/gdts jls1/doc1.bgf lci/snapshot/doc1.bgf
-	../../shared/tools/gdts jls2/doc2.bgf lci/snapshot/doc2.bgf
-	../../shared/tools/gdts jls3/doc3.bgf lci/snapshot/doc3.bgf
+	../../shared/tools/gdts jls1/impl1.bgf lci/snapshot/impl1.bgf
+	../../shared/tools/gdts jls2/impl2.bgf lci/snapshot/impl2.bgf
+	../../shared/tools/gdts jls3/impl3.bgf lci/snapshot/impl3.bgf
+	../../shared/tools/gdts jls1/read1.bgf lci/snapshot/read1.bgf
+	../../shared/tools/gdts jls2/read2.bgf lci/snapshot/read2.bgf
+	../../shared/tools/gdts jls3/read3.bgf lci/snapshot/read3.bgf
 
 rebuild:
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/19.doc.html > jls1/app.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/syntax.doc.html > jls2/app.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/syntax.html > jls3/app.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/4.doc.html   >jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/6.doc.html  >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/7.doc.html  >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/8.doc.html  >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/9.doc.html  >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/10.doc.html >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/14.doc.html >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/first_edition/html/15.doc.html >>jls1/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/typesValues.doc.html >jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/packages.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/classes.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/interfaces.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/arrays.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/statements.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/second_edition/html/expressions.doc.html >>jls2/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html >jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/names.html >>jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/packages.html >>jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/classes.html >>jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/interfaces.html >>jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/arrays.html >>jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/statements.html >>jls3/doc.html
-	curl -k http://java.sun.com/docs/books/jls/third_edition/html/expressions.html >>jls3/doc.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/19.read.html > jls1/impl.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/syntax.read.html > jls2/impl.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/syntax.html > jls3/impl.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/4.read.html   >jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/6.read.html  >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/7.read.html  >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/8.read.html  >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/9.read.html  >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/10.read.html >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/14.read.html >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/first_edition/html/15.read.html >>jls1/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/typesValues.read.html >jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/names.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/packages.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/classes.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/interfaces.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/arrays.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/statements.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/second_edition/html/expressions.read.html >>jls2/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/typesValues.html >jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/names.html >>jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/packages.html >>jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/classes.html >>jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/interfaces.html >>jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/arrays.html >>jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/statements.html >>jls3/read.html
+	curl -k http://java.sun.com/reads/books/jls/third_edition/html/expressions.html >>jls3/read.html
 

topics/java/jls1/Makefile

@@ -1,27 +1,27 @@
 all:
-	make app
-	make doc
+	make impl
+	make read
 	make test
 
 debug:
-	python ../../extraction/html2bgf/getpre.py syntax.kw app.html parse.html
-	python ../../extraction/html2bgf/html2bgf.py parse.html app1.bgf -v
-	python ../../extraction/html2bgf/getpre.py collect.kw doc.html parse.html 
-	python ../../extraction/html2bgf/html2bgf.py parse.html doc1.bgf -v
+	python ../../extraction/html2bgf/getpre.py syntax.kw impl.html parse.html
+	python ../../extraction/html2bgf/html2bgf.py parse.html impl1.bgf -v
+	python ../../extraction/html2bgf/getpre.py collect.kw read.html parse.html 
+	python ../../extraction/html2bgf/html2bgf.py parse.html read1.bgf -v
 
-app:
-	@echo "Extracting app1" > /dev/stderr
-	python ../../extraction/html2bgf/getpre.py syntax.kw app.html parse.html
-	python ../../extraction/html2bgf/html2bgf.py parse.html app1.bgf
+impl:
+	@echo "Extracting impl1" > /dev/stderr
+	python ../../extraction/html2bgf/getpre.py syntax.kw impl.html parse.html
+	python ../../extraction/html2bgf/html2bgf.py parse.html impl1.bgf
 
-doc:
-	@echo "Extracting doc1" > /dev/stderr
-	python ../../extraction/html2bgf/getpre.py collect.kw doc.html parse.html
-	python ../../extraction/html2bgf/html2bgf.py parse.html doc1.bgf
+read:
+	@echo "Extracting read1" > /dev/stderr
+	python ../../extraction/html2bgf/getpre.py collect.kw read.html parse.html
+	python ../../extraction/html2bgf/html2bgf.py parse.html read1.bgf
 
 test:
-	../../../shared/tools/checkxml bgf app1.bgf
-	../../../shared/tools/checkxml bgf doc1.bgf
+	../../../shared/tools/checkxml bgf impl1.bgf
+	../../../shared/tools/checkxml bgf read1.bgf
 
 clean:
 	rm -f *.bgf parse.html