Changeset 8448

Timestamp:

Feb 9, 2008, 9:16:45 AM (17 years ago)

Author:

gz

Message:

Move double-%-in to cocoa-utils, use it in log-debug

Location:

branches/gz-working/cocoa-ide

Files:

• cocoa-editor.lisp (modified) (1 diff)
• cocoa-utils.lisp (modified) (2 diffs)

branches/gz-working/cocoa-ide/cocoa-editor.lisp

@@ -1810 +1810 @@
       (hemlock-view pane))))
 
-(defun double-%-in (string)
-  ;; Replace any % characters in string with %%, to keep them from
-  ;; being treated as printf directives.
-  (let* ((%pos (position #\% string)))
-    (if %pos
-      (concatenate 'string (subseq string 0 %pos) "%%" (double-%-in (subseq string (1+ %pos))))
-      string)))
-
-(defun nsstring-for-lisp-condition (cond)
-  (%make-nsstring (double-%-in (or (ignore-errors (princ-to-string cond))
-                                   "#<error printing error message>"))))
-
 (objc:defmethod (#/runErrorSheet: :void) ((self hemlock-frame) message)
   #+debug (#_NSLog #@"runErrorSheet: signal = %@" :id signal)

branches/gz-working/cocoa-ide/cocoa-utils.lisp

@@ -235 +235 @@
 ;; debugging
 
+(defun double-%-in (string)
+  ;; Replace any % characters in string with %%, to keep them from
+  ;; being treated as printf directives.
+  (let* ((%pos (position #\% string)))
+    (if %pos
+      (concatenate 'string (subseq string 0 %pos) "%%" (double-%-in (subseq string (1+ %pos))))
+      string)))
+
 (defun log-debug (format-string &rest args)
-  (#_NSLog (ccl::%make-nsstring (apply #'format nil format-string args))))
+  (let ((string (apply #'format nil format-string args)))
+    (#_NSLog (ccl::%make-nsstring (double-%-in string)))))
 
 (defun nslog-condition (c)
@@ -244 +253 @@
         (#_NSLog #@"Error in event loop: %@" :address nsstr)))))
 
+(defun nsstring-for-lisp-condition (cond)
+  (%make-nsstring (double-%-in (or (ignore-errors (princ-to-string cond))
+                                   "#<error printing error message>"))))
+