jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modified to use new pointer type-checker.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@194 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-02-04 05:27:23 +00:00
commit 0a52977f06
1 changed files with 107 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

204
Lib/python/ptrlang.i
View file

@ -8,9 +8,37 @@
// by the file ../pointer.i // by the file ../pointer.i
%{ %{
#include <ctype.h> #include <ctype.h>
/* Pointer library specific types */
static _swig_type_info _swig_pointer_int_p[] = {{"_int_p",0},{"_int_p",0},{0}};
static _swig_type_info _swig_pointer_short_p[] = {{"_short_p",0},{"_short_p",0},{0}};
static _swig_type_info _swig_pointer_long_p[] = {{"_long_p",0},{"_long_p",0},{0}};
static _swig_type_info _swig_pointer_float_p[] = {{"_float_p",0},{"_float_p",0},{0}};
static _swig_type_info _swig_pointer_double_p[] = {{"_double_p",0},{"_double_p",0},{0}};
static _swig_type_info _swig_pointer_char_p[] = {{"_char_p",0},{"_char_p",0},{0}};
static _swig_type_info _swig_pointer_char_pp[] = {{"_char_pp",0},{"_char_pp",0},{0}};
static _swig_type_info *_swig_pointer_types[] = {
_swig_pointer_int_p,
_swig_pointer_short_p,
_swig_pointer_long_p,
_swig_pointer_float_p,
_swig_pointer_double_p,
_swig_pointer_char_p,
_swig_pointer_char_pp,
0
};
#define SWIG_POINTER_int_p _swig_pointer_types[0]
#define SWIG_POINTER_short_p _swig_pointer_types[1]
#define SWIG_POINTER_long_p _swig_pointer_types[2]
#define SWIG_POINTER_float_p _swig_pointer_types[3]
#define SWIG_POINTER_double_p _swig_pointer_types[4]
#define SWIG_POINTER_char_p _swig_pointer_types[5]
#define SWIG_POINTER_char_pp _swig_pointer_types[6]
/*------------------------------------------------------------------ /*------------------------------------------------------------------
ptrcast(value,type) ptrcast(value,type)
@ -29,6 +57,7 @@ static PyObject *ptrcast(PyObject *_PTRVALUE, char *type) {
void *ptr; void *ptr;
PyObject *obj; PyObject *obj;
char *typestr,*c; char *typestr,*c;
_swig_type_info temptype;
/* Produce a "mangled" version of the type string. */ /* Produce a "mangled" version of the type string. */
@ -51,42 +80,22 @@ static PyObject *ptrcast(PyObject *_PTRVALUE, char *type) {
c++; c++;
} }
*(r++) = 0; *(r++) = 0;
/* Check to see what kind of object _PTRVALUE is */ /* Check to see what kind of object _PTRVALUE is */
if (PyInt_Check(_PTRVALUE)) { if (PyInt_Check(_PTRVALUE)) {
ptr = (void *) PyInt_AsLong(_PTRVALUE); ptr = (void *) PyInt_AsLong(_PTRVALUE);
/* Received a numerical value. Make a pointer out of it */ /* Received a numerical value. Make a pointer out of it */
r = (char *) malloc(strlen(typestr)+22); temptype.name = typestr;
if (ptr) { obj = SWIG_NewPointerObj(ptr,&temptype);
SWIG_MakePtr(r, ptr, typestr);
} else {
sprintf(r,"_0%s",typestr);
}
obj = PyString_FromString(r); obj = PyString_FromString(r);
free(r); } else {
} else if (PyString_Check(_PTRVALUE)) {
/* Have a real pointer value now. Try to strip out the pointer
value */
s = PyString_AsString(_PTRVALUE);
r = (char *) malloc(strlen(type)+22);
/* Now extract the pointer value */ /* Now extract the pointer value */
if (!SWIG_GetPtr(s,&ptr,0)) { if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,0,0)) {
if (ptr) { temptype.name=typestr;
SWIG_MakePtr(r,ptr,typestr); obj = SWIG_NewPointerObj(ptr,&temptype);
} else {
sprintf(r,"_0%s",typestr);
}
obj = PyString_FromString(r);
} else { } else {
obj = NULL; obj = NULL;
} }
free(r);
} else {
obj = NULL;
} }
free(typestr);
if (!obj) if (!obj)
PyErr_SetString(PyExc_TypeError,"Type error in ptrcast. Argument is not a valid pointer value."); PyErr_SetString(PyExc_TypeError,"Type error in ptrcast. Argument is not a valid pointer value.");
return obj; return obj;
@ -106,46 +115,36 @@ static PyObject *ptrvalue(PyObject *_PTRVALUE, int index, char *type) {
char *s; char *s;
PyObject *obj; PyObject *obj;
if (!PyString_Check(_PTRVALUE)) { if (SWIG_ConvertPtr(_PTRVALUE,&ptr,0,0)) {
PyErr_SetString(PyExc_TypeError,"Type error in ptrvalue. Argument is not a valid pointer value.");
return NULL;
}
s = PyString_AsString(_PTRVALUE);
if (SWIG_GetPtr(s,&ptr,0)) {
PyErr_SetString(PyExc_TypeError,"Type error in ptrvalue. Argument is not a valid pointer value."); PyErr_SetString(PyExc_TypeError,"Type error in ptrvalue. Argument is not a valid pointer value.");
return NULL; return NULL;
} }
/* If no datatype was passed, try a few common datatypes first */ /* If no datatype was passed, try a few common datatypes first */
if (!type) { if (!type) {
/* No datatype was passed. Type to figure out if it's a common one */ /* No datatype was passed. Type to figure out if it's a common one */
if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_int_p,0)) {
if (!SWIG_GetPtr(s,&ptr,"_int_p")) {
type = "int"; type = "int";
} else if (!SWIG_GetPtr(s,&ptr,"_double_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_double_p,0)) {
type = "double"; type = "double";
} else if (!SWIG_GetPtr(s,&ptr,"_short_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_short_p,0)) {
type = "short"; type = "short";
} else if (!SWIG_GetPtr(s,&ptr,"_long_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_long_p,0)) {
type = "long"; type = "long";
} else if (!SWIG_GetPtr(s,&ptr,"_float_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_float_p,0)) {
type = "float"; type = "float";
} else if (!SWIG_GetPtr(s,&ptr,"_char_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_char_p,0)) {
type = "char"; type = "char";
} else if (!SWIG_GetPtr(s,&ptr,"_char_pp")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_char_pp,0)) {
type = "char *"; type = "char *";
} else { } else {
type = "unknown"; type = "unknown";
} }
} }
if (!ptr) { if (!ptr) {
PyErr_SetString(PyExc_TypeError,"Unable to dereference NULL pointer."); PyErr_SetString(PyExc_TypeError,"Unable to dereference NULL pointer.");
return NULL; return NULL;
} }
/* Now we have a datatype. Try to figure out what to do about it */ /* Now we have a datatype. Try to figure out what to do about it */
if (strcmp(type,"int") == 0) { if (strcmp(type,"int") == 0) {
obj = PyInt_FromLong((long) *(((int *) ptr) + index)); obj = PyInt_FromLong((long) *(((int *) ptr) + index));
@ -181,32 +180,32 @@ static PyObject *ptrcreate(char *type, PyObject *_PYVALUE, int numelements) {
void *ptr; void *ptr;
PyObject *obj; PyObject *obj;
int sz; int sz;
char *cast; _swig_type_info *cast;
char temp[40]; char temp[40];
/* Check the type string against a variety of possibilities */ /* Check the type string against a variety of possibilities */
if (strcmp(type,"int") == 0) { if (strcmp(type,"int") == 0) {
sz = sizeof(int)*numelements; sz = sizeof(int)*numelements;
cast = "_int_p"; cast = SWIG_POINTER_int_p;
} else if (strcmp(type,"short") == 0) { } else if (strcmp(type,"short") == 0) {
sz = sizeof(short)*numelements; sz = sizeof(short)*numelements;
cast = "_short_p"; cast = SWIG_POINTER_short_p;
} else if (strcmp(type,"long") == 0) { } else if (strcmp(type,"long") == 0) {
sz = sizeof(long)*numelements; sz = sizeof(long)*numelements;
cast = "_long_p"; cast = SWIG_POINTER_long_p;
} else if (strcmp(type,"double") == 0) { } else if (strcmp(type,"double") == 0) {
sz = sizeof(double)*numelements; sz = sizeof(double)*numelements;
cast = "_double_p"; cast = SWIG_POINTER_double_p;
} else if (strcmp(type,"float") == 0) { } else if (strcmp(type,"float") == 0) {
sz = sizeof(float)*numelements; sz = sizeof(float)*numelements;
cast = "_float_p"; cast = SWIG_POINTER_float_p;
} else if (strcmp(type,"char") == 0) { } else if (strcmp(type,"char") == 0) {
sz = sizeof(char)*numelements; sz = sizeof(char)*numelements;
cast = "_char_p"; cast = SWIG_POINTER_char_p;
} else if (strcmp(type,"char *") == 0) { } else if (strcmp(type,"char *") == 0) {
sz = sizeof(char *)*(numelements+1); sz = sizeof(char *)*(numelements+1);
cast = "_char_pp"; cast = SWIG_POINTER_char_pp;
} else { } else {
PyErr_SetString(PyExc_TypeError,"Unable to create unknown datatype."); PyErr_SetString(PyExc_TypeError,"Unable to create unknown datatype.");
return NULL; return NULL;
@ -280,8 +279,7 @@ static PyObject *ptrcreate(char *type, PyObject *_PYVALUE, int numelements) {
} }
/* Create the pointer value */ /* Create the pointer value */
SWIG_MakePtr(temp,ptr,cast); obj = SWIG_NewPointerObj(ptr,cast);
obj = PyString_FromString(temp);
return obj; return obj;
} }
@ -295,44 +293,34 @@ static PyObject *ptrcreate(char *type, PyObject *_PYVALUE, int numelements) {
static PyObject *ptrset(PyObject *_PTRVALUE, PyObject *_PYVALUE, int index, char *type) { static PyObject *ptrset(PyObject *_PTRVALUE, PyObject *_PYVALUE, int index, char *type) {
void *ptr; void *ptr;
char *s;
PyObject *obj; PyObject *obj;
if (!PyString_Check(_PTRVALUE)) { if (SWIG_ConvertPtr(_PTRVALUE,&ptr,0,0)) {
PyErr_SetString(PyExc_TypeError,"Type error in ptrset. Argument is not a valid pointer value.");
return NULL;
}
s = PyString_AsString(_PTRVALUE);
if (SWIG_GetPtr(s,&ptr,0)) {
PyErr_SetString(PyExc_TypeError,"Type error in ptrset. Argument is not a valid pointer value."); PyErr_SetString(PyExc_TypeError,"Type error in ptrset. Argument is not a valid pointer value.");
return NULL; return NULL;
} }
/* If no datatype was passed, try a few common datatypes first */ /* If no datatype was passed, try a few common datatypes first */
if (!type) { if (!type) {
/* No datatype was passed. Type to figure out if it's a common one */ /* No datatype was passed. Type to figure out if it's a common one */
if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_int_p,0)) {
if (!SWIG_GetPtr(s,&ptr,"_int_p")) {
type = "int"; type = "int";
} else if (!SWIG_GetPtr(s,&ptr,"_double_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_double_p,0)) {
type = "double"; type = "double";
} else if (!SWIG_GetPtr(s,&ptr,"_short_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_short_p,0)) {
type = "short"; type = "short";
} else if (!SWIG_GetPtr(s,&ptr,"_long_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_long_p,0)) {
type = "long"; type = "long";
} else if (!SWIG_GetPtr(s,&ptr,"_float_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_float_p,0)) {
type = "float"; type = "float";
} else if (!SWIG_GetPtr(s,&ptr,"_char_p")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_char_p,0)) {
type = "char"; type = "char";
} else if (!SWIG_GetPtr(s,&ptr,"_char_pp")) { } else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_char_pp,0)) {
type = "char *"; type = "char *";
} else { } else {
type = "unknown"; type = "unknown";
} }
} }
if (!ptr) { if (!ptr) {
PyErr_SetString(PyExc_TypeError,"Unable to set NULL pointer."); PyErr_SetString(PyExc_TypeError,"Unable to set NULL pointer.");
return NULL; return NULL;
@ -370,7 +358,6 @@ static PyObject *ptrset(PyObject *_PTRVALUE, PyObject *_PYVALUE, int index, char
return Py_None; return Py_None;
} }
/*------------------------------------------------------------------ /*------------------------------------------------------------------
ptradd(ptr,offset) ptradd(ptr,offset)
@ -380,47 +367,40 @@ static PyObject *ptrset(PyObject *_PTRVALUE, PyObject *_PYVALUE, int index, char
static PyObject *ptradd(PyObject *_PTRVALUE, int offset) { static PyObject *ptradd(PyObject *_PTRVALUE, int offset) {
char *r,*s; char *r;
void *ptr,*junk; void *ptr,*junk;
PyObject *obj; PyObject *obj;
char *type; _swig_type_info *type;
/* Check to see what kind of object _PTRVALUE is */ /* Check to see what kind of object _PTRVALUE is */
if (PyString_Check(_PTRVALUE)) {
/* Have a potential pointer value now. Try to strip out the value */
s = PyString_AsString(_PTRVALUE);
/* Try to handle a few common datatypes first */ /* Try to handle a few common datatypes first */
if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_int_p,0)) {
if (!SWIG_GetPtr(s,&ptr,"_int_p")) {
ptr = (void *) (((int *) ptr) + offset); ptr = (void *) (((int *) ptr) + offset);
} else if (!SWIG_GetPtr(s,&ptr,"_double_p")) { type = SWIG_POINTER_int_p;
} else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_double_p,0)) {
ptr = (void *) (((double *) ptr) + offset); ptr = (void *) (((double *) ptr) + offset);
} else if (!SWIG_GetPtr(s,&ptr,"_short_p")) { type = SWIG_POINTER_double_p;
} else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_short_p,0)) {
ptr = (void *) (((short *) ptr) + offset); ptr = (void *) (((short *) ptr) + offset);
} else if (!SWIG_GetPtr(s,&ptr,"_long_p")) { type = SWIG_POINTER_short_p;
} else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_long_p,0)) {
ptr = (void *) (((long *) ptr) + offset); ptr = (void *) (((long *) ptr) + offset);
} else if (!SWIG_GetPtr(s,&ptr,"_float_p")) { type = SWIG_POINTER_long_p;
} else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_float_p,0)) {
ptr = (void *) (((float *) ptr) + offset); ptr = (void *) (((float *) ptr) + offset);
} else if (!SWIG_GetPtr(s,&ptr,"_char_p")) { type = SWIG_POINTER_float_p;
} else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_char_p,0)) {
ptr = (void *) (((char *) ptr) + offset); ptr = (void *) (((char *) ptr) + offset);
} else if (!SWIG_GetPtr(s,&ptr,0)) { type = SWIG_POINTER_char_p;
} else if (!SWIG_ConvertPtr(_PTRVALUE,&ptr,SWIG_POINTER_char_pp,0)) {
ptr = (void *) (((char *) ptr) + offset); ptr = (void *) (((char *) ptr) + offset);
type = SWIG_POINTER_char_pp;
} else { } else {
PyErr_SetString(PyExc_TypeError,"Type error in ptradd. Argument is not a valid pointer value."); PyErr_SetString(PyExc_TypeError,"Type error in ptradd. Argument is not a valid pointer value.");
return NULL; return NULL;
} }
type = SWIG_GetPtr(s,&junk,"INVALID POINTER"); obj = SWIG_NewPointerObj(ptr, type);
r = (char *) malloc(strlen(type)+20);
if (ptr) {
SWIG_MakePtr(r,ptr,type);
} else {
sprintf(r,"_0%s",type);
}
obj = PyString_FromString(r);
free(r);
}
return obj; return obj;
} }
@ -429,17 +409,13 @@ static PyObject *ptradd(PyObject *_PTRVALUE, int offset) {
Allows a mapping between type1 and type2. (Like a typedef) Allows a mapping between type1 and type2. (Like a typedef)
------------------------------------------------------------------ */ ------------------------------------------------------------------ */
static void ptrmap(char *type1, char *type2) { static void ptrmap(char *type1, char *type2) {
char *typestr1,*typestr2,*c,*r; char *typestr1,*typestr2,*c,*r;
/* Produce a "mangled" version of the type string. */ /* Produce a "mangled" version of the type string. */
typestr1 = (char *) malloc(strlen(type1)+2); typestr1 = (char *) malloc(strlen(type1)+2);
/* Go through and munge the typestring */ /* Go through and munge the typestring */
r = typestr1; r = typestr1;
*(r++) = '_'; *(r++) = '_';
c = type1; c = type1;
@ -475,8 +451,12 @@ static void ptrmap(char *type1, char *type2) {
c++; c++;
} }
*(r++) = 0; *(r++) = 0;
/* Currently unsupported */
/*
SWIG_RegisterMapping(typestr1,typestr2,0); SWIG_RegisterMapping(typestr1,typestr2,0);
SWIG_RegisterMapping(typestr2,typestr1,0); SWIG_RegisterMapping(typestr2,typestr1,0);
*/
} }
/*------------------------------------------------------------------ /*------------------------------------------------------------------
@ -487,20 +467,14 @@ static void ptrmap(char *type1, char *type2) {
PyObject *ptrfree(PyObject *_PTRVALUE) { PyObject *ptrfree(PyObject *_PTRVALUE) {
void *ptr, *junk; void *ptr, *junk;
char *s;
if (!PyString_Check(_PTRVALUE)) { if (SWIG_ConvertPtr(_PTRVALUE,&ptr,0,0)) {
PyErr_SetString(PyExc_TypeError,"Type error in ptrfree. Argument is not a valid pointer value.");
return NULL;
}
s = PyString_AsString(_PTRVALUE);
if (SWIG_GetPtr(s,&ptr,0)) {
PyErr_SetString(PyExc_TypeError,"Type error in ptrfree. Argument is not a valid pointer value."); PyErr_SetString(PyExc_TypeError,"Type error in ptrfree. Argument is not a valid pointer value.");
return NULL; return NULL;
} }
/* Check to see if this pointer is a char ** */ /* Check to see if this pointer is a char ** */
if (!SWIG_GetPtr(s,&junk,"_char_pp")) { if (!SWIG_ConvertPtr(_PTRVALUE,&junk,SWIG_POINTER_char_pp,0)) {
char **c = (char **) ptr; char **c = (char **) ptr;
if (c) { if (c) {
int i = 0; int i = 0;
@ -648,5 +622,15 @@ void ptrmap(char *type1, char *type2);
// weird type-handling problems. // weird type-handling problems.
%init %{
{
int i;
for (i = 0; _swig_pointer_types[i]; i++) {
_swig_pointer_types[i] = SWIG_TypeRegister(_swig_pointer_types[i]);
}
}
%}