From 5fb9ef544933a64d3fac1626250cb6a33d40ee84 Mon Sep 17 00:00:00 2001
From: "Liam M. Healy" <lnp@healy.washington.dc.us>
Date: Tue, 11 Jan 2011 19:13:03 -0500
Subject: [PATCH] Don't import 'grid:dimensions, use alexandria:make-keyword

---
 gsll.asd          | 4 ++--
 init/init.lisp    | 4 ++--
 init/mobject.lisp | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gsll.asd b/gsll.asd
index d2496314..439f7257 100644
--- a/gsll.asd
+++ b/gsll.asd
@@ -1,6 +1,6 @@
 ;; Definition of GSLL system 
 ;; 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
 ;; Distributed under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
   :version "0"
   :author "Liam M. Healy"
   :licence "GPL v3"
-  :depends-on (antik cffi-grovel trivial-garbage #+fsbv fsbv)
+  :depends-on (antik cffi-grovel trivial-garbage alexandria #+fsbv fsbv)
   :components
   ((:module init
 	    :components
diff --git a/init/init.lisp b/init/init.lisp
index 058eb3fd..d5999ccc 100644
--- a/init/init.lisp
+++ b/init/init.lisp
@@ -1,6 +1,6 @@
 ;; Load GSL
 ;; 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
 ;; Distributed under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
   (:nicknames :gsl)
   (:use :common-lisp :cffi)
   (:import-from
-   :grid #:dimensions
+   :grid
     #:element-type #:foreign-array #:matrix #:dim0 #:dim1 #:^ #:copy)
   (:export #:element-type #:dim0 #:dim1  #:copy))
 
diff --git a/init/mobject.lisp b/init/mobject.lisp
index b7a63e53..8b3836c8 100644
--- a/init/mobject.lisp
+++ b/init/mobject.lisp
@@ -1,6 +1,6 @@
 ;; Definition of GSL objects and ways to use them.
 ;; 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
 ;; Distributed under the terms of the GNU General Public License
@@ -102,7 +102,7 @@
     (if (have-at-least-gsl-version gsl-version)
 	`(progn
 	   ,(if cbinfo
-		`(,(if (member 'grid:dimensions cl-alloc-args)
+		`(,(if (member 'dimensions cl-alloc-args)
 		       'def-ci-subclass 'def-ci-subclass-1d)
 		   ,class
 		   ,superclasses
@@ -288,9 +288,9 @@
   (if (listp symbol)
       (mappend (lambda (s) (symbol-keyword-symbol s singular)) symbol)
       (if (member (singular-symbol symbol) singular)
-	  (list (intern (symbol-name symbol) :keyword)
+	  (list (alexandria:make-keyword symbol)
 		`(list ,(singular-symbol symbol)))
-	  (list (intern (symbol-name symbol) :keyword)
+	  (list (alexandria:make-keyword symbol)
 		symbol))))
 
 ;;;;****************************************************************************
-- 
GitLab