Start splitting out parser utils.
This commit is contained in:
parent
7a260595d2
commit
46ffd605ea
6 changed files with 83 additions and 29 deletions
|
|
@ -43,7 +43,8 @@
|
|||
period
|
||||
util-list
|
||||
configuration
|
||||
util-string)
|
||||
util-string
|
||||
util-parser)
|
||||
|
||||
;; Pass 2: known keys
|
||||
(define mandatory-keys '(nick name mail phone))
|
||||
|
|
@ -135,15 +136,6 @@
|
|||
mr 'info
|
||||
(join (map (lambda (mk) (list mk #f)) mandatory-keys))))
|
||||
|
||||
;; Pass 0: Removes any comments and removes any leading and trailing
|
||||
;; whitespace.
|
||||
(define (preprocess-member-line line)
|
||||
(irregex-replace (irregex "[ \\t]*$" 'u)
|
||||
(irregex-replace (irregex "^[ \\t]*" 'u)
|
||||
(irregex-replace (irregex "#.*$" 'u) line "")
|
||||
"")
|
||||
""))
|
||||
|
||||
;; Pass 1: Expects line with comments and surrounding whitespace
|
||||
;; removed, returns either #f if nothing was parsed, symbol if only
|
||||
;; one token was there and pair of symbol and string if both key and
|
||||
|
|
@ -170,7 +162,7 @@
|
|||
(if (null? lines)
|
||||
(member-record-set mr #:parsed (reverse result))
|
||||
(let ((parsed-line (parse-member-line
|
||||
(preprocess-member-line
|
||||
(parser-preprocess-line
|
||||
(car lines)))))
|
||||
(loop (cdr lines)
|
||||
(if (symbol? parsed-line)
|
||||
|
|
@ -259,18 +251,6 @@
|
|||
(define (member-parser-tests!)
|
||||
(run-tests
|
||||
member-parser
|
||||
(test-equal? preprocess-member-line
|
||||
(preprocess-member-line "# all comment")
|
||||
"")
|
||||
(test-equal? preprocess-member-line
|
||||
(preprocess-member-line " # all comment after spaces")
|
||||
"")
|
||||
(test-equal? preprocess-member-line
|
||||
(preprocess-member-line " test # spaces and comment after spaces")
|
||||
"test")
|
||||
(test-equal? preprocess-member-line
|
||||
(preprocess-member-line "key value # spaces and comment after spaces")
|
||||
"key value")
|
||||
(test-false parse-member-line
|
||||
(parse-member-line ""))
|
||||
(test-eq? parse-member-line
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue