Changeset trunk,30 for trunk

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.

Location:

trunk

Files:

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

trunk/csv.lisp

@@ -1 +1 @@
 ;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp -*-
+
+#|
+Copyright (C) 2007  David Owen <dsowen@fugue88.ws>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+|#
 
 (require '#:dso-lex)

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))))))