Rename source and info.
This commit is contained in:
parent
fb98eb6a78
commit
3ef6c0b628
7 changed files with 18 additions and 18 deletions
|
@ -43,8 +43,8 @@
|
|||
brmember-sub-has-key?
|
||||
brmember-sub-ensure
|
||||
|
||||
member-source
|
||||
member-record-info
|
||||
brmember-source
|
||||
brmember-info
|
||||
member-missing-keys
|
||||
member-has-highlights?
|
||||
member-record-usable?
|
||||
|
@ -203,11 +203,11 @@
|
|||
(ldict-set sd key val))))))))
|
||||
|
||||
;; Returns source lines
|
||||
(define (member-source mr)
|
||||
(define (brmember-source mr)
|
||||
(ldict-ref mr 'source '()))
|
||||
|
||||
;; Returns member info key value
|
||||
(define (member-record-info mr key . defaults)
|
||||
(define (brmember-info mr key . defaults)
|
||||
(let ((info (ldict-ref mr 'info)))
|
||||
(if (null? defaults)
|
||||
(ldict-ref info key)
|
||||
|
@ -252,7 +252,7 @@
|
|||
;; module.
|
||||
(define (member-destroyed? mr)
|
||||
(and (not (member-existing? mr))
|
||||
(let ((member (member-record-info mr 'member)))
|
||||
(let ((member (brmember-info mr 'member)))
|
||||
(if (null? member)
|
||||
#f
|
||||
(month>=? (*current-month*)
|
||||
|
@ -260,7 +260,7 @@
|
|||
|
||||
;; Generic period-based predicate
|
||||
(define ((member-period-predicate? key) mr)
|
||||
(let ((periods (member-record-info mr key #f)))
|
||||
(let ((periods (brmember-info mr key #f)))
|
||||
(and periods
|
||||
(month-in-periods? periods))))
|
||||
|
||||
|
@ -284,13 +284,13 @@
|
|||
|
||||
;; Returns true if the member is active (not suspended or destroyed).
|
||||
(define (member-active? mr)
|
||||
(and (month-in-periods? (member-record-info mr 'member))
|
||||
(and (month-in-periods? (brmember-info mr 'member))
|
||||
(not (member-suspended? mr))))
|
||||
|
||||
;; Returns true if the member is currently a member
|
||||
(define (member-existing? mr)
|
||||
(month-in-periods?
|
||||
(member-record-info mr 'member)))
|
||||
(brmember-info mr 'member)))
|
||||
|
||||
;; Returns a list of flags of given member record.
|
||||
(define (member-flags mr)
|
||||
|
@ -303,7 +303,7 @@
|
|||
|
||||
;; Nickname as string
|
||||
(define (member-nick mr)
|
||||
(member-record-info mr 'nick))
|
||||
(brmember-info mr 'nick))
|
||||
|
||||
;; Returns member id
|
||||
(define (member-id mr)
|
||||
|
@ -313,7 +313,7 @@
|
|||
;; suspended.
|
||||
(define (member-suspended-months mr)
|
||||
(if (member-suspended? mr)
|
||||
(let ((period (periods-match (member-record-info mr 'suspend))))
|
||||
(let ((period (periods-match (brmember-info mr 'suspend))))
|
||||
(if period
|
||||
(month-diff (car period) (*current-month*))
|
||||
0))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue