Changeset trunk,30 for trunk/matching.lisp

Timestamp:

11/26/2007 07:01:44 PM (19 years ago)

Author:

dsowen

revision id:

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

Message:

Cleaned up whitespace.
Added copyright to csv.lisp.

File:

• trunk/matching.lisp (modified) (1 diff)

trunk/matching.lisp

@@ -235 +235 @@
      (destructuring-bind (head . tail) rule
        (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))))))
+           (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))))))