diff --git a/member-parser.scm b/member-parser.scm index 38a6758..c220aa4 100644 --- a/member-parser.scm +++ b/member-parser.scm @@ -47,8 +47,8 @@ ;; Pass 2: known keys and multikeys (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)) + (define known-keys (append mandatory-keys optional-keys)) + (define known-multikeys '(card desfire credit studentstart studentstop suspendstart suspendstop)) ;; Pass 3: Interpreter passes (define member-schema-interpreters @@ -171,7 +171,7 @@ (key (car line)) (value (cadr line)) (number (caddr line))) - (if (member key member-schema-known-keys) + (if (member key known-keys) (if (dict-has-key? processed key) (loop (cdr parsed) (member-record-add-highlight mr number "Duplicate key" 2 'error) @@ -179,7 +179,7 @@ (loop (cdr parsed) mr (dict-set processed key (cons value number)))) - (if (member key member-schema-known-multikeys) + (if (member key known-multikeys) (loop (cdr parsed) mr (dict-set processed key (cons (cons value number)