From 62b82274396c7147fded4138638727b4b838bec1 Mon Sep 17 00:00:00 2001 From: "Greg J. Badros" Date: Mon, 13 Dec 1999 03:47:14 +0000 Subject: [PATCH] *** empty log message *** --- NEWS | 12 ++++++++ ice-9/ChangeLog | 4 +++ libguile/ChangeLog | 25 +++++++++++++++-- libguile/Makefile.in | 65 +++++++++++++++++++++++++++++++------------- 4 files changed, 84 insertions(+), 22 deletions(-) diff --git a/NEWS b/NEWS index d88e165bc..362029c0a 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,16 @@ Please send Guile bug reports to bug-guile@gnu.org. Changes since Guile 1.3.4: +* Massive software engineering face-lift by Greg J. Badros + +Now Guile primitives are defined using the GUILE_PROC/GUILE_PROC1 macros +and must contain a docstring that is extracted into foo.doc using a new +guile-doc-snarf script (that uses guile-doc-snarf.awk). + +Also, many SCM_VALIDATE_* macros are defined to ease the redundancy and +improve the readability of argument checking. + + * Changes to the distribution ** Trees from nightly snapshots and CVS now require you to run autogen.sh. @@ -59,6 +69,8 @@ turn on this extra processing only when necessary. * Changes to the stand-alone interpreter +** New primitives: `pkgdata-dir', `site-dir', `library-dir' + ** Positions of erring expression in scripts With version 1.3.4, the location of the erring expression in Guile diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 4a6675f78..c06ab04b2 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,7 @@ +Sun Dec 12 19:18:52 1999 Greg J. Badros + + * Makefile.am, doc.scm: Added doc.scm. + 1999-12-12 18:54:06 1999 Greg J. Badros * popen.scm, slib.scm: Added some docstrings for procedures that diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 55c8356b8..9a567e900 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,9 +1,28 @@ +Sun Dec 12 19:39:00 1999 Greg J. Badros + + * Makefile.am: Fix ETAGS_ARGS to recognize GUILE_PROC, + GUILE_PROC1. Build guile-procedures.txt, and add that file to + pkgdata_DATA. + + * load.c: Added `pkgdata-dir', `site-dir', `library-dir' + primitives. + + * guile-doc-snarf.awk: Drop trailing space when no arguments: + e.g., "(foo )" is now "(foo)". + + * *.c, alist.c: moved all the documentation for primitives from + guile-doc/ref/{appendices,posix,scheme}.texi into the source code. + This leaves about half of the primitives undocumented. Also, all + the markup is currently still texinfo. I don't have a problem + with texinfo per se, but the markup is not very descriptive or + accurate. + Sun Dec 12 16:50:26 1999 Greg J. Badros * scm_validate.h: Drop the SCM_DOCSTRING_SNARF for turning off - SCM_VALIDATE macros; the SCM_VALIDATE macros should be checked - for argument mismatches (along with the FUNC_NAME macro checking) - by a static tool that runs directly over the .c files. + SCM_VALIDATE macros; the SCM_VALIDATE macros should be checked for + argument mismatches (along with the FUNC_NAME macro checking) by a + static tool that runs directly over the .c files. * snarf.h: Handle SCM_REGISTER_PROC better when snarfing. The docstring is still missing from the .doc file; it just gives the diff --git a/libguile/Makefile.in b/libguile/Makefile.in index 17c0ab67c..915774b16 100644 --- a/libguile/Makefile.in +++ b/libguile/Makefile.in @@ -95,7 +95,8 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I.. -I$(srcdir)/.. ${THREAD_CPPFLAGS} -ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' +ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' --regex='/[ \t]*GUILE_[G]?PROC1?[ \t]*(\([^,]*\),[^,]*/\1/' + lib_LTLIBRARIES = libguile.la bin_PROGRAMS = guile @@ -146,6 +147,8 @@ EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads dynl-dl.c dynl-dld SUFFIXES = .x .doc +pkgdata_DATA = guile-procedures.txt + MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) MOSTLYCLEANFILES = cpp_err_symbols_here cpp_err_symbols_diff cpp_err_symbols_new cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new @@ -194,7 +197,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DATA = $(modinclude_DATA) +DATA = $(modinclude_DATA) $(pkgdata_DATA) HEADERS = $(include_HEADERS) $(modinclude_HEADERS) $(noinst_HEADERS) \ $(pkginclude_HEADERS) @@ -422,6 +425,25 @@ uninstall-modincludeDATA: rm -f $(DESTDIR)$(modincludedir)/$$p; \ done +install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ + fi; fi; \ + done + +uninstall-pkgdataDATA: + @$(NORMAL_UNINSTALL) + list='$(pkgdata_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ + done + install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) @@ -565,8 +587,9 @@ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \ install-binSCRIPTS install-exec: install-exec-am -install-data-am: install-modincludeDATA install-includeHEADERS \ - install-modincludeHEADERS install-pkgincludeHEADERS +install-data-am: install-modincludeDATA install-pkgdataDATA \ + install-includeHEADERS install-modincludeHEADERS \ + install-pkgincludeHEADERS install-data: install-data-am install-am: all-am @@ -574,8 +597,8 @@ install-am: all-am install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ uninstall-binSCRIPTS uninstall-modincludeDATA \ - uninstall-includeHEADERS uninstall-modincludeHEADERS \ - uninstall-pkgincludeHEADERS + uninstall-pkgdataDATA uninstall-includeHEADERS \ + uninstall-modincludeHEADERS uninstall-pkgincludeHEADERS uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ $(HEADERS) scmconfig.h @@ -585,8 +608,8 @@ install-strip: installdirs: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(bindir) $(DESTDIR)$(modincludedir) \ - $(DESTDIR)$(includedir) $(DESTDIR)$(modincludedir) \ - $(DESTDIR)$(pkgincludedir) + $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(includedir) \ + $(DESTDIR)$(modincludedir) $(DESTDIR)$(pkgincludedir) mostlyclean-generic: @@ -646,17 +669,18 @@ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ install-binPROGRAMS mostlyclean-checkPROGRAMS distclean-checkPROGRAMS \ clean-checkPROGRAMS maintainer-clean-checkPROGRAMS uninstall-binSCRIPTS \ install-binSCRIPTS uninstall-modincludeDATA install-modincludeDATA \ -uninstall-includeHEADERS install-includeHEADERS \ -uninstall-modincludeHEADERS install-modincludeHEADERS \ -uninstall-pkgincludeHEADERS install-pkgincludeHEADERS tags \ -mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir mostlyclean-depend distclean-depend clean-depend \ -maintainer-clean-depend info-am info dvi-am dvi check-local check \ -check-am installcheck-am installcheck all-recursive-am install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +uninstall-pkgdataDATA install-pkgdataDATA uninstall-includeHEADERS \ +install-includeHEADERS uninstall-modincludeHEADERS \ +install-modincludeHEADERS uninstall-pkgincludeHEADERS \ +install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check-local check check-am installcheck-am installcheck \ +all-recursive-am install-exec-am install-exec install-data-am \ +install-data install-am install uninstall-am uninstall all-redirect \ +all-am all installdirs mostlyclean-generic distclean-generic \ +clean-generic maintainer-clean-generic clean mostlyclean distclean \ +maintainer-clean check-local: @@ -701,6 +725,9 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status ./guile-doc-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< \ || { rm $@; false; } +guile-procedures.txt: *.doc + cat *.doc > $@ + cpp_err_symbols.c: cpp_err_symbols.in $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols.in > \ cpp_err_symbols.tmp