From e8caa25a94313830393a2d9a766b6268ac345dc7 Mon Sep 17 00:00:00 2001 From: espen Date: Sun, 26 Dec 2004 11:40:58 +0000 Subject: [PATCH] Added reader and writer functions to list types --- glib/glib.lisp | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/glib/glib.lisp b/glib/glib.lisp index 6c2a90b..d9acc73 100644 --- a/glib/glib.lisp +++ b/glib/glib.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: glib.lisp,v 1.21 2004-12-09 23:31:50 espen Exp $ +;; $Id: glib.lisp,v 1.22 2004-12-26 11:40:58 espen Exp $ (in-package "GLIB") @@ -225,11 +225,35 @@ `(destroy-glist ,glist ',element-type))) (defmethod cleanup-function ((type (eql 'glist)) &rest args) - (declare (ignore type args)) + (declare (ignore type)) (destructuring-bind (element-type) args #'(lambda (glist) (destroy-glist glist element-type)))) +(defmethod writer-function ((type (eql 'glist)) &rest args) + (declare (ignore type)) + (destructuring-bind (element-type) args + #'(lambda (list location &optional (offset 0)) + (setf + (sap-ref-sap location offset) + (make-glist element-type list))))) + +(defmethod reader-function ((type (eql 'glist)) &rest args) + (declare (ignore type)) + (destructuring-bind (element-type) args + #'(lambda (location &optional (offset 0)) + (unless (null-pointer-p (sap-ref-sap location offset)) + (map-glist 'list #'identity (sap-ref-sap location offset) element-type))))) + +(defmethod destroy-function ((type (eql 'glist)) &rest args) + (declare (ignore type)) + (destructuring-bind (element-type) args + #'(lambda (location &optional (offset 0)) + (unless (null-pointer-p (sap-ref-sap location offset)) + (destroy-glist (sap-ref-sap location offset) element-type) + (setf (sap-ref-sap location offset) (make-pointer 0)))))) + + ;;;; Single linked list (GSList) @@ -305,16 +329,38 @@ (map-glist 'list #'identity gslist element-type)))) (defmethod cleanup-form (gslist (type (eql 'gslist)) &rest args) - (declare (ignore type args)) + (declare (ignore type)) (destructuring-bind (element-type) args `(destroy-gslist ,gslist ',element-type))) (defmethod cleanup-function ((type (eql 'gslist)) &rest args) - (declare (ignore type args)) + (declare (ignore type)) (destructuring-bind (element-type) args #'(lambda (gslist) (destroy-gslist gslist element-type)))) +(defmethod writer-function ((type (eql 'gslist)) &rest args) + (declare (ignore type)) + (destructuring-bind (element-type) args + #'(lambda (list location &optional (offset 0)) + (setf + (sap-ref-sap location offset) + (make-gslist element-type list))))) + +(defmethod reader-function ((type (eql 'gslist)) &rest args) + (declare (ignore type)) + (destructuring-bind (element-type) args + #'(lambda (location &optional (offset 0)) + (unless (null-pointer-p (sap-ref-sap location offset)) + (map-glist 'list #'identity (sap-ref-sap location offset) element-type))))) + +(defmethod destroy-function ((type (eql 'gslist)) &rest args) + (declare (ignore type)) + (destructuring-bind (element-type) args + #'(lambda (location &optional (offset 0)) + (unless (null-pointer-p (sap-ref-sap location offset)) + (destroy-gslist (sap-ref-sap location offset) element-type) + (setf (sap-ref-sap location offset) (make-pointer 0)))))) ;;; Vector -- 2.11.0