Changeset trunk,11 for trunk/parse3.lisp

Timestamp:

06/18/2007 07:51:03 PM (19 years ago)

Author:

dsowen

revision id:

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

Message:

Expanded CSV example.
Fixed: IF-MATCHES-PARSER was misspelled as IF-MATCHER-PARSER.
Adjusted tree construction for sequence matching.

File:

• trunk/parse3.lisp (modified) (3 diffs)

trunk/parse3.lisp

@@ -4 +4 @@
     ,@body))
 
-(defmacro if-matcher-parser (input parser (next match)
+(defmacro if-matches-parser (input parser (next match)
                              &body (&optional (then t) else))
   (declare (symbol parser next match))
@@ -66 +66 @@
           `(if-matches ,input ,head (,head-next ,head-match)
             (if-matches-sequence ,head-next ,tail (,next ,tail-match)
-              (let ((,match (cons ,head-match (list ,tail-match))))
+              (let ((,match (cons ,head-match ,tail-match)))
                 ,then)
               ,else)
             ,else))
-        `(if-matches ,input ,head (,next ,match) ,then ,else))))
+        (with-gensyms (tail-match)
+          `(if-matches ,input ,head (,next ,tail-match)
+            (let ((,match (list ,tail-match)))
+              ,then)
+            ,else)))))
 
 (defmacro if-matches-eqcount (input count rule (next match)
@@ -149 +153 @@
 (defmacro if-matches (input rule (next match) &body (&optional (then t) else))
   (etypecase rule
-    (symbol `(if-matcher-parser ,input ,rule (,next ,match) ,then ,else))
+    (symbol `(if-matches-parser ,input ,rule (,next ,match) ,then ,else))
     (character `(if-matches-char ,input ,rule (,next ,match) ,then ,else))
     (string `(if-matches-string ,input ,rule (,next ,match) ,then ,else))