- (list
- (intern
- (substitute
- #\- #\_ (string-upcase (slot-value enum-value 'nickname))) "KEYWORD")
- (slot-value enum-value 'value)))
- (%enum-class-values (type-class-peek type-number))))
-
-(defun define-enum-by-query (init-fname &optional name)
- (let ((type-number (type-init name init-fname)))
- (unless (= (type-parent type-number) (find-type-number 'enum))
- (error "~A is not an enum type" (alien-type-name type-number)))
-
- (type-class-ref type-number)
- (setf (find-type-number name) type-number)
- (let ((expanded (cons 'enum (%query-enum-values type-number)))
- (name (or name (default-type-name (alien-type-name type-number)))))
- (lisp::%deftype
- name
- #'(lambda (whole)
- (unless (zerop (length (cdr whole)))
- (lisp::do-arg-count-error 'deftype name (cdr whole) nil 0 0))
- expanded)))))
-
-
-;;;; Flags type
-
-(deftype flags (&rest args)
- `(or
- null
- (cons
- (member ,@(%map-mappings args :symbols))
- list)))
-
-(deftype-method translate-type-spec flags (type-spec)
- (let ((args (cdr (type-expand-to 'flags type-spec))))
- (if (integerp (first args))
- (translate-type-spec `(unsigned ,(first args)))
- (translate-type-spec 'unsigned))))
-
-(deftype-method size-of flags (type-spec)
- (let ((args (cdr (type-expand-to 'flags type-spec))))
- (if (integerp (first args))
- (size-of `(unsigned ,(first args)))
- (size-of 'unsigned))))
-
-(deftype-method translate-to-alien flags (type-spec expr &optional weak-ref)
- (declare (ignore weak-ref))
- (destructuring-bind (name &rest args) (type-expand-to 'flags type-spec)
- (declare (ignore name))
- (let ((mappings (%map-mappings args :flags-int))
- (value (make-symbol "VALUE")))
- `(let ((,value 0))
- (dolist (flag ,expr ,value)
- (setq ,value (logior ,value (second (assoc flag ',mappings)))))))))
-
-(deftype-method translate-from-alien flags (type-spec expr &optional weak-ref)
- (declare (ignore weak-ref))
- (destructuring-bind (name &rest args) (type-expand-to 'flags type-spec)
- (declare (ignore name))
- (let ((mappings (%map-mappings args :int-flags))
- (result (make-symbol "RESULT")))
- `(let ((,result nil))
- (dolist (mapping ',mappings ,result)
- (unless (zerop (logand ,expr (first mapping)))
- (push (second mapping) ,result)))))))
-
-(setf (alien-type-name 'flags) "GFlags")
-
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (defclass %flags-value (alien-structure)
- ((value :allocation :alien :type unsigned-int)
- (name :allocation :alien :type string)
- (nickname :allocation :alien :type string))
- (:metaclass proxy-class)))
-
-(defbinding %flags-class-values () (glist %flags-value)
- (class pointer))
-
-(defun %query-flags-values (type-number)
- (mapcar
- #'(lambda (flags-value)
- (list
- (intern
- (substitute
- #\- #\_ (string-upcase (slot-value flags-value 'nickname))) "KEYWORD")
- (slot-value flags-value 'value)))
- (%flags-class-values (type-class-peek type-number))))
+ (with-slots (nickname name value) enum-value
+ (list
+ (cond
+ ((eq symbolic-p :nickname) nickname)
+ (symbolic-p
+ (intern (substitute #\- #\_ (string-upcase nickname)) "KEYWORD"))
+ (t name))
+ value)))
+ values))
+
+(defbinding enum-class-values () (static (vector (inlined enum-value) n-values))
+ (class pointer)
+ (n-values unsigned-int :out))
+
+(defbinding flags-class-values () (static (vector (inlined enum-value) n-values))
+ (class pointer)
+ (n-values unsigned-int :out))
+
+(defun query-enum-values (type &optional (symbolic-p t))
+ (let ((class (type-class-ref type)))
+ (map-enum-values (if (eq (supertype type) 'enum)
+ (enum-class-values class)
+ (flags-class-values class))
+ symbolic-p)))
+
+(defun expand-enum-type (type-number forward-p options)
+ (declare (ignore forward-p))
+ (let* ((type (type-from-number type-number))
+ (mappings (getf options :mappings))
+ (expanded-mappings
+ (append
+ (delete-if
+ #'(lambda (mapping)
+ (or
+ (assoc (first mapping) mappings)
+ (rassoc (cdr mapping) mappings :test #'equal)))
+ (query-enum-values type-number))
+ (remove-if
+ #'(lambda (mapping) (eq (second mapping) nil)) mappings))))
+ `(progn
+ (register-type ',type ',(find-type-init-function type-number))
+ ,(ecase (supertype type-number)
+ (enum `(define-enum-type ,type ,@expanded-mappings))
+ (flags `(define-flags-type ,type ,@expanded-mappings))))))
+
+
+(register-derivable-type 'enum "GEnum" 'expand-enum-type)
+(register-derivable-type 'flags "GFlags" 'expand-enum-type)