Pd-cvs January 2008

pd-cvs@lists.iem.at

13 participants
134 discussions

externals/grill/py/source bound.cpp, 1.19, 1.20 clmeth.cpp, 1.28, 1.29 main.cpp, 1.37, 1.38 main.h, 1.45, 1.46 modmeth.cpp, 1.25, 1.26 py.cpp, 1.37, 1.38 pyargs.cpp, 1.23, 1.24 pyatom.cpp, 1.2, 1.3 pyatom.h, 1.2, 1.3 pybase.cpp, 1.19, 1.20 pybase.h, 1.14, 1.15 pybuffer.cpp, 1.13, 1.14 pybuffer.h, 1.2, 1.3 pybundle.cpp, 1.2, 1.3 pybundle.h, 1.2, 1.3 pydsp.cpp, 1.7, 1.8 pyext.cpp, 1.48, 1.49 pyext.h, 1.32, 1.33 pymeth.cpp, 1.7, 1.8 pyprefix.h, 1.7, 1.8 pysymbol.cpp, 1.8, 1.9 pysymbol.h, 1.5, 1.6 regi
by Thomas Grill 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15572/source Modified Files: bound.cpp clmeth.cpp main.cpp main.h modmeth.cpp py.cpp pyargs.cpp pyatom.cpp pyatom.h pybase.cpp pybase.h pybuffer.cpp pybuffer.h pybundle.cpp pybundle.h pydsp.cpp pyext.cpp pyext.h pymeth.cpp pyprefix.h pysymbol.cpp pysymbol.h register.cpp Log Message: cross-platform fixes enable compiled-only scripts (without .py) use PyGILState_\*() functionality (enabled with PY_USE_GIL) fixes for non-GIL usage improved symbol comparison buffer protocol adapted for Python 2.5 enable module packages (module/__init__.py[co]), now also for Max Index: pyprefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyprefix.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pyprefix.h 6 Jul 2007 21:44:56 -0000 1.7 --- pyprefix.h 3 Jan 2008 16:21:04 -0000 1.8 *************** *** 1,10 **** /* - py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** main.cpp 8 Jul 2005 14:30:31 -0000 1.37 --- main.cpp 3 Jan 2008 16:21:03 -0000 1.38 *************** *** 1,10 **** /* - py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pyargs.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyargs.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pyargs.cpp 11 Aug 2005 15:00:58 -0000 1.23 --- pyargs.cpp 3 Jan 2008 16:21:04 -0000 1.24 *************** *** 1,10 **** /* - py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pyatom.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyatom.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pyatom.h 7 Mar 2007 13:40:14 -0000 1.2 --- pyatom.h 3 Jan 2008 16:21:04 -0000 1.3 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pybase.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pybase.h 6 Jul 2007 21:44:56 -0000 1.14 --- pybase.h 3 Jan 2008 16:21:04 -0000 1.15 *************** *** 1,10 **** /* - py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 18,24 **** #ifdef PY_USE_GIL ! typedef PyGILState_STATE ThrState; #else ! typedef PyThreadState *ThrState; #endif --- 20,26 ---- #ifdef PY_USE_GIL ! typedef PyGILState_STATE ThrState; #else ! typedef PyThreadState *ThrState; #endif *************** *** 27,39 **** { public: ! pybase(); ! virtual ~pybase(); void Exit(); ! static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet = -1); ! static PyObject *MakePyArg(const t_symbol *s,int argc,const t_atom *argv); ! static const t_symbol *GetPyArgs(AtomList &lst,PyObject *pValue,int offs = 0); ! static const t_symbol *GetPyAtom(AtomList &lst,PyObject *pValue); static void lib_setup(); --- 29,41 ---- { public: ! pybase(); ! virtual ~pybase(); void Exit(); ! static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet = -1); ! static PyObject *MakePyArg(const t_symbol *s,int argc,const t_atom *argv); ! static const t_symbol *GetPyArgs(AtomList &lst,PyObject *pValue,int offs = 0); ! static const t_symbol *GetPyAtom(AtomList &lst,PyObject *pValue); static void lib_setup(); *************** *** 44,48 **** void m__dir(PyObject *obj); ! void m__doc(PyObject *obj); void m_dir() { m__dir(module); } --- 46,50 ---- void m__dir(PyObject *obj); ! void m__doc(PyObject *obj); void m_dir() { m__dir(module); } *************** *** 51,64 **** std::string modname; // module name ! PyObject *module,*dict; // object module and associated dictionary ! static const char *py_doc; void GetDir(PyObject *obj,AtomList &lst); ! AtomList args; void AddCurrentPath(flext_base *o); ! void SetArgs(); bool OutObject(flext_base *ext,int o,PyObject *obj); --- 53,66 ---- std::string modname; // module name ! PyObject *module,*dict; // object module and associated dictionary ! static const char *py_doc; void GetDir(PyObject *obj,AtomList &lst); ! AtomList args; void AddCurrentPath(flext_base *o); ! void SetArgs(); bool OutObject(flext_base *ext,int o,PyObject *obj); *************** *** 67,89 **** void Reload(); ! bool ImportModule(const char *name); ! void UnimportModule(); ! bool ReloadModule(); // Get module registry ! PyObject *GetRegistry(const char *regname); // Set module registry ! void SetRegistry(const char *regname,PyObject *reg); // Register object ! void Register(PyObject *reg); // Unregister object ! void Unregister(PyObject *reg); ! virtual void LoadModule() = 0; ! virtual void UnloadModule() = 0; ! virtual void Load() = 0; ! virtual void Unload() = 0; void OpenEditor(); --- 69,91 ---- void Reload(); ! bool ImportModule(const char *name); ! void UnimportModule(); ! bool ReloadModule(); // Get module registry ! PyObject *GetRegistry(const char *regname); // Set module registry ! void SetRegistry(const char *regname,PyObject *reg); // Register object ! void Register(PyObject *reg); // Unregister object ! void Unregister(PyObject *reg); ! virtual void LoadModule() = 0; ! virtual void UnloadModule() = 0; ! virtual void Load() = 0; ! virtual void Unload() = 0; void OpenEditor(); *************** *** 100,130 **** void Report() { while(PyErr_Occurred()) PyErr_Print(); } ! static bool IsAnything(const t_symbol *s) { return s && s != sym_float && s != sym_int && s != sym_symbol && s != sym_list && s != sym_pointer; } ! static bool IsAtom(const t_symbol *s) { return s == sym_float || s == sym_int || s == sym_symbol || s == sym_pointer; } ! // enum retval { nothing,atom,sequ }; ! // --- module stuff ----- ! static PyObject *module_obj,*module_dict; ! static PyObject *builtins_obj,*builtins_dict; ! static PyMethodDef func_tbl[],attr_tbl[]; ! static PyObject *py__doc__(PyObject *,PyObject *args); ! static PyObject *py_send(PyObject *,PyObject *args); #ifdef FLEXT_THREADS ! static PyObject *py_priority(PyObject *,PyObject *args); #endif ! static PyObject *py_arraysupport(PyObject *,PyObject *args); ! static PyObject *py_samplerate(PyObject *,PyObject *args); ! static PyObject *py_blocksize(PyObject *,PyObject *args); ! static PyObject *py_searchpaths(PyObject *,PyObject *args); ! static PyObject *py_helppaths(PyObject *,PyObject *args); #if FLEXT_SYS == FLEXT_SYS_PD ! static PyObject *py_getvalue(PyObject *,PyObject *args); ! static PyObject *py_setvalue(PyObject *,PyObject *args); #endif --- 102,132 ---- void Report() { while(PyErr_Occurred()) PyErr_Print(); } ! static bool IsAnything(const t_symbol *s) { return s && s != sym_float && s != sym_int && s != sym_symbol && s != sym_list && s != sym_pointer; } ! static bool IsAtom(const t_symbol *s) { return s == sym_float || s == sym_int || s == sym_symbol || s == sym_pointer; } ! // enum retval { nothing,atom,sequ }; ! // --- module stuff ----- ! static PyObject *module_obj,*module_dict; ! static PyObject *builtins_obj,*builtins_dict; ! static PyMethodDef func_tbl[],attr_tbl[]; ! static PyObject *py__doc__(PyObject *,PyObject *args); ! static PyObject *py_send(PyObject *,PyObject *args); #ifdef FLEXT_THREADS ! static PyObject *py_priority(PyObject *,PyObject *args); #endif ! static PyObject *py_arraysupport(PyObject *,PyObject *args); ! static PyObject *py_samplerate(PyObject *,PyObject *args); ! static PyObject *py_blocksize(PyObject *,PyObject *args); ! static PyObject *py_searchpaths(PyObject *,PyObject *args); ! static PyObject *py_helppaths(PyObject *,PyObject *args); #if FLEXT_SYS == FLEXT_SYS_PD ! static PyObject *py_getvalue(PyObject *,PyObject *args); ! static PyObject *py_setvalue(PyObject *,PyObject *args); #endif *************** *** 132,147 **** static PyObject *py_tuple(PyObject *,PyObject *args); ! // ----thread stuff ------------ ! virtual void m_stop(int argc,const t_atom *argv); ! bool respond; #ifdef FLEXT_THREADS ! int thrcount; bool shouldexit; ! int stoptick; Timer stoptmr; ! void tick(void *); #endif --- 134,149 ---- static PyObject *py_tuple(PyObject *,PyObject *args); ! // ----thread stuff ------------ ! virtual void m_stop(int argc,const t_atom *argv); ! bool respond; #ifdef FLEXT_THREADS ! int thrcount; bool shouldexit; ! int stoptick; Timer stoptmr; ! void tick(void *); #endif *************** *** 188,192 **** static PyFifo qufifo; static ThrCond qucond; ! #ifndef PY_USE_GIL static ThrState pythrsys; --- 190,194 ---- static PyFifo qufifo; static ThrCond qucond; ! #ifndef PY_USE_GIL static ThrState pythrsys; *************** *** 202,206 **** public: ! static void AddToPath(const char *dir); #ifdef FLEXT_THREADS --- 204,208 ---- public: ! static void AddToPath(const char *dir); #ifdef FLEXT_THREADS *************** *** 213,240 **** static inline ThrState FindThreadState() { return ThrState(); } ! static inline ThrState PyLock(ThrState = ThrState()) { return PyGILState_Ensure(); } ! static inline ThrState PyLockSys() { return PyLock(); } ! static inline void PyUnlock(ThrState st) { PyGILState_Release(st); } #else // PY_USE_GIL static ThrState FindThreadState(); static void FreeThreadState(); ! static ThrState PyLock(ThrState st = FindThreadState()) { ! if(!IsSystemThread() || !lockcount++) PyEval_AcquireLock(); ! return PyThreadState_Swap(st); } #if 1 ! static inline ThrState PyLockSys() { return PyLock(); } #else ! static ThrState PyLockSys() { if(!lockcount++) PyEval_AcquireLock(); ! return PyThreadState_Swap(pythrsys); } #endif ! static void PyUnlock(ThrState st) { ThrState old = PyThreadState_Swap(st); --- 215,242 ---- static inline ThrState FindThreadState() { return ThrState(); } ! static inline ThrState PyLock(ThrState = ThrState()) { return PyGILState_Ensure(); } ! static inline ThrState PyLockSys() { return PyLock(); } ! static inline void PyUnlock(ThrState st) { PyGILState_Release(st); } #else // PY_USE_GIL static ThrState FindThreadState(); static void FreeThreadState(); ! static ThrState PyLock(ThrState st = FindThreadState()) { ! if(st != pythrsys || !lockcount++) PyEval_AcquireLock(); ! return PyThreadState_Swap(st); } #if 1 ! static inline ThrState PyLockSys() { return PyLock(); } #else ! static ThrState PyLockSys() { if(!lockcount++) PyEval_AcquireLock(); ! return PyThreadState_Swap(pythrsys); } #endif ! static void PyUnlock(ThrState st) { ThrState old = PyThreadState_Swap(st); *************** *** 242,253 **** } #endif // PY_USE_GIL ! #else // FLEXT_THREADS ! static inline ThrState PyLock(ThrState = NULL) { return NULL; } ! static inline ThrState PyLockSys() { return NULL; } ! static inline void PyUnlock(ThrState st) {} #endif ! static PyObject* StdOut_Write(PyObject* Self, PyObject* Args); }; --- 244,255 ---- } #endif // PY_USE_GIL ! #else // FLEXT_THREADS ! static inline ThrState PyLock(ThrState = NULL) { return NULL; } ! static inline ThrState PyLockSys() { return NULL; } ! static inline void PyUnlock(ThrState st) {} #endif ! static PyObject* StdOut_Write(PyObject* Self, PyObject* Args); }; Index: pybase.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pybase.cpp 6 Jul 2007 21:44:56 -0000 1.19 --- pybase.cpp 3 Jan 2008 16:21:04 -0000 1.20 *************** *** 1,10 **** /* - py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 106,110 **** post("------------------------------------------------"); post("py/pyext %s - python script objects",PY__VERSION); ! post("(C)2002-2007 Thomas Grill - http://grrrr.org/ext"); post(""); post("using Python %s",Py_GetVersion()); --- 108,112 ---- post("------------------------------------------------"); post("py/pyext %s - python script objects",PY__VERSION); ! post("(C)2002-2008 Thomas Grill - http://grrrr.org/ext"); post(""); post("using Python %s",Py_GetVersion()); *************** *** 200,204 **** // ------------------------------------------------------------- ! #ifdef PY_USE_INOFFICIAL // add PD paths --- 202,206 ---- // ------------------------------------------------------------- ! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PD_DEVEL_VERSION) && defined(PY_USE_INOFFICIAL) // add PD paths Index: py.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/py.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** py.cpp 6 Jul 2007 21:44:56 -0000 1.37 --- py.cpp 3 Jan 2008 16:21:04 -0000 1.38 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 242,246 **** { post(""); ! post("%s %s - python script object, (C)2002-2007 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); --- 244,248 ---- { post(""); ! post("%s %s - python script object, (C)2002-2008 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); Index: pysymbol.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pysymbol.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pysymbol.cpp 27 Mar 2007 17:16:17 -0000 1.8 --- pysymbol.cpp 3 Jan 2008 16:21:04 -0000 1.9 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pydsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pydsp.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pydsp.cpp 7 Mar 2007 13:40:14 -0000 1.7 --- pydsp.cpp 3 Jan 2008 16:21:04 -0000 1.8 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pysymbol.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pysymbol.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pysymbol.h 7 Mar 2007 13:40:14 -0000 1.5 --- pysymbol.h 3 Jan 2008 16:21:04 -0000 1.6 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: bound.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/bound.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** bound.cpp 7 Mar 2007 13:40:14 -0000 1.19 --- bound.cpp 3 Jan 2008 16:21:03 -0000 1.20 *************** *** 1,10 **** /* - py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: modmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/modmeth.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** modmeth.cpp 6 Jul 2007 21:44:56 -0000 1.25 --- modmeth.cpp 3 Jan 2008 16:21:04 -0000 1.26 *************** *** 1,10 **** /* - py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 39,43 **** const char *pybase::py_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2007 Thomas Grill\n" "\n" "This is the pyext module. Available function:\n" --- 41,45 ---- const char *pybase::py_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2008 Thomas Grill\n" "\n" "This is the pyext module. Available function:\n" *************** *** 116,120 **** PyObject *pybase::py_searchpaths(PyObject *self,PyObject *args) { ! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PY_USE_INOFFICIAL) PyObject *ret = PyList_New(0); char *dir; --- 118,122 ---- PyObject *pybase::py_searchpaths(PyObject *self,PyObject *args) { ! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PD_DEVEL_VERSION) && defined(PY_USE_INOFFICIAL) PyObject *ret = PyList_New(0); char *dir; *************** *** 130,134 **** PyObject *pybase::py_helppaths(PyObject *self,PyObject *args) { ! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PY_USE_INOFFICIAL) PyObject *ret = PyList_New(0); char *dir; --- 132,136 ---- PyObject *pybase::py_helppaths(PyObject *self,PyObject *args) { ! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PD_DEVEL_VERSION) && defined(PY_USE_INOFFICIAL) PyObject *ret = PyList_New(0); char *dir; Index: register.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/register.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** register.cpp 8 Jul 2005 14:30:31 -0000 1.8 --- register.cpp 3 Jan 2008 16:21:04 -0000 1.9 *************** *** 1,10 **** /* - py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pybuffer.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybuffer.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pybuffer.cpp 6 Jul 2007 21:44:56 -0000 1.13 --- pybuffer.cpp 3 Jan 2008 16:21:04 -0000 1.14 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pymeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pymeth.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pymeth.cpp 7 Mar 2007 13:40:14 -0000 1.7 --- pymeth.cpp 3 Jan 2008 16:21:04 -0000 1.8 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 283,287 **** { post(""); ! post("%s %s - python method object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); --- 285,289 ---- { post(""); ! post("%s %s - python method object, (C)2002-2008 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** main.h 1 Nov 2007 21:44:22 -0000 1.45 --- main.h 3 Jan 2008 16:21:04 -0000 1.46 *************** *** 1,10 **** /* - py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 29,33 **** class FifoEl ! : public Fifo::Cell { public: --- 31,35 ---- class FifoEl ! : public FifoCell { public: Index: clmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/clmeth.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** clmeth.cpp 7 Mar 2007 13:40:14 -0000 1.28 --- clmeth.cpp 3 Jan 2008 16:21:03 -0000 1.29 *************** *** 1,10 **** /* - py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 44,48 **** const char *pyext::pyext_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2007 Thomas Grill\n" "\n" "This is the pyext base class. Available methods:\n" --- 46,50 ---- const char *pyext::pyext_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2008 Thomas Grill\n" "\n" "This is the pyext base class. Available methods:\n" Index: pyext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** pyext.h 6 Jul 2007 21:44:56 -0000 1.32 --- pyext.h 3 Jan 2008 16:21:04 -0000 1.33 *************** *** 1,10 **** /* - py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** pyext.cpp 6 Jul 2007 21:44:56 -0000 1.48 --- pyext.cpp 3 Jan 2008 16:21:04 -0000 1.49 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 511,515 **** { post(""); ! post("%s %s - python class object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); --- 513,517 ---- { post(""); ! post("%s %s - python class object, (C)2002-2008 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); Index: pyatom.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyatom.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pyatom.cpp 7 Mar 2007 13:40:14 -0000 1.2 --- pyatom.cpp 3 Jan 2008 16:21:04 -0000 1.3 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pybuffer.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybuffer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pybuffer.h 26 Sep 2005 13:59:59 -0000 1.2 --- pybuffer.h 3 Jan 2008 16:21:04 -0000 1.3 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pybundle.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybundle.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pybundle.cpp 7 Mar 2007 13:40:14 -0000 1.2 --- pybundle.cpp 3 Jan 2008 16:21:04 -0000 1.3 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ Index: pybundle.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybundle.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pybundle.h 7 Mar 2007 13:40:14 -0000 1.2 --- pybundle.h 3 Jan 2008 16:21:04 -0000 1.3 *************** *** 1,10 **** /* - py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */

1 0

externals/grill/py license.txt, 1.5, 1.6 py.vcproj, 1.33, 1.34 readme.txt, 1.52, 1.53
by Thomas Grill 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15572 Modified Files: license.txt py.vcproj readme.txt Log Message: cross-platform fixes enable compiled-only scripts (without .py) use PyGILState_\*() functionality (enabled with PY_USE_GIL) fixes for non-GIL usage improved symbol comparison buffer protocol adapted for Python 2.5 enable module packages (module/__init__.py[co]), now also for Max Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** py.vcproj 6 Jul 2007 21:44:56 -0000 1.33 --- py.vcproj 3 Jan 2008 16:21:03 -0000 1.34 *************** *** 86,93 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="$(prereq)\pthreads\include;$(pdmax)\pd\src;..\flext\source;C:\Python24\include;"C:\Python24\Lib\site-packages\numpy\core\include"" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS;PY_NUMPY;FLEXT_USECMEM;xPY_USE_GIL;PY_USE_INOFFICIAL" BasicRuntimeChecks="3" RuntimeLibrary="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" --- 86,96 ---- Name="VCCLCompilerTool" Optimization="0" ! InlineFunctionExpansion="0" ! EnableIntrinsicFunctions="TRUE" ! AdditionalIncludeDirectories="$(prereq)\pthreads\include;$(pdmax)\pd\src;..\flext\source;C:\Python24\include;"C:\Python24\Lib\site-packages\numpy\core\include";;C:\data\nova\libs\lockfree" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS;PY_NUMPY;FLEXT_USECMEM;PY_USE_GIL;PY_USE_INOFFICIAL" BasicRuntimeChecks="3" RuntimeLibrary="1" + EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" *************** *** 152,156 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\pdmax\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;PY_EXPORTS;PY_NUMARRAY;PY_USE_GIL" StringPooling="TRUE" --- 155,159 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\pdmax\flext\source;C:\Programme\prog\Python24\include;;C:\data\nova\libs\lockfree" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;PY_EXPORTS;PY_NUMARRAY;PY_USE_GIL" StringPooling="TRUE" Index: license.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/license.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** license.txt 23 Mar 2006 01:42:04 -0000 1.5 --- license.txt 3 Jan 2008 16:21:03 -0000 1.6 *************** *** 1,4 **** py/pyext - python script objects for PD and MaxMSP ! Copyright (C) 2002-2006 Thomas Grill This program is free software; you can redistribute it and/or --- 1,4 ---- py/pyext - python script objects for PD and MaxMSP ! Copyright (C) 2002-2008 Thomas Grill This program is free software; you can redistribute it and/or *************** *** 29,33 **** --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2006 Thomas Grill This program is free software; you can redistribute it and/or --- 29,33 ---- --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2008 Thomas Grill This program is free software; you can redistribute it and/or Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** readme.txt 6 Jul 2007 21:44:56 -0000 1.52 --- readme.txt 3 Jan 2008 16:21:03 -0000 1.53 *************** *** 1,5 **** py/pyext - python script objects for PD and Max/MSP ! Copyright (c)2002-2007 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 1,5 ---- py/pyext - python script objects for PD and Max/MSP ! Copyright (c)2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution.

1 0

externals/grill/pool/source data.cpp, 1.8, 1.9 main.cpp, 1.17, 1.18 pool.cpp, 1.24, 1.25 pool.h, 1.12, 1.13
by Thomas Grill 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10064/source Modified Files: data.cpp main.cpp pool.cpp pool.h Log Message: clarify usage of absdir flag for file operations fixed buffer overrun problems some assertions added success/error reporting for file operations got rid of type abbreviations changed obviously buggy pool name registering Index: data.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/data.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** data.cpp 20 Jan 2007 14:27:39 -0000 1.8 --- data.cpp 3 Jan 2008 16:06:07 -0000 1.9 *************** *** 1,14 **** /* - pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ #include "pool.h" - #include <string.h> #include <ctype.h> --- 1,15 ---- /* pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 16:14:29 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ #include "pool.h" #include <string.h> #include <ctype.h> *************** *** 18,22 **** using namespace std; ! pooldata::pooldata(const S *s,I vcnt,I dcnt): sym(s),nxt(NULL),refs(0), root(nullatom,NULL,vcnt,dcnt) --- 19,23 ---- using namespace std; ! pooldata::pooldata(const t_symbol *s,int vcnt,int dcnt): sym(s),nxt(NULL),refs(0), root(nullatom,NULL,vcnt,dcnt) *************** *** 31,37 **** ! const A pooldata::nullatom = { A_NULL }; ! I pooldata::GetAll(const AtomList &d,A *&keys,Atoms *&lst) { pooldir *pd = root.GetDir(d); --- 32,38 ---- ! const t_atom pooldata::nullatom = { A_NULL }; ! int pooldata::GetAll(const AtomList &d,t_atom *&keys,Atoms *&lst) { pooldir *pd = root.GetDir(d); *************** *** 44,48 **** } ! I pooldata::PrintAll(const AtomList &d) { char tmp[1024]; --- 45,49 ---- } ! int pooldata::PrintAll(const AtomList &d) { char tmp[1024]; *************** *** 55,59 **** } ! I pooldata::GetSub(const AtomList &d,const t_atom **&dirs) { pooldir *pd = root.GetDir(d); --- 56,60 ---- } ! int pooldata::GetSub(const AtomList &d,const t_atom **&dirs) { pooldir *pd = root.GetDir(d); *************** *** 67,71 **** ! BL pooldata::Paste(const AtomList &d,const pooldir *clip,I depth,BL repl,BL mkdir) { pooldir *pd = root.GetDir(d); --- 68,72 ---- ! bool pooldata::Paste(const AtomList &d,const pooldir *clip,int depth,bool repl,bool mkdir) { pooldir *pd = root.GetDir(d); *************** *** 73,77 **** } ! pooldir *pooldata::Copy(const AtomList &d,const A &key,BL cut) { pooldir *pd = root.GetDir(d); --- 74,78 ---- } ! pooldir *pooldata::Copy(const AtomList &d,const t_atom &key,bool cut) { pooldir *pd = root.GetDir(d); *************** *** 90,94 **** } ! pooldir *pooldata::CopyAll(const AtomList &d,I depth,BL cut) { pooldir *pd = root.GetDir(d); --- 91,95 ---- } ! pooldir *pooldata::CopyAll(const AtomList &d,int depth,bool cut) { pooldir *pd = root.GetDir(d); *************** *** 126,130 **** pooldir *pd = root.GetDir(d); if(pd) { ! char tmp[1024]; const char *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { --- 127,131 ---- pooldir *pd = root.GetDir(d); if(pd) { ! char tmp[1024]; // CnvFlnm checks for size of string buffer const char *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { *************** *** 138,147 **** } ! BL pooldata::SvDir(const AtomList &d,const C *flnm,I depth,BL absdir) { pooldir *pd = root.GetDir(d); if(pd) { ! C tmp[1024]; ! const C *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { ofstream file(t); --- 139,148 ---- } ! bool pooldata::SvDir(const AtomList &d,const char *flnm,int depth,bool absdir) { pooldir *pd = root.GetDir(d); if(pd) { ! char tmp[1024]; // CnvFlnm checks for size of string buffer ! const char *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { ofstream file(t); *************** *** 156,168 **** } ! BL pooldata::LdDirXML(const AtomList &d,const C *flnm,I depth,BL mkdir) { pooldir *pd = root.GetDir(d); if(pd) { ! C tmp[1024]; ! const C *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { ifstream file(t); ! BL ret = file.good() != 0; if(ret) { file.getline(tmp,sizeof tmp); --- 157,169 ---- } ! bool pooldata::LdDirXML(const AtomList &d,const char *flnm,int depth,bool mkdir) { pooldir *pd = root.GetDir(d); if(pd) { ! char tmp[1024]; // CnvFlnm checks for size of string buffer ! const char *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { ifstream file(t); ! bool ret = file.good() != 0; if(ret) { file.getline(tmp,sizeof tmp); *************** *** 185,194 **** } ! BL pooldata::SvDirXML(const AtomList &d,const C *flnm,I depth,BL absdir) { pooldir *pd = root.GetDir(d); if(pd) { ! C tmp[1024]; ! const C *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { ofstream file(t); --- 186,195 ---- } ! bool pooldata::SvDirXML(const AtomList &d,const char *flnm,int depth,bool absdir) { pooldir *pd = root.GetDir(d); if(pd) { ! char tmp[1024]; // CnvFlnm checks for size of string buffer ! const char *t = CnvFlnm(tmp,flnm,sizeof tmp); if(t) { ofstream file(t); *************** *** 199,203 **** file << "<!DOCTYPE pool SYSTEM \"http://grrrr.org/ext/pool/pool-0.2.dtd\">" << endl; file << "<pool>" << endl; ! BL ret = pd->SvDirXML(file,depth,tmp); file << "</pool>" << endl; return ret; --- 200,204 ---- file << "<!DOCTYPE pool SYSTEM \"http://grrrr.org/ext/pool/pool-0.2.dtd\">" << endl; file << "<pool>" << endl; ! bool ret = pd->SvDirXML(file,depth,tmp); file << "</pool>" << endl; return ret; Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** main.cpp 20 Jan 2007 14:27:39 -0000 1.17 --- main.cpp 3 Jan 2008 16:06:07 -0000 1.18 *************** *** 1,10 **** /* - pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ [...1137 lines suppressed...] #if FLEXT_SYS == FLEXT_SYS_PD // / and \ must not be mixed! // (char *) type casts for BorlandC++ ! char *sl = strchr((char *)fn,'/'); ! if(!sl) sl = strchr((char *)fn,'\\'); if(!sl || (sl != fn #if FLEXT_OS == FLEXT_OS_WIN *************** *** 1382,1386 **** )) { // prepend absolute canvas path if filename has no absolute path ! const C *p = GetString(canvas_getdir(thisCanvas())); return string(p)+'/'+fn; } --- 1384,1388 ---- )) { // prepend absolute canvas path if filename has no absolute path ! const char *p = GetString(canvas_getdir(thisCanvas())); return string(p)+'/'+fn; } Index: pool.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pool.cpp 20 Jan 2007 14:27:39 -0000 1.24 --- pool.cpp 3 Jan 2008 16:06:07 -0000 1.25 *************** *** 1,18 **** /* - pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ #include "pool.h" - #include <string.h> #include <ctype.h> #include <stdlib.h> #include <fstream> #if FLEXT_OS == FLEXT_OS_WIN --- 1,20 ---- /* pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 16:14:29 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ #include "pool.h" #include <string.h> #include <ctype.h> #include <stdlib.h> #include <fstream> + #include <vector> #if FLEXT_OS == FLEXT_OS_WIN *************** *** 115,122 **** ! inline I compare(I a,I b) { return a == b?0:(a < b?-1:1); } ! inline I compare(F a,F b) { return a == b?0:(a < b?-1:1); } ! static I compare(const S *a,const S *b) { if(a == b) --- 117,124 ---- ! inline int compare(int a,int b) { return a == b?0:(a < b?-1:1); } ! inline int compare(float a,float b) { return a == b?0:(a < b?-1:1); } ! static int compare(const t_symbol *a,const t_symbol *b) { if(a == b) *************** *** 126,130 **** } ! static I compare(const A &a,const A &b) { if(flext::GetType(a) == flext::GetType(b)) { --- 128,132 ---- } ! static int compare(const t_atom &a,const t_atom &b) { if(flext::GetType(a) == flext::GetType(b)) { *************** *** 152,156 **** ! poolval::poolval(const A &k,AtomList *d): data(d),nxt(NULL) { --- 154,158 ---- ! poolval::poolval(const t_atom &k,AtomList *d): data(d),nxt(NULL) { *************** *** 178,182 **** ! pooldir::pooldir(const A &d,pooldir *p,I vcnt,I dcnt): parent(p),nxt(NULL),vals(NULL),dirs(NULL), vbits(Int2Bits(vcnt)),dbits(Int2Bits(dcnt)), --- 180,184 ---- ! pooldir::pooldir(const t_atom &d,pooldir *p,int vcnt,int dcnt): parent(p),nxt(NULL),vals(NULL),dirs(NULL), vbits(Int2Bits(vcnt)),dbits(Int2Bits(dcnt)), *************** *** 194,201 **** } ! V pooldir::Clear(BL rec,BL dironly) { if(rec && dirs) { ! for(I i = 0; i < dsize; ++i) { pooldir *d = dirs[i].d,*d1; if(d) { --- 196,203 ---- } ! void pooldir::Clear(bool rec,bool dironly) { if(rec && dirs) { ! for(int i = 0; i < dsize; ++i) { pooldir *d = dirs[i].d,*d1; if(d) { *************** *** 211,215 **** } if(!dironly && vals) { ! for(I i = 0; i < vsize; ++i) { poolval *v = vals[i].v,*v1; if(v) { --- 213,217 ---- } if(!dironly && vals) { ! for(int i = 0; i < vsize; ++i) { poolval *v = vals[i].v,*v1; if(v) { *************** *** 226,230 **** } ! V pooldir::Reset(BL realloc) { Clear(true,false); --- 228,232 ---- } ! void pooldir::Reset(bool realloc) { Clear(true,false); *************** *** 243,251 **** } ! pooldir *pooldir::AddDir(I argc,const A *argv,I vcnt,I dcnt) { if(!argc) return this; ! I c = 1,dix = DIdx(argv[0]); pooldir *prv = NULL,*ix = dirs[dix].d; for(; ix; prv = ix,ix = ix->nxt) { --- 245,253 ---- } ! pooldir *pooldir::AddDir(int argc,const t_atom *argv,int vcnt,int dcnt) { if(!argc) return this; ! int c = 1,dix = DIdx(argv[0]); pooldir *prv = NULL,*ix = dirs[dix].d; for(; ix; prv = ix,ix = ix->nxt) { *************** *** 267,275 **** } ! pooldir *pooldir::GetDir(I argc,const A *argv,BL rmv) { if(!argc) return this; ! I c = 1,dix = DIdx(argv[0]); pooldir *prv = NULL,*ix = dirs[dix].d; for(; ix; prv = ix,ix = ix->nxt) { --- 269,277 ---- } ! pooldir *pooldir::GetDir(int argc,const t_atom *argv,bool rmv) { if(!argc) return this; ! int c = 1,dix = DIdx(argv[0]); pooldir *prv = NULL,*ix = dirs[dix].d; for(; ix; prv = ix,ix = ix->nxt) { *************** *** 296,300 **** } ! BL pooldir::DelDir(I argc,const A *argv) { pooldir *pd = GetDir(argc,argv,true); --- 298,302 ---- } ! bool pooldir::DelDir(int argc,const t_atom *argv) { pooldir *pd = GetDir(argc,argv,true); *************** *** 307,313 **** } ! V pooldir::SetVal(const A &key,AtomList *data,BL over) { ! I c = 1,vix = VIdx(key); poolval *prv = NULL,*ix = vals[vix].v; for(; ix; prv = ix,ix = ix->nxt) { --- 309,315 ---- } ! void pooldir::SetVal(const t_atom &key,AtomList *data,bool over) { ! int c = 1,vix = VIdx(key); poolval *prv = NULL,*ix = vals[vix].v; for(; ix; prv = ix,ix = ix->nxt) { *************** *** 346,350 **** } ! BL pooldir::SetVali(I rix,AtomList *data) { poolval *prv = NULL,*ix = NULL; --- 348,352 ---- } ! bool pooldir::SetVali(int rix,AtomList *data) { poolval *prv = NULL,*ix = NULL; *************** *** 379,385 **** } ! poolval *pooldir::RefVal(const A &key) { ! I c = 1,vix = VIdx(key); poolval *ix = vals[vix].v; for(; ix; ix = ix->nxt) { --- 381,387 ---- } ! poolval *pooldir::RefVal(const t_atom &key) { ! int c = 1,vix = VIdx(key); poolval *ix = vals[vix].v; for(; ix; ix = ix->nxt) { *************** *** 391,397 **** } ! poolval *pooldir::RefVali(I rix) { ! for(I vix = 0; vix < vsize; ++vix) if(rix > vals[vix].cnt) rix -= vals[vix].cnt; else { --- 393,399 ---- } ! poolval *pooldir::RefVali(int rix) { ! for(int vix = 0; vix < vsize; ++vix) if(rix > vals[vix].cnt) rix -= vals[vix].cnt; else { *************** *** 403,407 **** } ! flext::AtomList *pooldir::PeekVal(const A &key) { poolval *ix = RefVal(key); --- 405,409 ---- } ! flext::AtomList *pooldir::PeekVal(const t_atom &key) { poolval *ix = RefVal(key); *************** *** 409,415 **** } ! flext::AtomList *pooldir::GetVal(const A &key,BL cut) { ! I c = 1,vix = VIdx(key); poolval *prv = NULL,*ix = vals[vix].v; for(; ix; prv = ix,ix = ix->nxt) { --- 411,417 ---- } ! flext::AtomList *pooldir::GetVal(const t_atom &key,bool cut) { ! int c = 1,vix = VIdx(key); poolval *prv = NULL,*ix = vals[vix].v; for(; ix; prv = ix,ix = ix->nxt) { *************** *** 437,455 **** } ! I pooldir::CntAll() const { ! I cnt = 0; ! for(I vix = 0; vix < vsize; ++vix) cnt += vals[vix].cnt; return cnt; } ! I pooldir::PrintAll(char *buf,int len) const { int offs = strlen(buf); ! I cnt = 0; ! for(I vix = 0; vix < vsize; ++vix) { poolval *ix = vals[vix].v; ! for(I i = 0; ix; ++i,ix = ix->nxt) { PrintAtom(ix->key,buf+offs,len-offs); strcat(buf+offs," , "); --- 439,457 ---- } ! int pooldir::CntAll() const { ! int cnt = 0; ! for(int vix = 0; vix < vsize; ++vix) cnt += vals[vix].cnt; return cnt; } ! int pooldir::PrintAll(char *buf,int len) const { int offs = strlen(buf); ! int cnt = 0; ! for(int vix = 0; vix < vsize; ++vix) { poolval *ix = vals[vix].v; ! for(int i = 0; ix; ++i,ix = ix->nxt) { PrintAtom(ix->key,buf+offs,len-offs); strcat(buf+offs," , "); *************** *** 466,477 **** } ! I pooldir::GetKeys(AtomList &keys) { ! I cnt = CntAll(); keys(cnt); ! for(I vix = 0; vix < vsize; ++vix) { poolval *ix = vals[vix].v; ! for(I i = 0; ix; ++i,ix = ix->nxt) SetAtom(keys[i],ix->key); } --- 468,479 ---- } ! int pooldir::GetKeys(AtomList &keys) { ! int cnt = CntAll(); keys(cnt); ! for(int vix = 0; vix < vsize; ++vix) { poolval *ix = vals[vix].v; ! for(int i = 0; ix; ++i,ix = ix->nxt) SetAtom(keys[i],ix->key); } *************** *** 479,489 **** } ! I pooldir::GetAll(A *&keys,Atoms *&lst,BL cut) { ! I cnt = CntAll(); ! keys = new A[cnt]; lst = new Atoms[cnt]; ! for(I i = 0,vix = 0; vix < vsize; ++vix) { poolval *ix = vals[vix].v; for(; ix; ++i) { --- 481,491 ---- } ! int pooldir::GetAll(t_atom *&keys,Atoms *&lst,bool cut) { ! int cnt = CntAll(); ! keys = new t_atom[cnt]; lst = new Atoms[cnt]; ! for(int i = 0,vix = 0; vix < vsize; ++vix) { poolval *ix = vals[vix].v; for(; ix; ++i) { *************** *** 505,521 **** ! I pooldir::CntSub() const { ! I cnt = 0; ! for(I dix = 0; dix < dsize; ++dix) cnt += dirs[dix].cnt; return cnt; } ! I pooldir::GetSub(const A **&lst) { ! const I cnt = CntSub(); ! lst = new const A *[cnt]; ! for(I i = 0,dix = 0; i < cnt; ++dix) { pooldir *ix = dirs[dix].d; for(; ix; ix = ix->nxt) lst[i++] = &ix->dir; --- 507,523 ---- ! int pooldir::CntSub() const { ! int cnt = 0; ! for(int dix = 0; dix < dsize; ++dix) cnt += dirs[dix].cnt; return cnt; } ! int pooldir::GetSub(const t_atom **&lst) { ! const int cnt = CntSub(); ! lst = new const t_atom *[cnt]; ! for(int i = 0,dix = 0; i < cnt; ++dix) { pooldir *ix = dirs[dix].d; for(; ix; ix = ix->nxt) lst[i++] = &ix->dir; *************** *** 525,533 **** ! BL pooldir::Paste(const pooldir *p,I depth,BL repl,BL mkdir) { ! BL ok = true; ! for(I vi = 0; vi < p->vsize; ++vi) { for(poolval *ix = p->vals[vi].v; ix; ix = ix->nxt) { SetVal(ix->key,new Atoms(*ix->data),repl); --- 527,535 ---- ! bool pooldir::Paste(const pooldir *p,int depth,bool repl,bool mkdir) { ! bool ok = true; ! for(int vi = 0; vi < p->vsize; ++vi) { for(poolval *ix = p->vals[vi].v; ix; ix = ix->nxt) { SetVal(ix->key,new Atoms(*ix->data),repl); *************** *** 536,540 **** if(ok && depth) { ! for(I di = 0; di < p->dsize; ++di) { for(pooldir *dix = p->dirs[di].d; ok && dix; dix = dix->nxt) { pooldir *ndir = mkdir?AddDir(1,&dix->dir):GetDir(1,&dix->dir); --- 538,542 ---- if(ok && depth) { ! for(int di = 0; di < p->dsize; ++di) { for(pooldir *dix = p->dirs[di].d; ok && dix; dix = dix->nxt) { pooldir *ndir = mkdir?AddDir(1,&dix->dir):GetDir(1,&dix->dir); *************** *** 549,558 **** } ! BL pooldir::Copy(pooldir *p,I depth,BL cut) { ! BL ok = true; if(cut) { ! for(I vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) p->SetVal(ix->key,ix->data); --- 551,560 ---- } ! bool pooldir::Copy(pooldir *p,int depth,bool cut) { ! bool ok = true; if(cut) { ! for(int vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) p->SetVal(ix->key,ix->data); *************** *** 562,566 **** } else { ! for(I vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { p->SetVal(ix->key,new Atoms(*ix->data)); --- 564,568 ---- } else { ! for(int vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { p->SetVal(ix->key,new Atoms(*ix->data)); *************** *** 570,574 **** if(ok && depth) { ! for(I di = 0; di < dsize; ++di) { for(pooldir *dix = dirs[di].d; ok && dix; dix = dix->nxt) { pooldir *ndir = p->AddDir(1,&dix->dir); --- 572,576 ---- if(ok && depth) { ! for(int di = 0; di < dsize; ++di) { for(pooldir *dix = dirs[di].d; ok && dix; dix = dix->nxt) { pooldir *ndir = p->AddDir(1,&dix->dir); *************** *** 586,590 **** static bool _isspace(char c) { return c > 0 && isspace(c); } ! static const char *ReadAtom(const char *c,A &a,bool utf8) { // skip leading whitespace (NON-ASCII character are < 0) --- 588,592 ---- static bool _isspace(char c) { return c > 0 && isspace(c); } ! static const char *ReadAtom(const char *c,t_atom &a,bool utf8) { // skip leading whitespace (NON-ASCII character are < 0) *************** *** 654,660 **** wchar_t wtmp[1024]; int err = MultiByteToWideChar(CP_UTF8,0,tmp,strlen(tmp),wtmp,1024); ! if(!err) return false; err = WideCharToMultiByte(CP_ACP,0,wtmp,err,tmp,1024,NULL,FALSE); ! if(!err) return false; tmp[err] = 0; c = tmp; --- 656,662 ---- wchar_t wtmp[1024]; int err = MultiByteToWideChar(CP_UTF8,0,tmp,strlen(tmp),wtmp,1024); ! if(!err) return NULL; err = WideCharToMultiByte(CP_ACP,0,wtmp,err,tmp,1024,NULL,FALSE); ! if(!err) return NULL; tmp[err] = 0; c = tmp; *************** *** 668,672 **** TECObjectRef converter; OSStatus status = TECCreateConverter(&converter,inconv,outconv); ! if(status) return false; ByteCount inlen,outlen; --- 670,674 ---- TECObjectRef converter; OSStatus status = TECCreateConverter(&converter,inconv,outconv); ! if(status) return NULL; ByteCount inlen,outlen; *************** *** 680,689 **** TECDisposeConverter(converter); c = ctmp; ! if(status) return false; #else wchar_t wtmp[1024]; size_t len = mbstowcs(wtmp,tmp,1024); if(len < 0) return false; ! if(!WCStoUTF8(tmp,wtmp,sizeof(tmp))) return false; c = tmp; #endif --- 682,691 ---- TECDisposeConverter(converter); c = ctmp; ! if(status) return NULL; #else wchar_t wtmp[1024]; size_t len = mbstowcs(wtmp,tmp,1024); if(len < 0) return false; ! if(!WCStoUTF8(tmp,wtmp,sizeof(tmp))) return NULL; c = tmp; #endif *************** *** 697,729 **** } ! static BL ParseAtoms(C *tmp,flext::AtomList &l,bool utf8) { ! const int MAXATOMS = 1024; ! int cnt = 0; ! t_atom atoms[MAXATOMS]; ! for(const char *t = tmp; *t && cnt < MAXATOMS; ++cnt) { ! t = ReadAtom(t,atoms[cnt],utf8); ! if(!t) break; } ! l(cnt,atoms); ! return true; } ! static BL ParseAtoms(string &s,flext::AtomList &l,bool utf8) { ! return ParseAtoms((C *)s.c_str(),l,utf8); } ! static bool ReadAtoms(istream &is,flext::AtomList &l,C del,bool utf8) { ! char tmp[1024]; ! is.getline(tmp,sizeof tmp,del); ! if(is.eof() || !is.good()) ! return false; ! else ! return ParseAtoms(tmp,l,utf8); } ! static bool WriteAtom(ostream &os,const A &a,bool utf8) { if(flext::IsFloat(a)) --- 699,735 ---- } ! static bool ParseAtoms(const char *tmp,flext::AtomList &l,bool utf8) { ! FLEXT_ASSERT(tmp); ! vector<t_atom> atoms; ! while(*tmp) { ! t_atom at; ! tmp = ReadAtom(tmp,at,utf8); ! if(!tmp) break; ! atoms.push_back(at); } ! l(atoms.size(),&atoms[0]); ! return true; } ! static bool ParseAtoms(string &s,flext::AtomList &l,bool utf8) { ! return ParseAtoms((char *)s.c_str(),l,utf8); } ! static bool ReadAtoms(istream &is,flext::AtomList &l,char del,bool utf8) { ! vector<char> tmp; ! for(;;) { ! char c = is.get(); ! if(is.eof() || c == del) break; ! tmp.push_back(c); ! } ! tmp.push_back(0); // end-of-string marker ! ! return is.good() && ParseAtoms(&tmp[0],l,utf8); } ! static bool WriteAtom(ostream &os,const t_atom &a,bool utf8) { if(flext::IsFloat(a)) *************** *** 792,796 **** static void WriteAtoms(ostream &os,const flext::AtomList &l,bool utf8) { ! for(I i = 0; i < l.Count(); ++i) { WriteAtom(os,l[i],utf8); if(i < l.Count()-1) os << ' '; --- 798,802 ---- static void WriteAtoms(ostream &os,const flext::AtomList &l,bool utf8) { ! for(int i = 0; i < l.Count(); ++i) { WriteAtom(os,l[i],utf8); if(i < l.Count()-1) os << ' '; *************** *** 798,806 **** } ! BL pooldir::LdDir(istream &is,I depth,BL mkdir) { ! for(I i = 1; !is.eof(); ++i) { Atoms d,k,*v = new Atoms; ! BL r = ReadAtoms(is,d,',',false) && ReadAtoms(is,k,',',false) && --- 804,812 ---- } ! bool pooldir::LdDir(istream &is,int depth,bool mkdir) { ! for(int i = 1; !is.eof(); ++i) { Atoms d,k,*v = new Atoms; ! bool r = ReadAtoms(is,d,',',false) && ReadAtoms(is,k,',',false) && *************** *** 831,838 **** } ! BL pooldir::SvDir(ostream &os,I depth,const AtomList &dir) { ! I cnt = 0; ! for(I vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { WriteAtoms(os,dir,false); --- 837,844 ---- } ! bool pooldir::SvDir(ostream &os,int depth,const AtomList &dir) { ! int cnt = 0; ! for(int vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { WriteAtoms(os,dir,false); *************** *** 852,857 **** if(depth) { // save sub-directories ! I nd = depth > 0?depth-1:-1; ! for(I di = 0; di < dsize; ++di) { for(pooldir *ix = dirs[di].d; ix; ix = ix->nxt) { ix->SvDir(os,nd,Atoms(dir).Append(ix->dir)); --- 858,863 ---- if(depth) { // save sub-directories ! int nd = depth > 0?depth-1:-1; ! for(int di = 0; di < dsize; ++di) { for(pooldir *ix = dirs[di].d; ix; ix = ix->nxt) { ix->SvDir(os,nd,Atoms(dir).Append(ix->dir)); *************** *** 866,870 **** string tag,attr; bool Ok() const { return tag.length() > 0; } ! bool operator ==(const C *t) const { return !tag.compare(t); } void Clear() --- 872,876 ---- string tag,attr; bool Ok() const { return tag.length() > 0; } ! bool operator ==(const char *t) const { return !tag.compare(t); } void Clear() *************** *** 980,984 **** } ! BL pooldir::LdDirXMLRec(istream &is,I depth,BL mkdir,AtomList &d) { Atoms k,v; --- 986,990 ---- } ! bool pooldir::LdDirXMLRec(istream &is,int depth,bool mkdir,AtomList &d) { Atoms k,v; *************** *** 1000,1004 **** ) ) { ! BL ret = true; if(indata) { if(v.Count()) --- 1006,1010 ---- ) ) { ! bool ret = true; if(indata) { if(v.Count()) *************** *** 1122,1126 **** } ! BL pooldir::LdDirXML(istream &is,I depth,BL mkdir) { while(!is.eof()) { --- 1128,1132 ---- } ! bool pooldir::LdDirXML(istream &is,int depth,bool mkdir) { while(!is.eof()) { *************** *** 1148,1157 **** } ! static void indent(ostream &s,I cnt) { ! for(I i = 0; i < cnt; ++i) s << '\t'; } ! BL pooldir::SvDirXML(ostream &os,I depth,const AtomList &dir,I ind) { int i,lvls = ind?(dir.Count()?1:0):dir.Count(); --- 1154,1163 ---- } ! static void indent(ostream &s,int cnt) { ! for(int i = 0; i < cnt; ++i) s << '\t'; } ! bool pooldir::SvDirXML(ostream &os,int depth,const AtomList &dir,int ind) { int i,lvls = ind?(dir.Count()?1:0):dir.Count(); *************** *** 1166,1170 **** } ! for(I vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { indent(os,ind+lvls); --- 1172,1176 ---- } ! for(int vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { indent(os,ind+lvls); *************** *** 1178,1183 **** if(depth) { ! I nd = depth > 0?depth-1:-1; ! for(I di = 0; di < dsize; ++di) { for(pooldir *ix = dirs[di].d; ix; ix = ix->nxt) { ix->SvDirXML(os,nd,Atoms(dir).Append(ix->dir),ind+lvls); --- 1184,1189 ---- if(depth) { ! int nd = depth > 0?depth-1:-1; ! for(int di = 0; di < dsize; ++di) { for(pooldir *ix = dirs[di].d; ix; ix = ix->nxt) { ix->SvDirXML(os,nd,Atoms(dir).Append(ix->dir),ind+lvls); Index: pool.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pool.h 30 Sep 2006 19:23:16 -0000 1.12 --- pool.h 3 Jan 2008 16:06:07 -0000 1.13 *************** *** 1,10 **** /* - pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ --- 1,12 ---- /* pool - hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. + $LastChangedRevision: 26 $ + $LastChangedDate: 2008-01-03 16:14:29 +0100 (Thu, 03 Jan 2008) $ + $LastChangedBy: thomas $ */ *************** *** 24,43 **** using namespace std; - typedef void V; - typedef int I; - typedef unsigned long UL; - typedef float F; - typedef char C; - typedef bool BL; - typedef t_atom A; - typedef t_symbol S; typedef flext::AtomListStatic<8> Atoms; class poolval: public flext { public: ! poolval(const A &key,AtomList *data); ~poolval(); --- 26,38 ---- using namespace std; typedef flext::AtomListStatic<8> Atoms; + class poolval: public flext { public: ! poolval(const t_atom &key,AtomList *data); ~poolval(); *************** *** 45,49 **** poolval *Dup() const; ! A key; AtomList *data; poolval *nxt; --- 40,44 ---- poolval *Dup() const; ! t_atom key; AtomList *data; poolval *nxt; *************** *** 54,97 **** { public: ! pooldir(const A &dir,pooldir *parent,I vcnt,I dcnt); ~pooldir(); ! V Clear(BL rec,BL dironly = false); ! V Reset(BL realloc = true); ! BL Empty() const { return !dirs && !vals; } ! BL HasDirs() const { return dirs != NULL; } ! BL HasVals() const { return vals != NULL; } ! pooldir *GetDir(I argc,const A *argv,BL cut = false); ! pooldir *GetDir(const AtomList &d,BL cut = false) { return GetDir(d.Count(),d.Atoms(),cut); } ! BL DelDir(I argc,const A *argv); ! BL DelDir(const AtomList &d) { return DelDir(d.Count(),d.Atoms()); } ! pooldir *AddDir(I argc,const A *argv,I vcnt = 0,I dcnt = 0); ! pooldir *AddDir(const AtomList &d,I vcnt = 0,I dcnt = 0) { return AddDir(d.Count(),d.Atoms(),vcnt,dcnt); } ! V SetVal(const A &key,AtomList *data,BL over = true); ! BL SetVali(I ix,AtomList *data); ! V ClrVal(const A &key) { SetVal(key,NULL); } ! BL ClrVali(I ix) { return SetVali(ix,NULL); } ! AtomList *PeekVal(const A &key); ! AtomList *GetVal(const A &key,BL cut = false); ! I CntAll() const; ! I GetAll(A *&keys,Atoms *&lst,BL cut = false); ! I PrintAll(char *buf,int len) const; ! I GetKeys(AtomList &keys); ! I CntSub() const; ! I GetSub(const A **&dirs); ! poolval *RefVal(const A &key); ! poolval *RefVali(I ix); ! BL Paste(const pooldir *p,I depth,BL repl,BL mkdir); ! BL Copy(pooldir *p,I depth,BL cur); ! BL LdDir(istream &is,I depth,BL mkdir); ! BL LdDirXML(istream &is,I depth,BL mkdir); ! BL SvDir(ostream &os,I depth,const AtomList &dir = AtomList()); ! BL SvDirXML(ostream &os,I depth,const AtomList &dir = AtomList(),I ind = 0); int VSize() const { return vsize; } --- 49,92 ---- { public: ! pooldir(const t_atom &dir,pooldir *parent,int vcnt,int dcnt); ~pooldir(); ! void Clear(bool rec,bool dironly = false); ! void Reset(bool realloc = true); ! bool Empty() const { return !dirs && !vals; } ! bool HasDirs() const { return dirs != NULL; } ! bool HasVals() const { return vals != NULL; } ! pooldir *GetDir(int argc,const t_atom *argv,bool cut = false); ! pooldir *GetDir(const AtomList &d,bool cut = false) { return GetDir(d.Count(),d.Atoms(),cut); } ! bool DelDir(int argc,const t_atom *argv); ! bool DelDir(const AtomList &d) { return DelDir(d.Count(),d.Atoms()); } ! pooldir *AddDir(int argc,const t_atom *argv,int vcnt = 0,int dcnt = 0); ! pooldir *AddDir(const AtomList &d,int vcnt = 0,int dcnt = 0) { return AddDir(d.Count(),d.Atoms(),vcnt,dcnt); } ! void SetVal(const t_atom &key,AtomList *data,bool over = true); ! bool SetVali(int ix,AtomList *data); ! void ClrVal(const t_atom &key) { SetVal(key,NULL); } ! bool ClrVali(int ix) { return SetVali(ix,NULL); } ! AtomList *PeekVal(const t_atom &key); ! AtomList *GetVal(const t_atom &key,bool cut = false); ! int CntAll() const; ! int GetAll(t_atom *&keys,Atoms *&lst,bool cut = false); ! int PrintAll(char *buf,int len) const; ! int GetKeys(AtomList &keys); ! int CntSub() const; ! int GetSub(const t_atom **&dirs); ! poolval *RefVal(const t_atom &key); ! poolval *RefVali(int ix); ! bool Paste(const pooldir *p,int depth,bool repl,bool mkdir); ! bool Copy(pooldir *p,int depth,bool cur); ! bool LdDir(istream &is,int depth,bool mkdir); ! bool LdDirXML(istream &is,int depth,bool mkdir); ! bool SvDir(ostream &os,int depth,const AtomList &dir = AtomList()); ! bool SvDirXML(ostream &os,int depth,const AtomList &dir = AtomList(),int ind = 0); int VSize() const { return vsize; } *************** *** 99,110 **** protected: ! int VIdx(const A &v) const { return FoldBits(AtomHash(v),vbits); } ! int DIdx(const A &d) const { return FoldBits(AtomHash(d),dbits); } ! A dir; pooldir *nxt; pooldir *parent; ! const I vbits,dbits,vsize,dsize; static unsigned int FoldBits(unsigned long h,int bits); --- 94,105 ---- protected: ! int VIdx(const t_atom &v) const { return FoldBits(AtomHash(v),vbits); } ! int DIdx(const t_atom &d) const { return FoldBits(AtomHash(d),dbits); } ! t_atom dir; pooldir *nxt; pooldir *parent; ! const int vbits,dbits,vsize,dsize; static unsigned int FoldBits(unsigned long h,int bits); *************** *** 118,122 **** private: ! BL LdDirXMLRec(istream &is,I depth,BL mkdir,AtomList &d); }; --- 113,117 ---- private: ! bool LdDirXMLRec(istream &is,int depth,bool mkdir,AtomList &d); }; *************** *** 126,140 **** { public: ! pooldata(const S *s = NULL,I vcnt = 0,I dcnt = 0); ~pooldata(); bool Private() const { return sym == NULL; } ! V Push() { ++refs; } ! BL Pop() { return --refs > 0; } ! V Reset() { root.Reset(); } ! BL MkDir(const AtomList &d,I vcnt = 0,I dcnt = 0) { root.AddDir(d,vcnt,dcnt); --- 121,135 ---- { public: ! pooldata(const t_symbol *s = NULL,int vcnt = 0,int dcnt = 0); ~pooldata(); bool Private() const { return sym == NULL; } ! void Push() { ++refs; } ! bool Pop() { return --refs > 0; } ! void Reset() { root.Reset(); } ! bool MkDir(const AtomList &d,int vcnt = 0,int dcnt = 0) { root.AddDir(d,vcnt,dcnt); *************** *** 142,156 **** } ! BL ChkDir(const AtomList &d) { return root.GetDir(d) != NULL; } ! BL RmDir(const AtomList &d) { return root.DelDir(d); } ! BL Set(const AtomList &d,const A &key,AtomList *data,BL over = true) { pooldir *pd = root.GetDir(d); --- 137,151 ---- } ! bool ChkDir(const AtomList &d) { return root.GetDir(d) != NULL; } ! bool RmDir(const AtomList &d) { return root.DelDir(d); } ! bool Set(const AtomList &d,const t_atom &key,AtomList *data,bool over = true) { pooldir *pd = root.GetDir(d); *************** *** 160,164 **** } ! BL Seti(const AtomList &d,I ix,AtomList *data) { pooldir *pd = root.GetDir(d); --- 155,159 ---- } ! bool Seti(const AtomList &d,int ix,AtomList *data) { pooldir *pd = root.GetDir(d); *************** *** 168,172 **** } ! BL Clr(const AtomList &d,const A &key) { pooldir *pd = root.GetDir(d); --- 163,167 ---- } ! bool Clr(const AtomList &d,const t_atom &key) { pooldir *pd = root.GetDir(d); *************** *** 176,180 **** } ! BL Clri(const AtomList &d,I ix) { pooldir *pd = root.GetDir(d); --- 171,175 ---- } ! bool Clri(const AtomList &d,int ix) { pooldir *pd = root.GetDir(d); *************** *** 184,188 **** } ! BL ClrAll(const AtomList &d,BL rec,BL dironly = false) { pooldir *pd = root.GetDir(d); --- 179,183 ---- } ! bool ClrAll(const AtomList &d,bool rec,bool dironly = false) { pooldir *pd = root.GetDir(d); *************** *** 192,196 **** } ! AtomList *Peek(const AtomList &d,const A &key) { pooldir *pd = root.GetDir(d); --- 187,191 ---- } ! AtomList *Peek(const AtomList &d,const t_atom &key) { pooldir *pd = root.GetDir(d); *************** *** 198,202 **** } ! AtomList *Get(const AtomList &d,const A &key) { pooldir *pd = root.GetDir(d); --- 193,197 ---- } ! AtomList *Get(const AtomList &d,const t_atom &key) { pooldir *pd = root.GetDir(d); *************** *** 204,208 **** } ! poolval *Ref(const AtomList &d,const A &key) { pooldir *pd = root.GetDir(d); --- 199,203 ---- } ! poolval *Ref(const AtomList &d,const t_atom &key) { pooldir *pd = root.GetDir(d); *************** *** 210,214 **** } ! poolval *Refi(const AtomList &d,I ix) { pooldir *pd = root.GetDir(d); --- 205,209 ---- } ! poolval *Refi(const AtomList &d,int ix) { pooldir *pd = root.GetDir(d); *************** *** 216,220 **** } ! I CntAll(const AtomList &d) { pooldir *pd = root.GetDir(d); --- 211,215 ---- } ! int CntAll(const AtomList &d) { pooldir *pd = root.GetDir(d); *************** *** 222,229 **** } ! I PrintAll(const AtomList &d); ! I GetAll(const AtomList &d,A *&keys,Atoms *&lst); ! I CntSub(const AtomList &d) { pooldir *pd = root.GetDir(d); --- 217,224 ---- } ! int PrintAll(const AtomList &d); ! int GetAll(const AtomList &d,t_atom *&keys,Atoms *&lst); ! int CntSub(const AtomList &d) { pooldir *pd = root.GetDir(d); *************** *** 231,251 **** } ! I GetSub(const AtomList &d,const t_atom **&dirs); ! BL Paste(const AtomList &d,const pooldir *clip,I depth = -1,BL repl = true,BL mkdir = true); ! pooldir *Copy(const AtomList &d,const A &key,BL cut); ! pooldir *CopyAll(const AtomList &d,I depth,BL cut); ! BL LdDir(const AtomList &d,const C *flnm,I depth,BL mkdir = true); ! BL SvDir(const AtomList &d,const C *flnm,I depth,BL absdir); ! BL Load(const C *flnm) { AtomList l; return LdDir(l,flnm,-1); } ! BL Save(const C *flnm) { AtomList l; return SvDir(l,flnm,-1,true); } ! BL LdDirXML(const AtomList &d,const C *flnm,I depth,BL mkdir = true); ! BL SvDirXML(const AtomList &d,const C *flnm,I depth,BL absdir); ! BL LoadXML(const C *flnm) { AtomList l; return LdDirXML(l,flnm,-1); } ! BL SaveXML(const C *flnm) { AtomList l; return SvDirXML(l,flnm,-1,true); } ! I refs; ! const S *sym; pooldata *nxt; --- 226,246 ---- } ! int GetSub(const AtomList &d,const t_atom **&dirs); ! bool Paste(const AtomList &d,const pooldir *clip,int depth = -1,bool repl = true,bool mkdir = true); ! pooldir *Copy(const AtomList &d,const t_atom &key,bool cut); ! pooldir *CopyAll(const AtomList &d,int depth,bool cut); ! bool LdDir(const AtomList &d,const char *flnm,int depth,bool mkdir = true); ! bool SvDir(const AtomList &d,const char *flnm,int depth,bool absdir); ! bool Load(const char *flnm) { AtomList l; return LdDir(l,flnm,-1); } ! bool Save(const char *flnm) { AtomList l; return SvDir(l,flnm,-1,true); } ! bool LdDirXML(const AtomList &d,const char *flnm,int depth,bool mkdir = true); ! bool SvDirXML(const AtomList &d,const char *flnm,int depth,bool absdir); ! bool LoadXML(const char *flnm) { AtomList l; return LdDirXML(l,flnm,-1); } ! bool SaveXML(const char *flnm) { AtomList l; return SvDirXML(l,flnm,-1,true); } ! int refs; ! const t_symbol *sym; pooldata *nxt; *************** *** 253,257 **** private: ! static const A nullatom; }; --- 248,252 ---- private: ! static const t_atom nullatom; };

1 0

externals/grill/pool pool-help.pd, 1.5, 1.6 pool.vcproj, 1.21, 1.22 readme.txt, 1.33, 1.34
by Thomas Grill 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10064 Modified Files: pool-help.pd pool.vcproj readme.txt Log Message: clarify usage of absdir flag for file operations fixed buffer overrun problems some assertions added success/error reporting for file operations got rid of type abbreviations changed obviously buggy pool name registering Index: pool-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool-help.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pool-help.pd 4 Mar 2007 14:16:33 -0000 1.5 --- pool-help.pd 3 Jan 2008 16:06:07 -0000 1.6 *************** *** 1,3 **** ! #N canvas 24 27 964 785 12; #X msg 296 105 set 1 2 3; #X obj 238 631 print K; --- 1,3 ---- ! #N canvas 24 27 968 789 12; #X msg 296 105 set 1 2 3; #X obj 238 631 print K; *************** *** 240,245 **** #X text 424 343 clear value at index; #X msg 425 363 clri 2; - #X text 272 13 a hierarchical storage object \, (C)2002-2006 Thomas - Grill; #X text 713 523 output ordering; #N canvas 285 155 534 455 ordered 0; --- 240,243 ---- *************** *** 277,280 **** --- 275,280 ---- #X obj 499 666 print ------------; #X text 503 646 separator on bang; + #X text 272 13 a hierarchical storage object \, (C)2002-2008 Thomas + Grill; #X connect 0 0 67 0; #X connect 2 0 67 0; *************** *** 307,311 **** #X connect 67 1 1 0; #X connect 67 2 5 0; ! #X connect 67 3 92 0; #X connect 67 4 60 0; #X connect 70 0 67 0; --- 307,311 ---- #X connect 67 1 1 0; #X connect 67 2 5 0; ! #X connect 67 3 91 0; #X connect 67 4 60 0; #X connect 70 0 67 0; *************** *** 316,319 **** #X connect 82 0 67 0; #X connect 84 0 67 0; ! #X connect 92 0 93 0; ! #X connect 92 1 90 0; --- 316,319 ---- #X connect 82 0 67 0; #X connect 84 0 67 0; ! #X connect 91 0 92 0; ! #X connect 91 1 89 0; Index: pool.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.vcproj,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pool.vcproj 30 Sep 2006 19:23:16 -0000 1.21 --- pool.vcproj 3 Jan 2008 16:06:07 -0000 1.22 *************** *** 89,93 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\pd\pd-cvs\src";..\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" --- 89,93 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\programme\pd-0.40-2\src";..\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" *************** *** 112,116 **** LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\data\pd\pd-cvs\bin" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/pool.pdb" --- 112,116 ---- LinkIncremental="2" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\pd-0.40-2\bin" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/pool.pdb" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/readme.txt,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** readme.txt 20 Jan 2007 14:27:39 -0000 1.33 --- readme.txt 3 Jan 2008 16:06:07 -0000 1.34 *************** *** 1,5 **** pool - a hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 1,5 ---- pool - a hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2008 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 88,91 **** --- 88,92 ---- - XML files are now encoded UTF-8 - implemented output sorting (ogetall, ogetrec, ogetsub) + - fixed some potential buffer overrun problems 0.2.1:

1 0

externals/iem/iemmatrix/src iemmatrix_sources.c, 1.9, 1.10 iemmatrix_sources.h, 1.9, 1.10 matrix.c, 1.1, 1.2
by IOhannes m zmölnig 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21010 Modified Files: iemmatrix_sources.c iemmatrix_sources.h matrix.c Log Message: added [mtx_isequal] added fix for what was broken by holzis pd-extendification Index: iemmatrix_sources.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_sources.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** iemmatrix_sources.c 28 Aug 2006 16:48:51 -0000 1.9 --- iemmatrix_sources.c 3 Jan 2008 13:40:28 -0000 1.10 *************** *** 8,16 **** void iemmatrix_sources_setup(void) { iemtx_abs_setup(); /* mtx_abs.c */ iemtx_add_setup(); /* mtx_add.c */ iemtx_and_setup(); /* mtx_and.c */ iemtx_atan_setup(); /* mtx_atan.c */ - iemtx_binops_setup(); /* mtx_binops.c */ iemtx_bitand_setup(); /* mtx_bitand.c */ iemtx_bitleft_setup(); /* mtx_bitleft.c */ --- 8,16 ---- void iemmatrix_sources_setup(void) { + iematrix_setup(); /* matrix.c */ iemtx_abs_setup(); /* mtx_abs.c */ iemtx_add_setup(); /* mtx_add.c */ iemtx_and_setup(); /* mtx_and.c */ iemtx_atan_setup(); /* mtx_atan.c */ iemtx_bitand_setup(); /* mtx_bitand.c */ iemtx_bitleft_setup(); /* mtx_bitleft.c */ *************** *** 46,59 **** iemtx_int_setup(); /* mtx_int.c */ iemtx_inverse_setup(); /* mtx_inverse.c */ iemtx_le_setup(); /* mtx_le.c */ iemtx_log_setup(); /* mtx_log.c */ iemtx_lt_setup(); /* mtx_lt.c */ - iemtx_matrix_setup(); /* mtx_matrix.c */ iemtx_max2_setup(); /* mtx_max2.c */ iemtx_mean_setup(); /* mtx_mean.c */ iemtx_min2_setup(); /* mtx_min2.c */ iemtx_minmax_setup(); /* mtx_minmax.c */ - iemtx_mul_setup(); /* mtx_mul.c */ iemtx_mul__setup(); /* mtx_mul~.c */ iemtx_neq_setup(); /* mtx_neq.c */ iemtx_not_setup(); /* mtx_not.c */ --- 46,59 ---- iemtx_int_setup(); /* mtx_int.c */ iemtx_inverse_setup(); /* mtx_inverse.c */ + iemtx_isequal_setup(); /* mtx_isequal.c */ iemtx_le_setup(); /* mtx_le.c */ iemtx_log_setup(); /* mtx_log.c */ iemtx_lt_setup(); /* mtx_lt.c */ iemtx_max2_setup(); /* mtx_max2.c */ iemtx_mean_setup(); /* mtx_mean.c */ iemtx_min2_setup(); /* mtx_min2.c */ iemtx_minmax_setup(); /* mtx_minmax.c */ iemtx_mul__setup(); /* mtx_mul~.c */ + iemtx_mul_setup(); /* mtx_mul.c */ iemtx_neq_setup(); /* mtx_neq.c */ iemtx_not_setup(); /* mtx_not.c */ Index: iemmatrix_sources.h =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_sources.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** iemmatrix_sources.h 28 Aug 2006 16:48:51 -0000 1.9 --- iemmatrix_sources.h 3 Jan 2008 13:40:28 -0000 1.10 *************** *** 6,14 **** #ifndef IEMMATRIX_SOURCES_H__ #define IEMMATRIX_SOURCES_H__ void iemtx_abs_setup(void); /* mtx_abs.c */ void iemtx_add_setup(void); /* mtx_add.c */ void iemtx_and_setup(void); /* mtx_and.c */ void iemtx_atan_setup(void); /* mtx_atan.c */ - void iemtx_binops_setup(void); /* mtx_binops.c */ void iemtx_bitand_setup(void); /* mtx_bitand.c */ void iemtx_bitleft_setup(void); /* mtx_bitleft.c */ --- 6,14 ---- #ifndef IEMMATRIX_SOURCES_H__ #define IEMMATRIX_SOURCES_H__ + void iematrix_setup(void); /* matrix.c */ void iemtx_abs_setup(void); /* mtx_abs.c */ void iemtx_add_setup(void); /* mtx_add.c */ void iemtx_and_setup(void); /* mtx_and.c */ void iemtx_atan_setup(void); /* mtx_atan.c */ void iemtx_bitand_setup(void); /* mtx_bitand.c */ void iemtx_bitleft_setup(void); /* mtx_bitleft.c */ *************** *** 44,57 **** void iemtx_int_setup(void); /* mtx_int.c */ void iemtx_inverse_setup(void); /* mtx_inverse.c */ void iemtx_le_setup(void); /* mtx_le.c */ void iemtx_log_setup(void); /* mtx_log.c */ void iemtx_lt_setup(void); /* mtx_lt.c */ - void iemtx_matrix_setup(void); /* mtx_matrix.c */ void iemtx_max2_setup(void); /* mtx_max2.c */ void iemtx_mean_setup(void); /* mtx_mean.c */ void iemtx_min2_setup(void); /* mtx_min2.c */ void iemtx_minmax_setup(void); /* mtx_minmax.c */ - void iemtx_mul_setup(void); /* mtx_mul.c */ void iemtx_mul__setup(void); /* mtx_mul~.c */ void iemtx_neq_setup(void); /* mtx_neq.c */ void iemtx_not_setup(void); /* mtx_not.c */ --- 44,57 ---- void iemtx_int_setup(void); /* mtx_int.c */ void iemtx_inverse_setup(void); /* mtx_inverse.c */ + void iemtx_isequal_setup(void); /* mtx_isequal.c */ void iemtx_le_setup(void); /* mtx_le.c */ void iemtx_log_setup(void); /* mtx_log.c */ void iemtx_lt_setup(void); /* mtx_lt.c */ void iemtx_max2_setup(void); /* mtx_max2.c */ void iemtx_mean_setup(void); /* mtx_mean.c */ void iemtx_min2_setup(void); /* mtx_min2.c */ void iemtx_minmax_setup(void); /* mtx_minmax.c */ void iemtx_mul__setup(void); /* mtx_mul~.c */ + void iemtx_mul_setup(void); /* mtx_mul.c */ void iemtx_neq_setup(void); /* mtx_neq.c */ void iemtx_not_setup(void); /* mtx_not.c */ Index: matrix.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/matrix.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** matrix.c 11 Jan 2007 19:41:20 -0000 1.1 --- matrix.c 3 Jan 2008 13:40:28 -0000 1.2 *************** *** 218,221 **** --- 218,222 ---- (t_method)matrix_free, sizeof(t_matrix), 0, A_GIMME, 0); class_addcreator((t_newmethod)matrix_new, gensym("mtx"), A_GIMME, 0); + class_addcreator((t_newmethod)matrix_new, gensym("iemmatrix"), A_GIMME, 0); /* the core : functions for matrices */ *************** *** 253,254 **** --- 254,259 ---- matrix_setup(); } + + void iematrix_setup(void){ + matrix_setup(); + }

1 0

externals/iem/iemmatrix/tests/mtx_isequal 00_exist.pd, NONE, 1.1 01_function0.pd, NONE, 1.1 01_function1.pd, NONE, 1.1 01_function2.pd, NONE, 1.1 01_function3.pd, NONE, 1.1
by IOhannes m zmölnig 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/iem/iemmatrix/tests/mtx_isequal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20588/mtx_isequal Added Files: 00_exist.pd 01_function0.pd 01_function1.pd 01_function2.pd 01_function3.pd Log Message: tests for new "mtx_isequal" --- NEW FILE: 01_function3.pd --- #N canvas 433 156 508 521 10; #X obj 122 68 inlet bang; #X obj 122 385 outlet 1==OK; #X msg 122 366 1; #X msg 122 112 matrix 3 3 1 2 3 4 5 6 7 8 9; #X obj 122 231 mtx_isequal; #X obj 122 90 t b b; #X text 67 37 test whether [mtx_isequal] correctly detects the inequality of 2 matrices; #X obj 122 347 select 0; #X msg 154 138 matrix 2 2 1 2 3 4; #X connect 0 0 5 0; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 7 0; #X connect 5 0 3 0; #X connect 5 1 8 0; #X connect 7 0 2 0; #X connect 8 0 4 1; --- NEW FILE: 01_function0.pd --- #N canvas 433 156 508 521 10; #X obj 122 68 inlet bang; #X obj 122 385 outlet 1==OK; #X msg 122 366 1; #X msg 122 112 matrix 3 3 1 2 3 4 5 6 7 8 9; #X obj 122 231 mtx_isequal; #X text 67 37 test whether [mtx_isequal] correctly detects the equality of 2 matrices; #X obj 122 347 select 1; #X obj 122 165 t a a; #X connect 0 0 3 0; #X connect 2 0 1 0; #X connect 3 0 7 0; #X connect 4 0 6 0; #X connect 6 0 2 0; #X connect 7 0 4 0; #X connect 7 1 4 1; --- NEW FILE: 01_function1.pd --- #N canvas 385 142 508 466 10; #X obj 122 68 inlet bang; #X obj 122 385 outlet 1==OK; #X msg 122 366 1; #X obj 122 139 t a a; #X obj 122 161 mtx_isequal; #X obj 122 347 select 1; #X text 67 37 test whether [mtx_isequal] correctly detects the equality of 2 matrices; #X obj 122 112 mtx_rand; #X connect 0 0 7 0; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 3 1 4 1; #X connect 4 0 5 0; #X connect 5 0 2 0; #X connect 7 0 3 0; --- NEW FILE: 00_exist.pd --- #N canvas 385 142 508 466 10; #X obj 122 68 inlet bang; #X obj 122 385 outlet 1==OK; #X obj 122 347 b; #X msg 122 366 1; #X msg 122 122 matrix 1 1 1; #X obj 122 161 mtx_isequal; #X text 67 37 test for existance of [mtx_isequal]; #X connect 0 0 4 0; #X connect 2 0 3 0; #X connect 3 0 1 0; #X connect 4 0 5 0; #X connect 5 0 2 0; --- NEW FILE: 01_function2.pd --- #N canvas 433 156 508 521 10; #X obj 122 68 inlet bang; #X obj 122 385 outlet 1==OK; #X msg 122 366 1; #X msg 122 112 matrix 3 3 1 2 3 4 5 6 7 8 9; #X obj 122 231 mtx_isequal; #X obj 122 90 t b b; #X msg 154 138 matrix 3 3 1 2 3 4 5 6 7 8 10; #X text 67 37 test whether [mtx_isequal] correctly detects the inequality of 2 matrices; #X obj 122 347 select 0; #X connect 0 0 5 0; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 8 0; #X connect 5 0 3 0; #X connect 5 1 6 0; #X connect 6 0 4 1; #X connect 8 0 2 0;

1 0

externals/iem/iemmatrix/tests runtests.sh, 1.3, 1.4 runtests.txt, 1.11, 1.12
by IOhannes m zmölnig 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/iem/iemmatrix/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20588 Modified Files: runtests.sh runtests.txt Log Message: tests for new "mtx_isequal" Index: runtests.txt =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/tests/runtests.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** runtests.txt 29 Mar 2006 15:33:46 -0000 1.11 --- runtests.txt 3 Jan 2008 13:38:16 -0000 1.12 *************** *** 158,161 **** --- 158,166 ---- mtx_int/03_function; mtx_inverse/00_exist; + mtx_isequal/00_exist; + mtx_isequal/01_function0; + mtx_isequal/01_function1; + mtx_isequal/01_function2; + mtx_isequal/01_function3; mtx_le/00_exist; mtx_le/01_function; Index: runtests.sh =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/tests/runtests.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** runtests.sh 8 Dec 2006 21:23:45 -0000 1.3 --- runtests.sh 3 Jan 2008 13:38:16 -0000 1.4 *************** *** 19,22 **** --- 19,28 ---- cat ${RUNTESTS_LOG}.$$ | egrep "^regression-test: " | sed -e 's/^regression-test: //' + FAILEDTESTS=$(cat ${RUNTESTS_LOG}.$$ | egrep "^regression-test: .*: failed$" | sed -e 's|^regression-test: ||' -e 's|: failed$||') + echo -n "failed tests: " + for ft in ${FAILEDTESTS}; do + echo -n "${ft} " + done + echo }

1 0

externals/iem/iemmatrix/tests/mtx_isequal - New directory
by IOhannes m zmölnig 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/iem/iemmatrix/tests/mtx_isequal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20236/mtx_isequal Log Message: Directory /cvsroot/pure-data/externals/iem/iemmatrix/tests/mtx_isequal added to the repository

1 0

externals/iem/iemmatrix/src mtx_isequal.c,NONE,1.1
by IOhannes m zmölnig 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15248 Added Files: mtx_isequal.c Log Message: an object to test for equality of matrices --- NEW FILE: mtx_isequal.c --- /* * iemmatrix * * objects for manipulating simple matrices * mostly refering to matlab/octave matrix functions * * Copyright (c) IOhannes m zmölnig, forum::für::umläute * IEM, Graz, Austria * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. * */ #include "iemmatrix.h" /* mtx_isequal */ /* mtx_isequal */ static t_class *mtx_isequal_class, *mtx_isequalscalar_class; static void mtx_isequalscalar_matrix(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc-2; int row=atom_getfloat(argv), col=atom_getfloat(argv+1); t_float offset=x->f; t_atom *buf; t_atom *ap=argv+2; if(argc<2){post("mtx_isequal: crippled matrix");return; } while(n--){ if(atom_getfloat(ap)!=offset) { outlet_float(x->x_obj.ob_outlet, (t_float)0); return; } ap++; } outlet_float(x->x_obj.ob_outlet, (t_float)1); } static void mtx_isequalscalar_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc; t_atom *ap=argv; t_float offset = x->f; while(n--){ if(atom_getfloat(ap)!=offset) { outlet_float(x->x_obj.ob_outlet, (t_float)0); return; } ap++; } outlet_float(x->x_obj.ob_outlet, (t_float)1); } static void mtx_isequal_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv) { int row=atom_getfloat(argv); int col=atom_getfloat(argv+1); t_atom *m; t_atom *m1 = argv+2; t_atom *m2 = x->m2.atombuffer+2; int n = argc-2; if (argc<2){ post("mtx_isequal: crippled matrix"); return; } if ((col<1)||(row<1)) { post("mtx_isequal: invalid dimensions"); return; } if (col*row>argc-2){ post("sparse matrix not yet supported : use \"mtx_check\""); return; } if ((col!=x->m2.col)||(row!=x->m2.row)){ outlet_float(x->x_obj.ob_outlet, (t_float)0); return; } while(n--){ if(atom_getfloat(m1++)!=atom_getfloat(m2++)) { outlet_float(x->x_obj.ob_outlet, (t_float)0); return; } } outlet_float(x->x_obj.ob_outlet, (t_float)1); } static void mtx_isequal_float(t_mtx_binmtx *x, t_float f) { t_matrix *m=&x->m, *m2=&x->m2; t_atom *ap=m2->atombuffer+2; int row2, col2, n; if (!m2->atombuffer){ outlet_float(x->x_obj.ob_outlet, (t_float)0); return; } row2=atom_getfloat(m2->atombuffer); col2=atom_getfloat(m2->atombuffer+1); n=row2*col2; while(n--){ if(atom_getfloat(ap)!=f) { outlet_float(x->x_obj.ob_outlet, (t_float)0); return; } ap++; } outlet_float(x->x_obj.ob_outlet, (t_float)1); } static void *mtx_isequal_new(t_symbol *s, int argc, t_atom *argv) { if (argc>1) post("mtx_isequal : extra arguments ignored"); if (argc) { t_mtx_binscalar *x = (t_mtx_binscalar *)pd_new(mtx_isequalscalar_class); floatinlet_new(&x->x_obj, &x->f); x->f = atom_getfloatarg(0, argc, argv); outlet_new(&x->x_obj, 0); return(x); } else { t_mtx_binmtx *x = (t_mtx_binmtx *)pd_new(mtx_isequal_class); inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("matrix"), gensym("")); outlet_new(&x->x_obj, 0); x->m.col = x->m.row = x->m2.col = x->m2.row = 0; x->m.atombuffer = x->m2.atombuffer = 0; return(x); } } void mtx_isequal_setup(void) { mtx_isequal_class = class_new(gensym("mtx_isequal"), (t_newmethod)mtx_isequal_new, (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); class_addmethod(mtx_isequal_class, (t_method)mtx_isequal_matrix, gensym("matrix"), A_GIMME, 0); class_addmethod(mtx_isequal_class, (t_method)mtx_bin_matrix2, gensym(""), A_GIMME, 0); class_addfloat (mtx_isequal_class, mtx_isequal_float); class_addbang (mtx_isequal_class, mtx_binmtx_bang); mtx_isequalscalar_class = class_new(gensym("mtx_isequal"), 0, (t_method)mtx_binscalar_free, sizeof(t_mtx_binscalar), 0, 0); class_addmethod(mtx_isequalscalar_class, (t_method)mtx_isequalscalar_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_isequalscalar_class, mtx_isequalscalar_list); class_addbang (mtx_isequalscalar_class, mtx_binscalar_bang); } void iemtx_isequal_setup(void) { mtx_isequal_setup(); }

1 0

externals/iem/iemmatrix/src mtx_diegg.c,1.3,1.4
by IOhannes m zmölnig 03 Jan '08

03 Jan '08

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9539/src Modified Files: mtx_diegg.c Log Message: fixed mtx_diegg and tests (it was really inconsistent) Index: mtx_diegg.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_diegg.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mtx_diegg.c 29 Mar 2006 12:07:52 -0000 1.3 --- mtx_diegg.c 3 Jan 2008 13:07:48 -0000 1.4 *************** *** 22,26 **** if(row*col>argc-2)post("mtx_diegg: sparse matrices not yet supported : use \"mtx_check\""); else { ! for(n=0;n<length;n++, dummy++)SETFLOAT(dummy, atom_getfloat(argv+(n-1)*(col-1))); outlet_list(x->x_obj.ob_outlet, gensym("diegg"), length, ap); } --- 22,29 ---- if(row*col>argc-2)post("mtx_diegg: sparse matrices not yet supported : use \"mtx_check\""); else { ! for(n=0;n<length;n++, dummy++){ ! int index=(n+1)*(col-1); ! SETFLOAT(dummy, atom_getfloat(argv+index)); ! } outlet_list(x->x_obj.ob_outlet, gensym("diegg"), length, ap); } *************** *** 35,43 **** if(!argc)return(x); ! x->atombuffer = (t_atom *)getbytes((argc*argc+2)*sizeof(t_atom)); ! setdimen(x, argc, argc); ! matrix_set(x, 0); ! argv+=argc-1; ! while(argc--)SETFLOAT(x->atombuffer+2+argc*(1+x->col), atom_getfloat(argv--)); return (x); --- 38,43 ---- if(!argc)return(x); ! ! matrix_diegg(x, s, argc, argv); return (x);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2008