diff options
| author | Matthias Benkard <code@mail.matthias.benkard.de> | 2007-08-07 16:38:12 +0200 |
|---|---|---|
| committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2007-08-07 16:38:12 +0200 |
| commit | 414d2bf6f6f75db5ec3babb164d8ed7d46d65080 (patch) | |
| tree | dbf55eb9b5977f1d09245e7e34dd5b916830562a /Lisp | |
| parent | 39ca66d95e0771b892f9edb3892ec4b669a35808 (diff) | |
Rename the internal function OBJCL-INVOKE-CLASS-METHOD to OBJCL-INVOKE-METHOD.
darcs-hash:2a0df2a072f110c491fb0aa97ddade5defd293c5
Diffstat (limited to 'Lisp')
| -rw-r--r-- | Lisp/libobjcl.lisp | 4 | ||||
| -rw-r--r-- | Lisp/method-invocation.lisp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lisp/libobjcl.lisp b/Lisp/libobjcl.lisp index 041ddf3..1cb29a2 100644 --- a/Lisp/libobjcl.lisp +++ b/Lisp/libobjcl.lisp @@ -74,8 +74,8 @@ objects or classes, let alone send messages to them. (argc :int) &rest) -(defcfun ("objcl_invoke_class_method" - %objcl-invoke-class-method) obj-data +(defcfun ("objcl_invoke_method" + %objcl-invoke-method) obj-data (receiver obj-data) (method-name :string) (argc :int) diff --git a/Lisp/method-invocation.lisp b/Lisp/method-invocation.lisp index e7079a7..4de8dc6 100644 --- a/Lisp/method-invocation.lisp +++ b/Lisp/method-invocation.lisp @@ -123,7 +123,7 @@ Returns: *result* --- the return value of the method invocation. "an Objective C instance (ID, OBJC-CLASS or EXCEPTION)") (let* ((arglist (arglist-intersperse-types (mapcar #'lisp->obj-data args))) - (return-value (apply-macro '%objcl-invoke-class-method + (return-value (apply-macro '%objcl-invoke-method (lisp->obj-data receiver) method-name (length args) @@ -136,7 +136,7 @@ Returns: *result* --- the return value of the method invocation. (constructor-name-p method-name)))) (obj-data->lisp return-value)))) (if (typep value 'condition) - (cerror "Return NIL from OBJCL-INVOKE-CLASS-METHOD" value) + (cerror "Return NIL from OBJCL-INVOKE-METHOD" value) value)) (dealloc-obj-data return-value)))) |