From 223899941fd91d5958d7898ec878edf4322cfb9f Mon Sep 17 00:00:00 2001 From: Liam Healy <liam@thinkpad.local> Date: Sun, 19 Dec 2010 11:43:39 -0500 Subject: [PATCH] Use new macros from FSBV Use new macros define-equivalent-type, defconvert, and defenumeration from FSBV. --- init/types.lisp | 10 ++++++---- linear-algebra/blas2.lisp | 14 ++++++-------- linear-algebra/blas3.lisp | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/init/types.lisp b/init/types.lisp index 56614545..107cfc98 100644 --- a/init/types.lisp +++ b/init/types.lisp @@ -1,8 +1,8 @@ ;; Number types used by GSL functions, and specification conversion ;; Liam Healy 2008-12-31 21:06:34EST types.lisp -;; Time-stamp: <2010-06-27 18:03:22EDT types.lisp> +;; Time-stamp: <2010-12-19 11:42:56EST types.lisp> ;; -;; Copyright 2008, 2009 Liam M. Healy +;; Copyright 2008, 2009, 2010 Liam M. Healy ;; Distributed under the terms of the GNU General Public License ;; ;; This program is free software: you can redistribute it and/or modify @@ -24,13 +24,15 @@ ;;;; Unsigned address types size_t ;;;;**************************************************************************** +(fsbv:defconvert (sizet :constructor values)) + (case (cffi:foreign-type-size :long) (8 (push :int64 *features*) - #+fsbv (fsbv:defsynonym sizet :uint64)) + #+fsbv (fsbv:define-equivalent-type sizet :uint64)) (4 (push :int32 *features*) - #+fsbv (fsbv:defsynonym sizet :uint32))) + #+fsbv (fsbv:define-equivalent-type sizet :uint32))) ;;;;**************************************************************************** ;;;; Type specification conversion diff --git a/linear-algebra/blas2.lisp b/linear-algebra/blas2.lisp index b2fbe8a3..9092c41e 100644 --- a/linear-algebra/blas2.lisp +++ b/linear-algebra/blas2.lisp @@ -1,8 +1,8 @@ ;; BLAS level 2, Matrix-vector operations ;; Liam Healy, Wed Apr 26 2006 - 21:08 -;; Time-stamp: <2010-07-07 14:25:00EDT blas2.lisp> +;; Time-stamp: <2010-12-19 11:24:07EST blas2.lisp> ;; -;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy +;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy ;; Distributed under the terms of the GNU General Public License ;; ;; This program is free software: you can redistribute it and/or modify @@ -27,14 +27,12 @@ ;;;; Options ;;;;**************************************************************************** -#+fsbv -(fsbv:defcenum-aux cblas-transpose) +#+fsbv (fsbv:defenumeration cblas-transpose) +;;; Eventually, #-fsbv (cffi:defconvert-cenum cblas-transpose) -#+fsbv -(fsbv:defcenum-aux cblas-uplo) +#+fsbv (fsbv:defenumeration cblas-uplo) -#+fsbv -(fsbv:defcenum-aux cblas-diag) +#+fsbv (fsbv:defenumeration cblas-diag) ;;;;**************************************************************************** ;;;; Functions diff --git a/linear-algebra/blas3.lisp b/linear-algebra/blas3.lisp index ab51b2a8..beb861d9 100644 --- a/linear-algebra/blas3.lisp +++ b/linear-algebra/blas3.lisp @@ -1,8 +1,8 @@ ;; BLAS level 3, Matrix-matrix operations ;; Liam Healy, Wed Apr 26 2006 - 21:08 -;; Time-stamp: <2010-07-07 14:25:00EDT blas3.lisp> +;; Time-stamp: <2010-12-19 11:25:19EST blas3.lisp> ;; -;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy +;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy ;; Distributed under the terms of the GNU General Public License ;; ;; This program is free software: you can redistribute it and/or modify @@ -26,8 +26,8 @@ ;;;; Options ;;;;**************************************************************************** -#+fsbv -(fsbv:defcenum-aux cblas-side) +#+fsbv (fsbv:defenumeration cblas-side) +;;; Eventually, #-fsbv (cffi:defconvert-cenum cblas-side) ;;;;**************************************************************************** ;;;; Functions -- GitLab