From 54e4cc2a2225dde15737cd7523e15d34dc728746 Mon Sep 17 00:00:00 2001 Message-Id: <54e4cc2a2225dde15737cd7523e15d34dc728746.1716778892.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 28 Sep 2006 10:20:12 +0000 Subject: [PATCH] Modified QUERY-ENUM-VALUES to return nicknames if optional argument is :NICKNAME Organization: Straylight/Edgeware From: espen --- glib/genums.lisp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/glib/genums.lisp b/glib/genums.lisp index 40fba65..9bbdfe6 100644 --- a/glib/genums.lisp +++ b/glib/genums.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: genums.lisp,v 1.21 2006/09/05 13:20:08 espen Exp $ +;; $Id: genums.lisp,v 1.22 2006/09/28 10:20:12 espen Exp $ (in-package "GLIB") @@ -38,9 +38,11 @@ (defun map-enum-values (values symbolic-p) #'(lambda (enum-value) (with-slots (nickname name value) enum-value (list - (if symbolic-p - (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD") - name) + (cond + ((eq symbolic-p :nickname) nickname) + (symbolic-p + (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD")) + (t name)) value))) values)) -- [mdw]