Unify compare of various iterator types

Also: refactor API functions to match operator names

cpp.hint

@@ -1464,14 +1464,6 @@
 #define CONFIG_DEEMON_PATH(x)
 #define DEFINE_BLACKLISTVARKWDSITERATOR_COMPARE(n,...) DeeObject*n(DeeBlackListKwdsIterator*self,DeeBlackListKwdsIterator*other){}
 #define DEFINE_BLACKLISTMAPPINGITERATOR_COMPARE(n,...) DeeObject*n(DeeBlackListKwIterator*self,DeeBlackListKwIterator*other){}
-#define DEFINE_ITER_COMPARE(n,...) DeeObject*n(SeqSimpleProxyIterator*self,SeqSimpleProxyIterator*other){}
-#define DEFINE_SIITER_COMPARE(n,...) DeeObject*n(SetIntersectionIterator*self,SetIntersectionIterator*other){}
-#define DEFINE_SEGITER_COMPARE(n,...) DeeObject*n(SegmentsIterator*self,SegmentsIterator*other){}
-#define DEFINE_REPEATITER_COMPARE(n,...) DeeObject*n(RepeatIterator*self,RepeatIterator*other){}
-#define DEFINE_RANGEITERATOR_COMPARE(n,...) DeeObject*n(RangeIterator*self,RangeIterator*other){}
-#define DEFINE_RANGEITERATOR_COMPARE_R(n,...) DeeObject*n(RangeIterator*self,RangeIterator*other){}
-#define DEFINE_IRI_COMPARE(n,...) DeeObject*n(IntRangeIterator*self,IntRangeIterator*other){}
-#define DEFINE_IRI_COMPARE_R(n,...) DeeObject*n(IntRangeIterator*self,IntRangeIterator*other){}
 #define DEFINE_KWDSITERATOR_COMPARE(n,...) DeeObject*n(KwdsIterator*self,KwdsIterator*other){}
 #define SEQ_EACH_HEAD OBJECT_HEAD DeeObject*se_seq;
 #define DEFINE_SEQ_EACH_UNARY(n,...) SeqEachOperator*n(SeqEachBase*self){}
@@ -1484,7 +1476,6 @@
 #define DEFINE_SEW_TRINARY(n,...) SeqEachOperator*n(DeeObject*self,DeeObject*a,DeeObject*b){}
 #define DEFINE_SEO_UNARY_INPLACE(n,...) int n(SeqEachOperator**p_self){}
 #define DEFINE_SEO_BINARY_INPLACE(n,...) int n(SeqEachOperator**p_self,DeeObject*other){}
-#define DEFINE_SUBRANGEITERATOR_COMPARE(n,...) DeeObject*n(SubRangeIterator*self,SubRangeIterator*other){}
 #define DEFINE_FOLD_COMPARE(n,T) size_t n(T const*data,size_t datalen,uint32_t fold[UNICODE_FOLDED_MAX],size_t fold_len);
 #define DEFINE_MEMCASECHR(n,rname,T,dee_foldcmp) \
 	T*n(T const*haystack,T needle,size_t haystack_length){}\
@@ -1512,33 +1503,18 @@
 #define DEFINE_CASEFIND_MATCH_FUNCTION(n,T,...) T*n(T*scan_str,size_t scan_size,T*open_str,size_t open_size,T*clos_str,size_t clos_size,size_t*p_match_length){}
 #define DEFINE_RFIND_MATCH_FUNCTION(n,T,...) T*n(T*scan_str,size_tscan_size,T*open_str,size_topen_size,T*clos_str,size_tclos_size){}
 #define DEFINE_CASERFIND_MATCH_FUNCTION(n,T,...) T*n(T*scan_str,size_t scan_size,T*open_str,size_t open_size,T*clos_str,size_t clos_size,size_t*p_match_length){}
-#define DEFINE_STRINGFINDITERATOR_COMPARE(n,...) DeeObject*n(StringFindIterator*self,StringFindIterator*other){}
-#define DEFINE_STRINGSCANITERATOR_COMPARE(n,...) DeeObject*n(StringScanIterator*self,StringScanIterator*other){}
 #define SWITCH_BUILTIN_CODECS(n,...) {}
-#define DEFINE_BYTESSPLITITERATOR_COMPARE(n,...) DeeObject*n(BytesSplitIterator*self,BytesSplitIterator*other){}
-#define DEFINE_BYTESFINDITERATOR_COMPARE(n,...) DeeObject*n(BytesFindIterator*self,BytesFindIterator*other){}
 #define DEFINE_REGRUPSITERATOR_COMPARE(n,...) DeeObject*n(ReGroupsIterator*self,ReGroupsIterator*other){}
-#define DEFINE_RESEQUENCEITARTOR_COMPARE(n,...) DeeObject*n(ReSequenceIterator*self,ReSequenceIterator*other){}
-#define DEFINE_STRINGSEGMENTSITERATOR_COMPARE(n,...) DeeObject*n(StringSegmentsIterator*self,StringSegmentsIterator*other){}
-#define DEFINE_STRINGSPLITITER_COMPARE(n,...) DeeObject*n(StringSplitIterator*self,StringSplitIterator*other){}
 #define DEFINE_WEAKREF_COMPARE(n,...) DeeObject*n(WeakRef*self,WeakRef*other){}
 #define DEFINE_DEPRECATED_INPLACE_BINARY(n,...) DeeObject*object_##n(DeeObject*self,size_t argc,DeeObject*const*argv){}
 #define DEFINE_NUMERIC_ISCMP(n,...) DeeObject*numeric_##n(DeeObject*self,size_t argc,DeeObject*const*argv){}
-#define DEFINE_LISTITERATOR_COMPARE(n,...) DeeObject*n(ListIterator*self,ListIterator*other){}
-#define DEFINE_ITERATOR_COMPARE(n,...) DeeObject*n(DeeObject*self,DeeObject*other){}
 #define DEFINE_INT_COMPARE_FUNCTION(n,...) DeeObject*int_##n(DeeIntObject*self,size_t argc,DeeObject*const*argv){}
-#define DEFINE_DOCKWDSITERATOR_COMPARE(n,...) DeeObject*n(DocKwdsIterator*self,DocKwdsIterator*other){}
-#define DEFINE_CLSMEMBER_COMPARE(n,...) DeeObject*n(DeeClsMemberObject*self,DeeClsMemberObject*other){}
-#define DEFINE_HASHSETITERATOR_COMPARE(n,...) DeeObject*n(HashSetIterator*self,HashSetIterator*other){}
-#define DEFINE_GCSETITERATOR_COMPARE(n,...) DeeObject*n(GCSetIterator*self,GCSetIterator*other){}
 #define DEFINE_FLOAT_COMPARE(n,...) DeeObject*n(Float*self,DeeObject*other){}
 #define DEFINE_FLOAT_COMPARE_FUNCTION(n,...) DeeObject*float_##n(Float*self,size_t argc,DeeObject*const*argv){}
 #define DEFINE_FILE_CLASS_STD_FUNCTIONS(stdxxx,...) \
 	DeeObject*file_class_get_##stdxxx(DeeObject*self){}\
 	int file_class_del_##stdxxx(DeeObject*self){}\
 	int file_class_set_##stdxxx(DeeObject*self,DeeObject*value){}
-#define DEFINE_DICTITERATOR_COMPARE(n,...) DeeObject*n(DictIterator*self,DictIterator*other){}
-#define DEFINE_CLASSOPERATORTABLEITERATOR_COMPARE(n,...) DeeObject*n(ClassOperatorTableIterator*self,ClassOperatorTableIterator*other){}
 #define DEFINE_UNARY_INSTANCE_WRAPPER_FUNCTION(instance_txxx,instance_xxx,...) \
 	DeeObject*instance_txxx(DeeTypeObject*tp_self,DeeObject*self){}\
 	DeeObject*instance_xxx(DeeObject*self){}
@@ -1566,10 +1542,7 @@
 #define DEFINE_BINARY_INPLACE_INSTANCE_WRAPPER_FUNCTION(instance_txxx,instance_xxx,...) \
 	int instance_txxx(DeeTypeObject*tp_self,DeeObject**p_self,DeeObject*other){}\
 	int instance_xxx(DeeObject**p_self,DeeObject*other){}
-#define DEFINE_CELL_COMPARE(n,...) DeeObject*n(Cell*self,Cell*other){}
 #define DEFINE_BYTES_COMPARE(n,...) DeeObject*n(Bytes*self,DeeObject*other){}
-#define DEFINE_RODICTITERATOR_COMPARE(n,...) DeeObject*n(RoDictIterator*self,RoDictIterator*other){}
-#define DEFINE_ROSETITERATOR_COMPARE(n,...) DeeObject*n(RoSetIterator*self,RoSetIterator*other){}
 #define DEFINE_SEQITERATOR_COMPARE(n,...) DeeObject*n(SeqIterator*self,SeqIterator*other){}
 #define DEFINE_STRINGITERATOR_COMPARE(n,...) DeeObject*n(StringIterator*self,StringIterator*other){}
 #define DEFINE_TRACEITER_COMPARE(n,...) DeeObject*n(TraceIterator*self,TraceIterator*other){}

include/deemon/class.h

@@ -1010,6 +1010,12 @@ INTDEF struct type_gc Dee_tpconst instance_gc;
 /* Builtin (standard) operators for hashing and comparing class objects. */
 INTDEF WUNUSED NONNULL((1, 2)) Dee_hash_t DCALL instance_builtin_thash(DeeTypeObject *tp_self, DeeObject *__restrict self);
 INTDEF WUNUSED NONNULL((1)) Dee_hash_t DCALL instance_builtin_hash(DeeObject *__restrict self);
+INTDEF WUNUSED NONNULL((1, 2, 3)) int DCALL instance_builtin_tcompare(DeeTypeObject *tp_self, DeeObject *self, DeeObject *other);
+INTDEF WUNUSED NONNULL((1, 2)) int DCALL instance_builtin_compare(DeeObject *self, DeeObject *other);
+INTDEF WUNUSED NONNULL((1, 2, 3)) int DCALL instance_builtin_tcompare_eq(DeeTypeObject *tp_self, DeeObject *self, DeeObject *other);
+INTDEF WUNUSED NONNULL((1, 2)) int DCALL instance_builtin_compare_eq(DeeObject *self, DeeObject *other);
+INTDEF WUNUSED NONNULL((1, 2, 3)) int DCALL instance_builtin_ttrycompare_eq(DeeTypeObject *tp_self, DeeObject *self, DeeObject *other);
+INTDEF WUNUSED NONNULL((1, 2)) int DCALL instance_builtin_trycompare_eq(DeeObject *self, DeeObject *other);
 INTDEF WUNUSED NONNULL((1, 2, 3)) DREF DeeObject *DCALL instance_builtin_teq(DeeTypeObject *tp_self, DeeObject *self, DeeObject *other);
 INTDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *DCALL instance_builtin_eq(DeeObject *self, DeeObject *other);
 INTDEF WUNUSED NONNULL((1, 2, 3)) DREF DeeObject *DCALL instance_builtin_tne(DeeTypeObject *tp_self, DeeObject *self, DeeObject *other);
@@ -1336,6 +1342,18 @@ INTDEF WUNUSED NONNULL((1, 2)) dssize_t DCALL instance_enumattr(DeeTypeObject *t
 	 : (tp_hash) == &instance_builtin_hash                           \
 	   ? instance_builtin_thash(tp_self, self)                       \
 	   : (*(tp_hash))(self))
+#define DeeType_invoke_cmp_tp_compare_eq_NODEFAULT(tp_self, tp_compare_eq, self, other) \
+	((tp_compare_eq) == &instance_builtin_compare_eq                                    \
+	   ? instance_builtin_tcompare_eq(tp_self, self, other)                             \
+	   : (*(tp_compare_eq))(self, other))
+#define DeeType_invoke_cmp_tp_compare_NODEFAULT(tp_self, tp_compare, self, other) \
+	((tp_compare) == &instance_builtin_compare                                    \
+	   ? instance_builtin_tcompare(tp_self, self, other)                          \
+	   : (*(tp_compare))(self, other))
+#define DeeType_invoke_cmp_tp_trycompare_eq_NODEFAULT(tp_self, tp_trycompare_eq, self, other) \
+	((tp_trycompare_eq) == &instance_builtin_trycompare_eq                                    \
+	   ? instance_builtin_ttrycompare_eq(tp_self, self, other)                                \
+	   : (*(tp_trycompare_eq))(self, other))
 #define DeeType_invoke_cmp_tp_eq_NODEFAULT(tp_self, tp_eq, self, other) \
 	((tp_eq) == &instance_eq                                            \
 	 ? instance_teq(tp_self, self, other)                               \
@@ -1372,9 +1390,6 @@ INTDEF WUNUSED NONNULL((1, 2)) dssize_t DCALL instance_enumattr(DeeTypeObject *t
 	 : (tp_ge) == &instance_builtin_ge                                  \
 	   ? instance_builtin_tge(tp_self, self, other)                     \
 	   : (*(tp_ge))(self, other))
-#define DeeType_invoke_cmp_tp_compare_eq_NODEFAULT(tp_self, tp_compare_eq, self, other)       (*(tp_compare_eq))(self, other)
-#define DeeType_invoke_cmp_tp_compare_NODEFAULT(tp_self, tp_compare, self, other)             (*(tp_compare))(self, other)
-#define DeeType_invoke_cmp_tp_trycompare_eq_NODEFAULT(tp_self, tp_trycompare_eq, self, other) (*(tp_trycompare_eq))(self, other)
 #define DeeType_invoke_seq_tp_iter_NODEFAULT(tp_self, tp_iter, self) \
 	((tp_iter) == &instance_iter                                     \
 	 ? instance_titer(tp_self, self)                                 \

include/deemon/cxx/object.h

@@ -2919,7 +2919,7 @@ class Object
 	}
 
 	bool contains(DeeObject *value) {
-		return throw_if_negative(DeeObject_Contains(this, value)) > 0;
+		return throw_if_negative(DeeObject_ContainsAsBool(this, value)) > 0;
 	}
 	size_t size() {
 		return throw_if_minusone(DeeObject_Size(this));

include/deemon/dict.h

@@ -142,7 +142,7 @@ INTDEF WUNUSED NONNULL((1)) DREF DeeObject *DCALL DeeDict_ByHash(DeeObject *__re
 #define DeeDict_SetItemString(self, key, value)             DeeDict_SetItemStringHash(self, key, Dee_HashStr(key), value)
 #define DeeDict_SetItemStringLen(self, key, keylen, value)  DeeDict_SetItemStringLenHash(self, key, keylen, Dee_HashPtr(key, keylen), value)
 
-#define DeeDict_HasItem(self, key)        DeeObject_Contains(self, key)
+#define DeeDict_HasItem(self, key)        DeeObject_ContainsAsBool(self, key)
 #define DeeDict_GetItem(self, key)        DeeObject_GetItem(self, key)
 #define DeeDict_DelItem(self, key)        DeeObject_DelItem(self, key)
 #define DeeDict_SetItem(self, key, value) DeeObject_SetItem(self, key, value)

include/deemon/object.h

@@ -1922,7 +1922,7 @@ struct Dee_type_math {
 struct Dee_type_nii;
 struct Dee_type_cmp {
 	/* Compare operators. */
-	WUNUSED_T NONNULL_T((1))    Dee_hash_t      (DCALL *tp_hash)(DeeObject *__restrict self);
+	WUNUSED_T NONNULL_T((1)) Dee_hash_t (DCALL *tp_hash)(DeeObject *__restrict self);
 
 	/* Same as "tp_compare", but only needs to support equal/not-equal compare:
 	 * @return: Dee_COMPARE_ERR: An error occurred.
@@ -4596,9 +4596,9 @@ DFUNDEF WUNUSED NONNULL((1, 2)) int
 /* Sequence operator invocation. */
 DFUNDEF WUNUSED NONNULL((1)) size_t (DCALL DeeObject_Size)(DeeObject *__restrict self); /* @return: (size_t)-1: Error */
 DFUNDEF WUNUSED NONNULL((1)) size_t (DCALL DeeObject_SizeFast)(DeeObject *__restrict self); /* @return: (size_t)-1: Fast size cannot be determined */
-DFUNDEF WUNUSED NONNULL((1)) DREF DeeObject *(DCALL DeeObject_SizeObject)(DeeObject *__restrict self);
-DFUNDEF WUNUSED NONNULL((1, 2)) int (DCALL DeeObject_Contains)(DeeObject *self, DeeObject *some_object); /* @return: 1: found */
-DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_ContainsObject)(DeeObject *self, DeeObject *some_object);
+DFUNDEF WUNUSED NONNULL((1)) DREF DeeObject *(DCALL DeeObject_SizeOb)(DeeObject *__restrict self);
+DFUNDEF WUNUSED NONNULL((1, 2)) int (DCALL DeeObject_ContainsAsBool)(DeeObject *self, DeeObject *some_object); /* @return: 1: found */
+DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_Contains)(DeeObject *self, DeeObject *some_object);
 DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_GetItem)(DeeObject *self, DeeObject *index);
 DFUNDEF WUNUSED NONNULL((1)) DREF DeeObject *(DCALL DeeObject_GetItemIndex)(DeeObject *__restrict self, size_t index);
 DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_GetItemStringHash)(DeeObject *__restrict self, char const *__restrict key, Dee_hash_t hash);

include/deemon/super.h

@@ -152,10 +152,10 @@ DFUNDEF WUNUSED NONNULL((1, 2, 3)) Dee_ssize_t (DCALL DeeObject_TForeach)(DeeTyp
 DFUNDEF WUNUSED NONNULL((1, 2, 3)) Dee_ssize_t (DCALL DeeObject_TForeachPair)(DeeTypeObject *tp_self, DeeObject *self, Dee_foreach_pair_t proc, void *arg);
 DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_TIter)(DeeTypeObject *tp_self, DeeObject *self);
 DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_TIterNext)(DeeTypeObject *tp_self, DeeObject *self);
-DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_TSizeObject)(DeeTypeObject *tp_self, DeeObject *self);
+DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_TSizeOb)(DeeTypeObject *tp_self, DeeObject *self);
 DFUNDEF WUNUSED NONNULL((1, 2)) size_t (DCALL DeeObject_TSize)(DeeTypeObject *tp_self, DeeObject *self); /* @return: (size_t)-1: Error */
 DFUNDEF WUNUSED NONNULL((1, 2)) size_t (DCALL DeeObject_TSizeFast)(DeeTypeObject *tp_self, DeeObject *self); /* @return: (size_t)-1: Fast size cannot be determined */
-DFUNDEF WUNUSED NONNULL((1, 2, 3)) DREF DeeObject *(DCALL DeeObject_TContainsObject)(DeeTypeObject *tp_self, DeeObject *self, DeeObject *some_object);
+DFUNDEF WUNUSED NONNULL((1, 2, 3)) DREF DeeObject *(DCALL DeeObject_TContains)(DeeTypeObject *tp_self, DeeObject *self, DeeObject *some_object);
 DFUNDEF WUNUSED NONNULL((1, 2, 3)) DREF DeeObject *(DCALL DeeObject_TGetItem)(DeeTypeObject *tp_self, DeeObject *self, DeeObject *index);
 DFUNDEF WUNUSED NONNULL((1, 2)) DREF DeeObject *(DCALL DeeObject_TGetItemIndex)(DeeTypeObject *tp_self, DeeObject *self, size_t index);
 DFUNDEF WUNUSED NONNULL((1, 2, 3)) DREF DeeObject *(DCALL DeeObject_TGetItemStringHash)(DeeTypeObject *tp_self, DeeObject *self, char const *key, Dee_hash_t hash);

src/deemon/compiler/optimize/opt_action.c

@@ -408,7 +408,7 @@ INTERN WUNUSED NONNULL((1, 2)) int
 		if (self->a_action.a_act0->a_type == AST_CONSTEXPR &&
 		    self->a_action.a_act1->a_type == AST_CONSTEXPR) {
 			/* Propagate constants. */
-			expr_result = DeeObject_ContainsObject(self->a_action.a_act1->a_constexpr,
+			expr_result = DeeObject_Contains(self->a_action.a_act1->a_constexpr,
 			                                       self->a_action.a_act0->a_constexpr);
 action_set_expr_result:
 			if (!expr_result) {

src/deemon/execute/asm/exec.gas-386.S

@@ -5422,8 +5422,8 @@ target_leave:
 
 
 
-define_unary_op target_getsize, fSYM(DeeObject_SizeObject,4)
-define_binary_op target_contains, fSYM(DeeObject_ContainsObject,8)
+define_unary_op target_getsize, fSYM(DeeObject_SizeOb,4)
+define_binary_op target_contains, fSYM(DeeObject_Contains,8)
 define_binary_op target_getitem, fSYM(DeeObject_GetItem,8)
 
 
@@ -5537,7 +5537,7 @@ target_contains_c:
 	ADJUST_CFA_OFFSET(4)
 	pushl  (%ecx,%eax,4) /* Constant set. */
 	ADJUST_CFA_OFFSET(4)
-	call   fSYM(DeeObject_ContainsObject,8)
+	call   fSYM(DeeObject_Contains,8)
 	ADJUST_CFA_OFFSET(-8)
 	testl  %eax, %eax
 	jz     .except /* Check for errors. */

src/deemon/execute/code-exec.c.inl

@@ -3038,7 +3038,7 @@ do_fprint_c_nl:
 		/* Sequence operators. */
 		TARGET(ASM_GETSIZE, -1, +1) {
 			DREF DeeObject *object_size;
-			object_size = DeeObject_SizeObject(TOP);
+			object_size = DeeObject_SizeOb(TOP);
 			if unlikely(!object_size)
 				HANDLE_EXCEPT();
 			Dee_Decref(TOP);
@@ -3048,7 +3048,7 @@ do_fprint_c_nl:
 
 		TARGET(ASM_CONTAINS, -2, +1) {
 			DREF DeeObject *does_contain;
-			does_contain = DeeObject_ContainsObject(SECOND, FIRST);
+			does_contain = DeeObject_Contains(SECOND, FIRST);
 			if unlikely(!does_contain)
 				HANDLE_EXCEPT();
 			POPREF();
@@ -3063,7 +3063,7 @@ do_fprint_c_nl:
 do_contains_c:
 			ASSERT_USAGE(-1, +1);
 			ASSERT_CONSTimm();
-			value = DeeObject_ContainsObject(CONSTimm, TOP);
+			value = DeeObject_Contains(CONSTimm, TOP);
 			if unlikely(!value)
 				HANDLE_EXCEPT();
 			Dee_Decref(TOP);

src/deemon/linker-scripts/link-deemon-gcc-i386-cygwin.def

@@ -620,7 +620,7 @@ EXPORTS
 	_DeeObject_CompareKeyEq@12=DeeObject_CompareKeyEq@12
 	_DeeObject_ConcatInherited@8=DeeObject_ConcatInherited@8
 	_DeeObject_Contains@8=DeeObject_Contains@8
-	_DeeObject_ContainsObject@8=DeeObject_ContainsObject@8
+	_DeeObject_ContainsAsBool@8=DeeObject_ContainsAsBool@8
 	_DeeObject_Copy@4=DeeObject_Copy@4
 	_DeeObject_Dec@4=DeeObject_Dec@4
 	_DeeObject_DeepCopy@4=DeeObject_DeepCopy@4
@@ -760,7 +760,7 @@ EXPORTS
 	_DeeObject_ShrUInt8@8=DeeObject_ShrUInt8@8
 	_DeeObject_Size@4=DeeObject_Size@4
 	_DeeObject_SizeFast@4=DeeObject_SizeFast@4
-	_DeeObject_SizeObject@4=DeeObject_SizeObject@4
+	_DeeObject_SizeOb@4=DeeObject_SizeOb@4
 	_DeeObject_Str@4=DeeObject_Str@4
 	_DeeObject_Sub@8=DeeObject_Sub@8
 	_DeeObject_SubInt8@8=DeeObject_SubInt8@8
@@ -797,7 +797,7 @@ EXPORTS
 	_DeeObject_TCmpNe@12=DeeObject_TCmpNe@12
 	_DeeObject_TCompare@12=DeeObject_TCompare@12
 	_DeeObject_TCompareEq@12=DeeObject_TCompareEq@12
-	_DeeObject_TContainsObject@12=DeeObject_TContainsObject@12
+	_DeeObject_TContains@12=DeeObject_TContains@12
 	_DeeObject_TCopy@8=DeeObject_TCopy@8
 	_DeeObject_TDec@8=DeeObject_TDec@8
 	_DeeObject_TDeepCopy@8=DeeObject_TDeepCopy@8
@@ -903,7 +903,7 @@ EXPORTS
 	_DeeObject_TShr@12=DeeObject_TShr@12
 	_DeeObject_TSize@8=DeeObject_TSize@8
 	_DeeObject_TSizeFast@8=DeeObject_TSizeFast@8
-	_DeeObject_TSizeObject@8=DeeObject_TSizeObject@8
+	_DeeObject_TSizeOb@8=DeeObject_TSizeOb@8
 	_DeeObject_TStr@8=DeeObject_TStr@8
 	_DeeObject_TSub@12=DeeObject_TSub@12
 	_DeeObject_TThisCall@20=DeeObject_TThisCall@20

src/deemon/linker-scripts/link-deemon-msvc-i386-win32.def

@@ -620,7 +620,7 @@ EXPORTS
 	DeeObject_CompareKeyEq@12=_DeeObject_CompareKeyEq@12
 	DeeObject_ConcatInherited@8=_DeeObject_ConcatInherited@8
 	DeeObject_Contains@8=_DeeObject_Contains@8
-	DeeObject_ContainsObject@8=_DeeObject_ContainsObject@8
+	DeeObject_ContainsAsBool@8=_DeeObject_ContainsAsBool@8
 	DeeObject_Copy@4=_DeeObject_Copy@4
 	DeeObject_Dec@4=_DeeObject_Dec@4
 	DeeObject_DeepCopy@4=_DeeObject_DeepCopy@4
@@ -760,7 +760,7 @@ EXPORTS
 	DeeObject_ShrUInt8@8=_DeeObject_ShrUInt8@8
 	DeeObject_Size@4=_DeeObject_Size@4
 	DeeObject_SizeFast@4=_DeeObject_SizeFast@4
-	DeeObject_SizeObject@4=_DeeObject_SizeObject@4
+	DeeObject_SizeOb@4=_DeeObject_SizeOb@4
 	DeeObject_Str@4=_DeeObject_Str@4
 	DeeObject_Sub@8=_DeeObject_Sub@8
 	DeeObject_SubInt8@8=_DeeObject_SubInt8@8
@@ -797,7 +797,7 @@ EXPORTS
 	DeeObject_TCmpNe@12=_DeeObject_TCmpNe@12
 	DeeObject_TCompare@12=_DeeObject_TCompare@12
 	DeeObject_TCompareEq@12=_DeeObject_TCompareEq@12
-	DeeObject_TContainsObject@12=_DeeObject_TContainsObject@12
+	DeeObject_TContains@12=_DeeObject_TContains@12
 	DeeObject_TCopy@8=_DeeObject_TCopy@8
 	DeeObject_TDec@8=_DeeObject_TDec@8
 	DeeObject_TDeepCopy@8=_DeeObject_TDeepCopy@8
@@ -903,7 +903,7 @@ EXPORTS
 	DeeObject_TShr@12=_DeeObject_TShr@12
 	DeeObject_TSize@8=_DeeObject_TSize@8
 	DeeObject_TSizeFast@8=_DeeObject_TSizeFast@8
-	DeeObject_TSizeObject@8=_DeeObject_TSizeObject@8
+	DeeObject_TSizeOb@8=_DeeObject_TSizeOb@8
 	DeeObject_TStr@8=_DeeObject_TStr@8
 	DeeObject_TSub@12=_DeeObject_TSub@12
 	DeeObject_TThisCall@20=_DeeObject_TThisCall@20