Skip to content
Snippets Groups Projects
Commit e15aaed2 authored by Liam M. Healy's avatar Liam M. Healy
Browse files

In actual-array-class, don't replace real class names

In actual-array-class, if 'category is not one of 'vector, 'matrix or
'both, then assume it's actually a class name and just return it
without trying to make a class name.  This fixes a problem with
e.g. elt+ where the second argument specializer is a class name of the
scalar.
parent f3932b3d
No related branches found
No related tags found
No related merge requests found
;; Helpers for defining GSL functions on arrays ;; Helpers for defining GSL functions on arrays
;; Liam Healy 2009-01-07 22:01:16EST defmfun-array.lisp ;; Liam Healy 2009-01-07 22:01:16EST defmfun-array.lisp
;; Time-stamp: <2011-01-12 00:22:59EST defmfun-array.lisp> ;; Time-stamp: <2011-01-29 21:40:31EST defmfun-array.lisp>
;; ;;
;; Copyright 2009, 2011 Liam M. Healy ;; Copyright 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
...@@ -154,13 +154,15 @@ ...@@ -154,13 +154,15 @@
(case category (case category
(:element-type (grid:number-class element-type)) (:element-type (grid:number-class element-type))
(:component-float-type (:component-float-type
(grid:number-class (grid:component-float-type element-type))) (grid:number-class (grid:component-float-type element-type)))
(otherwise ((vector grid:matrix both)
(grid:data-class-name (grid:data-class-name
(if (and (eq category 'both) replace-both) (if (and (eq category 'both) replace-both)
replace-both replace-both
category) category)
element-type)))) element-type))
;; an actual not-to-be-replaced class name
(otherwise category)))
(defun actual-class-arglist (defun actual-class-arglist
(arglist element-type c-arguments &optional replace-both) (arglist element-type c-arguments &optional replace-both)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment