Changeset 158

Timestamp:

Dec 29, 2003, 12:19:23 AM (21 years ago)

Author:

Gary Byers

Message:

SUPER's gensym'ed in methods; FLET SUPER accesses it.
Remove the CFBUNDLE stuff, so this file can be loaded when it isn't
necessary.

File:

• trunk/ccl/examples/objc-runtime.lisp (modified) (5 diffs)

trunk/ccl/examples/objc-runtime.lisp

@@ -54 +54 @@
 (defloadvar *NSApp* nil )
 
-(declaim (special *default-bundle-path* *default-bundle-executable-path*))
 
 (defun ensure-objc-classptr-resolved (classptr)
@@ -167 +166 @@
                                        (funcall f (id->objc-class id)))))
 
-(eval-when (:load-toplevel :execute)
-  (unless (boundp '*default-bundle-path*)
-    (error "The variable ~s should be set to point to the application bundle path" '*default-bundle-path*))
-  (unless (probe-file *default-bundle-path*)
-    (error "The bundle directory ~s doesn't exist."))
-  (unless (boundp '*default-bundle-executable-path*)
-    (error "The variable ~S should be set to point to the bundle executable file in ~s" '*default-bundle-executable-path* '*default-bundle-path*))
-  (unless (probe-file *default-bundle-executable-path*)
-    (cerror "Create it"
-            "The executable file ~s does not exist."
-            *default-bundle-executable-path*)
-    (create-file *default-bundle-executable-path*)))
+
 
 #+darwinppc-target
 (progn
-(defun fake-cfbundle-path ()
-  (when *default-bundle-path*
-    (let* ((fakepath
-            (native-translated-namestring *default-bundle-executable-path*)))
-      (setenv "CFProcessPath" fakepath))))
-
 (defloadvar *cocoa-event-process* *initial-process*)
 
@@ -203 +185 @@
 
 
-
-(fake-cfbundle-path)
 
 
@@ -1363 +1343 @@
                (self (intern "SELF"))
                (_cmd (intern "_CMD"))
-               ;; SUPER should probably be a gensym, but that'd break
-               ;; the old [:super ...] construct
-               (super 'super) 
+               (super (gensym "SUPER")) 
                (params `(:id ,self :<sel> ,_cmd ,@argspecs)))
           `(progn
@@ -1392 +1370 @@
                                (make-general-send nil msg args nil ,super ,class-name))
                              (%send-super/stret (s msg &rest args)
-                               (make-general-send nil msg args s ,super ,class-name)))
+                               (make-general-send nil msg args s ,super ,class-name))
+                             (super () ,super))
                         ,@body)))))
             (%define-lisp-objc-method