r9669: openmcl fix

[uffi.git] / src / functions.lisp

diff --git a/src/functions.lisp b/src/functions.lisp
index 5210f0a22a2ec41a8e51839ee85b9fff8a19a212..1b6b32501f4d8bc044d6877b5233eaa8fc019bc9 100644 (file)
--- a/src/functions.lisp
+++ b/src/functions.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          function.cl
+;;;; Name:          function.lisp
 ;;;; Purpose:       UFFI source to C function definitions
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: functions.lisp,v 1.3 2002/10/14 01:51:15 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,45 +16,45 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 (defun process-function-args (args)
   (if (null args)
-      #+(or lispworks cmu sbcl cormanlisp (and mcl (not openmcl))) nil
+      #+(or lispworks cmu sbcl scl cormanlisp (and mcl (not openmcl))) nil
       #+allegro '(:void)
-      #+mcl (values nil nil)
+      #+openmcl (values nil nil)
 
       ;; args not null
-      #+(or lispworks allegro cmu sbcl (and mcl (not openmcl)) cormanlisp)
+      #+(or lispworks allegro cmu sbcl scl (and mcl (not openmcl)) cormanlisp)
       (let (processed)
        (dolist (arg args)
          (push (process-one-function-arg arg) processed))
        (nreverse processed))
       #+openmcl
       (let ((processed nil)
-           (params nil)
-           name type)
+           (params nil))
        (dolist (arg args)
-         (setf name (car arg))
-         (setf type (convert-from-uffi-type (cadr arg) :routine))
-         ;;(when (and (listp type) (eq (car type) :address))
-         ;;(setf type :address))
-         (push name params)
-         (push type processed)
-         (push name processed))
+         (let ((name (car arg))
+               (type (convert-from-uffi-type (cadr arg) :routine)))
+           ;;(when (and (listp type) (eq (car type) :address))
+           ;;(setf type :address))
+           (push name params)
+           (push type processed)
+           (push name processed)))
        (values (nreverse params) (nreverse processed)))
     ))
 
 (defun process-one-function-arg (arg)
   (let ((name (car arg))
        (type (convert-from-uffi-type (cadr arg) :routine)))
-    #+(or cmu sbcl)
+    #+(or cmu sbcl scl)
     (list name type :in)
     #+(or allegro lispworks (and mcl (not openmcl)))
     (if (and (listp type) (listp (car type)))
        (append (list name) type)
       (list name type))
+    #+openmcl
+    (declare (ignore name type))
     ))    
 
 
@@ -66,7 +66,7 @@
 ;; name is either a string representing foreign name, or a list
 ;; of foreign-name as a string and lisp name as a symbol
 (defmacro def-function (names args &key module returning)
-  #+(or cmu sbcl allegro mcl cormanlisp) (declare (ignore module))
+  #+(or cmu sbcl scl allegro mcl cormanlisp) (declare (ignore module))
   
   (let* ((result-type (convert-from-uffi-type returning :return))
         (function-args (process-function-args args))
@@ -80,12 +80,12 @@
        :returning ,(allegro-convert-return-type result-type)
        :call-direct t
        :strings-convert nil)
-    #+cmu
+    #+(or cmu scl)
     `(alien:def-alien-routine (,foreign-name ,lisp-name)
         ,result-type
        ,@function-args)
     #+sbcl
-    `(sb-alien:def-alien-routine (,foreign-name ,lisp-name)
+    `(sb-alien:define-alien-routine (,foreign-name ,lisp-name)
         ,result-type
        ,@function-args)
     #+lispworks
@@ -93,12 +93,15 @@
         ,function-args
        ,@(if module (list :module module) (values))
        :result-type ,result-type
+      :language :ansi-c
        :calling-convention :cdecl)
     #+(and mcl (not openmcl))
     `(eval-when (:compile-toplevel :load-toplevel :execute)
        (ccl:define-entry-point (,lisp-name ,foreign-name)
          ,function-args
          ,result-type))
+    #+openmcl
+    (declare (ignore function-args))
     #+(and openmcl darwinppc-target)
     (setf foreign-name (concatenate 'string "_" foreign-name))
     #+openmcl
@@ -114,10 +117,5 @@
     ))
 
 
-(defun make-lisp-name (name)
-  (let ((converted (substitute #\- #\_ name)))
-     (intern 
-      #+case-sensitive converted
-      #-case-sensitive (string-upcase converted))))