From f4d00bc0a6e27671631eb9168061d8ec4872029f Mon Sep 17 00:00:00 2001
From: Eitaro Fukamachi <e.arrows@gmail.com>
Date: Fri, 24 Oct 2014 14:01:04 +0900
Subject: [PATCH] Don't set a handler function name as an identifier.

---
 src/myway.lisp |  5 +----
 src/util.lisp  | 20 +-------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/myway.lisp b/src/myway.lisp
index 57c7add..b343161 100644
--- a/src/myway.lisp
+++ b/src/myway.lisp
@@ -11,8 +11,6 @@
   (:import-from :myway.route
                 :route
                 :make-route)
-  (:import-from :myway.util
-                :function-name)
   (:export :make-mapper
            :connect
            :next-route
@@ -28,8 +26,7 @@
            :make-route))
 (in-package :myway)
 
-(defun connect (mapper url fn &key (method '(:GET)) regexp (name (when (functionp fn)
-                                                                   (function-name fn))))
+(defun connect (mapper url fn &key (method '(:GET)) regexp name)
   (add-route mapper
              (make-route url
                          :method method
diff --git a/src/util.lisp b/src/util.lisp
index 30a1a6b..58eb119 100644
--- a/src/util.lisp
+++ b/src/util.lisp
@@ -3,8 +3,7 @@
   (:use :cl)
   (:import-from :cl-utilities
                 :with-collectors)
-  (:export :make-collector
-           :function-name))
+  (:export :make-collector))
 (in-package :myway.util)
 
 (defun make-collector ()
@@ -16,20 +15,3 @@
           (unless (eq data none)
             (buffer data))
           buffer)))))
-
-(defun function-name (fn)
-  (when (symbolp fn)
-    (return-from function-name fn))
-  #+ccl (ccl:function-name fn)
-  #-ccl
-  (multiple-value-bind (lambda closurep name) (function-lambda-expression fn)
-    (declare (ignore closurep))
-    (cond
-      (lambda nil)
-      ((and (listp name)
-            (or (eq (car name) 'labels)
-                (eq (car name) 'flet)))
-       (cadr name))
-      ((and (listp name)
-            (eq (car name) 'lambda)) nil)
-      (T name))))