Changed _swig_type_info to swig_type_info

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@799 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-09-02 16:25:50 +00:00
commit 16ff68c288
20 changed files with 201 additions and 209 deletions

View file

@ -3,37 +3,37 @@
* Tcl8.x - Object oriented runtime functions
*/
typedef int (*_swig_wrapper)(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST []);
typedef int (*swig_wrapper)(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST []);
typedef struct _swig_method {
typedef struct swig_method {
const char *name;
_swig_wrapper method;
} _swig_method;
swig_wrapper method;
} swig_method;
typedef struct _swig_attribute {
typedef struct swig_attribute {
const char *name;
_swig_wrapper getmethod;
_swig_wrapper setmethod;
} _swig_attribute;
swig_wrapper getmethod;
swig_wrapper setmethod;
} swig_attribute;
typedef struct _swig_class {
typedef struct swig_class {
const char *name;
_swig_type_info **type;
_swig_wrapper constructor;
swig_type_info **type;
swig_wrapper constructor;
void (*destructor)(void *);
_swig_method *methods;
_swig_attribute *attributes;
} _swig_class;
swig_method *methods;
swig_attribute *attributes;
} swig_class;
typedef struct _swig_instance {
typedef struct swig_instance {
Tcl_Obj *thisptr;
void *thisvalue;
_swig_class *classptr;
swig_class *classptr;
int destroy;
} _swig_instance;
} swig_instance;
static void SwigObjectDelete(ClientData clientData) {
_swig_instance *si = (_swig_instance *) clientData;
swig_instance *si = (swig_instance *) clientData;
if (si->destroy) {
if (si->classptr->destructor) {
(si->classptr->destructor)(si->thisvalue);
@ -48,9 +48,9 @@ static int
SwigMethodCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST _objv[])
{
char *method, *attrname;
_swig_instance *inst = (_swig_instance *) clientData;
_swig_method *meth;
_swig_attribute *attr;
swig_instance *inst = (swig_instance *) clientData;
swig_method *meth;
swig_attribute *attr;
Tcl_Obj *oldarg;
Tcl_Obj **objv;
int rcode;
@ -151,9 +151,9 @@ SwigObjectCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONS
{
Tcl_Obj *newObj = 0;
void *thisvalue = 0;
_swig_instance *newinst = 0;
_swig_class *classptr = (_swig_class *) clientData;
_swig_wrapper cons = 0;
swig_instance *newinst = 0;
swig_class *classptr = (swig_class *) clientData;
swig_wrapper cons = 0;
char *name = 0;
int firstarg = 0;
int thisarg = 0;
@ -213,7 +213,7 @@ SwigObjectCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONS
Tcl_DecrRefCount(newObj);
return TCL_ERROR;
}
newinst = (_swig_instance *) malloc(sizeof(_swig_instance));
newinst = (swig_instance *) malloc(sizeof(swig_instance));
newinst->thisptr = newObj;
Tcl_IncrRefCount(newObj);
newinst->thisvalue = thisvalue;

View file

@ -13,15 +13,15 @@
/* 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_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[] = {
static swig_type_info *_swig_pointer_types[] = {
_swig_pointer_int_p,
_swig_pointer_short_p,
_swig_pointer_long_p,
@ -59,7 +59,7 @@ static int ptrcast(Tcl_Interp *interp, char *ptrvalue, char *type) {
char *typestr,*c;
int pv;
int error = 0;
_swig_type_info sinfo;
swig_type_info sinfo;
/* Produce a "mangled" version of the type string. */
@ -188,7 +188,7 @@ static int ptrvalue(Tcl_Interp *interp, char *ptrvalue, int index, char *type) {
static int ptrcreate(Tcl_Interp *interp, char *type, char *ptrvalue, int numelements) {
void *ptr;
int sz;
_swig_type_info *cast = 0;
swig_type_info *cast = 0;
char temp[40];
/* Check the type string against a variety of possibilities */
@ -393,8 +393,8 @@ static int ptradd(Tcl_Interp *interp, char *ptrvalue, int offset) {
char *r,*s;
void *ptr,*junk;
_swig_type_info *type = 0;
_swig_type_info stype;
swig_type_info *type = 0;
swig_type_info stype;
/* Check to see what kind of object ptrvalue is */

View file

@ -13,21 +13,21 @@ extern "C" {
#endif
#ifdef SWIG_NOINCLUDE
SWIGEXPORT(int) SWIG_ConvertPtrFromString(Tcl_Interp *, char *, void **, _swig_type_info *);
SWIGEXPORT(int) SWIG_ConvertPtr(Tcl_Interp *, Tcl_Obj *, void **, _swig_type_info *);
SWIGEXPORT(void) SWIG_MakePtr(char *, void *, _swig_type_info *);
SWIGEXPORT(Tcl_Obj *) SWIG_NewPointerObj(void *, _swig_type_info *);
SWIGEXPORT(int) SWIG_ConvertPtrFromString(Tcl_Interp *, char *, void **, swig_type_info *);
SWIGEXPORT(int) SWIG_ConvertPtr(Tcl_Interp *, Tcl_Obj *, void **, swig_type_info *);
SWIGEXPORT(void) SWIG_MakePtr(char *, void *, swig_type_info *);
SWIGEXPORT(Tcl_Obj *) SWIG_NewPointerObj(void *, swig_type_info *);
SWIGEXPORT(int) SWIG_GetArgs(Tcl_Interp *, int, Tcl_Obj *CONST [], const char *, ...);
SWIGEXPORT(char *) SWIG_PointerTypeFromString(char *c);
#else
/* Convert a pointer value */
SWIGSTATICRUNTIME(int)
SWIG_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, _swig_type_info *ty)
SWIGRUNTIME(int)
SWIG_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type_info *ty)
{
unsigned long p;
register int d;
_swig_type_info *tc;
swig_type_info *tc;
p = 0;
/* Pointer values must start with leading underscore */
if (*c != '_') {
@ -62,15 +62,15 @@ SWIG_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, _swig_type_in
/* Convert a pointer value */
SWIGSTATICRUNTIME(int)
SWIG_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, _swig_type_info *ty)
SWIGRUNTIME(int)
SWIG_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, swig_type_info *ty)
{
return SWIG_ConvertPtrFromString(interp, Tcl_GetStringFromObj(oc,NULL), ptr, ty);
}
/* Convert a pointer value */
SWIGSTATICRUNTIME(char *)
SWIGRUNTIME(char *)
SWIG_PointerTypeFromString(char *c) {
char d;
/* Pointer values must start with leading underscore */
@ -87,8 +87,8 @@ SWIG_PointerTypeFromString(char *c) {
}
/* Take a pointer and convert it to a string */
SWIGSTATICRUNTIME(void)
SWIG_MakePtr(char *c, void *ptr, _swig_type_info *ty) {
SWIGRUNTIME(void)
SWIG_MakePtr(char *c, void *ptr, swig_type_info *ty) {
static char hex[17] = "0123456789abcdef";
unsigned long p, s;
char result[24], *r;
@ -110,8 +110,8 @@ SWIG_MakePtr(char *c, void *ptr, _swig_type_info *ty) {
}
/* Create a new pointer object */
SWIGSTATICRUNTIME(Tcl_Obj *)
SWIG_NewPointerObj(void *ptr, _swig_type_info *type) {
SWIGRUNTIME(Tcl_Obj *)
SWIG_NewPointerObj(void *ptr, swig_type_info *type) {
char result[256];
Tcl_Obj *robj;
SWIG_MakePtr(result,ptr,type);
@ -120,7 +120,7 @@ SWIG_NewPointerObj(void *ptr, _swig_type_info *type) {
}
/* Get arguments */
SWIGSTATICRUNTIME(int)
SWIGRUNTIME(int)
SWIG_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fmt, ...)
{
int argno = 0, opt = 0, tempi;
@ -129,7 +129,7 @@ SWIG_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fm
const char *c;
va_list ap;
void *vptr;
_swig_type_info *ty;
swig_type_info *ty;
va_start(ap,fmt);
for (c = fmt; (*c && (*c != ':')); c++,argno++) {
@ -183,7 +183,7 @@ SWIG_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fm
*((char *)vptr) = *(Tcl_GetStringFromObj(objv[argno+1],NULL));
break;
case 'p':
ty = (_swig_type_info *) va_arg(ap, void *);
ty = (swig_type_info *) va_arg(ap, void *);
if (SWIG_ConvertPtr(interp, objv[argno+1], (void **) vptr, ty) == TCL_ERROR) goto argerror;
break;
case 'o':
@ -218,7 +218,7 @@ typedef struct {
const char *name;
int (*wrapper)(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST []);
ClientData clientdata;
} _swig_command_info;
} swig_command_info;
/* Structure for variable linking table */
typedef struct {
@ -226,7 +226,7 @@ typedef struct {
void *addr;
char * (*get)(ClientData, Tcl_Interp *, char *, char *, int);
char * (*set)(ClientData, Tcl_Interp *, char *, char *, int);
} _swig_var_info;
} swig_var_info;
#ifdef __cplusplus