diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/interp/daase.lisp | 2 | ||||
| -rw-r--r-- | src/interp/lisplib.boot | 4 | ||||
| -rw-r--r-- | src/interp/sys-utility.boot | 9 |
7 files changed, 30 insertions, 15 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.2.0-2008-03-30. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-03-31. # # 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.2.0-2008-03-30' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-30' +PACKAGE_VERSION='1.2.0-2008-03-31' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-31' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1399,7 +1399,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.2.0-2008-03-30 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-03-31 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1469,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-30:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-31:";; esac cat <<\_ACEOF @@ -1573,7 +1573,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-03-30 +OpenAxiom configure 1.2.0-2008-03-31 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1587,7 +1587,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.2.0-2008-03-30, which was +It was created by OpenAxiom $as_me 1.2.0-2008-03-31, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25757,7 +25757,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.2.0-2008-03-30, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-03-31, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25806,7 +25806,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-03-30 +OpenAxiom config.status 1.2.0-2008-03-31 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 94b25eda..a1929d05 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-30], +AC_INIT([OpenAxiom], [1.2.0-2008-03-31], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index e973e096..5fdae1a6 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1078,7 +1078,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-30], +AC_INIT([OpenAxiom], [1.2.0-2008-03-31], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 7d8cb609..7e2c7153 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-03-31 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/sys-utility.boot (loadModule): New. + * interp/daase.lisp (initial-getdatabase): Use it instead of + Lisp's LOAD. + * interp/lisplib.boot (loadLib): Likewise. + (loadLibNoUpdate): Likewise. + 2008-03-30 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/i-intern.boot (mkAtree3): Don't apply syntactic diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp index 8c2efb59..93524aff 100644 --- a/src/interp/daase.lisp +++ b/src/interp/daase.lisp @@ -412,7 +412,7 @@ (if (probe-file c) (progn (put con 'loaded c) - (load c) + (|loadModule| c con) (format t "loaded.~%")) (format t "skipped.~%")))) (format t "~%"))) diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 52c73045..5c5f50df 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -157,7 +157,7 @@ loadLib cname == kind := GETDATABASE(cname,'CONSTRUCTORKIND) if $printLoadMsgs then sayKeyedMsg("S2IL0002",[namestring fullLibName,kind,cname]) - LOAD(fullLibName) + loadModule(fullLibName,cname) clearConstructorCache cname updateDatabase(cname,cname,systemdir?) installConstructor(cname,kind) @@ -183,7 +183,7 @@ loadLibNoUpdate(cname, libName, fullLibName) == kind := GETDATABASE(cname,'CONSTRUCTORKIND) if $printLoadMsgs then sayKeyedMsg("S2IL0002",[namestring fullLibName,kind,cname]) - if CATCH('VERSIONCHECK,LOAD(fullLibName)) = -1 + if CATCH('VERSIONCHECK,loadModule(fullLibName,cname)) = -1 then PRINC('" wrong library version...recompile ") PRINC(fullLibName) diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot index f422d993..6bbb59a9 100644 --- a/src/interp/sys-utility.boot +++ b/src/interp/sys-utility.boot @@ -13,7 +13,7 @@ -- the documentation and/or other materials provided with the -- distribution. -- --- - Neither the name of The Numerical ALgorithms Group Ltd. nor the +-- - Neither the name of The Numerical Algorithms Group Ltd. nor the -- names of its contributors may be used to endorse or promote products -- derived from this software without specific prior written permission. -- @@ -161,6 +161,13 @@ checkMkdir path == getSystemModulePath m == CONCAT(systemRootDirectory(),'"algebra/",m,'".",$faslType) +++ load module in `path' that supposedly will define the function +++ indicated by `name'. +loadModule: (%String,%Symbol) -> %Thing +loadModule(path,name) == + FMAKUNBOUND name + LOAD path + --% numericis log10 x == LOG(x,10) |