Mon May 11 14:21:24 CEST 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>
* cleanup: rename type= to smoke-type=.
diff -rN -u old-smoke/src/objects/enum.lisp new-smoke/src/objects/enum.lisp
--- old-smoke/src/objects/enum.lisp 2014-09-30 10:25:47.000000000 +0200
+++ new-smoke/src/objects/enum.lisp 2014-09-30 10:25:48.000000000 +0200
@@ -22,7 +22,7 @@
(defun check-enum-type (enum enum-type)
- (assert (type= (enum-type enum)
+ (assert (smoke-type= (enum-type enum)
enum-type)
(enum enum-type)
"The enums ~A is not of type ~A." enum (name enum-type)))
@@ -30,7 +30,7 @@
(defun enum= (enum1 enum2)
"Returns true when ENUM1 and ENUM2 are equal and false otherwise."
(declare (enum enum1 enum2))
- (assert (type= (enum-type enum1)
+ (assert (smoke-type= (enum-type enum1)
(enum-type enum2))
(enum1 enum2)
"The enums ~A and ~A have a different type." enum1 enum2)
diff -rN -u old-smoke/src/objects/method.lisp new-smoke/src/objects/method.lisp
--- old-smoke/src/objects/method.lisp 2014-09-30 10:25:47.000000000 +0200
+++ new-smoke/src/objects/method.lisp 2014-09-30 10:25:48.000000000 +0200
@@ -96,7 +96,7 @@
;;(= (type-id type) 12)))
(string (or (type-equal type "const char*")
(type-equal type "const QString&")))
- (enum (type= (enum-type object)
+ (enum (smoke-type= (enum-type object)
type))
(sequence (type-equal type "const QStringList&"))
(character (type-equal type "char"))))
diff -rN -u old-smoke/src/objects/type.lisp new-smoke/src/objects/type.lisp
--- old-smoke/src/objects/type.lisp 2014-09-30 10:25:47.000000000 +0200
+++ new-smoke/src/objects/type.lisp 2014-09-30 10:25:48.000000000 +0200
@@ -18,7 +18,7 @@
(defmethod name ((type smoke-type))
(get-struct-slot-value type 'name))
-(defun type= (type1 type2)
+(defun smoke-type= (type1 type2)
(and t ;(pointer-eq (smoke type1)
; (smoke type2))
(= (id type1)
diff -rN -u old-smoke/src/overload-resolution.lisp new-smoke/src/overload-resolution.lisp
--- old-smoke/src/overload-resolution.lisp 2014-09-30 10:25:47.000000000 +0200
+++ new-smoke/src/overload-resolution.lisp 2014-09-30 10:25:48.000000000 +0200
@@ -331,7 +331,7 @@
(11 (object.typep 'double-float))
(12 (object.typep 'enum)) ;; FIXME enum-type
(13 (and (object.typep (find-class 'smoke-standard-object))
- (type= type (object.type-of))))))
+ (smoke-type= type (object.type-of))))))
(defun make-cleanup-pointer (pointer cleanup-function)
diff -rN -u old-smoke/src/package.lisp new-smoke/src/package.lisp
--- old-smoke/src/package.lisp 2014-09-30 10:25:47.000000000 +0200
+++ new-smoke/src/package.lisp 2014-09-30 10:25:48.000000000 +0200
@@ -22,7 +22,7 @@
#:name
#:id
- #:type=
+ #:smoke-type=
#:define-methods