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

Corrected SWIGEXPORT to SWIGIMPORT

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5412 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-11-25 21:51:10 +00:00
commit dfd57099df
2 changed files with 160 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

32
SWIG/Lib/python/pyrun.swg
View file

@ -64,17 +64,17 @@ typedef struct swig_const_info {
#ifdef SWIG_NOINCLUDE #ifdef SWIG_NOINCLUDE
SWIGEXPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
SWIGEXPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
SWIGEXPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void);
SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
SWIGIMPORT(char *) SWIG_Python_PackData(char *c, void *, int);
SWIGIMPORT(char *) SWIG_Python_UnpackData(char *c, void *, int);
SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
SWIGEXPORT(PyObject *) SWIG_Python_newvarlink(void);
SWIGEXPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
SWIGEXPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
SWIGEXPORT(char *) SWIG_Python_PackData(char *c, void *, int);
SWIGEXPORT(char *) SWIG_Python_UnpackData(char *c, void *, int);
SWIGEXPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
#else #else
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -169,8 +169,7 @@ SWIG_Python_newvarlink(void) {
} }
SWIGRUNTIME(void) SWIGRUNTIME(void)
SWIG_Python_addvarlink(PyObject *p, char *name, SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
swig_varlinkobject *v; swig_varlinkobject *v;
swig_globalvar *gv; swig_globalvar *gv;
v= (swig_varlinkobject *) p; v= (swig_varlinkobject *) p;
@ -293,9 +292,9 @@ cobject:
} }
if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) { if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) {
PyObject *zero = PyInt_FromLong(0); PyObject *zero = PyInt_FromLong(0);
PyObject_SetAttrString(pyobj,(char*)"thisown",zero); PyObject_SetAttrString(pyobj,(char*)"thisown",zero);
Py_DECREF(zero); Py_DECREF(zero);
} }
return 0; return 0;
@ -315,8 +314,7 @@ type_error:
/* Convert a pointer value, signal an exception on a type mismatch */ /* Convert a pointer value, signal an exception on a type mismatch */
SWIGRUNTIME(void *) SWIGRUNTIME(void *)
SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
{
void *result; void *result;
SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION); SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION);
return result; return result;

271
SWIG/Lib/tcl/swigtcl8.swg
View file

@ -110,25 +110,27 @@ typedef struct swig_instance {
#define SWIG_ObjectDelete SWIG_Tcl_ObjectDelete #define SWIG_ObjectDelete SWIG_Tcl_ObjectDelete
#ifdef SWIG_NOINCLUDE #ifdef SWIG_NOINCLUDE
SWIGEXPORT(char *) SWIG_Tcl_PackData(char *c, void *ptr, int sz);
SWIGEXPORT(char *) SWIG_Tcl_UnpackData(char *c, void *ptr, int sz); SWIGIMPORT(char *) SWIG_Tcl_PackData(char *c, void *ptr, int sz);
SWIGEXPORT(int) SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *, char *, void **, swig_type_info *,int flags); SWIGIMPORT(char *) SWIG_Tcl_UnpackData(char *c, void *ptr, int sz);
SWIGEXPORT(int) SWIG_Tcl_ConvertPtr(Tcl_Interp *, Tcl_Obj *, void **, swig_type_info *, int flags); SWIGIMPORT(int) SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *, char *, void **, swig_type_info *,int flags);
SWIGEXPORT(int) SWIG_Tcl_ConvertPacked(Tcl_Interp *, Tcl_Obj *, void *, int sz, swig_type_info *, int flags); SWIGIMPORT(int) SWIG_Tcl_ConvertPtr(Tcl_Interp *, Tcl_Obj *, void **, swig_type_info *, int flags);
SWIGEXPORT(void) SWIG_Tcl_MakePtr(char *, void *, swig_type_info *, int flags); SWIGIMPORT(int) SWIG_Tcl_ConvertPacked(Tcl_Interp *, Tcl_Obj *, void *, int sz, swig_type_info *, int flags);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_NewPointerObj(void *, swig_type_info *, int flags); SWIGIMPORT(void) SWIG_Tcl_MakePtr(char *, void *, swig_type_info *, int flags);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_NewPackedObj(void *, int sz, swig_type_info *, int flags); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_NewPointerObj(void *, swig_type_info *, int flags);
SWIGEXPORT(int) SWIG_Tcl_GetArgs(Tcl_Interp *, int, Tcl_Obj *CONST [], const char *, ...); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_NewPackedObj(void *, int sz, swig_type_info *, int flags);
SWIGEXPORT(char *) SWIG_Tcl_PointerTypeFromString(char *c); SWIGIMPORT(int) SWIG_Tcl_GetArgs(Tcl_Interp *, int, Tcl_Obj *CONST [], const char *, ...);
SWIGEXPORT(void) SWIG_Tcl_Acquire(void *ptr); SWIGIMPORT(char *) SWIG_Tcl_PointerTypeFromString(char *c);
SWIGEXPORT(int) SWIG_Tcl_Disown(void *ptr); SWIGIMPORT(void) SWIG_Tcl_Acquire(void *ptr);
SWIGEXPORT(int) SWIG_Tcl_Thisown(void *ptr); SWIGIMPORT(int) SWIG_Tcl_Disown(void *ptr);
SWIGEXPORT(void) SWIG_Tcl_InstallConstants(Tcl_Interp *interp, struct swig_const_info constants[]); SWIGIMPORT(int) SWIG_Tcl_Thisown(void *ptr);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_GetConstant(const char *key); SWIGIMPORT(void) SWIG_Tcl_InstallConstants(Tcl_Interp *interp, struct swig_const_info constants[]);
SWIGEXPORT(Tcl_Obj *) SWIG_Tcl_NewInstanceObj(Tcl_Interp *interp, void *, swig_type_info *, int flags); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_GetConstant(const char *key);
SWIGEXPORT(int) SWIG_Tcl_ObjectConstructor(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); SWIGIMPORT(Tcl_Obj *) SWIG_Tcl_NewInstanceObj(Tcl_Interp *interp, void *, swig_type_info *, int flags);
SWIGEXPORT(int) SWIG_Tcl_MethodCommand(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]); SWIGIMPORT(int) SWIG_Tcl_ObjectConstructor(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
SWIGEXPORT(void) SWIG_Tcl_ObjectDelete(ClientData); SWIGIMPORT(int) SWIG_Tcl_MethodCommand(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
SWIGIMPORT(void) SWIG_Tcl_ObjectDelete(ClientData);
#else #else
/* Object support */ /* Object support */
@ -137,8 +139,7 @@ static int swigobjectTableinit = 0;
/* Acquire ownership of a pointer */ /* Acquire ownership of a pointer */
SWIGRUNTIME(void) SWIGRUNTIME(void)
SWIG_Tcl_Acquire(void *ptr) SWIG_Tcl_Acquire(void *ptr) {
{
Tcl_HashEntry *entryPtr; Tcl_HashEntry *entryPtr;
int newobj; int newobj;
if (!swigobjectTableinit) { if (!swigobjectTableinit) {
@ -150,8 +151,7 @@ SWIG_Tcl_Acquire(void *ptr)
/* Disown a pointer. Returns 1 if we owned it to begin with */ /* Disown a pointer. Returns 1 if we owned it to begin with */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_Disown(void *ptr) SWIG_Tcl_Disown(void *ptr) {
{
Tcl_HashEntry *entryPtr; Tcl_HashEntry *entryPtr;
if (!swigobjectTableinit) return 0; if (!swigobjectTableinit) return 0;
entryPtr = Tcl_FindHashEntry(&swigobjectTable, (char *) ptr); entryPtr = Tcl_FindHashEntry(&swigobjectTable, (char *) ptr);
@ -212,8 +212,7 @@ SWIG_Tcl_UnpackData(char *c, void *ptr, int sz) {
/* Convert a pointer value */ /* Convert a pointer value */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type_info *ty, int flags) SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type_info *ty, int flags) {
{
swig_type_info *tc; swig_type_info *tc;
/* Pointer values must start with leading underscore */ /* Pointer values must start with leading underscore */
while (*c != '_') { while (*c != '_') {
@ -250,8 +249,7 @@ SWIG_Tcl_ConvertPtrFromString(Tcl_Interp *interp, char *c, void **ptr, swig_type
/* Convert a pointer value */ /* Convert a pointer value */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, swig_type_info *ty, int flags) SWIG_Tcl_ConvertPtr(Tcl_Interp *interp, Tcl_Obj *oc, void **ptr, swig_type_info *ty, int flags) {
{
return SWIG_Tcl_ConvertPtrFromString(interp, Tcl_GetStringFromObj(oc,NULL), ptr, ty, flags); return SWIG_Tcl_ConvertPtrFromString(interp, Tcl_GetStringFromObj(oc,NULL), ptr, ty, flags);
} }
@ -399,8 +397,7 @@ SWIG_Tcl_GetConstant(const char *key) {
/* Get arguments */ /* Get arguments */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fmt, ...) SWIG_Tcl_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char *fmt, ...) {
{
int argno = 0, opt = 0; int argno = 0, opt = 0;
long tempi; long tempi;
double tempd; double tempd;
@ -418,60 +415,60 @@ SWIG_Tcl_GetArgs(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], const char
} }
if (argno >= (objc-1)) { if (argno >= (objc-1)) {
if (!opt) { if (!opt) {
Tcl_SetResult(interp, (char *) "Wrong # args. ", TCL_STATIC); Tcl_SetResult(interp, (char *) "Wrong # args. ", TCL_STATIC);
goto argerror; goto argerror;
} else { } else {
va_end(ap); va_end(ap);
return TCL_OK; return TCL_OK;
} }
} }
vptr = va_arg(ap,void *); vptr = va_arg(ap,void *);
if (vptr) { if (vptr) {
if (isupper(*c)) { if (isupper(*c)) {
obj = SWIG_GetConstant(Tcl_GetStringFromObj(objv[argno+1],0)); obj = SWIG_GetConstant(Tcl_GetStringFromObj(objv[argno+1],0));
if (!obj) obj = objv[argno+1]; if (!obj) obj = objv[argno+1];
} else { } else {
obj = objv[argno+1]; obj = objv[argno+1];
} }
switch(*c) { switch(*c) {
case 'i': case 'I': case 'i': case 'I':
case 'l': case 'L': case 'l': case 'L':
case 'h': case 'H': case 'h': case 'H':
case 'b': case 'B': case 'b': case 'B':
if (Tcl_GetLongFromObj(interp,obj,&tempi) != TCL_OK) goto argerror; if (Tcl_GetLongFromObj(interp,obj,&tempi) != TCL_OK) goto argerror;
if ((*c == 'i') || (*c == 'I')) *((int *)vptr) = (int)tempi; if ((*c == 'i') || (*c == 'I')) *((int *)vptr) = (int)tempi;
else if ((*c == 'l') || (*c == 'L')) *((long *)vptr) = (long)tempi; else if ((*c == 'l') || (*c == 'L')) *((long *)vptr) = (long)tempi;
else if ((*c == 'h') || (*c == 'H')) *((short*)vptr) = (short)tempi; else if ((*c == 'h') || (*c == 'H')) *((short*)vptr) = (short)tempi;
else if ((*c == 'b') || (*c == 'B')) *((unsigned char *)vptr) = (unsigned char)tempi; else if ((*c == 'b') || (*c == 'B')) *((unsigned char *)vptr) = (unsigned char)tempi;
break; break;
case 'f': case 'F': case 'f': case 'F':
case 'd': case 'D': case 'd': case 'D':
if (Tcl_GetDoubleFromObj(interp,obj,&tempd) != TCL_OK) goto argerror; if (Tcl_GetDoubleFromObj(interp,obj,&tempd) != TCL_OK) goto argerror;
if ((*c == 'f') || (*c == 'F')) *((float *) vptr) = (float)tempd; if ((*c == 'f') || (*c == 'F')) *((float *) vptr) = (float)tempd;
else if ((*c == 'd') || (*c == 'D')) *((double*) vptr) = tempd; else if ((*c == 'd') || (*c == 'D')) *((double*) vptr) = tempd;
break; break;
case 's': case 'S': case 's': case 'S':
if (*(c+1) == '#') { if (*(c+1) == '#') {
int *vlptr = (int *) va_arg(ap, void *); int *vlptr = (int *) va_arg(ap, void *);
*((char **) vptr) = Tcl_GetStringFromObj(obj, vlptr); *((char **) vptr) = Tcl_GetStringFromObj(obj, vlptr);
c++; c++;
} else { } else {
*((char **)vptr) = Tcl_GetStringFromObj(obj,NULL); *((char **)vptr) = Tcl_GetStringFromObj(obj,NULL);
} }
break; break;
case 'c': case 'C': case 'c': case 'C':
*((char *)vptr) = *(Tcl_GetStringFromObj(obj,NULL)); *((char *)vptr) = *(Tcl_GetStringFromObj(obj,NULL));
break; break;
case 'p': case 'P': case 'p': case 'P':
ty = (swig_type_info *) va_arg(ap, void *); ty = (swig_type_info *) va_arg(ap, void *);
if (SWIG_Tcl_ConvertPtr(interp, obj, (void **) vptr, ty, SWIG_POINTER_EXCEPTION) == TCL_ERROR) goto argerror; if (SWIG_Tcl_ConvertPtr(interp, obj, (void **) vptr, ty, SWIG_POINTER_EXCEPTION) == TCL_ERROR) goto argerror;
break; break;
case 'o': case 'O': case 'o': case 'O':
*((Tcl_Obj **)vptr) = objv[argno+1]; *((Tcl_Obj **)vptr) = objv[argno+1];
break; break;
default: default:
break; break;
} }
} }
} }
@ -510,8 +507,7 @@ SWIG_Tcl_ObjectDelete(ClientData clientData) {
/* Function to invoke object methods given an instance */ /* Function to invoke object methods given an instance */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST _objv[]) SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST _objv[]) {
{
char *method, *attrname; char *method, *attrname;
swig_instance *inst = (swig_instance *) clientData; swig_instance *inst = (swig_instance *) clientData;
swig_method *meth; swig_method *meth;
@ -557,11 +553,11 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
if (bi != -1) { if (bi != -1) {
cls = cls->bases[bi]; cls = cls->bases[bi];
if (cls) { if (cls) {
cls_stack_bi[cls_stack_top]++; cls_stack_bi[cls_stack_top]++;
cls_stack_top++; cls_stack_top++;
cls_stack[cls_stack_top] = cls; cls_stack[cls_stack_top] = cls;
cls_stack_bi[cls_stack_top] = -1; cls_stack_bi[cls_stack_top] = -1;
continue; continue;
} }
} }
if (!cls) { if (!cls) {
@ -575,72 +571,72 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
/* Check for methods */ /* Check for methods */
while (meth && meth->name) { while (meth && meth->name) {
if (strcmp(meth->name,method) == 0) { if (strcmp(meth->name,method) == 0) {
oldarg = objv[1]; oldarg = objv[1];
objv[1] = inst->thisptr; objv[1] = inst->thisptr;
Tcl_IncrRefCount(inst->thisptr); Tcl_IncrRefCount(inst->thisptr);
rcode = (*meth->method)(clientData,interp,objc,objv); rcode = (*meth->method)(clientData,interp,objc,objv);
objv[1] = oldarg; objv[1] = oldarg;
Tcl_DecrRefCount(inst->thisptr); Tcl_DecrRefCount(inst->thisptr);
return rcode; return rcode;
} }
meth++; meth++;
} }
/* Check class methods for a match */ /* Check class methods for a match */
if (strcmp(method,"cget") == 0) { if (strcmp(method,"cget") == 0) {
if (objc < 3) { if (objc < 3) {
Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC); Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
return TCL_ERROR; return TCL_ERROR;
} }
attrname = Tcl_GetStringFromObj(objv[2],NULL); attrname = Tcl_GetStringFromObj(objv[2],NULL);
attr = cls->attributes; attr = cls->attributes;
while (attr && attr->name) { while (attr && attr->name) {
if ((strcmp(attr->name, attrname) == 0) && (attr->getmethod)) { if ((strcmp(attr->name, attrname) == 0) && (attr->getmethod)) {
oldarg = objv[1]; oldarg = objv[1];
objv[1] = inst->thisptr; objv[1] = inst->thisptr;
Tcl_IncrRefCount(inst->thisptr); Tcl_IncrRefCount(inst->thisptr);
rcode = (*attr->getmethod)(clientData,interp,2, objv); rcode = (*attr->getmethod)(clientData,interp,2, objv);
objv[1] = oldarg; objv[1] = oldarg;
Tcl_DecrRefCount(inst->thisptr); Tcl_DecrRefCount(inst->thisptr);
return rcode; return rcode;
} }
attr++; attr++;
} }
if (strcmp(attrname, "-this") == 0) { if (strcmp(attrname, "-this") == 0) {
Tcl_SetObjResult(interp, Tcl_DuplicateObj(inst->thisptr)); Tcl_SetObjResult(interp, Tcl_DuplicateObj(inst->thisptr));
return TCL_OK; return TCL_OK;
} }
if (strcmp(attrname, "-thisown") == 0) { if (strcmp(attrname, "-thisown") == 0) {
if (SWIG_Thisown(inst->thisvalue)) { if (SWIG_Thisown(inst->thisvalue)) {
Tcl_SetResult(interp,(char*)"1",TCL_STATIC); Tcl_SetResult(interp,(char*)"1",TCL_STATIC);
} else { } else {
Tcl_SetResult(interp,(char*)"0",TCL_STATIC); Tcl_SetResult(interp,(char*)"0",TCL_STATIC);
} }
return TCL_OK; return TCL_OK;
} }
} else if (strcmp(method, "configure") == 0) { } else if (strcmp(method, "configure") == 0) {
int i; int i;
if (objc < 4) { if (objc < 4) {
Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC); Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
return TCL_ERROR; return TCL_ERROR;
} }
i = 2; i = 2;
while (i < objc) { while (i < objc) {
attrname = Tcl_GetStringFromObj(objv[i],NULL); attrname = Tcl_GetStringFromObj(objv[i],NULL);
attr = cls->attributes; attr = cls->attributes;
while (attr && attr->name) { while (attr && attr->name) {
if ((strcmp(attr->name, attrname) == 0) && (attr->setmethod)) { if ((strcmp(attr->name, attrname) == 0) && (attr->setmethod)) {
oldarg = objv[i]; oldarg = objv[i];
objv[i] = inst->thisptr; objv[i] = inst->thisptr;
Tcl_IncrRefCount(inst->thisptr); Tcl_IncrRefCount(inst->thisptr);
rcode = (*attr->setmethod)(clientData,interp,3, &objv[i-1]); rcode = (*attr->setmethod)(clientData,interp,3, &objv[i-1]);
objv[i] = oldarg; objv[i] = oldarg;
Tcl_DecrRefCount(inst->thisptr); Tcl_DecrRefCount(inst->thisptr);
if (rcode != TCL_OK) return rcode; if (rcode != TCL_OK) return rcode;
numconf += 2; numconf += 2;
} }
attr++; attr++;
} }
i+=2; i+=2;
} }
} }
} }
@ -665,7 +661,7 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
while (meth && meth->name) { while (meth && meth->name) {
char *cr = (char *) Tcl_GetStringResult(interp); char *cr = (char *) Tcl_GetStringResult(interp);
if (!strstr(strchr(cr,':'), meth->name)) if (!strstr(strchr(cr,':'), meth->name))
Tcl_AppendElement(interp, (char *) meth->name); Tcl_AppendElement(interp, (char *) meth->name);
meth++; meth++;
} }
cls = inst->classptr->bases[bi++]; cls = inst->classptr->bases[bi++];
@ -675,8 +671,7 @@ SWIG_Tcl_MethodCommand(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_
/* Function to create objects */ /* Function to create objects */
SWIGRUNTIME(int) SWIGRUNTIME(int)
SWIG_Tcl_ObjectConstructor(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) SWIG_Tcl_ObjectConstructor(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
{
Tcl_Obj *newObj = 0; Tcl_Obj *newObj = 0;
void *thisvalue = 0; void *thisvalue = 0;
swig_instance *newinst = 0; swig_instance *newinst = 0;
@ -695,41 +690,41 @@ SWIG_Tcl_ObjectConstructor(ClientData clientData, Tcl_Interp *interp, int objc,
if (objc > 1) { if (objc > 1) {
char *s = Tcl_GetStringFromObj(objv[1],NULL); char *s = Tcl_GetStringFromObj(objv[1],NULL);
if (strcmp(s,"-this") == 0) { if (strcmp(s,"-this") == 0) {
thisarg = 2; thisarg = 2;
cons = 0; cons = 0;
} else if (strcmp(s,"-args") == 0) { } else if (strcmp(s,"-args") == 0) {
firstarg = 1; firstarg = 1;
} else if (objc == 2) { } else if (objc == 2) {
firstarg = 1; firstarg = 1;
name = s; name = s;
} else if (objc >= 3) { } else if (objc >= 3) {
char *s1; char *s1;
name = s; name = s;
s1 = Tcl_GetStringFromObj(objv[2],NULL); s1 = Tcl_GetStringFromObj(objv[2],NULL);
if (strcmp(s1,"-this") == 0) { if (strcmp(s1,"-this") == 0) {
thisarg = 3; thisarg = 3;
cons = 0; cons = 0;
} else { } else {
firstarg = 1; firstarg = 1;
} }
} }
} }
if (cons) { if (cons) {
int result; int result;
result = (*cons)(0, interp, objc-firstarg, &objv[firstarg]); result = (*cons)(0, interp, objc-firstarg, &objv[firstarg]);
if (result != TCL_OK) { if (result != TCL_OK) {
return result; return result;
} }
newObj = Tcl_DuplicateObj(Tcl_GetObjResult(interp)); newObj = Tcl_DuplicateObj(Tcl_GetObjResult(interp));
if (!name) name = Tcl_GetStringFromObj(newObj,NULL); if (!name) name = Tcl_GetStringFromObj(newObj,NULL);
} else if (thisarg > 0) { } else if (thisarg > 0) {
if (thisarg < objc) { if (thisarg < objc) {
destroy = 0; destroy = 0;
newObj = Tcl_DuplicateObj(objv[thisarg]); newObj = Tcl_DuplicateObj(objv[thisarg]);
if (!name) name = Tcl_GetStringFromObj(newObj,NULL); if (!name) name = Tcl_GetStringFromObj(newObj,NULL);
} else { } else {
Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC); Tcl_SetResult(interp, (char *) "wrong # args.", TCL_STATIC);
return TCL_ERROR; return TCL_ERROR;
} }
} else { } else {
Tcl_SetResult(interp, (char *) "No constructor available.", TCL_STATIC); Tcl_SetResult(interp, (char *) "No constructor available.", TCL_STATIC);
@ -771,7 +766,7 @@ SWIG_Tcl_NewInstanceObj(Tcl_Interp *interp, void *thisvalue, swig_type_info *typ
newinst->destroy = flags; newinst->destroy = flags;
newinst->cmdtok = Tcl_CreateObjCommand(interp, Tcl_GetStringFromObj(robj,NULL), (swig_wrapper_func) SWIG_MethodCommand, (ClientData) newinst, (swig_delete_func) SWIG_ObjectDelete); newinst->cmdtok = Tcl_CreateObjCommand(interp, Tcl_GetStringFromObj(robj,NULL), (swig_wrapper_func) SWIG_MethodCommand, (ClientData) newinst, (swig_delete_func) SWIG_ObjectDelete);
if (flags) { if (flags) {
SWIG_Acquire(thisvalue); SWIG_Acquire(thisvalue);
} }
} }
} }