Changeset trunk,25 for trunk

Timestamp:

06/25/2007 07:37:09 PM (19 years ago)

Author:

dsowen

revision id:

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

Message:

Fixed: Error if first rule in sequence is a nest rule, like ((...) ...).
Export defparser and defgrammar.

Location:

trunk

Files:

• matching.lisp (modified) (1 diff)
• package.lisp (modified) (1 diff)

trunk/matching.lisp

@@ -234 +234 @@
     (list
      (destructuring-bind (head . tail) rule
-       (symcase head
-         (^ (destructuring-bind (regex) tail
-              `(if-matches-regex ,input ,regex (,next ,match) ,then ,else)))
-         (/ `(if-matches-choice ,input ,tail (,next ,match) ,then ,else))
-         ({} (destructuring-bind (mincount maxcount subrule) tail
-               `(if-matches-count ,input ,mincount ,maxcount ,subrule
-                 (,next ,match) ,then ,else)))
-         (* (destructuring-bind (sub) tail
-              `(if-matches-count ,input 0 nil ,sub (,next ,match)
-                ,then ,else)))
-         (? (destructuring-bind (sub) tail
-              `(if-matches-count ,input 0 1 ,sub (,next ,match) ,then ,else)))
-         (+ (destructuring-bind (sub) tail
-              `(if-matches-count ,input 1 nil ,sub (,next ,match)
-                ,then ,else)))
-         (& (destructuring-bind (sub) tail
-              `(if-matches-required ,input ,sub (,next ,match) ,then ,else)))
-         (! (destructuring-bind (sub) tail
-              `(if-matches-forbidden ,input ,sub (,next ,match) ,then ,else)))
-         (= (destructuring-bind (sub) tail
-              `(if-matches-only ,input ,sub (,next ,match) ,then ,else)))
-         (t `(if-matches-sequence ,input ,rule (,next ,match)
-              ,then ,else)))))))
+       (if (symbolp head)
+           (symcase head
+             (^ (destructuring-bind (regex) tail
+                  `(if-matches-regex ,input ,regex (,next ,match)
+                    ,then ,else)))
+             (/ `(if-matches-choice ,input ,tail (,next ,match) ,then ,else))
+             ({} (destructuring-bind (mincount maxcount subrule) tail
+                   `(if-matches-count ,input ,mincount ,maxcount ,subrule
+                     (,next ,match) ,then ,else)))
+             (* (destructuring-bind (sub) tail
+                  `(if-matches-count ,input 0 nil ,sub (,next ,match)
+                    ,then ,else)))
+             (? (destructuring-bind (sub) tail
+                  `(if-matches-count ,input 0 1 ,sub (,next ,match)
+                    ,then ,else)))
+             (+ (destructuring-bind (sub) tail
+                  `(if-matches-count ,input 1 nil ,sub (,next ,match)
+                    ,then ,else)))
+             (& (destructuring-bind (sub) tail
+                  `(if-matches-required ,input ,sub (,next ,match)
+                    ,then ,else)))
+             (! (destructuring-bind (sub) tail
+                  `(if-matches-forbidden ,input ,sub (,next ,match)
+                    ,then ,else)))
+             (= (destructuring-bind (sub) tail
+                  `(if-matches-only ,input ,sub (,next ,match) ,then ,else)))
+             (t `(if-matches-sequence ,input ,rule (,next ,match)
+                  ,then ,else)))
+           `(if-matches-sequence ,input ,rule (,next ,match) ,then ,else))))))

trunk/package.lisp

@@ -35 +35 @@
            #:if-matches-forbidden
            #:if-matches-only
-           #:if-matches))
+           #:if-matches
+           #:defparser
+           #:defgrammar))