Make it run again.

This commit is contained in:
Dominik Pantůček 2023-03-25 21:18:42 +01:00
parent eb2b37e412
commit 7e7c0f3e32
6 changed files with 23 additions and 39 deletions

View file

@ -50,15 +50,15 @@ BBSTOOL-SOURCES=bbstool.scm testing.scm listing.scm dictionary.scm \
members-base.scm utils.scm primes.scm member-record.scm \
configuration.scm progress.scm table.scm cards.scm
BBSTOOL-OBJS=testing.o listing.o month.o period.o ansi.o \
member-file.o dictionary.o command-line.o \
members-base.o utils.o primes.o member-record.o \
configuration.o progress.o table.o cards.o
BBSTOOL-OBJS=testing.o listing.o month.o period.o ansi.o dictionary.o \
command-line.o members-base.o utils.o primes.o \
member-record.o configuration.o progress.o table.o \
cards.o
BBSTOOL-SHARED=testing.so listing.so month.so period.so ansi.so \
member-file.so dictionary.so command-line.so \
members-base.so utils.so primes.so member-record.so \
configuration.so progress.so table.so cards.so
dictionary.so command-line.so members-base.so utils.so \
primes.so member-record.so configuration.so progress.so \
table.so cards.so
.PHONY: imports
imports: $(BBSTOOL-DEPS)
@ -125,15 +125,6 @@ ansi.so: ansi.o
ansi.o: ansi.import.scm
ansi.import.scm: $(ANSI-SOURCES)
MEMBER-FILE-SOURCES=member-file.scm dictionary.import.scm \
ansi.import.scm month.import.scm period.import.scm \
listing.import.scm testing.import.scm \
configuration.import.scm progress.import.scm
member-file.so: member-file.o
member-file.o: member-file.import.scm
member-file.import.scm: $(MEMBER-FILE-SOURCES)
COMMAND-LINE-SOURCES=command-line.scm testing.import.scm
command-line.so: command-line.o
@ -141,10 +132,10 @@ command-line.o: command-line.import.scm
command-line.import.scm: $(COMMAND-LINE-SOURCES)
MEMBERS-BASE-SOURCES=members-base.scm testing.import.scm \
utils.import.scm dictionary.import.scm member-file.import.scm \
primes.import.scm member-record.import.scm ansi.import.scm \
period.import.scm month.import.scm configuration.import.scm \
progress.import.scm table.import.scm
utils.import.scm dictionary.import.scm primes.import.scm \
member-record.import.scm ansi.import.scm period.import.scm \
month.import.scm configuration.import.scm progress.import.scm \
table.import.scm member-parser.import.scm
members-base.so: members-base.o
members-base.o: members-base.import.scm

View file

@ -30,7 +30,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
dictionary
month
period
member-file
command-line
utils
ansi
@ -97,11 +96,11 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
(period-tests!)
(utils-tests!)
(ansi-tests!)
(member-file-tests!)
(command-line-tests!)
(members-base-tests!)
(primes-tests!)
(member-record-tests!)
(member-parser-tests!)
(table-tests!)
(newline))

View file

@ -25,15 +25,6 @@
#
csi -q -b \
testing.scm \
listing.scm \
dictionary.scm \
month.scm \
period.scm \
ansi.scm \
member-file.scm \
command-line.scm \
members-base.scm \
bbstool.scm \
-- \
"$@"

View file

@ -36,7 +36,7 @@
(chicken base)
(chicken io)
(chicken irregex)
member2-record
member-record
testing
dictionary
month
@ -242,8 +242,3 @@
))
)
(import member-parser)
(member-parser-tests!)
(print (load-member-file (make-member-record '|joe| "members/joe" '(|2803|))))

View file

@ -24,7 +24,7 @@
;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
;;
(declare (unit member2-record))
(declare (unit member-record))
(module
member-record
@ -53,6 +53,8 @@
member-format
member<?
member-record-tests!
)
@ -245,6 +247,12 @@
resl))
(loop (cdr fmtl)
(cons (make-string 1 (car fmtl)) resl)))))))
;; Comparator of member records based on nickname.
(define (member<? a b)
(string-ci<? (member-nick a)
(member-nick b)))
;; Self-tests
(define (member-record-tests!)
(run-tests

View file

@ -58,7 +58,7 @@
testing
utils
dictionary
member-file
member-parser
primes
member-record
ansi