From a56ff102f79a9028624928012d89cc1447c8093b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Sun, 26 Mar 2023 14:35:05 +0200 Subject: [PATCH] Split mandatory and optional keys. --- Makefile | 2 +- bbstool.scm | 2 +- member-parser.scm | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 56bae84..a7086f7 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ BBSTOOL-SOURCES=bbstool.scm testing.scm listing.scm dictionary.scm \ month.scm period.scm ansi.scm command-line.scm \ members-base.scm utils.scm primes.scm member-record.scm \ configuration.scm progress.scm table.scm cards.scm \ - member-print.scm + member-print.scm member-parser.scm BBSTOOL-OBJS=testing.o listing.o month.o period.o ansi.o dictionary.o \ command-line.o members-base.o utils.o primes.o \ diff --git a/bbstool.scm b/bbstool.scm index eb76bd3..2046c3a 100644 --- a/bbstool.scm +++ b/bbstool.scm @@ -43,7 +43,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. member-parser) ;; Print banner -(print "bbstool 0.4 (c) 2023 Brmlab, z.s.") +(print "bbstool 0.5 (c) 2023 Brmlab, z.s.") (newline) ;; Command-line options and configurable parameters diff --git a/member-parser.scm b/member-parser.scm index 96ffd1c..38a6758 100644 --- a/member-parser.scm +++ b/member-parser.scm @@ -45,7 +45,9 @@ configuration) ;; Pass 2: known keys and multikeys - (define member-schema-known-keys '(nick mail phone name born joined destroyed)) + (define mandatory-keys '(nick name mail phone)) + (define optional-keys '(born joined destroyed)) + (define member-schema-known-keys (append mandatory-keys optional-keys)) (define member-schema-known-multikeys '(card desfire credit studentstart studentstop suspendstart suspendstop)) ;; Pass 3: Interpreter passes