Changeset trunk,27

Timestamp:

06/25/2007 09:36:52 PM (19 years ago)

Author:

dsowen

revision id:

svn-v3-trunk0:2948df59-2b31-0410-8e06-c40c0b09d5b6:trunk:29

Message:

More improvements to CSV parser.
Adjusted for speed fix in lexer.
Cons less.

Location:

trunk

Files:

• csv.lisp (modified) (3 diffs)
• parsing.lisp (modified) (1 diff)

trunk/csv.lisp

@@ -23 +23 @@
   ("." illegal))
 
-(defun lex-all-csv (input &optional tokens)
-  (format t "~&Lexing '~A...'~%" (subseq input 0 40))
-  (multiple-value-bind (class image left) (lex-csv input)
-    (cond
-      ((and class (eq class 'illegal))
-       (princ "oops")
-       (error "Illegal input"))
-      (class
-       (lex-all-csv left (cons (list class image) tokens)))
-      (t
-       (nreverse tokens)))))
+(defun lex-all-csv (input)
+  (labels ((lex-all (start tokens)
+             (multiple-value-bind (class image next-offset)
+                 (lex-csv input start)
+               (cond
+                 ((and class (eq class 'illegal))
+                  (error "Illegal input"))
+                 (class
+                  (lex-all next-offset (cons (cons class image) tokens)))
+                 (t
+                  (nreverse tokens))))))
+    (lex-all 0 nil)))
 
 (defmacro defmatcher (class)
@@ -39 +40 @@
     `(defun ,fn-sym (token-list)
       (when token-list
-        (destructuring-bind (class image) (first token-list)
+        (destructuring-bind (class . image) (first token-list)
           (when (eq class ',class)
             (values t (rest token-list) (list image))))))))
@@ -52 +53 @@
   (file (+ row))
   (row (t-value (* row-rest) (= t-newline))
-       (lambda (row)
-         (mapcar #'car (cons (first row) (mapcar #'second (second row))))))
+       (lambda (row) (cons (caar row) (mapcar #'second (second row)))))
   (row-rest ((= t-comma) t-value) car))
 

trunk/parsing.lisp

@@ -32 +32 @@
   `(defun ,name (input)
     (if-matches input ,rule (next match)
-     (values t next (list ',name ,(if filter `(,filter match) 'match))))))
+     (values t next (cons ',name ,(if filter `(,filter match) 'match))))))
 
 (defmacro defgrammar (() &body definitions)