PyObject* taglist;
} TagListObject;
//----------------------------------------------------------------------------
+static void taglist_showcontents(PyObject* self)
+{
+ TagListObject*taglist = (TagListObject*)self;
+ int t, l = PyList_Size(taglist->taglist);
+ for(t=0;t<l;t++) {
+ PyObject*item = PyList_GetItem(taglist->taglist, t);
+ mylog(" %08x(%d) taglist_showcontents item=%08x(%d)\n", (int)self, self->ob_refcnt, item, item->ob_refcnt);
+ }
+}
+//----------------------------------------------------------------------------
PyObject * taglist_new()
{
TagListObject* taglist = PyObject_New(TagListObject, &TagListClass);
mylog("+%08x(%d) taglist_new2 tag=%08x", (int)taglist, taglist->ob_refcnt, tag);
PyObject* tagmap = tagmap_new();
- swf_FoldAllTags(tag);
-
- int nr=0;
+ int nr=0, len=0;
TAG*t = tag;
TAG*last = t;
- while(t) {nr++;last=t;t=t->next;}
+ while(t) {len++;last=t;t=t->next;}
if(last && last->id==ST_END) {
- swf_DeleteTag(last);
- nr--;
+ swf_DeleteTag(last); last = 0;
+ len--;
+ if(len==0) tag = 0;
}
- taglist->taglist = PyList_New(nr);
+ taglist->taglist = PyList_New(len);
- mylog("+%08x(%d) taglist_new2: %d items", (int)taglist, taglist->ob_refcnt, nr);
-
nr = 0;
t = tag;
while(t) {
}
nr++;
t=t->next;
+ Py_DECREF(newtag);
}
Py_DECREF(tagmap);
return (PyObject*)taglist;
TAG* taglist_getTAGs(PyObject*self)
{
PyObject* tagmap = tagmap_new();
+ TAG* tag = taglist_getTAGs2(self, tagmap, 1);
+ Py_DECREF(tagmap);
+ return tag;
+}
+//----------------------------------------------------------------------------
+TAG* taglist_getTAGs2(PyObject*self, PyObject*tagmap, int addDependencies)
+{
if(!PY_CHECK_TYPE(self,&TagListClass)) {
PyErr_SetString(PyExc_Exception, setError("Not a taglist (%08x).", self));
return 0;
mylog(" %08x(%d) taglist_getTAGs", (int)self, self->ob_refcnt);
for(t=0;t<l;t++) {
PyObject*item = PyList_GetItem(taglist->taglist, t);
- tag = tag_getTAG(item, tag, tagmap);
- if(!tag) {
- //pass through errors
- Py_DECREF(tagmap);
- return 0;
+ if(addDependencies) {
+ PyObject* deps = tag_getDependencies(item);
+ int l = PyList_Size(deps);
+ int t;
+ for(t=0;t<l;t++) {
+ PyObject*item = PyList_GetItem(deps, t);
+ if(tagmap_obj2id(tagmap, item)<0) {
+ /*PyObject*_self = taglist_concat(self, item);
+ Py_DECREF(self);
+ self = _self;*/
+ tag = tag_getTAG(item, tag, tagmap);
+ if(!tag) { return 0; }
+ if(!firstTag)
+ firstTag = tag;
+ }
+ }
}
+
+ tag = tag_getTAG(item, tag, tagmap);
+ if(!tag) { /* pass through errors */ return 0; }
+
if(!firstTag)
firstTag = tag;
}
- Py_DECREF(tagmap);
return firstTag;
}
//----------------------------------------------------------------------------
return PY_NONE;
}
//----------------------------------------------------------------------------
-static void taglist_dealloc(PyObject* self)
-{
- TagListObject*taglist = (TagListObject*)self;
- 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);
-}
-//----------------------------------------------------------------------------
static PyMethodDef taglist_functions[] =
{{"foldAll", taglist_foldAll, METH_VARARGS, "fold all sprites (movieclips) in the list"},
{"unfoldAll", taglist_unfoldAll, METH_VARARGS, "unfold (expand) all sprites (movieclips) in the list"},
mylog(" %08x(%d) taglist_concat %08x(%d)", (int)self, self->ob_refcnt, list, list->ob_refcnt);
if (PyArg_Parse(list, "O!", &TagClass, &tag)) {
- list = tag_getDependencies(tag);
- int l = PyList_Size(list);
- int t;
- for(t=0;t<l;t++) {
- PyObject*item = PyList_GetItem(list, t);
- PyObject*_self = taglist_concat(self, item);
- Py_DECREF(self);
- self = _self;
- }
if(!taglist_contains(self, tag)) {
mylog(" %08x(%d) taglist_concat: Adding Tag %08x(%d)", (int)self, self->ob_refcnt, tag, tag->ob_refcnt);
PyList_Append(taglist->taglist, tag);
Py_INCREF(tag);
return tag;
}
+//----------------------------------------------------------------------------
+static void taglist_dealloc(PyObject* self)
+{
+ TagListObject*taglist = (TagListObject*)self;
+ 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);
+}
+//----------------------------------------------------------------------------
static PySequenceMethods taglist_as_sequence =
{
sq_length: taglist_length, // len(obj)