[Psyco-checkins] CVS: psyco/c/Objects pdescrobject.c,NONE,1.1 pdescrobject.h,NONE,1.1 pstructmember.c,NONE,1.1 pstructmember.h,NONE,1.1

[Armin R. <ar...@us...>]

Update of /cvsroot/psyco/psyco/c/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv26610

Added Files:
	pdescrobject.c pdescrobject.h pstructmember.c pstructmember.h 
Log Message:
added missing files

--- NEW FILE: pdescrobject.c ---
#include "pdescrobject.h"


static vinfo_t* pmember_get(PsycoObject* po, PyMemberDescrObject* descr,
			    vinfo_t* obj, PyTypeObject *type)
{
	/* a meta-implementation for member_get() of descrobject.c.
	   Note that not all parameters are 'vinfo_t*'; only 'obj'
	   is. This is because PsycoObject_GenericGetAttr() gives
	   immediate values for the other two arguments. */

	/* We assume that 'obj' is a valid instance of 'type'. */
	return PsycoMember_GetOne(po, obj, descr->d_member);
}


DEFINEFN
void psy_descrobject_init()
{
	PyObject* dummy;
	PyTypeObject* PyMemberDescr_Type;
	PyMemberDef dummydef;

	/* Member descriptors */
	/* any better way to get a pointer to PyMemberDescr_Type? */
	memset(&dummydef, 0, sizeof(dummydef));
	dummydef.name = "dummy";
	dummy = PyDescr_NewMember(&PsycoFunction_Type, &dummydef);
	PyMemberDescr_Type = dummy->ob_type;
	Py_DECREF(dummy);

	Psyco_DefineMeta(PyMemberDescr_Type->tp_descr_get,
			 pmember_get);
}

--- NEW FILE: pdescrobject.h ---
 /***************************************************************/
/***            Psyco equivalent of descrobject.h              ***/
 /***************************************************************/

#ifndef _PSY_DESCROBJECT_H
#define _PSY_DESCROBJECT_H


#include "pobject.h"
#include "pabstract.h"


EXTERNFN void psy_descrobject_init(void);


#endif /* _PSY_DESCROBJECT_H */

--- NEW FILE: pstructmember.c ---
#include "pstructmember.h"
#include "pstringobject.h"


DEFINEFN
vinfo_t* PsycoMember_GetOne(PsycoObject* po, vinfo_t* addr, PyMemberDef* l)
{
	vinfo_t* v;
	vinfo_t* w1;
	vinfo_t* w2;
	if (l->flags & READ_RESTRICTED)
		goto fallback;

	/* XXX add (some of) the missing types */
	switch (l->type) {
	case T_UBYTE:  /* read a byte, extend it unsigned */
		v = psyco_read_array_item_var(po, addr, psyco_viZero,
					      l->offset, 0);
		break;
	case T_INT:
	case T_UINT:
	case T_LONG:
	case T_ULONG:  /* read a long */
		v = psyco_read_array_item_var(po, addr, psyco_viZero,
					      l->offset, SIZE_OF_LONG_BITS);
		break;
#if 0
		XXX implement pfloatobject.c first
	case T_FLOAT:  /* read a long, turn it into a float */
		w1 = psyco_read_array_item_var(po, addr, psyco_viZero,
					      l->offset, SIZE_OF_LONG_BITS);
		if (w1 == NULL)
			return NULL;
		v = PsycoFloat_FromFloat(w1);
		vinfo_decref(w1, po);
		break;
	case T_DOUBLE:  /* read two longs, turn them into a double */
		w1 = psyco_read_array_item_var(po, addr, psyco_viZero,
					       l->offset, SIZE_OF_LONG_BITS);
		if (w1 == NULL)
			return NULL;
		w2 = psyco_read_array_item_var(po, addr, psyco_viZero,
					       l->offset + SIZEOF_LONG,
					       SIZE_OF_LONG_BITS);
		if (w2 == NULL) {
			vinfo_decref(w1, po);
			return NULL;
		}
		v = PsycoFloat_FromDouble(w1, w2);
		vinfo_decref(w2, po);
		vinfo_decref(w1, po);
		break;
#endif
	case T_CHAR:  /* read a byte, turn it into a char */
		w1 = psyco_read_array_item_var(po, addr, psyco_viZero,
					       l->offset, 0);
		if (w1 == NULL)
			return NULL;
		v = PsycoCharacter_New(w1);
		vinfo_decref(w1, po);
		break;
	case T_OBJECT:  /* read a long, turn it into a PyObject with reference */
		v = psyco_read_array_item_var(po, addr, psyco_viZero,
					      l->offset, SIZE_OF_LONG_BITS);
		if (v == NULL)
			return NULL;
		if (runtime_condition_t(po, integer_non_null(po, v))) {
			need_reference(po, v);
		}
		else {
			v = psyco_viNone;
			vinfo_incref(v);
		}
		break;
	case T_OBJECT_EX:  /* same as T_OBJECT, exception if NULL */
		v = psyco_read_array_item_var(po, addr, psyco_viZero,
					      l->offset, SIZE_OF_LONG_BITS);
		if (v == NULL)
			return NULL;
		if (runtime_condition_t(po, integer_non_null(po, v))) {
			need_reference(po, v);
		}
		else {
			PycException_SetString(po, PyExc_AttributeError,
					       l->name);
			return NULL;
		}
		break;
	default:
		goto fallback;
	}
	return v;

  fallback:
	/* call the Python implementation for cases we cannot handle directy */
	return psyco_generic_call(po, PyMember_GetOne,
				  CfReturnRef|CfPyErrIfNull, "vl", addr, l);
}

--- NEW FILE: pstructmember.h ---
 /***************************************************************/
/***           Psyco equivalent of structmember.h              ***/
 /***************************************************************/

#ifndef _PSY_STRUCTMEMBER_H
#define _PSY_STRUCTMEMBER_H


#include "pobject.h"


EXTERNFN
vinfo_t* PsycoMember_GetOne(PsycoObject* po, vinfo_t* addr, PyMemberDef* l);


inline void psy_structmember_init(void) { }  /* nothing */

#endif /* _PSY_STRUCTMEMBER_H */