Sun Jan 10 09:49:36 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Support modular smoke & cleanup.

--- old-smoke/src/clos.lisp 2014-10-30 08:09:08.000000000 +0100

+++ new-smoke/src/clos.lisp 2014-10-30 08:09:08.000000000 +0100

@@ -202,26 +202,30 @@

(defun make-smoke-classes (package smoke)

"Constructs a lisp class in PACKAGE for each one in the Smoke module SMOKE."

(declare (optimize (speed 3)))

- (let ((*package* (find-package package)))

+ (let ((impl-package *package*)

+ (*package* (find-package package)))

(add-id-class-map smoke)

(map-classes

#'(lambda (class)

- (unless (or (external-p class)

- (and (eq package :cl-smoke.qt)

- (string/= (smoke-get-module-name

- (smoke-module-pointer smoke))

- "qt")

- (string= (name class) "QGlobalSpace")))

+ (unless (external-p class)

(with-simple-restart (skip "Skip generating class ~A" (name class))

- (add-id class

- (closer-mop:ensure-class (lispify (name class))

- :direct-superclasses

- (mapcar #'smoke-class-symbol

- (smoke-class-direct-superclasses class))

- :id (id class)

- :smoke (smoke class)

- :metaclass 'smoke-standard-class))

- (export (lispify (name class))))))

+ (let ((class-name

+ ;; There is a QGlobalSpace class per Smoke module.

+ ;; Put it in *package* and not PACKAGE to avoid

+ ;; clashes between multiple modules.

+ (if (string= "QGlobalSpace" (name class))

+ (lispify "QGlobalSpace" impl-package)

+ (lispify (name class)))))

+ (add-id class

+ (closer-mop:ensure-class class-name

+ :direct-superclasses

+ (mapcar #'smoke-class-symbol

+ (smoke-class-direct-superclasses class))

+ :id (id class)

+ :smoke (smoke class)

+ :metaclass 'smoke-standard-class))

+ (when (eql (symbol-package class-name) *package*)

+ (export class-name))))))

smoke)))

(defclass smoke-gf (cxx-generic-function)