#include "primitives.h"
#include "action.h"
#include "tag.h"
+#include "tagmap.h"
#include "taglist.h"
//----------------------------------------------------------------------------
typedef struct {
PyObject_HEAD
- TAG*firstTag;
- TAG*searchTag;
- TAG*lastTag;
- PyDictObject* char2id;
- PyDictObject* id2char;
- U16 currentID;
+ 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);
- taglist->firstTag = 0;
- taglist->searchTag = 0;
- taglist->lastTag = 0;
- taglist->currentID = 1;
- taglist->char2id = (PyDictObject*)PyDict_New();
- taglist->id2char = (PyDictObject*)PyDict_New();
+ mylog("+%08x(%d) taglist_new", (int)taglist, taglist->ob_refcnt);
+ taglist->taglist = PyList_New(0);
return (PyObject*)taglist;
}
+//----------------------------------------------------------------------------
PyObject * taglist_new2(TAG*tag)
{
TagListObject* taglist = PyObject_New(TagListObject, &TagListClass);
- taglist->firstTag = tag;
- taglist->searchTag = tag;
- taglist->lastTag = tag;
- while(taglist->lastTag->next)
- taglist->lastTag = taglist->lastTag->next;
- taglist->currentID = 1;
- taglist->char2id = (PyDictObject*)PyDict_New();
- taglist->id2char = (PyDictObject*)PyDict_New();
+ mylog("+%08x(%d) taglist_new2 tag=%08x", (int)taglist, taglist->ob_refcnt, tag);
+ PyObject* tagmap = tagmap_new();
+
+ int nr=0, len=0;
+ TAG*t = tag;
+ TAG*last = t;
+ while(t) {len++;last=t;t=t->next;}
+
+ if(last && last->id==ST_END) {
+ swf_DeleteTag(0, last); last = 0;
+ len--;
+ if(len==0) tag = 0;
+ }
+
+ taglist->taglist = PyList_New(len);
+
+ nr = 0;
+ t = tag;
+ while(t) {
+ 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)) {
+ int id = swf_GetDefineID(t);
+ tagmap_addMapping(tagmap, id, newtag);
+ }
+ nr++;
+ t=t->next;
+ Py_DECREF(newtag);
+ }
+ Py_DECREF(tagmap);
return (PyObject*)taglist;
}
-TAG* taglist_getTAGs(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)
{
- // TODO: checking!
- return ((TagListObject*)taglist)->firstTag;
+ if(!PY_CHECK_TYPE(self,&TagListClass)) {
+ PyErr_SetString(PyExc_Exception, setError("Not a taglist (%08x).", self));
+ return 0;
+ }
+ TagListObject*taglist = (TagListObject*)self;
+
+ /* TODO: the tags will be modified by this. We should set mutexes. */
+
+ int l = PyList_Size(taglist->taglist);
+ int t;
+ TAG* tag = 0;
+ TAG* firstTag = 0;
+ mylog(" %08x(%d) taglist_getTAGs", (int)self, self->ob_refcnt);
+ for(t=0;t<l;t++) {
+ PyObject*item = PyList_GetItem(taglist->taglist, t);
+ 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;
+ }
+ return firstTag;
}
//----------------------------------------------------------------------------
static PyObject * taglist_foldAll(PyObject* self, PyObject* args)
{
- SWF swf;
+/* SWF swf;
TagListObject*taglist = (TagListObject*)self;
if(!self || !PyArg_ParseTuple(args,""))
return NULL;
swf_FoldAll(&swf);
taglist->firstTag = swf.firstTag;
taglist->lastTag = 0; // FIXME
- taglist->searchTag = 0;
+ taglist->searchTag = 0;*/
return PY_NONE;
}
//----------------------------------------------------------------------------
static PyObject * taglist_unfoldAll(PyObject* self, PyObject* args)
{
SWF swf;
- TagListObject*taglist = (TagListObject*)self;
+/* TagListObject*taglist = (TagListObject*)self;
if(!self || !PyArg_ParseTuple(args,""))
return NULL;
swf.firstTag = taglist->firstTag;
swf_UnFoldAll(&swf);
taglist->firstTag = swf.firstTag;
taglist->lastTag = 0; // FIXME
- taglist->searchTag = 0;
+ taglist->searchTag = 0;*/
return PY_NONE;
}
//----------------------------------------------------------------------------
static PyObject * taglist_optimizeOrder(PyObject* self, PyObject* args)
{
SWF swf;
- TagListObject*taglist = (TagListObject*)self;
+/* TagListObject*taglist = (TagListObject*)self;
if(!self || !PyArg_ParseTuple(args,""))
return NULL;
swf.firstTag = taglist->firstTag;
swf_UnFoldAll(&swf);
taglist->firstTag = swf.firstTag;
taglist->lastTag = 0; // FIXME
- taglist->searchTag = 0;
+ taglist->searchTag = 0;*/
return PY_NONE;
}
//----------------------------------------------------------------------------
-static void taglist_dealloc(PyObject* self)
-{
- TagListObject*taglist = (TagListObject*)self;
- SWF swf;
- mylog("taglist_dealloc %08x(%d)\n", (int)self, self->ob_refcnt);
- swf.firstTag = taglist->firstTag;
- swf_FreeTags(&swf);
- taglist->firstTag = 0;
- taglist->lastTag = 0;
- taglist->searchTag = 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"},
static PyObject* taglist_getattr(PyObject * self, char* a)
{
PyObject* ret = Py_FindMethod(taglist_functions, self, a);
- mylog("taglist_getattr %08x(%d) %s: %08x\n", (int)self, self->ob_refcnt, a, ret);
+ mylog(" %08x(%d) taglist_getattr %s: %08x\n", (int)self, self->ob_refcnt, a, ret);
return ret;
}
//----------------------------------------------------------------------------
static int taglist_length(PyObject * self)
{
TagListObject*tags = (TagListObject*)self;
- TAG*tag;
- int l = 0;
- mylog("taglist_length %08x(%d)", (int)self, self->ob_refcnt);
- tag = tags->firstTag;
- while(tag) {
- l++;
- tag = tag->next;
+ mylog(" %08x(%d) taglist_length", (int)self, self->ob_refcnt);
+ return PyList_GET_SIZE(tags->taglist);
+}
+//----------------------------------------------------------------------------
+static int taglist_contains(PyObject * self, PyObject * tag)
+{
+ /* TODO: optimize! */
+ TagListObject*taglist = (TagListObject*)self;
+ PyObject*list = taglist->taglist;
+ int l = PyList_Size(list);
+ int t;
+ for(t=0;t<l;t++) {
+ PyObject*item = PyList_GetItem(list, t);
+ if(item == tag) {
+ return 1;
+ }
}
- return l;
+ return 0;
}
//----------------------------------------------------------------------------
static PyObject * taglist_concat(PyObject * self, PyObject* list)
{
PyObject*tag = 0;
+ PY_ASSERT_TYPE(self, &TagListClass);
TagListObject*taglist = (TagListObject*)self;
- mylog("taglist_concat %08x(%d) %08x", (int)self, self->ob_refcnt, list);
+ mylog(" %08x(%d) taglist_concat %08x(%d)", (int)self, self->ob_refcnt, list, list->ob_refcnt);
- /* TODO: rewrite */
-
if (PyArg_Parse(list, "O!", &TagClass, &tag)) {
+ 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);
+ } else {
+ mylog(" %08x(%d) taglist_concat: Already contains Tag %08x(%d)", (int)self, self->ob_refcnt, tag, tag->ob_refcnt);
+ }
+ Py_INCREF(self);
+ return self;
/* copy tag, so we don't have to do INCREF(tag) (and don't
get problems if the tag is appended to more than one
taglist) */
/* TODO: handle IDs */
+ /*
+ TAG*t = tag_getTAG(tag);
+ TAG*nt = 0;
mylog("taglist_concat: Tag", (int)self, self->ob_refcnt);
- taglist->lastTag = swf_InsertTag(taglist->lastTag, tag_getTAG(tag)->id);
- swf_SetBlock(taglist->lastTag, tag_getTAG(tag)->data, tag_getTAG(tag)->len);
- if(!taglist->firstTag) {
- taglist->firstTag = taglist->searchTag = taglist->lastTag;
- }
- if(swf_isDefiningTag(tag_getTAG(tag))) {
- PyObject*id = PyLong_FromLong(taglist->currentID);
+ // copy tag
+ nt = swf_InsertTag(0, t->id);
+ swf_SetBlock(nt,t->data,t->len);
+ PyObject*newtag = tag_new(taglist->swf, nt);
+ if(swf_isDefiningTag(t)) {
+ int id = swf_GetDefineID(t);
+ PyObject*id = PyLong_FromLong(id);
PyDict_SetItem((PyObject*)(taglist->char2id), list, id);
Py_INCREF(id);
PyDict_SetItem((PyObject*)(taglist->id2char), id, list);
Py_INCREF(id);
}
Py_INCREF(self);
- return self;
+ return self;*/
}
PyErr_Clear();
if (PyList_Check(list)) {
int l = PyList_Size(list);
int t;
- mylog("taglist_concat: PythonList", (int)self, self->ob_refcnt);
for(t=0;t<l;t++) {
PyObject*item = PyList_GetItem(list, t);
- self = taglist_concat(self, item);
+ if(!PY_CHECK_TYPE(item, &TagClass)) {
+ PyErr_SetString(PyExc_Exception, setError("taglist concatenation only works with tags and lists (%08x).", list));
+ return 0;
+ }
+ PyObject*_self = taglist_concat(self, item);
+ Py_DECREF(self);
+ self = _self;
if(!self)
return 0;
}
Py_INCREF(self);
return self;
}
+ PyErr_Clear();
+ if (PY_CHECK_TYPE(list, &TagListClass)) {
+ TagListObject*taglist2 = (TagListObject*)list;
+ return taglist_concat(self, taglist2->taglist);
+
+ /*TAG* tags = taglist_getTAGs(self);
+ TAG* tags2 = taglist_getTAGs(list);
+ TAG* tags3;
+ tags3 = swf_Concatenate(tags,tags2);
+ PyObject* newtaglist = taglist_new(tags3);
+ swf_FreeTags(tags3);
+ Py_INCREF(newtaglist);*/
+ }
+ PyErr_Clear();
+
PyErr_SetString(PyExc_Exception, setError("taglist concatenation only works with tags and lists (%08x).", list));
return 0;
}
static PyObject * taglist_item(PyObject * self, int index)
{
TagListObject*taglist = (TagListObject*)self;
- TAG*tag;
- PyObject*tagobject;
- int i = 0;
- mylog("taglist_item %08x(%d) [%d]", (int)self, self->ob_refcnt, index);
-
- if(index<0) {
- PyErr_SetString(PyExc_Exception, setError("Negative Indices not supported."));
- return NULL;
- }
-
- tag = taglist->firstTag;
- while(tag && i<index) {
- tag = tag->next;
- i++;
- }
- if(!tag || i != index) {
- if(index> i+10) {
- PyErr_SetString(PyExc_Exception, setError("No Tag at position %d", index));
- return NULL;
- }
-
- mylog("taglist_item %08x(%d)->IndexError (%d)", (int)self, self->ob_refcnt, index);
-
- Py_INCREF(PyExc_IndexError);
- PyErr_SetObject(PyExc_IndexError, Py_None);
- return NULL;
- }
-
- tagobject = tag_new2(tag);
- return (PyObject*)tagobject;
+ PyObject*tag;
+ tag = PyList_GetItem(taglist->taglist, index);
+ if(!tag)
+ return 0;
+ mylog(" %08x(%d) taglist_item(%d): %08x", (int)self, self->ob_refcnt, index, 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)
sq_slice: 0, // x[i:j] intintargfunc
sq_ass_item: 0, // x[i] = y intobjargproc
sq_ass_slice: 0, // x[i:j] = v intintobjargproc
- sq_contains: 0, //???
+ sq_contains: taglist_contains, //???
};
-static PyTypeObject TagListClass =
+PyTypeObject TagListClass =
{
PyObject_HEAD_INIT(NULL)
0,
git.asbjorn.biz / swftools.git / blobdiff