Finish mbase-dir renaming.
This commit is contained in:
parent
30d848ed9f
commit
ee8aa95e24
3 changed files with 11 additions and 11 deletions
|
@ -28,9 +28,9 @@
|
||||||
(module
|
(module
|
||||||
mbase-dir
|
mbase-dir
|
||||||
(
|
(
|
||||||
load-members-dir
|
load-mbase-dir
|
||||||
members-dir-load-member
|
mbase-dir-load-member
|
||||||
members-dir-tests!
|
mbase-dir-tests!
|
||||||
)
|
)
|
||||||
|
|
||||||
(import scheme
|
(import scheme
|
||||||
|
@ -139,7 +139,7 @@
|
||||||
|
|
||||||
;; Loads the members directory as dictionary of files to symlinks
|
;; Loads the members directory as dictionary of files to symlinks
|
||||||
;; mapping.
|
;; mapping.
|
||||||
(define (load-members-dir dn)
|
(define (load-mbase-dir dn)
|
||||||
(files-dictionary-filter-4digit-symbols
|
(files-dictionary-filter-4digit-symbols
|
||||||
(files+symlinks->files-dictionary
|
(files+symlinks->files-dictionary
|
||||||
(get-files+symlinks dn))))
|
(get-files+symlinks dn))))
|
||||||
|
@ -148,14 +148,14 @@
|
||||||
;; keys. The info key contains whatever load-member-file from the
|
;; keys. The info key contains whatever load-member-file from the
|
||||||
;; member-file module returns. The id key contains whatever is the
|
;; member-file module returns. The id key contains whatever is the
|
||||||
;; first 4-digit symbol in (cons fname aliases) list.
|
;; first 4-digit symbol in (cons fname aliases) list.
|
||||||
(define (members-dir-load-member mdir fname symlinks)
|
(define (mbase-dir-load-member mdir fname symlinks)
|
||||||
(let* ((mr0 (make-brmember fname
|
(let* ((mr0 (make-brmember fname
|
||||||
(make-pathname mdir (symbol->string fname))
|
(make-pathname mdir (symbol->string fname))
|
||||||
symlinks)))
|
symlinks)))
|
||||||
(load-brmember-file mr0)))
|
(load-brmember-file mr0)))
|
||||||
|
|
||||||
;; Performs self-tests of this module.
|
;; Performs self-tests of this module.
|
||||||
(define (members-dir-tests!)
|
(define (mbase-dir-tests!)
|
||||||
(run-tests
|
(run-tests
|
||||||
members-base
|
members-base
|
||||||
(test-equal? files+symlinks->files-dictionary
|
(test-equal? files+symlinks->files-dictionary
|
||||||
|
|
|
@ -95,14 +95,14 @@
|
||||||
.
|
.
|
||||||
,(with-progress%
|
,(with-progress%
|
||||||
progress? "members"
|
progress? "members"
|
||||||
(let* ((fss (load-members-dir dn))
|
(let* ((fss (load-mbase-dir dn))
|
||||||
(tot (sub1 (length (ldict-keys fss))))
|
(tot (sub1 (length (ldict-keys fss))))
|
||||||
(mb0 (ldict-map
|
(mb0 (ldict-map
|
||||||
(lambda (symfn symlinks prg)
|
(lambda (symfn symlinks prg)
|
||||||
(progress%-advance (/ prg tot))
|
(progress%-advance (/ prg tot))
|
||||||
(members-dir-load-member dn
|
(mbase-dir-load-member dn
|
||||||
symfn
|
symfn
|
||||||
symlinks))
|
symlinks))
|
||||||
fss))
|
fss))
|
||||||
(mb1 (ldict-reduce (make-ldict)
|
(mb1 (ldict-reduce (make-ldict)
|
||||||
(lambda (acc symfn mr)
|
(lambda (acc symfn mr)
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
(util-list-tests!)
|
(util-list-tests!)
|
||||||
(ansi-tests!)
|
(ansi-tests!)
|
||||||
(command-line-tests!)
|
(command-line-tests!)
|
||||||
(members-dir-tests!)
|
(mbase-dir-tests!)
|
||||||
(primes-tests!)
|
(primes-tests!)
|
||||||
(brmember-tests!)
|
(brmember-tests!)
|
||||||
(table-tests!)
|
(table-tests!)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue