Sun Jan 17 22:04:08 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>
* Fix class-map image loading and use the new static smoke methods.
indClass() and isDerivedFrom() are now static (r1076132 and also in KDE 4.4).
hunk ./src/class-map.lisp 11
- (assert value ()
- "Unknown smoke module ~A ~A."
- smoke (smoke-get-module-name (smoke-module-pointer smoke)))
+ (assert value () "Unknown smoke module ~A." smoke)
hunk ./src/libsmoke/class.lisp 22
- (smoke :pointer)
hunk ./src/libsmoke/smoke.cpp 133
- * @param smoke the smoke module
hunk ./src/libsmoke/smoke.cpp 136
-cl_smoke_find_class(Smoke::ModuleIndex* c, void* smoke, const char* name)
+cl_smoke_find_class(Smoke::ModuleIndex* c, const char* name)
hunk ./src/libsmoke/smoke.cpp 138
- *c = get_smoke(smoke)->findClass(name);
+ *c = Smoke::findClass(name);
hunk ./src/libsmoke/smoke.cpp 184
- return get_smoke(smoke)->isDerivedFrom(get_smoke(smoke), class_index,
+ return Smoke::isDerivedFrom(get_smoke(smoke), class_index,
hunk ./src/objects/class.lisp 64
- ((smoke-name :initarg :smoke-name
- :initform nil
- :documentation "The name of the Smoke module"))
+ ()
hunk ./src/objects/class.lisp 66
- (format stream "No Smoke class named ~S in the Smoke module ~S."
- (cell-error-name condition)
- (slot-value condition 'smoke-name))))
+ (format stream "No Smoke class named ~S."
+ (cell-error-name condition))))
hunk ./src/objects/class.lisp 76
-(defun make-smoke-class (smoke name)
- "Returns the class named NAME of the smoke module SMOKE.
+(defun make-smoke-class (name)
+ "Returns the class named NAME.
hunk ./src/objects/class.lisp 81
- (smoke-find-class c (smoke-module-pointer smoke) name)
+ (smoke-find-class c name)
hunk ./src/objects/class.lisp 84
- (error (make-condition 'undefined-class :name name :smoke-name (smoke-get-module-name (smoke-module-pointer smoke))))
+ (error (make-condition 'undefined-class :name name))
hunk ./src/objects/class.lisp 104
- (handler-case (make-smoke-class (smoke class) (name class))
+ (handler-case (make-smoke-class (name class))
hunk ./src/objects/method.lisp 20
- (call-next-method)
+ (print-unreadable-object (smoke-method stream :type t)
+ (princ "no method" stream))
hunk ./src/objects/method.lisp 140
- (format nil "~A~:[~; static~]" (access method) (static-p method)))
+ (format nil "~:[~;virtual ~]~A~:[~; static~]" [_$_]
+ (virtual-p method) (access method) (static-p method)))
hunk ./src/objects/method.lisp 214
+(defun virtual-p (method)
+ "Returns T when METHOD is internal and NIL otherwise."
+ (/= 0 (get-method-flag method :virtual)))
+
hunk ./src/smoke-to-clos.lisp 168
+ (eval-startup (:compile-toplevel :load-toplevel :execute)
+ ;; FIXME when loading the Lisp image we no longer need to
+ ;; call #'ensure-class, but the class-map needs still
+ ;; to be populated by #'add-id-class-map and #'add-id;
+ ;; For now we ignore the negligible overhead.
+ (make-smoke-classes ,package ,smoke))
hunk ./src/smoke-to-clos.lisp 175
- (make-smoke-classes ,package ,smoke)
hunk ./src/smoke.lisp 55
-(defun static-call (smoke class-name method-name &rest args)
- (s-call (make-smoke-method-from-name (make-smoke-class smoke class-name)
- method-name)
- (null-pointer) args))
-