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

Cosmetic changes in SwigType_add_qualifier

Browse source
This commit is contained in:
William S Fulton 2013-02-21 07:00:25 +00:00
commit cfd8497f3e
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/Swig/typeobj.c
View file

@ -429,21 +429,16 @@ int SwigType_isreference(const SwigType *t) {
* 'qual' can be a list of multiple qualifiers in any order, separated by spaces. * 'qual' can be a list of multiple qualifiers in any order, separated by spaces.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
/* Helper function to sort the mangled list */
static int SwigType_compare_qualifiers(const DOH *a, const DOH *b) {
return strcmp(Char(a), Char(b));
}
SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) {
List *qlist; List *qlist;
String *allq, *newq, *q; String *allq, *newq;
int i, sz; int i, sz;
char *c, *cqual, *cq, *cqprev; const char *cqprev = 0;
c = Char(t); const char *c = Char(t);
cqual = Char(qual); const char *cqual = Char(qual);
/* if 't' has no qualifiers and 'qual' is a single qualifier, simply add it */ /* if 't' has no qualifiers and 'qual' is a single qualifier, simply add it */
if ((strncmp(c, "q(", 2) != 0) && (strstr(cqual, " ") == NULL)) { if ((strncmp(c, "q(", 2) != 0) && (strstr(cqual, " ") == 0)) {
String *temp = NewStringf("q(%s).", cqual); String *temp = NewStringf("q(%s).", cqual);
Insert(t, 0, temp); Insert(t, 0, temp);
Delete(temp); Delete(temp);
@ -464,17 +459,16 @@ SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) {
qlist = Split(allq, ' ', INT_MAX); qlist = Split(allq, ' ', INT_MAX);
Delete(allq); Delete(allq);
/* sort list */ /* sort in alphabetical order */
SortList(qlist, SwigType_compare_qualifiers); SortList(qlist, Strcmp);
/* create new qualifier string from unique elements of list */ /* create new qualifier string from unique elements of list */
sz = Len(qlist); sz = Len(qlist);
newq = NewString("q("); newq = NewString("q(");
cqprev = NULL;
for (i = 0; i < sz; ++i) { for (i = 0; i < sz; ++i) {
q = Getitem(qlist, i); String *q = Getitem(qlist, i);
cq = Char(q); const char *cq = Char(q);
if (cqprev == NULL || strcmp(cqprev, cq) != 0) { if (cqprev == 0 || strcmp(cqprev, cq) != 0) {
if (i > 0) { if (i > 0) {
Append(newq, " "); Append(newq, " ");
} }