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 | 22 | ||||
-rw-r--r-- | src/interp/Makefile.in | 59 | ||||
-rw-r--r-- | src/interp/Makefile.pamphlet | 59 | ||||
-rw-r--r-- | src/interp/daase.lisp | 2 | ||||
-rw-r--r-- | src/interp/hashcode.boot | 1 | ||||
-rw-r--r-- | src/interp/int-top.boot | 3 | ||||
-rw-r--r-- | src/interp/interop.boot | 1 | ||||
-rw-r--r-- | src/interp/intint.lisp | 1 | ||||
-rw-r--r-- | src/interp/mark.boot | 1 | ||||
-rw-r--r-- | src/interp/monitor.lisp | 1 | ||||
-rw-r--r-- | src/interp/osyscmd.boot | 1 | ||||
-rw-r--r-- | src/interp/package.boot | 1 | ||||
-rw-r--r-- | src/interp/patches.lisp | 2 | ||||
-rw-r--r-- | src/interp/pspad1.boot | 1 | ||||
-rw-r--r-- | src/interp/pspad2.boot | 1 | ||||
-rw-r--r-- | src/interp/setvars.boot | 2 | ||||
-rw-r--r-- | src/interp/spad.lisp | 7 | ||||
-rw-r--r-- | src/interp/sys-macros.lisp | 7 | ||||
-rw-r--r-- | src/interp/template.boot | 1 | ||||
-rw-r--r-- | src/interp/wi1.boot | 1 | ||||
-rw-r--r-- | src/interp/wi2.boot | 1 | ||||
-rw-r--r-- | src/interp/xruncomp.boot | 1 |
25 files changed, 177 insertions, 21 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-22. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-24. # # 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-22' -PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-22' +PACKAGE_VERSION='1.1.0-2007-11-24' +PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-24' 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-22 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.1.0-2007-11-24 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-22:";; + short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-24:";; 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-22 +OpenAxiom configure 1.1.0-2007-11-24 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-22, which was +It was created by OpenAxiom $as_me 1.1.0-2007-11-24, 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-22, which was +This file was extended by OpenAxiom $as_me 1.1.0-2007-11-24, 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-22 +OpenAxiom config.status 1.1.0-2007-11-24 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 d3e90ec0..56c278d0 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-22], +AC_INIT([OpenAxiom], [1.1.0-2007-11-24], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 665a575c..eacc33a4 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-22], +AC_INIT([OpenAxiom], [1.1.0-2007-11-24], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 69160e62..872ee67c 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,5 +1,27 @@ 2007-11-24 Gabriel Dos Reis <gdr@cs.tamu.edu> + * Makefile.pamphlet (patches.$(FASLEXT)): New rule. + (setvars.$(FASLEXT)): Likewise. + (osyscmd.$(FASLEXT)): Likewise. + (intint.$(FASLEXT)): Likewise. + (int-top.$(FASLEXT)): Likewise. + (wi2.$(FASLEXT)): Likewise. + (wi1.$(FASLEXT)): Likewise. + (template.$(FASLEXT)): Likewise. + (package.$(FASLEXT)): Likewise. + (xruncomp.$(FASLEXT)): Likewise. + (interop.$(FASLEXT)): Likewise. + (mark.$(FASLEXT)): Likewise. + (daase.$(FASLEXT)): Likewise. + (monitor.$(FASLEXT)): Likewise. + (hashcode.$(FASLEXT)): Likewise. + (pspad2.$(FASLEXT)): Likewise. + (pspad1.$(FASLEXT)): Likewise. + (nocompil.$(FASLEXT)): Likewise. + (fname.$(FASLEXT)): Likewise. + +2007-11-24 Gabriel Dos Reis <gdr@cs.tamu.edu> + * nrungo.boot (lazyCompareSigEqual): If template slot is "$" then compare with reified dollar. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 9bdc9ce1..3a2c5e02 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -493,12 +493,28 @@ hypertex.$(FASLEXT): hypertex.boot boot-pkg.$(FASLEXT) ## OpenAxiom's interpreter. +patches.$(FASLEXT): patches.lisp macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +setvars.$(FASLEXT): setvars.boot macros.$(FASLEXT) debug.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + profile.$(FASLEXT): profile.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +osyscmd.$(FASLEXT): osyscmd.boot int-top.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +intint.$(FASLEXT): intint.lisp i-toplev.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +int-top.$(FASLEXT): int-top.boot incl.$(FASLEXT) i-toplev.$(FASLEXT) \ + unlisp.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + i-toplev.$(FASLEXT): i-toplev.boot i-analy.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -560,6 +576,11 @@ setvart.$(FASLEXT): setvart.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< ## OpenAxiom's compiler +wi2.$(FASLEXT): wi2.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +wi1.$(FASLEXT): wi1.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< compiler.$(FASLEXT): compiler.boot category.$(FASLEXT) c-util.$(FASLEXT) \ modemap.$(FASLEXT) pathname.$(FASLEXT) @@ -580,6 +601,9 @@ nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT) nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +template.$(FASLEXT): template.boot c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -587,6 +611,9 @@ define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \ c-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +package.$(FASLEXT): package.boot clam.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \ cattable.$(FASLEXT) compat.$(FASLEXT) g-cndata.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -609,6 +636,12 @@ simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT) newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +xruncomp.$(FASLEXT): xruncomp.boot c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +interop.$(FASLEXT): interop.boot c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + c-doc.$(FASLEXT): c-doc.boot c-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -642,6 +675,9 @@ server.$(FASLEXT): server.boot macros.$(FASLEXT) spad-parser.$(FASLEXT): spad-parser.boot parse.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +mark.$(FASLEXT): mark.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + parse.$(FASLEXT): parse.boot metalex.$(FASLEXT) postpar.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -697,7 +733,7 @@ cparse.$(FASLEXT): cparse.boot ptrees.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< macex.$(FASLEXT): macex.boot ptrees.$(FASLEXT) - $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< ptrees.$(FASLEXT): ptrees.boot posit.$(FASLEXT) serror.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -745,6 +781,9 @@ cfuns.$(FASLEXT): cfuns.lisp boot-pkg.$(FASLEXT) obey.$(FASLEXT): obey.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +daase.$(FASLEXT): daase.lisp macros.$(FASLEXT) foam_l.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + setq.$(FASLEXT): setq.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -754,6 +793,9 @@ spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT) debug.$(FASLEXT): debug.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +monitor.$(FASLEXT): monitor.lisp macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + property.$(FASLEXT): property.lisp sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -817,6 +859,15 @@ c-util.$(FASLEXT): c-util.boot g-util.$(FASLEXT) pathname.$(FASLEXT): pathname.boot nlib.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +hashcode.$(FASLEXT): hashcode.boot g-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +pspad2.$(FASLEXT): pspad2.boot pspad1.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +pspad1.$(FASLEXT): pspad1.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -829,6 +880,12 @@ compress.$(FASLEXT): compress.boot sys-macros.$(FASLEXT) msg.$(FASLEXT): msg.boot sys-macros.$(FASLEXT) astr.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +fname.$(FASLEXT): fname.lisp macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + sys-macros.$(FASLEXT): sys-macros.lisp diagnostics.$(FASLEXT) \ union.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index d3b3fb31..98dac678 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1054,12 +1054,28 @@ hypertex.$(FASLEXT): hypertex.boot boot-pkg.$(FASLEXT) ## OpenAxiom's interpreter. +patches.$(FASLEXT): patches.lisp macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +setvars.$(FASLEXT): setvars.boot macros.$(FASLEXT) debug.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + profile.$(FASLEXT): profile.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +osyscmd.$(FASLEXT): osyscmd.boot int-top.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +intint.$(FASLEXT): intint.lisp i-toplev.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +int-top.$(FASLEXT): int-top.boot incl.$(FASLEXT) i-toplev.$(FASLEXT) \ + unlisp.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + i-toplev.$(FASLEXT): i-toplev.boot i-analy.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1121,6 +1137,11 @@ setvart.$(FASLEXT): setvart.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< ## OpenAxiom's compiler +wi2.$(FASLEXT): wi2.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +wi1.$(FASLEXT): wi1.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< compiler.$(FASLEXT): compiler.boot category.$(FASLEXT) c-util.$(FASLEXT) \ modemap.$(FASLEXT) pathname.$(FASLEXT) @@ -1141,6 +1162,9 @@ nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT) nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +template.$(FASLEXT): template.boot c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1148,6 +1172,9 @@ define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \ c-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +package.$(FASLEXT): package.boot clam.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \ cattable.$(FASLEXT) compat.$(FASLEXT) g-cndata.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1170,6 +1197,12 @@ simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT) newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +xruncomp.$(FASLEXT): xruncomp.boot c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +interop.$(FASLEXT): interop.boot c-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + c-doc.$(FASLEXT): c-doc.boot c-util.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1203,6 +1236,9 @@ server.$(FASLEXT): server.boot macros.$(FASLEXT) spad-parser.$(FASLEXT): spad-parser.boot parse.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +mark.$(FASLEXT): mark.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + parse.$(FASLEXT): parse.boot metalex.$(FASLEXT) postpar.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1258,7 +1294,7 @@ cparse.$(FASLEXT): cparse.boot ptrees.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< macex.$(FASLEXT): macex.boot ptrees.$(FASLEXT) - $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< ptrees.$(FASLEXT): ptrees.boot posit.$(FASLEXT) serror.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1306,6 +1342,9 @@ cfuns.$(FASLEXT): cfuns.lisp boot-pkg.$(FASLEXT) obey.$(FASLEXT): obey.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +daase.$(FASLEXT): daase.lisp macros.$(FASLEXT) foam_l.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + setq.$(FASLEXT): setq.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1315,6 +1354,9 @@ spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT) debug.$(FASLEXT): debug.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +monitor.$(FASLEXT): monitor.lisp macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + property.$(FASLEXT): property.lisp sys-macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1378,6 +1420,15 @@ c-util.$(FASLEXT): c-util.boot g-util.$(FASLEXT) pathname.$(FASLEXT): pathname.boot nlib.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< +hashcode.$(FASLEXT): hashcode.boot g-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +pspad2.$(FASLEXT): pspad2.boot pspad1.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +pspad1.$(FASLEXT): pspad1.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< @@ -1390,6 +1441,12 @@ compress.$(FASLEXT): compress.boot sys-macros.$(FASLEXT) msg.$(FASLEXT): msg.boot sys-macros.$(FASLEXT) astr.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +nocompil.$(FASLEXT): nocompil.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +fname.$(FASLEXT): fname.lisp macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + sys-macros.$(FASLEXT): sys-macros.lisp diagnostics.$(FASLEXT) \ union.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp index c3d47c27..ea9bebd3 100644 --- a/src/interp/daase.lisp +++ b/src/interp/daase.lisp @@ -200,6 +200,8 @@ ; -- tim daly +(import-module "macros") +(import-module "foam_l") (in-package "BOOT") (defstruct database diff --git a/src/interp/hashcode.boot b/src/interp/hashcode.boot index bcd1a554..3492b08a 100644 --- a/src/interp/hashcode.boot +++ b/src/interp/hashcode.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"g-util" )package "BOOT" -- Type hasher for old compiler style type names which produces a hash code diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot index 1a512d48..3ccdf3fd 100644 --- a/src/interp/int-top.boot +++ b/src/interp/int-top.boot @@ -32,6 +32,9 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"incl" +import '"i-toplev" +import '"unlisp" )package "BOOT" ncParseAndInterpretString s == diff --git a/src/interp/interop.boot b/src/interp/interop.boot index 99543049..0854f714 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"c-util" )package "BOOT" -- note domainObjects are now (dispatchVector hashCode . domainVector) diff --git a/src/interp/intint.lisp b/src/interp/intint.lisp index d08cc8fd..b3f8de0d 100644 --- a/src/interp/intint.lisp +++ b/src/interp/intint.lisp @@ -32,6 +32,7 @@ ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"i-toplev" (in-package "BOOT") (defun |intSayKeyedMsg| (key args) diff --git a/src/interp/mark.boot b/src/interp/mark.boot index 67ec82c8..5c314d2f 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -41,6 +41,7 @@ -- Entire constructor is then assembled and prettyprinted +import '"macros" )package "BOOT" REMPROP("and",'parseTran) diff --git a/src/interp/monitor.lisp b/src/interp/monitor.lisp index 28477ea7..6fa26c98 100644 --- a/src/interp/monitor.lisp +++ b/src/interp/monitor.lisp @@ -32,6 +32,7 @@ ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +(import-module "macros") (in-package "BOOT") (defun monitor-help () diff --git a/src/interp/osyscmd.boot b/src/interp/osyscmd.boot index c26a4246..eaa77cdf 100644 --- a/src/interp/osyscmd.boot +++ b/src/interp/osyscmd.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"int-top" )package "BOOT" diff --git a/src/interp/package.boot b/src/interp/package.boot index f2d758f1..764630b8 100644 --- a/src/interp/package.boot +++ b/src/interp/package.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"clam" )package "BOOT" isPackageFunction() == diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp index 5c11c540..d99e6b06 100644 --- a/src/interp/patches.lisp +++ b/src/interp/patches.lisp @@ -31,7 +31,7 @@ ;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +(import-module "macros") (in-package "BOOT") ;;patches for now diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index 89fe6b79..b738d5e2 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"macros" )package "BOOT" $escapeWords := ["always", "assert", "but", "define", diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot index 80af26dc..fd19e4fd 100644 --- a/src/interp/pspad2.boot +++ b/src/interp/pspad2.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"pspad1" )package "BOOT" --====================================================================== diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot index b40f4c65..ffcca4d7 100644 --- a/src/interp/setvars.boot +++ b/src/interp/setvars.boot @@ -53,6 +53,8 @@ -- its arguments, such as describeSetOutputFortran. +import '"macros" +import '"debug" )package "BOOT" -- The `set' function in this file handles the top level `)set' diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp index 1f8b84b0..3a0fef1b 100644 --- a/src/interp/spad.lisp +++ b/src/interp/spad.lisp @@ -267,10 +267,6 @@ (FLAG JUNKTOKLIST 'KEY) -(defmacro |report| (L) - (SUBST (SECOND L) 'x - '(COND ($reportFlag (sayBrightly x)) ((QUOTE T) NIL)))) - (defmacro |DomainSubstitutionMacro| (&rest L) (|DomainSubstitutionFunction| (first L) (second L))) @@ -565,7 +561,4 @@ (if (null (rest fn)) (setq fn (list (pathname (car fn))))) (rdefiostream (list (cons 'FILE fn) '(mode . OUTPUT)))) -(defmacro |spadConstant| (dollar n) - `(spadcall (svref ,dollar (the fixnum ,n)))) - diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index 3f4ac262..04993256 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -1248,3 +1248,10 @@ (defmacro |shoeread-line| (st) `(read-line ,st nil nil)) +(defmacro |report| (L) + (SUBST (SECOND L) 'x + '(COND ($reportFlag (sayBrightly x)) ((QUOTE T) NIL)))) + + +(defmacro |spadConstant| (dollar n) + `(spadcall (svref ,dollar (the fixnum ,n)))) diff --git a/src/interp/template.boot b/src/interp/template.boot index d77f8630..75e61ac8 100644 --- a/src/interp/template.boot +++ b/src/interp/template.boot @@ -31,6 +31,7 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"c-util" )package "BOOT" getOperationAlistFromLisplib x == diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 6d287d09..c97a61d5 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"macros" )package "BOOT" -- !! do not delete the next function ! diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 77171800..29c5e1d8 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"macros" )package "BOOT" compDefineFunctor1(df, m,$e,$prefix,$formalArgList) == diff --git a/src/interp/xruncomp.boot b/src/interp/xruncomp.boot index ffd4b211..bb5d26a2 100644 --- a/src/interp/xruncomp.boot +++ b/src/interp/xruncomp.boot @@ -32,6 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import '"c-util" )package "BOOT" ------- from info.boot ----------- |