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

fix sorting problem with template types, strcmp can't be used directly with the DOH_String type. Use Cmp

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7395 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-08-26 07:06:10 +00:00
commit f906b4d5e7
2 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
SWIG/Source/DOH/string.c
View file

@ -111,30 +111,25 @@ String_len(DOH *so) {
static int static int
String_cmp(DOH *so1, DOH *so2) String_cmp(DOH *so1, DOH *so2)
{ {
String * s1 = (String *) ObjData(so1); String *s1, *s2;
String * s2 = (String *) ObjData(so2); char *c1, *c2;
register char *c1 = s1->str; int maxlen,i;
register char *c2 = s2->str; s1 = (String *) ObjData(so1);
#if 1 s2 = (String *) ObjData(so2);
/* this should be faster ? */ maxlen = s1->len;
return strcmp(c1, c2); if (s2->len < maxlen) maxlen = s2->len;
#else c1 = s1->str;
register int len1 = s1->len; c2 = s2->str;
register int len2 = s2->len; for (i = maxlen; i; --i,c1++,c2++) {
if (len1 < len2) { if (*c1 != *c2) break;
register char *ce = c1 + len1;
for (; c1 != ce ; ++c1, ++c2) {
if (*c1 != *c2) return ((*c1 < *c2) ? -1 : 1);
}
return -1;
} else {
register char *ce = c2 + len2;
for (; c2 != ce ; ++c1, ++c2) {
if (*c1 != *c2) return ((*c1 < *c2) ? -1 : 1);
}
return (len1 == len2) ? 0 : 1;
} }
#endif if (i != 0) {
if (*c1 < *c2) return -1;
else return 1;
}
if (s1->len == s2->len) return 0;
if (s1->len > s2->len) return 1;
return -1;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------

2
SWIG/Source/Swig/typesys.c
View file

@ -1773,7 +1773,7 @@ void SwigType_inherit_equiv(File *out) {
/* Helper function to sort the mangled list */ /* Helper function to sort the mangled list */
static int SwigType_compare_mangled(const DOH *a, const DOH *b) { static int SwigType_compare_mangled(const DOH *a, const DOH *b) {
return strcmp(DohData(a), DohData(b)); return Cmp(a, b);
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------