aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-03-31 06:09:09 +0000
committerdos-reis <gdr@axiomatics.org>2008-03-31 06:09:09 +0000
commit9920a0abe7a40dedfe43efe83722372e06dc0826 (patch)
treee66a2cc4273225b62da5080ac2471dd76607e365 /src/interp
parentd1991c79a1612d16a38ede9d6f72024f64714122 (diff)
downloadopen-axiom-9920a0abe7a40dedfe43efe83722372e06dc0826.tar.gz
* 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.
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/daase.lisp2
-rw-r--r--src/interp/lisplib.boot4
-rw-r--r--src/interp/sys-utility.boot9
3 files changed, 11 insertions, 4 deletions
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)