Commit 5fb9ef54 authored by Liam M. Healy's avatar Liam M. Healy
Browse files

Don't import 'grid:dimensions, use alexandria:make-keyword

parent 0701df89
;; Definition of GSLL system ;; Definition of GSLL system
;; Liam Healy ;; Liam Healy
;; Time-stamp: <2011-01-01 10:57:50EST gsll.asd> ;; Time-stamp: <2011-01-11 19:16:46EST gsll.asd>
;; ;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Distributed under the terms of the GNU General Public License ;; Distributed under the terms of the GNU General Public License
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
:version "0" :version "0"
:author "Liam M. Healy" :author "Liam M. Healy"
:licence "GPL v3" :licence "GPL v3"
:depends-on (antik cffi-grovel trivial-garbage #+fsbv fsbv) :depends-on (antik cffi-grovel trivial-garbage alexandria #+fsbv fsbv)
:components :components
((:module init ((:module init
:components :components
......
;; Load GSL ;; Load GSL
;; Liam Healy Sat Mar 4 2006 - 18:53 ;; Liam Healy Sat Mar 4 2006 - 18:53
;; Time-stamp: <2011-01-10 18:28:14EST init.lisp> ;; Time-stamp: <2011-01-11 19:06:42EST init.lisp>
;; ;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Distributed under the terms of the GNU General Public License ;; Distributed under the terms of the GNU General Public License
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
(:nicknames :gsl) (:nicknames :gsl)
(:use :common-lisp :cffi) (:use :common-lisp :cffi)
(:import-from (:import-from
:grid #:dimensions :grid
#:element-type #:foreign-array #:matrix #:dim0 #:dim1 #:^ #:copy) #:element-type #:foreign-array #:matrix #:dim0 #:dim1 #:^ #:copy)
(:export #:element-type #:dim0 #:dim1 #:copy)) (:export #:element-type #:dim0 #:dim1 #:copy))
......
;; Definition of GSL objects and ways to use them. ;; Definition of GSL objects and ways to use them.
;; Liam Healy, Sun Dec 3 2006 - 10:21 ;; Liam Healy, Sun Dec 3 2006 - 10:21
;; Time-stamp: <2011-01-10 18:19:11EST mobject.lisp> ;; Time-stamp: <2011-01-11 19:10:48EST mobject.lisp>
;; ;;
;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
;; Distributed under the terms of the GNU General Public License ;; Distributed under the terms of the GNU General Public License
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
(if (have-at-least-gsl-version gsl-version) (if (have-at-least-gsl-version gsl-version)
`(progn `(progn
,(if cbinfo ,(if cbinfo
`(,(if (member 'grid:dimensions cl-alloc-args) `(,(if (member 'dimensions cl-alloc-args)
'def-ci-subclass 'def-ci-subclass-1d) 'def-ci-subclass 'def-ci-subclass-1d)
,class ,class
,superclasses ,superclasses
...@@ -288,9 +288,9 @@ ...@@ -288,9 +288,9 @@
(if (listp symbol) (if (listp symbol)
(mappend (lambda (s) (symbol-keyword-symbol s singular)) symbol) (mappend (lambda (s) (symbol-keyword-symbol s singular)) symbol)
(if (member (singular-symbol symbol) singular) (if (member (singular-symbol symbol) singular)
(list (intern (symbol-name symbol) :keyword) (list (alexandria:make-keyword symbol)
`(list ,(singular-symbol symbol))) `(list ,(singular-symbol symbol)))
(list (intern (symbol-name symbol) :keyword) (list (alexandria:make-keyword symbol)
symbol)))) symbol))))
;;;;**************************************************************************** ;;;;****************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment