Member file parsing passes 0 and 1.

member2-parser.scm

@@ -33,15 +33,59 @@
   )
 
  (import scheme
+	 (chicken base)
 	 (chicken io)
+	 (chicken irregex)
 	 member2-record)
 
- ;; Returns a list of parsed lines
+ ;; Removes any comments and removes any leading and trailing
- (define (parse-member-lines source)
+ ;; whitespace.
+ (define (preprocess-member-line line)
+   (irregex-replace (irregex "[ \\t]*$" 'u)
+		    (irregex-replace (irregex "^[ \\t]*" 'u)
+				     (irregex-replace (irregex "#.*$" 'u) line "")
+				     "")
+		    ""))
+
+ ;; 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 the value
+ ;; were present.
+ (define (parse-member-line line)
+   (if (= (string-length line) 0)
+       #f
+       (let ((dm (irregex-search (irregex "[ \\t]" 'u) line)))
+	 (if dm
+	     (let* ((sep-idx (irregex-match-start-index dm))
+		    (key-str (substring line 0 sep-idx))
+		    (key (string->symbol key-str))
+		    (sep+val (substring line sep-idx))
+		    (val (irregex-replace (irregex "^[ \\t]*" 'u) sep+val "")))
+	       (cons key val))
+	     (string->symbol line)))))
+
+ ;; Adds parsed lines to member record.
+ (define (parse-member-lines mr source)
    (let loop ((lines source)
+	      (mr (member-record-set mr #:source source))
 	      (result '())
 	      (line-number 1))
-     #f))
+     (if (null? lines)
+	 (member-record-set mr #:parsed (reverse result))
+	 (let ((parsed-line (parse-member-line
+			     (preprocess-member-line
+			      (car lines)))))
+	   (loop (cdr lines)
+		 (if (symbol? parsed-line)
+		     (member-record-add-highlight mr line-number "Got only key" 1 'error)
+		     mr)
+		 (if (pair? parsed-line)
+		     (cons (list (car parsed-line)
+				 (cdr parsed-line)
+				 line-number)
+			   result)
+		     result)
+		 (add1 line-number))))))
 
  ;; Loads member file source. Performs passes 0 and 1 on each line
  ;; returning parsed source. Parsed source is a list of lists
@@ -49,9 +93,9 @@
  ;; trailing whitespace is trimmed for both keys and values.
  (define (parse-member-file mr)
    (let* ((mrif (member-record-input-file mr))
-	  (source (read-lines mrif)))
+	  (source (read-lines mrif))
-     (member-record-set mr
+	  (mrp (parse-member-lines mr source)))
-			#:source source)))
+     #f))
 
  (define (member-parser-tests!)
    #f)