rewrote using CL-Syntax.

fukamachi · Nov 3, 2011 · 4971a9c · 4971a9c
1 parent 7988d14
commit 4971a9c
Show file tree

Hide file tree

Showing 45 changed files with 53 additions and 45 deletions.
diff --git a/clack-app-route.asd b/clack-app-route.asd
@@ -22,7 +22,8 @@
   :author "Eitarow Fukamachi"
   :license "LLGPL"
   :depends-on (:clack
-               :cl-annot
+               :cl-syntax
+               :cl-syntax-annot
                :cl-ppcre
                :alexandria)
   :components ((:file "src/contrib/app/route"))

diff --git a/clack-middleware-clsql.asd b/clack-middleware-clsql.asd
@@ -22,7 +22,8 @@
   :author "Eitarow Fukamachi"
   :license "LLGPL"
   :depends-on (:clack
-               :cl-annot
+               :cl-syntax
+               :cl-syntax-annot
                :clsql)
   :components ((:file "src/contrib/middleware/clsql"))
   :description "Middleware for CLSQL connection management")
diff --git a/clack-middleware-csrf.asd b/clack-middleware-csrf.asd
@@ -22,7 +22,8 @@
   :author "Eitarow Fukamachi"
   :license "LLGPL"
   :depends-on (:clack
-               :cl-annot
+               :cl-syntax
+               :cl-syntax-annot
                :anaphora)
   :components ((:file "src/contrib/middleware/csrf"))
   :description "Middleware for easy CSRF protection"

diff --git a/clack-middleware-oauth.asd b/clack-middleware-oauth.asd
@@ -22,7 +22,8 @@
   :author "Eitarow Fukamachi"
   :license "LLGPL"
   :depends-on (:clack
-               :cl-annot
+               :cl-syntax
+               :cl-syntax-annot
                :cl-oauth
                :anaphora
                :metabang-bind)

diff --git a/clack-middleware-rucksack.asd b/clack-middleware-rucksack.asd
@@ -22,7 +22,8 @@
   :author "Eitarow Fukamachi"
   :license "LLGPL"
   :depends-on (:clack
-               :cl-annot
+               :cl-syntax
+               :cl-syntax-annot
                :rucksack)
   :components ((:file "src/contrib/middleware/rucksack"))
   :description "Middleware for Rucksack connection management")
diff --git a/clack.asd b/clack.asd
@@ -27,7 +27,8 @@
                :anaphora
                :arnesi
                :split-sequence
-               :cl-annot
+               :cl-syntax
+               :cl-syntax-annot
                :closer-mop
                ;; Server
                :hunchentoot

diff --git a/my-projects b/my-projects
@@ -3,15 +3,17 @@
 # To use clbuild2, just copy this file to your clbuild2 base directory
 # and run following commands.
 #
-#     $ clbuild install-from-upstream clack cl-annot cl-test-more
+#     $ clbuild install-from-upstream clack cl-annot cl-syntax cl-test-more
 #     $ clbuild quickload clack
 #
 
 clack get_git git://github.com/fukamachi/clack.git
 cl-annot get_git git://github.com/arielnetworks/cl-annot.git
+cl-syntax get_git git://github.com/m2ym/cl-syntax.git
 cl-test-more get_git git://github.com/fukamachi/cl-test-more.git
 
 # for developers
 #clack get_git git@github.com:fukamachi/clack.git
 #cl-annot get_git git@github.com:arielnetworks/cl-annot.git
+#cl-syntax get_git git@github.com:m2ym/cl-syntax.git
 #cl-test-more get_git git@github.com:fukamachi/cl-test-more.git
diff --git a/src/contrib/app/route.lisp b/src/contrib/app/route.lisp
@@ -24,7 +24,7 @@
                 :make-url-rule
                 :match))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @eval-always
 @doc "

diff --git a/src/contrib/middleware/clsql.lisp b/src/contrib/middleware/clsql.lisp
@@ -13,7 +13,7 @@
                 :connect
                 :disconnect))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-clsql> (<middleware>)

diff --git a/src/contrib/middleware/csrf.lisp b/src/contrib/middleware/csrf.lisp
@@ -16,7 +16,7 @@
   (:import-from :clack.util
                 :generate-random-id))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-csrf> (<middleware>)

diff --git a/src/contrib/middleware/oauth.lisp b/src/contrib/middleware/oauth.lisp
@@ -14,7 +14,7 @@
         :clack.request
         :clack.response))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-oauth> (<middleware>)

diff --git a/src/contrib/middleware/rucksack.lisp b/src/contrib/middleware/rucksack.lisp
@@ -13,7 +13,7 @@
                 :with-transaction
                 :current-rucksack))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-rucksack> (<middleware>)

diff --git a/src/core/app/directory.lisp b/src/core/app/directory.lisp
@@ -21,7 +21,7 @@
                 :directory-pathname-p
                 :list-directory))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-app-directory> (<clack-app-file>) ())

diff --git a/src/core/app/file.lisp b/src/core/app/file.lisp
@@ -21,7 +21,7 @@
                 :file-exists-p
                 :directory-exists-p))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-app-file> (<component>)

diff --git a/src/core/app/urlmap.lisp b/src/core/app/urlmap.lisp
@@ -16,7 +16,7 @@
                 :scan-to-strings
                 :regex-replace))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-app-urlmap> (<component>)

diff --git a/src/core/builder.lisp b/src/core/builder.lisp
@@ -17,7 +17,7 @@
   (:import-from :clack.middleware.conditional
                 :<clack-middleware-conditional>))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defvar *builder-lazy-p* nil

diff --git a/src/core/clack.lisp b/src/core/clack.lisp
@@ -30,7 +30,7 @@
            :make-app
            :wrap))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @doc "
 Easy way to run Clack Application.

diff --git a/src/core/component.lisp b/src/core/component.lisp
@@ -9,7 +9,7 @@
 (clack.util:namespace clack.component
   (:use :cl))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <component> () ()

diff --git a/src/core/handler.lisp b/src/core/handler.lisp
@@ -11,7 +11,7 @@
   (:import-from :clack.util
                 :find-handler))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <handler> ()

diff --git a/src/core/handler/apache.lisp b/src/core/handler/apache.lisp
@@ -18,7 +18,7 @@
   (:import-from :clack.util.hunchentoot
                 :url-decode))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defun run (app &key debug (port 3000))

diff --git a/src/core/handler/hunchentoot.lisp b/src/core/handler/hunchentoot.lisp
@@ -18,7 +18,7 @@
   (:import-from :flexi-streams
                 :make-external-format))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 (defun initialize ()
   (setf *hunchentoot-default-external-format*

diff --git a/src/core/logger.lisp b/src/core/logger.lisp
@@ -14,7 +14,7 @@
   (:import-from :clack.util.localtime
                 :now))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defvar *logger-output* (make-string-output-stream)

diff --git a/src/core/middleware.lisp b/src/core/middleware.lisp
@@ -12,7 +12,7 @@
                 :<component>
                 :call))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <middleware> (<component>)

diff --git a/src/core/middleware/auth/basic.lisp b/src/core/middleware/auth/basic.lisp
@@ -18,7 +18,7 @@
                 :aand
                 :it))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-auth-basic> (<middleware>)

diff --git a/src/core/middleware/conditional.lisp b/src/core/middleware/conditional.lisp
@@ -10,7 +10,7 @@
   (:use :cl
         :clack))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-conditional> (<middleware>)

diff --git a/src/core/middleware/logger/base.lisp b/src/core/middleware/logger/base.lisp
@@ -9,7 +9,7 @@
 (clack.util:namespace clack.logger.base
   (:use :cl))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-logger-base> () ()

diff --git a/src/core/middleware/logger/file.lisp b/src/core/middleware/logger/file.lisp
@@ -14,7 +14,7 @@
                 :<clack-logger-base>
                 :output))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-logger-file> (<clack-logger-base>)

diff --git a/src/core/middleware/logger/logger.lisp b/src/core/middleware/logger/logger.lisp
@@ -19,7 +19,7 @@
   (:import-from :clack.logger.base :output)
   (:import-from :clack.logger.stream :<clack-logger-stream>))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-logger> (<middleware>)

diff --git a/src/core/middleware/logger/stream.lisp b/src/core/middleware/logger/stream.lisp
@@ -14,7 +14,7 @@
                 :<clack-logger-base>
                 :output))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-logger-stream> (<clack-logger-base>)

diff --git a/src/core/middleware/session/session.lisp b/src/core/middleware/session/session.lisp
@@ -16,7 +16,7 @@
   (:import-from :alexandria :hash-table-plist))
 #.(rename-package :clack.session.state :clack.session.state '(state))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-session> (<middleware>)

diff --git a/src/core/middleware/session/state.lisp b/src/core/middleware/session/state.lisp
@@ -16,7 +16,7 @@
            :sid-generator
            :sid-validator))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-session-state> ()

diff --git a/src/core/middleware/session/state/cookie.lisp b/src/core/middleware/session/state/cookie.lisp
@@ -30,7 +30,7 @@
            :extract-id
            :generate-id))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-session-state-cookie> (<clack-session-state>)

diff --git a/src/core/middleware/session/store.lisp b/src/core/middleware/session/store.lisp
@@ -13,7 +13,7 @@
                 :remove-from-plistf)
   (:import-from :clack.util :getf*))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-session-store> ()

diff --git a/src/core/middleware/static.lisp b/src/core/middleware/static.lisp
@@ -15,7 +15,7 @@
   (:import-from :alexandria
                 :starts-with-subseq))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <clack-middleware-static> (<middleware>)

diff --git a/src/core/request.lisp b/src/core/request.lisp
@@ -48,7 +48,7 @@
            :user-agent
            :uploads))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <request> ()

diff --git a/src/core/response.lisp b/src/core/response.lisp
@@ -22,7 +22,7 @@
                 :universal-to-timestamp)
   (:export :status))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defclass <response> ()

diff --git a/src/core/test.lisp b/src/core/test.lisp
@@ -14,7 +14,7 @@
   (:import-from :clack.util
                 :find-handler))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defvar *clack-test-handler* :hunchentoot

diff --git a/src/core/test/suite.lisp b/src/core/test/suite.lisp
@@ -24,7 +24,7 @@
                 :find-system
                 :component-pathname))
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defvar *clack-test-access-port* *clack-test-port*

diff --git a/src/util/doc.lisp b/src/util/doc.lisp
@@ -16,7 +16,7 @@
                 :generic-function-lambda-list))
 (in-package :clack.util.doc)
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 '#.(defvar *section-plist*

diff --git a/src/util/ducktype.lisp b/src/util/ducktype.lisp
@@ -11,7 +11,7 @@
   (:use :cl))
 (in-package :clack.util.ducktype)
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 (defvar *previous-readtables* nil
   "Stack of readtables for duck-typing reader.")

diff --git a/src/util/hunchentoot.lisp b/src/util/hunchentoot.lisp
@@ -39,7 +39,7 @@
         :rfc2388))
 (in-package :clack.util.hunchentoot)
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 (defparameter *mime-type-list* '(("application/andrew-inset" "ez")
                                  ("application/cu-seeme" "cu")

diff --git a/src/util/localtime.lisp b/src/util/localtime.lisp
@@ -16,7 +16,7 @@
                 :+gmt-zone+))
 (in-package :clack.util.localtime)
 
-(cl-annot:enable-annot-syntax)
+(cl-syntax:use-syntax :annot)
 
 @export
 (defun now ()