X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2Ftaglist.c;h=7e101c8457f01e0fa400766c958a69530ce896f2;hb=6d72eaadfcc19eb917ca15ada059210e2b63a91f;hp=27b3a6662ea48777cbf9bb7582ce40e1bedf417a;hpb=726d172d02228a2e9b084efba8d3173994343c2b;p=swftools.git diff --git a/lib/python/taglist.c b/lib/python/taglist.c index 27b3a66..7e101c8 100644 --- a/lib/python/taglist.c +++ b/lib/python/taglist.c @@ -13,14 +13,12 @@ typedef struct { PyObject_HEAD PyObject* taglist; - PyObject* tagmap; } TagListObject; //---------------------------------------------------------------------------- PyObject * taglist_new() { TagListObject* taglist = PyObject_New(TagListObject, &TagListClass); - mylog("+%08x(%d) taglist_new2", (int)taglist, taglist->ob_refcnt); - taglist->tagmap = tagmap_new(); + mylog("+%08x(%d) taglist_new", (int)taglist, taglist->ob_refcnt); taglist->taglist = PyList_New(0); return (PyObject*)taglist; } @@ -28,30 +26,46 @@ PyObject * taglist_new() PyObject * taglist_new2(TAG*tag) { TagListObject* taglist = PyObject_New(TagListObject, &TagListClass); - mylog("+%08x(%d) taglist_new2", (int)taglist, taglist->ob_refcnt); - taglist->tagmap = tagmap_new(); + mylog("+%08x(%d) taglist_new2 tag=%08x", (int)taglist, taglist->ob_refcnt, tag); + PyObject* tagmap = tagmap_new(); - int nr=0; + int nr=0, len=0; TAG*t = tag; - while(t) {nr++;t=t->next;} - taglist->taglist = PyList_New(nr); + TAG*last = t; + while(t) {len++;last=t;t=t->next;} + if(last && last->id==ST_END) { + swf_DeleteTag(last); last = 0; + len--; + if(len==0) tag = 0; + } + + taglist->taglist = PyList_New(len); + nr = 0; t = tag; while(t) { - PyObject*newtag = tag_new(tag); + PyObject*newtag = tag_new2(t, tagmap); + if(newtag==NULL) { + // pass through exception + Py_DECREF(tagmap); + return NULL; + } PyList_SET_ITEM(taglist->taglist,nr,newtag);Py_INCREF(newtag); if(swf_isDefiningTag(t)) { - tagmap_add(taglist->tagmap, newtag); + int id = swf_GetDefineID(t); + tagmap_addMapping(tagmap, id, newtag); } nr++; t=t->next; } + Py_DECREF(tagmap); return (PyObject*)taglist; } //---------------------------------------------------------------------------- TAG* taglist_getTAGs(PyObject*self) { + PyObject* tagmap = tagmap_new(); if(!PY_CHECK_TYPE(self,&TagListClass)) { PyErr_SetString(PyExc_Exception, setError("Not a taglist (%08x).", self)); return 0; @@ -67,10 +81,16 @@ TAG* taglist_getTAGs(PyObject*self) mylog(" %08x(%d) taglist_getTAGs", (int)self, self->ob_refcnt); for(t=0;ttaglist, t); - tag = tag_getTAG(item, tag, taglist->tagmap); + tag = tag_getTAG(item, tag, tagmap); + if(!tag) { + //pass through errors + Py_DECREF(tagmap); + return 0; + } if(!firstTag) firstTag = tag; } + Py_DECREF(tagmap); return firstTag; } //---------------------------------------------------------------------------- @@ -119,11 +139,9 @@ static PyObject * taglist_optimizeOrder(PyObject* self, PyObject* args) 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; - Py_DECREF(taglist->tagmap); - taglist->tagmap= 0; PyObject_Del(self); } //---------------------------------------------------------------------------- @@ -150,7 +168,7 @@ static int taglist_length(PyObject * self) //---------------------------------------------------------------------------- static int taglist_contains(PyObject * self, PyObject * tag) { - mylog(" %08x(%d) taglist_contains %08x", (int)self, self->ob_refcnt, tag); + /* TODO: optimize! */ TagListObject*taglist = (TagListObject*)self; PyObject*list = taglist->taglist; int l = PyList_Size(list); @@ -158,11 +176,9 @@ static int taglist_contains(PyObject * self, PyObject * tag) for(t=0;tob_refcnt); return 1; } } - mylog(" %08x(%d) taglist_contains: no", (int)self, self->ob_refcnt); return 0; } //---------------------------------------------------------------------------- @@ -171,14 +187,12 @@ static PyObject * taglist_concat(PyObject * self, PyObject* list) 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;tob_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 @@ -219,7 +234,6 @@ static PyObject * taglist_concat(PyObject * self, PyObject* list) 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;tob_refcnt); TagListObject*taglist2 = (TagListObject*)list; return taglist_concat(self, taglist2->taglist); @@ -261,7 +274,7 @@ static PyObject * taglist_item(PyObject * self, int index) PyObject*tag; mylog(" %08x(%d) taglist_item(%d)", (int)self, self->ob_refcnt, index); tag = PyList_GetItem(taglist->taglist, index); - Py_INCREF(tag); //TODO-REF + Py_INCREF(tag); return tag; } static PySequenceMethods taglist_as_sequence = @@ -275,7 +288,7 @@ static PySequenceMethods taglist_as_sequence = sq_ass_slice: 0, // x[i:j] = v intintobjargproc sq_contains: taglist_contains, //??? }; -static PyTypeObject TagListClass = +PyTypeObject TagListClass = { PyObject_HEAD_INIT(NULL) 0,