projects
/
cl-gtk2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4802d42
)
glib: user internal package to generate structure names instead of gensym
author
Dmitry Kalyanov
<Kalyanov.Dmitry@gmail.com>
Thu, 6 Aug 2009 07:30:52 +0000
(11:30 +0400)
committer
Dmitry Kalyanov
<Kalyanov.Dmitry@gmail.com>
Thu, 6 Aug 2009 07:30:52 +0000
(11:30 +0400)
glib/gobject.boxed.lisp
patch
|
blob
|
history
diff --git
a/glib/gobject.boxed.lisp
b/glib/gobject.boxed.lisp
index
6a9e304
..
05e9bcf
100644
(file)
--- a/
glib/gobject.boxed.lisp
+++ b/
glib/gobject.boxed.lisp
@@
-92,6
+92,8
@@
(for type = (cstruct-slot-description-type slot))
(for count = (cstruct-slot-description-count slot))
(collect `(,name ,type ,@(when count `(:count ,count))))))
(for type = (cstruct-slot-description-type slot))
(for count = (cstruct-slot-description-count slot))
(collect `(,name ,type ,@(when count `(:count ,count))))))
+ (defcunion ,(generated-cunion-name name)
+ (,name ,(generated-cstruct-name name)))
(eval-when (:compile-toplevel :load-toplevel :execute)
(setf (get ',name 'g-boxed-foreign-info)
(make-g-boxed-cstruct-wrapper-info :name ',name
(eval-when (:compile-toplevel :load-toplevel :execute)
(setf (get ',name 'g-boxed-foreign-info)
(make-g-boxed-cstruct-wrapper-info :name ',name
@@
-310,13
+312,15
@@
:structure (parse-variant-structure-definition variant-name slots parent)))
(collect variant)))
:structure (parse-variant-structure-definition variant-name slots parent)))
(collect variant)))
+(defpackage :gobject.boxed.generated-names)
+
(defun generated-cstruct-name (symbol)
(or (get symbol 'generated-cstruct-name)
(defun generated-cstruct-name (symbol)
(or (get symbol 'generated-cstruct-name)
- (setf (get symbol 'generated-cstruct-name) (gensym (format nil "GEN-~A-CSTRUCT-" (symbol-name symbol))))))
+ (setf (get symbol 'generated-cstruct-name) (gentemp (format nil "CSTRUCT-~A" (symbol-name symbol)) (find-package :gobject.boxed.generated-names)))))
(defun generated-cunion-name (symbol)
(or (get symbol 'generated-cunion-name)
(defun generated-cunion-name (symbol)
(or (get symbol 'generated-cunion-name)
- (setf (get symbol 'generated-cunion-name) (gensym (format nil "GEN-~A-CUNION-" (symbol-name symbol))))))
+ (setf (get symbol 'generated-cunion-name) (gentemp (format nil "CUNION-~A" (symbol-name symbol)) (find-package :gobject.boxed.generated-names)))))
(defun generate-cstruct-1 (struct)
`(defcstruct ,(generated-cstruct-name (cstruct-description-name struct))
(defun generate-cstruct-1 (struct)
`(defcstruct ,(generated-cstruct-name (cstruct-description-name struct))