[e-cvs] cvs commit: e/src/jsrc/org/quasiliteral/term QuasiBuilderAdaptor.java Term.java
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Thu, 10 Jan 2002 16:43:39 -0500
markm 02/01/10 16:43:39
Modified: src/build makerules.mk
src/jsrc Makefile
src/jsrc/org/quasiliteral/astro AstroBuilder.java
BaseBuilder.java
src/jsrc/org/quasiliteral/term QuasiBuilderAdaptor.java
Term.java
Log:
starting to write out edoc files
Revision Changes Path
1.16 +12 -0 e/src/build/makerules.mk
Index: makerules.mk
===================================================================
RCS file: /cvs/e/src/build/makerules.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- makerules.mk 2001/10/27 17:27:41 1.15
+++ makerules.mk 2002/01/10 21:43:38 1.16
@@ -217,6 +217,7 @@
ifdef JAVA_HOME
JAVACMD=$(JAVA_HOME)/jre/bin/java
COMP_PATH=$(JAVA_HOME)/jre/lib/rt.jar$(SEP)$(COMMON_PATH)
+ TOOL_PATH=$(COMP_PATH)$(SEP)$(JAVA_HOME)/lib/tools.jar
ifndef JAVAC
JAVAC=$(JAVA_HOME)/bin/javac
endif
@@ -225,6 +226,7 @@
# not JAVA_HOME
JAVACMD=java
COMP_PATH=
+ TOOL_PATH=
ifndef JAVAC
JAVAC=javac
endif
@@ -241,6 +243,16 @@
STLE=$(STLJ) org.erights.e.elang.interp.Interp
JCOMPILE=$(JAVAC) -g -classpath "$(COMP_PATH)" -d $(TOP)/classes
+TOOLCOMPILE=$(JAVAC) -g -classpath "$(TOOL_PATH)" -d $(TOP)/classes
+
+
+ifndef JAVADOC
+ifdef JAVA_HOME
+JAVADOC=$(JAVA_HOME)/bin/javadoc
+else
+JAVADOC="define JAVADOC (or JAVA_HOME) in environment "
+endif
+endif
#
1.70 +29 -4 e/src/jsrc/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/jsrc/Makefile,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Makefile 2002/01/09 17:22:00 1.69
+++ Makefile 2002/01/10 21:43:39 1.70
@@ -10,6 +10,8 @@
include $(TOP)/src/build/makerules.mk
+FULL_JAVA_SOURCES=c:/jdk1.4/src
+
ifeq "$(MAKE_PARSERS)" "true"
all: all_parse
else
@@ -115,7 +117,34 @@
find net/ertp -name '*.java' > files.tmp
$(JCOMPILE) @files.tmp
+_edoclet:
+ find org/quasiliteral/doclet -name '*.java' > files.tmp
+ $(TOOLCOMPILE) @files.tmp
+
+_packages:
+ find antlr net org -name '*.java' | \
+ grep -v "/CVS/" | \
+ sed 's@/[^/]*$$@@' | sort|uniq | sed 's@/@.@g' \
+ > packages.tmp
+ (cd $(FULL_JAVA_SOURCES); find com java javax org -name '*.java') | \
+ grep -v "/CVS/" | \
+ sed 's@/[^/]*$$@@' | sort|uniq | sed 's@/@.@g' \
+ >> packages.tmp
+ # echo "javax.swing" > packages.tmp
+
+edocs: _edoclet _packages
+ -rm -rf $(TOP)/edoc
+ mkdir $(TOP)/edoc
+ $(JAVADOC) -J-Xmx256m \
+ -docletpath "$(RUN_PATH)" \
+ -doclet org.quasiliteral.doclet.DocSaver \
+ -public \
+ -sourcepath "$(TOP)/src/jsrc$(SEP)$(FULL_JAVA_SOURCES)" \
+ -d $(TOP)/edoc \
+ @packages.tmp
+
+
pre_parsers: setup _develop
twixt_parsers: stl_elib quasi_1 third_party quasi_2
@@ -136,7 +165,3 @@
rm -rf $(TOP)/classes/com/skyhunter; \
jar cfm ../dist/e-no-sky.jar ../src/jsrc/ForManifest.txt .)
# (cd $(TOP)/dist; jar -i e.jar)
-
-
-
-
1.8 +8 -0 e/src/jsrc/org/quasiliteral/astro/AstroBuilder.java
Index: AstroBuilder.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/quasiliteral/astro/AstroBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AstroBuilder.java 2001/12/19 22:36:13 1.7
+++ AstroBuilder.java 2002/01/10 21:43:39 1.8
@@ -178,6 +178,14 @@
Object list(AstroArg first, AstroArg second, AstroArg third);
/**
+ * The four-argument args list
+ */
+ Object list(AstroArg first,
+ AstroArg second,
+ AstroArg third,
+ AstroArg fourth);
+
+ /**
* Extend args list with an additional term, like a backwards cons.
* <p>
* May be destructive of 'list' and 'next'
1.6 +7 -0 e/src/jsrc/org/quasiliteral/astro/BaseBuilder.java
Index: BaseBuilder.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/quasiliteral/astro/BaseBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseBuilder.java 2001/12/19 22:36:13 1.5
+++ BaseBuilder.java 2002/01/10 21:43:39 1.6
@@ -149,6 +149,13 @@
return with(list(first, second), third);
}
+ public Object list(AstroArg first,
+ AstroArg second,
+ AstroArg third,
+ AstroArg fourth) {
+ return with(list(first, second, third), fourth);
+ }
+
/**
*
*/
1.6 +7 -0 e/src/jsrc/org/quasiliteral/term/QuasiBuilderAdaptor.java
Index: QuasiBuilderAdaptor.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/quasiliteral/term/QuasiBuilderAdaptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- QuasiBuilderAdaptor.java 2001/12/22 06:46:56 1.5
+++ QuasiBuilderAdaptor.java 2002/01/10 21:43:39 1.6
@@ -121,6 +121,13 @@
return myBuilder.list(first, second, third);
}
+ public Object list(AstroArg first,
+ AstroArg second,
+ AstroArg third,
+ AstroArg fourth) {
+ return myBuilder.list(first, second, third, fourth);
+ }
+
public Object with(Object list, AstroArg next) {
return myBuilder.with(list, next);
}
1.24 +9 -4 e/src/jsrc/org/quasiliteral/term/Term.java
Index: Term.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/quasiliteral/term/Term.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Term.java 2001/12/24 23:09:38 1.23
+++ Term.java 2002/01/10 21:43:39 1.24
@@ -359,12 +359,17 @@
reps = 1;
open = "[";
close = "]";
+ if (h <= 1) {
+ T.require(myArgs.size() == 0,
+ "internal: bad height " + h);
+ out.print("[]");
+ return;
+ }
} else {
out.print(label);
if (h <= 1) {
- if (myArgs.size() != 0) {
- throw new RuntimeException("internal: bad height " + h);
- }
+ T.require(myArgs.size() == 0,
+ "internal: bad height " + h);
//If it's a leaf, don't show parens either
return;
}
@@ -372,7 +377,7 @@
open = "(";
close = ")";
}
- if (h <= 2) {
+ if (h == 2) {
//If it only contains leaves, do it on one line
out.print(open);
((Term)myArgs.get(0)).prettyPrintOn(out, quasiFlag);