aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-09-05 11:41:13 +0000
committerdos-reis <gdr@axiomatics.org>2008-09-05 11:41:13 +0000
commit8ee9095f7120c9d611b3c8056f4d86603ebda59e (patch)
tree1937e819e1540e2badc41eb7c2523e72f86430f5 /src/interp
parentd09cf0aa8047981bbf25722b5cadd0aa8b6c533f (diff)
downloadopen-axiom-8ee9095f7120c9d611b3c8056f4d86603ebda59e.tar.gz
* interp/daase.lisp (processDir): Lose last argument. Don't
change directory. (localdatabase): Adjust call. * interp/lisplib.boot (getAllIndexPathnames): Take an argument. (getAllAldorObjectFiles): Likewise.
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/daase.lisp10
-rw-r--r--src/interp/lisplib.boot14
2 files changed, 12 insertions, 12 deletions
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index 8eabf2ef..9355c2a1 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -982,11 +982,9 @@
(when options
(format t " Ignoring unknown )library option: ~a~%" options))
(values only dir noexpose)))
- (processDir (dirarg thisdir)
- (|changeDirectory| (string dirarg))
- (let ((indexFiles (|getAllIndexPathnames|))
- (aldorFiles (|getAllAldorObjectFiles|)))
- (|changeDirectory| thisdir)
+ (processDir (dirarg)
+ (let ((indexFiles (|getAllIndexPathnames| dirarg))
+ (aldorFiles (|getAllAldorObjectFiles| dirarg)))
(values
indexFiles
(first aldorFiles)
@@ -1006,7 +1004,7 @@
(setq noexpose t))
(if dir
(multiple-value-setq (nrlibs asys asos libs)
- (processDir dir thisdir)))
+ (processDir (|ensureTrailingSlash| (string dir)))))
(dolist (file filelist)
(let ((filename (pathname-name file))
(namedir (directory-namestring file)))
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index a4b90f8a..7296b447 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -685,21 +685,23 @@ getIndexPathname: %String -> %String
getIndexPathname dir ==
strconc(ensureTrailingSlash dir, $IndexFilename)
-getAllIndexPathnames() ==
+getAllIndexPathnames: %String -> %List
+getAllIndexPathnames dir ==
-- GCL's semantics of Common Lisp's `DIRECTORY *' differs from the
-- rest of everybody else' semantics. Namely, GCL would return a
-- a list of drirectories AND files. Pretty much like `ls *'.
-- Everybody else strips out directories.
)if %hasFeature KEYWORD::GCL
- [getIndexPathname NAMESTRING d for d in DIRECTORY '"*.NRLIB"]
+ [getIndexPathname NAMESTRING d for d in DIRECTORY strconc(dir,'"*.NRLIB")]
)else
- DIRECTORY strconc('"*.NRLIB/",$IndexFilename)
+ DIRECTORY strconc(dir,'"*.NRLIB/",$IndexFilename)
)endif
-getAllAldorObjectFiles() ==
- asys := DIRECTORY '"*.asy"
- asos := DIRECTORY '"*.ao"
+getAllAldorObjectFiles: %String -> %List
+getAllAldorObjectFiles dir ==
+ asys := DIRECTORY strconc(dir,'"*.asy")
+ asos := DIRECTORY strconc(dir,'"*.ao")
-- don't include both a `x.asy' and `x.ao', and retain
-- only sensical .asy files.
dupAOs := MAPCAN(function PATHNAME_-NAME,asys)