diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/interp/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 7 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 13 | ||||
| -rw-r--r-- | src/interp/clammed.boot.pamphlet | 7 |
7 files changed, 28 insertions, 27 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-16. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-17. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.1.0-2007-11-16' -PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-16' +PACKAGE_VERSION='1.1.0-2007-11-17' +PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-17' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1388,7 +1388,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.1.0-2007-11-16 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.1.0-2007-11-17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1458,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-16:";; + short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-17:";; esac cat <<\_ACEOF @@ -1562,7 +1562,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.1.0-2007-11-16 +OpenAxiom configure 1.1.0-2007-11-17 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1576,7 +1576,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.1.0-2007-11-16, which was +It was created by OpenAxiom $as_me 1.1.0-2007-11-17, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25198,7 +25198,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.1.0-2007-11-16, which was +This file was extended by OpenAxiom $as_me 1.1.0-2007-11-17, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25247,7 +25247,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.1.0-2007-11-16 +OpenAxiom config.status 1.1.0-2007-11-17 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index f0ce52e2..ba762c88 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.1.0-2007-11-16], +AC_INIT([OpenAxiom], [1.1.0-2007-11-17], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 1edec621..822c33ed 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1010,7 +1010,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.1.0-2007-11-16], +AC_INIT([OpenAxiom], [1.1.0-2007-11-17], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 610b45c3..44304a2e 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,9 @@ +2007-11-17 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (clammed.$(FASLEXT)): New rule. + (<<clammed.clisp>>): Remove. + * clammed.boot.pamphlet: Push into package "BOOT". Fix syntax. + 2007-11-16 Gabriel Dos Reis <gdr@cs.tamu.edu> * compiler.boot ($coreDiagnosticFunctions): New. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index e79389ba..6e13a54b 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -677,6 +677,9 @@ info.$(FASLEXT): info.boot g-util.$(FASLEXT) slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +clammed.$(FASLEXT): clammed.boot g-timer.$(FASLEXT) + $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< + clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -740,10 +743,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT) boot-pkg.$(FASLEXT): boot-pkg.lisp $(BOOTSYS) -- --compile --output=$@ $< -clammed.clisp: clammed.boot - @ echo 226 making $@ from $< - @ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS} - bookvol5.lisp: $(srcdir)/bookvol5.pamphlet @ echo 298 making $@ from $< $(axiom_build_document) --tangle=Interpreter --output=$@ $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index c178279e..f3c38e4f 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -824,14 +824,6 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex $(INSTALL_DATA) $< $@ @ -\subsection{clammed.boot \cite{62}} - -<<clammed.clisp>>= -clammed.clisp: clammed.boot - @ echo 226 making $@ from $< - @ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS} -@ - \subsection{bookvol5.lsp} @@ -1254,6 +1246,9 @@ info.$(FASLEXT): info.boot g-util.$(FASLEXT) slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +clammed.$(FASLEXT): clammed.boot g-timer.$(FASLEXT) + $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< + clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1317,8 +1312,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT) boot-pkg.$(FASLEXT): boot-pkg.lisp $(BOOTSYS) -- --compile --output=$@ $< -<<clammed.clisp>> - <<bookvol5.lisp>> <<nrunopt.clisp>> diff --git a/src/interp/clammed.boot.pamphlet b/src/interp/clammed.boot.pamphlet index af4ea229..1027d7e9 100644 --- a/src/interp/clammed.boot.pamphlet +++ b/src/interp/clammed.boot.pamphlet @@ -45,6 +45,9 @@ @ <<*>>= <<license>> +import '"g-timer" +)package "BOOT" +)eval BOOTTRAN::$bfClamming := true --% Functions on $clamList @@ -125,10 +128,10 @@ isValidType form == if # cl ^= # argl and GENSYMP last argl then argl:= DROP(-1,argl) # cl ^= # argl => nil cl:= replaceSharps(cl,form) - and/[isValid for x in argl for c in cl] where isValid == + and/[isValid for x in argl for c in cl] where isValid() == categoryForm?(c) => evalCategory(x,MSUBSTQ(x,'_$,c)) and isValidType x - not GETDATABASE(opOf x,'CONSTRUCTORKIND) = 'domain + GETDATABASE(opOf x,'CONSTRUCTORKIND) ^= 'domain selectMms1(op,tar,args1,args2,$Coerce) == -- for new compiler/old world compatibility, sometimes have to look |