From 5afdd8fb4413afb64c3424a8b26cf96cd12d1f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Tue, 11 Apr 2023 22:00:04 +0200 Subject: [PATCH] Rename initial accessors. --- src/brmember.scm | 12 ++++++------ src/hackerbase.scm | 2 +- src/member-parser.scm | 2 +- src/members-print.scm | 4 ++-- src/web-static.scm | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/brmember.scm b/src/brmember.scm index bfc8bf7..5d8de8e 100644 --- a/src/brmember.scm +++ b/src/brmember.scm @@ -31,9 +31,9 @@ ( make-brmember - member-file-name - member-file-path - member-record-input-file + brmember-file-name + brmember-file-path + brmember-input-file member-record-set member-record-add-highlight @@ -130,15 +130,15 @@ pairs))))))) ;; File name without directory - (define (member-file-name mr) + (define (brmember-file-name mr) (ldict-ref mr 'file-name)) ;; Convenience accessor for file name with directory - (define (member-file-path mr) + (define (brmember-file-path mr) (ldict-ref mr 'file-path)) ;; Returns opened input file for this record (used by parser). - (define (member-record-input-file mr) + (define (brmember-input-file mr) (open-input-file (ldict-ref mr 'file-path))) diff --git a/src/hackerbase.scm b/src/hackerbase.scm index 688ff6f..0595a35 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -297,7 +297,7 @@ (gen-web-static MB (-web-dir-))) ((edit) (if mr - (edit-file (member-file-path mr)) + (edit-file (brmember-file-path mr)) (print "No member to edit."))) ((no-op) (void)) ((unpaired) diff --git a/src/member-parser.scm b/src/member-parser.scm index 8762a86..8e830c9 100644 --- a/src/member-parser.scm +++ b/src/member-parser.scm @@ -222,7 +222,7 @@ ;; Loads member file source. Performs passes 0, 1 and 2. (define (load-member-file mr) - (let* ((mrif (member-record-input-file mr)) + (let* ((mrif (brmember-input-file mr)) (source (read-lines mrif)) (mrp (parse-member-lines mr source))) (member-schema-finalize diff --git a/src/members-print.scm b/src/members-print.scm index 62879e4..d4641d5 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -288,7 +288,7 @@ (newline) (print "Member files with errors (" (length pmrs) "): " (string-intersperse - (map member-file-path pmrs) + (map brmember-file-path pmrs) ", ")))) (let ((pmrs (filter-members-by-predicate mb (lambda (mr) (and (member-has-highlights? mr) @@ -297,7 +297,7 @@ (newline) (print "Member files with issues: " (string-intersperse - (map member-file-path pmrs) + (map brmember-file-path pmrs) ", "))))) ;; Prints the stats in format used by gnuplot. diff --git a/src/web-static.scm b/src/web-static.scm index 358aa4a..bc0ff69 100644 --- a/src/web-static.scm +++ b/src/web-static.scm @@ -74,7 +74,7 @@ (sprintf "git -C \"~A\" log -p -- \"~A\"" (string-translate* (*members-directory*) '(("\"" . "\\\""))) - (member-file-name mr) + (brmember-file-name mr) )))) (when (not (null? lines)) (print (car lines))