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

Changes to default type handling to disambiguate dimensionless [] and

Browse source 
dimensioned arrays [ANY].


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4832 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-05-29 18:28:31 +00:00
commit 6c5a5ac719
1 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Source/Swig/stype.c
View file

@ -534,6 +534,9 @@ SwigType_strip_qualifiers(SwigType *t) {
* Types: SWIGTYPE * Types: SWIGTYPE
* MemberPointer: m(CLASS).SWIGTYPE * MemberPointer: m(CLASS).SWIGTYPE
* Enums: enum SWIGENUM * Enums: enum SWIGENUM
*
* Note: if this function is applied to a primitive type, it returns NULL. This
* allows recursive application for special types like arrays.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
static Hash *default_cache = 0; static Hash *default_cache = 0;
@ -545,7 +548,14 @@ SwigType *SwigType_default(SwigType *t) {
if (!default_cache) default_cache = NewHash(); if (!default_cache) default_cache = NewHash();
r = Getattr(default_cache,t); r = Getattr(default_cache,t);
if (r) return Copy(r); if (r) {
if (Strcmp(r,t) == 0) return 0;
return Copy(r);
}
if (SwigType_isvarargs(t)) {
return 0;
}
r = t; r = t;
while ((r1 = SwigType_typedef_resolve(r))) { while ((r1 = SwigType_typedef_resolve(r))) {
@ -563,18 +573,37 @@ SwigType *SwigType_default(SwigType *t) {
} else if (SwigType_isreference(r)) { } else if (SwigType_isreference(r)) {
def = NewString("r.SWIGTYPE"); def = NewString("r.SWIGTYPE");
} else if (SwigType_isarray(r)) { } else if (SwigType_isarray(r)) {
def = NewString("a().SWIGTYPE"); if (Strcmp(r,"a(ANY).SWIGTYPE") == 0) {
def = NewString("a().SWIGTYPE");
} else {
int i, empty = 0;
int ndim = SwigType_array_ndim(r);
for (i = 0; i < ndim; i++) {
String *dim = SwigType_array_getdim(r,i);
if (!Len(dim)) {
empty = 1;
}
Delete(dim);
}
if (empty) {
def = NewString("a().SWIGTYPE");
} else {
def = NewString("a(ANY).SWIGTYPE");
}
}
} else if (SwigType_ismemberpointer(r)) { } else if (SwigType_ismemberpointer(r)) {
def = NewString("m(CLASS).SWIGTYPE"); def = NewString("m(CLASS).SWIGTYPE");
} else if (SwigType_isenum(r)) { } else if (SwigType_isenum(r)) {
def = NewString("enum SWIGTYPE"); def = NewString("enum SWIGTYPE");
} else if (SwigType_isvarargs(r)) {
def = NewString("v(...)");
} else { } else {
def = NewString("SWIGTYPE"); def = NewString("SWIGTYPE");
} }
if (r != t) Delete(r); if (r != t) Delete(r);
Setattr(default_cache,t,Copy(def)); Setattr(default_cache,t,Copy(def));
if (Strcmp(def,t) == 0) {
Delete(def);
def = 0;
}
return def; return def;
} }