}
if(!firstTag)
firstTag = tag;
- mylog(" %08x(%d) taglist_getTAGs: added tag %08x", (int)self, self->ob_refcnt, tag);
}
Py_DECREF(tagmap);
return firstTag;
static void taglist_dealloc(PyObject* self)
{
TagListObject*taglist = (TagListObject*)self;
- mylog("-%08x(%d) taglist_dealloc\n", (int)self, self->ob_refcnt);
+ mylog("-%08x(%d) taglist_dealloc list=%08x(%d)\n", (int)self, self->ob_refcnt, taglist->taglist, taglist->taglist->ob_refcnt);
Py_DECREF(taglist->taglist);
taglist->taglist = 0;
PyObject_Del(self);
PyObject*tag = 0;
PY_ASSERT_TYPE(self, &TagListClass);
TagListObject*taglist = (TagListObject*)self;
- mylog(" %08x(%d) taglist_concat %08x", (int)self, self->ob_refcnt, list);
+ mylog(" %08x(%d) taglist_concat %08x(%d)", (int)self, self->ob_refcnt, list, list->ob_refcnt);
if (PyArg_Parse(list, "O!", &TagClass, &tag)) {
- mylog(" %08x(%d) taglist_concat: Tag %08x", (int)self, self->ob_refcnt, tag);
list = tag_getDependencies(tag);
int l = PyList_Size(list);
int t;
- mylog(" %08x(%d) taglist_concat: Tag: %d dependencies", (int)self, self->ob_refcnt, l);
for(t=0;t<l;t++) {
PyObject*item = PyList_GetItem(list, t);
PyObject*_self = taglist_concat(self, item);
self = _self;
}
if(!taglist_contains(self, tag)) {
- mylog(" %08x(%d) taglist_concat: Adding Tag %08x", (int)self, self->ob_refcnt, tag);
+ mylog(" %08x(%d) taglist_concat: Adding Tag %08x(%d)", (int)self, self->ob_refcnt, tag, tag->ob_refcnt);
PyList_Append(taglist->taglist, tag);
+ } else {
+ mylog(" %08x(%d) taglist_concat: Already contains Tag %08x(%d)", (int)self, self->ob_refcnt, tag, tag->ob_refcnt);
}
- mylog(" %08x(%d) taglist_concat: done", (int)self, self->ob_refcnt);
Py_INCREF(self);
return self;
/* copy tag, so we don't have to do INCREF(tag) (and don't
if (PyList_Check(list)) {
int l = PyList_Size(list);
int t;
- mylog(" %08x(%d) taglist_concat: List", (int)self, self->ob_refcnt);
for(t=0;t<l;t++) {
PyObject*item = PyList_GetItem(list, t);
if(!PY_CHECK_TYPE(item, &TagClass)) {
}
PyErr_Clear();
if (PY_CHECK_TYPE(list, &TagListClass)) {
- mylog(" %08x(%d) taglist_concat: TagList", (int)self, self->ob_refcnt);
TagListObject*taglist2 = (TagListObject*)list;
return taglist_concat(self, taglist2->taglist);
sq_ass_slice: 0, // x[i:j] = v intintobjargproc
sq_contains: taglist_contains, //???
};
-static PyTypeObject TagListClass =
+PyTypeObject TagListClass =
{
PyObject_HEAD_INIT(NULL)
0,