Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25536
Modified Files: Tag: desiredata kernel.c m_pd.h Log Message: moved struct t_hash to header
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.62 retrieving revision 1.4.4.11.2.33.2.63 diff -C2 -d -r1.4.4.11.2.33.2.62 -r1.4.4.11.2.33.2.63 *** m_pd.h 30 Jul 2007 16:08:14 -0000 1.4.4.11.2.33.2.62 --- m_pd.h 30 Jul 2007 19:12:45 -0000 1.4.4.11.2.33.2.63 *************** *** 176,182 **** } t_atom;
- typedef struct _hash t_hash; typedef void *hashkey; typedef void *hashvalue; typedef void (*hash_iter)(void *data, hashkey k, hashvalue v); t_hash *hash_new(long capa); --- 176,197 ---- } t_atom;
typedef void *hashkey; typedef void *hashvalue; + + struct t_hashentry { + hashkey k; + hashvalue v; + t_hashentry *next; + }; + + struct t_hash : t_pd { + long capa; + long size; + t_hashentry **tab; + /* when iterating: */ + long i; + t_hashentry *next; + }; + typedef void (*hash_iter)(void *data, hashkey k, hashvalue v); t_hash *hash_new(long capa); *************** *** 194,199 **** /* t_appendix is made of the things that logically ought to be in t_gobj but have been put in a separate memory space because this allows most externals to work unmodified on both DesireData ! and non-DesireData systems. The equivalent in the Tcl side is really part of every view object. ! */ typedef struct t_appendix { struct _gobj *next; /* big hack. this is the donut hole as cut from _gobj */ --- 209,213 ---- /* t_appendix is made of the things that logically ought to be in t_gobj but have been put in a separate memory space because this allows most externals to work unmodified on both DesireData ! and non-DesireData systems. The equivalent in the Tcl side is really part of every view object. */ typedef struct t_appendix { struct _gobj *next; /* big hack. this is the donut hole as cut from _gobj */
Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.71 retrieving revision 1.1.2.72 diff -C2 -d -r1.1.2.71 -r1.1.2.72 *** kernel.c 30 Jul 2007 16:23:07 -0000 1.1.2.71 --- kernel.c 30 Jul 2007 19:12:45 -0000 1.1.2.72 *************** *** 108,126 **** t_class *hash_class;
- struct t_hashentry { - hashkey k; - hashvalue v; - t_hashentry *next; - }; - - struct _hash : t_pd { - long capa; - long size; - t_hashentry **tab; - /* when iterating: */ - long i; - t_hashentry *next; - }; - t_hash *hash_new(long capa) { t_hash *self = (t_hash *)malloc(sizeof(t_hash)); --- 108,111 ----