diff --git a/src/brmember.scm b/src/brmember.scm index 2a94d46..a8ec390 100644 --- a/src/brmember.scm +++ b/src/brmember.scm @@ -45,10 +45,10 @@ brmember-source brmember-info - member-missing-keys - member-has-highlights? - member-record-usable? - member-has-problems? + brmember-missing-keys + brmember-has-highlights? + brmember-usable? + brmember-has-problems? member-destroyed? member-suspended? @@ -214,14 +214,14 @@ (ldict-ref info key (car defaults))))) ;; Return mandatory keys with #f as value - (define (member-missing-keys mr) + (define (brmember-missing-keys mr) (ldict-reduce '() (lambda (acc k v) (if v acc (cons k acc))) (ldict-ref mr 'info))) ;; True if there are any source highlights - (define (member-has-highlights? mr) + (define (brmember-has-highlights? mr) (ldict-contains? mr 'highlights)) ;; Returns true if there is at least one highlight of given type @@ -238,13 +238,13 @@ (member-highlights-has-type? mr 'error)) ;; Absolutely required - (define (member-record-usable? mr) + (define (brmember-usable? mr) (ldict-contains? (ldict-ref mr 'info) 'member)) ;; True if member record is OK - (define (member-has-problems? mr) + (define (brmember-has-problems? mr) (or (member-has-errors? mr) - (not (member-record-usable? mr)) + (not (brmember-usable? mr)) (not (is-4digit-prime? (member-id mr))))) ;; Returns true if the member record represents non-existing diff --git a/src/hackerbase.scm b/src/hackerbase.scm index 0595a35..76da4e7 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -276,8 +276,8 @@ (if (null? mb) num (loop (cdr mb) - (if (or (member-has-problems? (car mb)) - (member-has-highlights? (car mb))) + (if (or (brmember-has-problems? (car mb)) + (brmember-has-highlights? (car mb))) (let () (newline) (print-member-table (car mb)) diff --git a/src/members-base.scm b/src/members-base.scm index 74bd0e1..93cd5a6 100644 --- a/src/members-base.scm +++ b/src/members-base.scm @@ -158,7 +158,7 @@ ;; Returns dictionary with statistics about the members base. (define (members-base-info mb-arg) - (let* ((members (filter-members-by-predicate mb-arg member-record-usable?)) + (let* ((members (filter-members-by-predicate mb-arg brmember-usable?)) (di0 (make-ldict)) (di1 (ldict-set di0 'invalid (filter (compose not is-4digit-prime? member-id) members))) diff --git a/src/members-print.scm b/src/members-print.scm index 10d248e..6dbe3cc 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -283,7 +283,7 @@ #:row-border #t #:col-border #t ))) - (let ((pmrs (filter-members-by-predicate mb member-has-problems?))) + (let ((pmrs (filter-members-by-predicate mb brmember-has-problems?))) (when (not (null? pmrs)) (newline) (print "Member files with errors (" (length pmrs) "): " @@ -291,8 +291,8 @@ (map brmember-file-path pmrs) ", ")))) (let ((pmrs (filter-members-by-predicate mb (lambda (mr) - (and (member-has-highlights? mr) - (not (member-has-problems? mr))))))) + (and (brmember-has-highlights? mr) + (not (brmember-has-problems? mr))))))) (when (not (null? pmrs)) (newline) (print "Member files with issues: "