Sun Aug 2 12:12:41 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>

* Cleanup C++ to Lisp translation

--- old-smoke/src/objects/class.lisp 2014-10-30 08:11:56.000000000 +0100

+++ new-smoke/src/objects/class.lisp 2014-10-30 08:11:56.000000000 +0100

@@ -1,17 +1,18 @@

(in-package #:smoke)

(defclass smoke-class ()

- ((id :initform 0 :type smoke-index :reader id :initarg :id)

- (smoke :type smoke-module :reader smoke :initarg :smoke)))

+ ((id :initform 0 :type smoke-index

+ :reader id :initarg :id)

+ (smoke :type smoke-module

+ :reader smoke :initarg :smoke)))

(defun make-smoke-class-from-id (smoke id)

(make-instance 'smoke-class :id id :smoke smoke))

-

(declaim (inline smoke-class-pointer))

(defun smoke-class-pointer (class)

- (mem-aref (the foreign-pointer (smoke-array-pointer (smoke-module-classes

- (smoke class))))

+ (mem-aref (the foreign-pointer

+ (smoke-array-pointer (smoke-module-classes (smoke class))))

'smoke-class

(the smoke-index (id class))))

@@ -42,7 +43,8 @@

(defun external-p (class)

"Returns T when CLASS is external in its module; NIL otherwise."

- (declare (optimize (speed 3)))

+ (declare (type smoke-class class)

+ (optimize (speed 3)))

(class-slot-value class 'external))

(defun get-class-flag (class flag)

@@ -68,7 +70,6 @@

(slot-value condition 'smoke-name))))

(:documentation "A undefined Smoke class"))

-;smoke-find-class

(defun make-smoke-class (smoke name)

"Returns the class named NAME of the smoke module SMOKE.

Signals an undefined-class condition when there is no class for NAME."

@@ -107,8 +108,10 @@

T))

(defun derived-real-p (class base-class)

- (smoke-is-derived-from (smoke-module-pointer (smoke class)) (id class)

- (smoke-module-pointer (smoke base-class)) (id base-class)))

+ (smoke-is-derived-from (smoke-module-pointer (smoke class))

+ (id class)

+ (smoke-module-pointer (smoke base-class))

+ (id base-class)))

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

@@ -124,8 +127,7 @@

(if (= 0 class-index)

classes

(smoke-add-superclass

- class (append classes

- (list

- (make-smoke-class-from-id (smoke class)

- class-index)))

+ class

+ (append classes

+ (list (make-smoke-class-from-id (smoke class) class-index)))

(1+ index)))))