cleaned up grill externals - replaced with svn:externals to svn.grrrr.org/ext/trunk/

svn path=/trunk/; revision=10951

1 files changed, 0 insertions, 231 deletions

diff --git a/externals/grill/py/source/pyargs.cpp b/externals/grill/py/source/pyargs.cpp
deleted file mode 100644
index 73d8f027..00000000
--- a/externals/grill/py/source/pyargs.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/* 
-py/pyext - python external object for PD and MaxMSP
-
-Copyright (c)2002-2008 Thomas Grill (gr@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 $
-*/
-
-#include "pybase.h"
-#include "pyatom.h"
-
-static const t_symbol *symatom = flext::MakeSymbol(" py ");
-
-static PyObject *MakePyAtom(const t_atom &at)
-{
-	if(flext::IsSymbol(at)) 
-        return pySymbol_FromSymbol(flext::GetSymbol(at));
-#if 1
-    else if(flext::CanbeFloat(at)) {
-        // if a number can be an integer... let it be an integer!
-        int ival = flext::GetAInt(at);
-        double fval = flext::GetAFloat(at);
-        return (double)ival == fval?PyInt_FromLong(ival):PyFloat_FromDouble(fval);
-    }
-#else
-    else if(flext::IsFloat(at))
-        return PyFloat_FromDouble(flext::GetFloat(at));
-    else if(flext::IsInt(at))
-        return PyInt_FromLong(flext::GetInt(at));
-#endif
-    return NULL;
-}
-
-static PyObject *MakePyAtom(int argc,const t_atom *argv)
-{
-    if(argc != sizeof(size_t)/2) return NULL;
-
-    size_t atom = 0;
-    for(int i = sizeof(size_t)/2-1; i >= 0; --i)
-        if(!flext::CanbeInt(argv[i])) { 
-            atom = 0; 
-            break; 
-        }
-        else
-            atom = (atom<<16)+flext::GetAInt(argv[i]);
-
-    if(atom) {
-        PyObject *el = PyAtom::Retrieve(atom);
-        if(!el) el = Py_None; // object already gone....
-        Py_INCREF(el);
-        return el;
-    }
-    else
-        return NULL;
-}
-
-PyObject *pybase::MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet)
-{
-	PyObject *ret,*el;
-
-    if(s == symatom && (el = MakePyAtom(argc,argv)) != NULL) {
-    	ret = PyTuple_New(1);
-		PyTuple_SET_ITEM(ret,0,el);             
-    }
-    else {
-	    bool any = IsAnything(s);
-	    ret = PyTuple_New(argc+(any?1:0)+(inlet >= 0?1:0));
-
-	    int pix = 0;
-
-	    if(inlet >= 0)
-		    PyTuple_SET_ITEM(ret,pix++,PyInt_FromLong(inlet)); 
-
-	    if(any)
-		    PyTuple_SET_ITEM(ret,pix++,pySymbol_FromSymbol(s)); 
-
-	    for(int i = 0; i < argc; ++i) {
-		    el = MakePyAtom(argv[i]);
-		    if(!el) {
-			    post("py/pyext: cannot convert argument %i",any?i+1:i);
-                
-                el = Py_None;
-                Py_INCREF(Py_None);
-            }
-		    
-		    PyTuple_SET_ITEM(ret,pix++,el); // reference stolen
-	    }
-    }
-
-	return ret;
-}
-
-PyObject *pybase::MakePyArg(const t_symbol *s,int argc,const t_atom *argv)
-{
-	PyObject *ret;
-
-    if(s == symatom && (ret = MakePyAtom(argc,argv)) != NULL) {
-        // ok!
-    }
-    else if(argc == 1 && !IsAnything(s))
-        // convert atoms and one-element lists
-		ret = MakePyAtom(*argv);       
-    else {
-	    bool any = s != sym_list;
-	    ret = PyTuple_New(argc+(any?1:0));
-
-	    int pix = 0;
-	    if(any)
-		    PyTuple_SET_ITEM(ret,pix++,pySymbol_FromSymbol(s)); 
-
-	    for(int i = 0; i < argc; ++i) {
-		    PyObject *el = MakePyAtom(argv[i]);
-		    if(!el) {
-			    post("py/pyext: cannot convert argument %i",any?i+1:i);
-                
-                el = Py_None;
-                Py_INCREF(Py_None);
-            }
-    		
-		    PyTuple_SET_ITEM(ret,pix++,el); // reference stolen
-	    }
-    }
-
-	return ret;
-}
-
-inline bool issym(PyObject *p)
-{
-    return PyString_Check(p) || pySymbol_Check(p);
-}
-
-inline bool isseq(PyObject *p)
-{
-    return PySequence_Check(p) && !issym(p);
-}
-
-const t_symbol *pybase::getone(t_atom &at,PyObject *arg)
-{
-    if(PyInt_Check(arg)) { flext::SetInt(at,PyInt_AsLong(arg)); return sym_fint; }
-    else if(PyLong_Check(arg)) { flext::SetInt(at,PyLong_AsLong(arg)); return sym_fint; }
-    else if(PyFloat_Check(arg)) { flext::SetFloat(at,(float)PyFloat_AsDouble(arg)); return flext::sym_float; }
-    else if(pySymbol_Check(arg)) { flext::SetSymbol(at,pySymbol_AS_SYMBOL(arg)); return flext::sym_symbol; }
-    else if(PyString_Check(arg)) { flext::SetString(at,PyString_AS_STRING(arg)); return flext::sym_symbol; }
-	else {
-		PyObject *tp = PyObject_Type(arg);
-		PyObject *stp = tp?PyObject_Str(tp):NULL;
-		char *tmp = "";
-		if(stp) tmp = PyString_AS_STRING(stp);
-		flext::post("py/pyext: Could not convert argument %s",tmp);
-		Py_XDECREF(stp);
-		Py_XDECREF(tp);
-
-        flext::SetSymbol(at,flext::sym__); 
-        return sym_symbol;
-	}
-}
-
-const t_symbol *pybase::getlist(t_atom *lst,PyObject *seq,int cnt,int offs)
-{
-	for(int ix = 0; ix < cnt; ++ix) {
-		PyObject *arg = PySequence_GetItem(seq,ix+offs); // new reference
-        getone(lst[ix],arg);
-        Py_DECREF(arg);
-	}
-    return flext::sym_list;
-}
-
-const t_symbol *pybase::GetPyArgs(AtomList &lst,PyObject *pValue,int offs)
-{
-	if(pValue == NULL) return false; 
-
-    // output bang on None returned
-    if(pValue == Py_None) return sym_bang;
-
-	// analyze return value or tuple
-    const t_symbol *sym = NULL;
-
-	if(isseq(pValue)) {
-        // Python might crash here if pValue is no "real" sequence, but rather e.g. an instance
-
-        int rargc = PySequence_Size(pValue);
-
-        if(rargc == 2) {
-            // check if syntax is symbol/string, list -> anything message
-            PyObject *s = PySequence_GetItem(pValue,0);
-            PyObject *l = PySequence_GetItem(pValue,1);
-
-            if(issym(s) && isseq(l)) {
-                // is anything message
-                rargc = PySequence_Size(l);
-            	lst(offs+rargc);           
-                getlist(lst.Atoms(),l,rargc);
-                sym = pyObject_AsSymbol(s);
-            }
-            else {
-                // (symbol,atom) list
-            	lst(offs+rargc);           
-	    	    sym = getlist(lst.Atoms(),pValue,rargc);
-            }
-
-            Py_DECREF(s);
-            Py_DECREF(l);
-        }
-        else {
-        	lst(offs+rargc);           
-		    sym = getlist(lst.Atoms(),pValue,rargc);
-        }
-	}
-    else {
-        lst(offs+1);
-        sym = getone(lst[offs],pValue);
-	}
-
-    return sym;
-}
-
-
-const t_symbol *pybase::GetPyAtom(AtomList &lst,PyObject *obj)
-{
-    size_t atom = PyAtom::Register(obj);
-    size_t szat = sizeof(atom)/2;
-
-    lst(szat);
-    for(size_t i = 0; i < szat; ++i,atom >>= 16)
-        flext::SetInt(lst[i],(int)(atom&((1<<16)-1)));
-    return symatom;
-}