Changeset 11620

Timestamp:

Jan 16, 2009, 4:44:12 AM (12 years ago)

Author:

rme

Message:

New macros WITH-AUTORELEASED-NSSTRING, WITH-AUTORELEASED-NSSTRINGS.

Delete %make-nsstring-from-utf8-c-string and update %make-nsstring
accordingly.

Move %make-nsstring from objc-runtime.lisp to objc-support.lisp.

In #/reason method on ns-lisp-exception, autorelease returned string.

Location:

trunk/source/objc-bridge

Files:

• objc-runtime.lisp (modified) (1 diff)
• objc-support.lisp (modified) (2 diffs)

trunk/source/objc-bridge/objc-runtime.lisp

@@ -3029 +3029 @@
         (release-autorelease-pool ,pool-temp)))))
 
-
-(defun %make-nsstring (string)
-  (with-encoded-cstrs :utf-8 ((s string))
-    (%make-nsstring-from-utf8-c-string s)))
-
-
-
 #+apple-objc-2.0
 ;;; New!!! Improved!!! At best, half-right!!!
 (defmacro with-ns-exceptions-as-errors (&body body)
   `(progn ,@body))
-                 
-             
-    
+
 #-apple-objc-2.0
 (defmacro with-ns-exceptions-as-errors (&body body)

trunk/source/objc-bridge/objc-support.lisp

@@ -183 +183 @@
 (pushnew 'recognize-objc-exception *foreign-error-condition-recognizers*)
 
-(defun %make-nsstring-from-utf8-c-string (s)
-  (#/initWithUTF8String: (#/alloc ns:ns-string) s))
-
+(defun %make-nsstring (string)
+  (with-encoded-cstrs :utf-8 ((s string))
+    (#/initWithUTF8String: (#/alloc ns:ns-string) s)))
+
+(defmacro with-autoreleased-nsstring ((nsstring lisp-string) &body body)
+  `(let* ((,nsstring (%make-nsstring ,lisp-string)))
+     (#/autorelease ,nsstring)
+     ,@body))
+
+(defmacro with-autoreleased-nsstrings (speclist &body body)
+  (with-specs-aux 'with-autoreleased-nsstring speclist body))
 
 (defun retain-objc-instance (instance)
@@ -230 +238 @@
   (with-slots (condition) self
     (if condition
-      (%make-nsstring (format nil "~A" condition))
+      (#/autorelease (%make-nsstring (format nil "~A" condition)))
       (call-next-method))))