# HG changeset patch # User Steve Losh # Date 1449347738 0 # Node ID dcaf8468adb18e5babc4168a04634e78c3052218 # Parent 15af562c7bcaf7267d92491ebac6d3dbc9a7f7d3 Move middleware utils to the middleware module diff -r 15af562c7bca -r dcaf8468adb1 src/middleware/core.lisp --- a/src/middleware/core.lisp Sat Dec 05 20:27:18 2015 +0000 +++ b/src/middleware/core.lisp Sat Dec 05 20:35:38 2015 +0000 @@ -2,3 +2,15 @@ (defvar *middleware* (fset:empty-map)) + +(defmacro handle-op (message op fallback &rest body) + `(if (equal ,op (fset:lookup ,message "op")) + (progn ,@body) + (funcall ,fallback ,message))) + +(defmacro define-middleware (name op message-binding &rest body) + (let ((fallback (gensym))) + `(defun ,name (,fallback) + (lambda (,message-binding) + (handle-op ,message-binding ,op ,fallback + ,@body))))) diff -r 15af562c7bca -r dcaf8468adb1 src/utils.lisp --- a/src/utils.lisp Sat Dec 05 20:27:18 2015 +0000 +++ b/src/utils.lisp Sat Dec 05 20:35:38 2015 +0000 @@ -97,14 +97,3 @@ "id" (fset:lookup message "id") "session" (fset:lookup message "session")))) -(defmacro handle-op (message op fallback &rest body) - `(if (equal ,op (fset:lookup ,message "op")) - (progn ,@body) - (funcall ,fallback ,message))) - -(defmacro define-middleware (name op message-binding &rest body) - (let ((fallback (gensym))) - `(defun ,name (,fallback) - (lambda (,message-binding) - (handle-op ,message-binding ,op ,fallback - ,@body)))))