@@ -69,8 +69,6 @@ static PyObject *read_bool(Reader *reader);
6969static PyObject * read_string (Reader * reader );
7070static PyObject * read_TypelessData (Reader * reader );
7171
72- static uint32_t hash_string (const char * str );
73-
7472static read_type getReadFunction (int hash_value , int * index );
7573static PyObject * getSubNodes (PyObject * nodes , int * index );
7674
@@ -92,8 +90,7 @@ static inline uint32_t hash_str(const char *str)
9290static inline void initReadFuncOrNodes (PyObject * nodes , int * index , PyObject * * subnodes , read_type * func , char * subalign )
9391{
9492 TypeTreeNodeObject * node = (TypeTreeNodeObject * )PyList_GetItem (nodes , * index );
95- uint32_t hash = hash_str (node -> m_Type );
96- * func = getReadFunction (hash , index );
93+ * func = getReadFunction (node -> typehash , index );
9794 if (* func == NULL )
9895 {
9996 * subnodes = getSubNodes (nodes , index );
@@ -391,7 +388,7 @@ static PyObject *TypeTreeHelper_ReadValue(PyObject *nodes, Reader *reader, int *
391388 char align = (node -> m_MetaFlag & kAlignBytesFlag ) ? 1 : 0 ;
392389 // printf("RVa: %d\t%lld\t%s\t%s\t%d\t%d\n", *index, (reader->data - reader->dataStart), node->m_Name, node->m_Type, align, node->m_MetaFlag);
393390
394- int hash_value = hash_str ( node -> m_Type ) ;
391+ int hash_value = node -> typehash ;
395392 read_type func = getReadFunction (hash_value , index );
396393 if (func )
397394 {
@@ -620,10 +617,10 @@ TypeTreeNode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
620617 self -> m_ByteSize = 0 ;
621618 self -> m_Index = 0 ;
622619 self -> m_MetaFlag = 0 ;
623- self -> m_Type = NULL ;
624- self -> m_Name = NULL ;
625- // self->m_Type[0] = '\0';
626- // self->m_Name[0] = '\0';
620+ self -> m_Type = PyMem_Malloc ( sizeof ( char )) ;
621+ self -> m_Name = PyMem_Malloc ( sizeof ( char )) ;
622+ self -> m_Type [0 ] = '\0' ;
623+ self -> m_Name [0 ] = '\0' ;
627624 // self->children_count = 0;
628625 // self->children = NULL;
629626 self -> m_TypeStrOffset = 0 ;
@@ -673,20 +670,66 @@ TypeTreeNode_init(TypeTreeNodeObject *self, PyObject *args, PyObject *kwds)
673670 return -1 ;
674671 if (type != NULL )
675672 {
673+ PyMem_Free (self -> m_Type );
676674 self -> m_Type = PyMem_Malloc (strlen (type ) + 1 );
677675 strcpy (self -> m_Type , type );
676+ self -> typehash = hash_str (type );
678677 }
679678 if (name != NULL )
680679 {
680+ PyMem_Free (self -> m_Name );
681681 self -> m_Name = PyMem_Malloc (strlen (name ) + 1 );
682682 strcpy (self -> m_Name , name );
683683 }
684684 return 0 ;
685685};
686686
687+ static PyObject *
688+ TypeTreeNode_getType (TypeTreeNodeObject * self , void * closure )
689+ {
690+ return PyUnicode_DecodeUTF8 (self -> m_Type , strlen (self -> m_Type ), SURROGATEESCAPE );
691+ }
692+
693+ static int
694+ TypeTreeNode_setType (TypeTreeNodeObject * self , PyObject * value , void * closure )
695+ {
696+ if (!PyUnicode_Check (value ))
697+ {
698+ PyErr_SetString (PyExc_TypeError , "The type attribute value must be a string" );
699+ return NULL ;
700+ }
701+ PyMem_Free (self -> m_Type );
702+ char * type = PyUnicode_AsUTF8 (value );
703+ self -> m_Type = PyMem_Malloc (strlen (type ) + 1 );
704+ strcpy (self -> m_Type , type );
705+ self -> typehash = hash_str (type );
706+ return 0 ;
707+ }
708+
709+ static PyObject *
710+ TypeTreeNode_getName (TypeTreeNodeObject * self , void * closure )
711+ {
712+ return PyUnicode_DecodeUTF8 (self -> m_Name , strlen (self -> m_Name ), SURROGATEESCAPE );
713+ }
714+
715+ static int
716+ TypeTreeNode_setName (TypeTreeNodeObject * self , PyObject * value , void * closure )
717+ {
718+ if (!PyUnicode_Check (value ))
719+ {
720+ PyErr_SetString (PyExc_TypeError , "The name attribute value must be a string" );
721+ return NULL ;
722+ }
723+ PyMem_Free (self -> m_Name );
724+ char * name = PyUnicode_AsUTF8 (value );
725+ self -> m_Name = PyMem_Malloc (strlen (name ) + 1 );
726+ strcpy (self -> m_Name , name );
727+ return 0 ;
728+ }
729+
687730static PyMemberDef TypeTreeNode_members [] = {
688- {"m_Type" , T_STRING , offsetof(TypeTreeNodeObject , m_Type ), 0 , "" },
689- {"m_Name" , T_STRING , offsetof(TypeTreeNodeObject , m_Name ), 0 , "" },
731+ // {"m_Type", T_STRING, offsetof(TypeTreeNodeObject, m_Type), 0, ""},
732+ // {"m_Name", T_STRING, offsetof(TypeTreeNodeObject, m_Name), 0, ""},
690733 {"m_ByteSize" , T_INT , offsetof(TypeTreeNodeObject , m_ByteSize ), 0 , "" },
691734 {"m_Index" , T_INT , offsetof(TypeTreeNodeObject , m_Index ), 0 , "" },
692735 {"m_IsArray" , T_BOOL , offsetof(TypeTreeNodeObject , m_IsArray ), 0 , "" },
@@ -700,6 +743,14 @@ static PyMemberDef TypeTreeNode_members[] = {
700743 {NULL } /* Sentinel */
701744};
702745
746+ static PyGetSetDef TypeTreeNode_getsetters [] = {
747+ {"m_Type" , (getter )TypeTreeNode_getType , (setter )TypeTreeNode_setType ,
748+ "" , NULL },
749+ {"m_Name" , (getter )TypeTreeNode_getName , (setter )TypeTreeNode_setName ,
750+ "" , NULL },
751+ {NULL } /* Sentinel */
752+ };
753+
703754static PyObject *
704755TypeTreeNode_repr (PyObject * self )
705756{
@@ -708,8 +759,7 @@ TypeTreeNode_repr(PyObject *self)
708759 "<TypeTreeNode %d %s %s>" ,
709760 node -> m_Level ,
710761 node -> m_Type ,
711- node -> m_Name
712- );
762+ node -> m_Name );
713763}
714764
715765// PyTypeObject TypeTreeNodeType;
@@ -766,6 +816,7 @@ PyTypeObject TypeTreeNodeType = {
766816 .tp_init = (initproc )TypeTreeNode_init ,
767817 .tp_dealloc = (destructor )TypeTreeNode_dealloc ,
768818 .tp_members = TypeTreeNode_members ,
819+ .tp_getset = TypeTreeNode_getsetters ,
769820 .tp_repr = (reprfunc )TypeTreeNode_repr ,
770821};
771822
0 commit comments