Rename constructor.
This commit is contained in:
parent
6b5821ac2e
commit
c854fed99d
2 changed files with 11 additions and 11 deletions
|
@ -29,7 +29,7 @@
|
||||||
(module
|
(module
|
||||||
brmember
|
brmember
|
||||||
(
|
(
|
||||||
make-member-record
|
make-brmember
|
||||||
|
|
||||||
member-file-name
|
member-file-name
|
||||||
member-file-path
|
member-file-path
|
||||||
|
@ -110,7 +110,7 @@
|
||||||
;; Creates new member record based on the file and symlinks
|
;; Creates new member record based on the file and symlinks
|
||||||
;; information received from the members directory. Any keyword
|
;; information received from the members directory. Any keyword
|
||||||
;; arguments are converted to respective symbols in the dictionary.
|
;; arguments are converted to respective symbols in the dictionary.
|
||||||
(define (make-member-record file-name file-path symlinks . args)
|
(define (make-brmember file-name file-path symlinks . args)
|
||||||
(let loop ((args args)
|
(let loop ((args args)
|
||||||
(pairs `((file-name . ,file-name)
|
(pairs `((file-name . ,file-name)
|
||||||
(file-path . ,file-path)
|
(file-path . ,file-path)
|
||||||
|
@ -121,9 +121,9 @@
|
||||||
(if (null? args)
|
(if (null? args)
|
||||||
(make-ldict pairs)
|
(make-ldict pairs)
|
||||||
(if (not (keyword? (car args)))
|
(if (not (keyword? (car args)))
|
||||||
(error 'make-member-record "Optional arguments must be keywords" (car args))
|
(error 'make-brmember "Optional arguments must be keywords" (car args))
|
||||||
(if (null? (cdr args))
|
(if (null? (cdr args))
|
||||||
(error 'make-member-record "Each optional keyword argument must have a value" (car args))
|
(error 'make-brmember "Each optional keyword argument must have a value" (car args))
|
||||||
(loop (cddr args)
|
(loop (cddr args)
|
||||||
(cons (cons (string->symbol (keyword->string (car args)))
|
(cons (cons (string->symbol (keyword->string (car args)))
|
||||||
(cadr args))
|
(cadr args))
|
||||||
|
@ -352,17 +352,17 @@
|
||||||
(define (member-record-tests!)
|
(define (member-record-tests!)
|
||||||
(run-tests
|
(run-tests
|
||||||
member-record
|
member-record
|
||||||
(test-true make-member-record
|
(test-true make-brmember
|
||||||
(ldict-equal?
|
(ldict-equal?
|
||||||
(make-member-record '|1234| "members/1234" '(|member|))
|
(make-brmember '|1234| "members/1234" '(|member|))
|
||||||
(make-ldict
|
(make-ldict
|
||||||
'((file-name . |1234|)
|
'((file-name . |1234|)
|
||||||
(file-path . "members/1234")
|
(file-path . "members/1234")
|
||||||
(symlinks |member|)
|
(symlinks |member|)
|
||||||
(id . 1234)))))
|
(id . 1234)))))
|
||||||
(test-true make-member-record
|
(test-true make-brmember
|
||||||
(ldict-equal?
|
(ldict-equal?
|
||||||
(make-member-record '|1234| "members/1234" '(|member|) #:msg "msg")
|
(make-brmember '|1234| "members/1234" '(|member|) #:msg "msg")
|
||||||
(make-ldict
|
(make-ldict
|
||||||
'((msg . "msg")
|
'((msg . "msg")
|
||||||
(file-name . |1234|)
|
(file-name . |1234|)
|
||||||
|
|
|
@ -149,9 +149,9 @@
|
||||||
;; 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 (members-dir-load-member mdir fname symlinks)
|
||||||
(let* ((mr0 (make-member-record fname
|
(let* ((mr0 (make-brmember fname
|
||||||
(make-pathname mdir (symbol->string fname))
|
(make-pathname mdir (symbol->string fname))
|
||||||
symlinks)))
|
symlinks)))
|
||||||
(load-member-file mr0)))
|
(load-member-file mr0)))
|
||||||
|
|
||||||
;; Performs self-tests of this module.
|
;; Performs self-tests of this module.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue