Commit a13502c2 authored by Liam Healy's avatar Liam Healy
Browse files

Use symbols exported from c-array

Some symbols that were formerly in the GSLL package and now are in
c-array need to imported from that package.  This only affects
non-native implementation and so was discovered in trying to compile
in CCL.  There are still too many test failures in CCL.
parent 6ea380c0
;; A "marray" is an array in both GSL and CL
;; Liam Healy 2008-04-06 21:23:41EDT
;; Time-stamp: <2009-12-25 15:25:11EST marray.lisp>
;; Time-stamp: <2009-12-25 23:04:11EST marray.lisp>
(in-package :gsl)
......@@ -72,9 +72,9 @@
',(element-type object)
:initial-contents
',(loop for elt across
(subseq (original-array object)
(offset object)
(+ (offset object) (size object)))
(subseq (c-array:original-array object)
(c-array:offset object)
(+ (c-array:offset object) (size object)))
collect elt)))
;;;;****************************************************************************
......
;; Expand the body of a defmfun
;; Liam Healy 2009-04-13 22:07:13EDT body-expand.lisp
;; Time-stamp: <2009-12-20 23:13:49EST body-expand.lisp>
;; Time-stamp: <2009-12-25 22:48:01EST body-expand.lisp>
(in-package :gsl)
......@@ -134,10 +134,13 @@
(mappend
(lambda (arg)
(list (cond
((member (c-array:st-symbol arg) allocated-return) :pointer)
((member (c-array:st-symbol arg)
allocated-return)
:pointer)
(t (c-array:st-type arg)))
(c-array:st-symbol arg)))
(mapcar 'c-array:st-pointer-generic-pointer c-arguments))
(mapcar 'c-array:st-pointer-generic-pointer
c-arguments))
(list (c-array:st-type creturn-st))))))
,@(case c-return
(:void `((declare (ignore ,(c-array:st-symbol creturn-st)))))
......@@ -147,7 +150,9 @@
#-native
,@(when outputs
(mapcar
(lambda (x) `(setf (cl-invalid ,x) t (c-invalid ,x) nil))
(lambda (x)
`(setf (c-array:cl-invalid ,x) t
(c-array:c-invalid ,x) nil))
outputs))
,@(when (eq (c-array:st-type creturn-st) :pointer)
`((check-null-pointer
......
;; Helpers that define a single GSL function interface
;; Liam Healy 2009-01-07 22:02:20EST defmfun-single.lisp
;; Time-stamp: <2009-12-21 08:35:23EST defmfun-single.lisp>
;; Time-stamp: <2009-12-25 22:43:57EST defmfun-single.lisp>
;; $Id: $
(in-package :gsl)
......@@ -120,7 +120,7 @@
#-native
(destructuring-bind (&key inputs &allow-other-keys) key-args
`(progn
,@(mapcar (lambda (v) `(copy-cl-to-c ,v))
,@(mapcar (lambda (v) `(c-array:copy-cl-to-c ,v))
(intersection
inputs (arglist-plain-and-categories arglist nil)))
,(body-expand name arglist gsl-name c-arguments key-args)))
......
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