fix nestedness of results

Author: dradetsky

src/defclass-std.lisp

@@ -125,18 +125,23 @@
 (defmacro defclass/std (name direct-superclasses direct-slots &rest options)
   "Shortcut macro to the DEFCLASS macro. See README for syntax and usage."
   `(defclass ,name ,direct-superclasses
-     ,@(mapcar (lambda (line)
-                 (let ((prefix (if (or (member :with-prefix line)
-                                       (member :with line)
-                                       *with-prefix*)
-                                   (concatenate 'string (string name) "-")
-                                   ""))
-                       (split-kws-line (split-fusioned-keywords line)))
-                   (check-for-repeated-keywords split-kws-line)
-                   (replace-keywords split-kws-line prefix)))
-               direct-slots)
+     ,(process-slots direct-slots name)
      ,@options))
 
+(defun process-slots (direct-slots classname)
+  (let ((processed (mapcar (lambda (line)
+            (let ((prefix (if (or (member :with-prefix line)
+                                  (member :with line)
+                                  *with-prefix*)
+                              (concatenate 'string (string classname) "-")
+                              ""))
+                  (split-kws-line (split-fusioned-keywords line)))
+              (check-for-repeated-keywords split-kws-line)
+              (replace-keywords split-kws-line prefix)))
+          direct-slots)))
+    ;; un-nest the lists
+    (reduce #'append processed)))
+
 (defmacro class/std (name &body defaulted-slots)
   "Shortcut macro to the DEFCLASS/STD macro."
   `(defclass/std ,name ()