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

avoid multiple Len() calls

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8161 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-01 11:03:35 +00:00
commit af7b90f2df
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SWIG/Source/CParse/templ.c
View file

@ -171,7 +171,8 @@ cparse_template_expand(Node *n, String *tname, String *rname, String *templatear
List *bases = Getattr(n,baselists[b]); List *bases = Getattr(n,baselists[b]);
if (bases) { if (bases) {
int i; int i;
for (i = 0; i < Len(bases); i++) { int ilen = Len(bases);
for (i = 0; i < ilen; i++) {
String *name = Copy(Getitem(bases,i)); String *name = Copy(Getitem(bases,i));
Setitem(bases,i,name); Setitem(bases,i,name);
Append(typelist,name); Append(typelist,name);

19
SWIG/Source/Swig/stype.c
View file

@ -987,7 +987,7 @@ String *SwigType_manglestr(SwigType *s) {
void void
SwigType_typename_replace(SwigType *t, String *pat, String *rep) { SwigType_typename_replace(SwigType *t, String *pat, String *rep) {
String *nt; String *nt;
int i; int i, ilen;
List *elem; List *elem;
if (!Strstr(t,pat)) return; if (!Strstr(t,pat)) return;
@ -998,7 +998,8 @@ SwigType_typename_replace(SwigType *t, String *pat, String *rep) {
} }
nt = NewStringEmpty(); nt = NewStringEmpty();
elem = SwigType_split(t); elem = SwigType_split(t);
for (i = 0; i < Len(elem); i++) { ilen = Len(elem);
for (i = 0; i < ilen; i++) {
String *e = Getitem(elem,i); String *e = Getitem(elem,i);
if (SwigType_issimple(e)) { if (SwigType_issimple(e)) {
if (StringEqual(e,pat)) { if (StringEqual(e,pat)) {
@ -1014,13 +1015,14 @@ SwigType_typename_replace(SwigType *t, String *pat, String *rep) {
{ {
String *tsuffix; String *tsuffix;
List *tparms = SwigType_parmlist(e); List *tparms = SwigType_parmlist(e);
int j; int j, jlen;
String *nt = SwigType_templateprefix(e); String *nt = SwigType_templateprefix(e);
StringAppend(nt,"<("); StringAppend(nt,"<(");
for (j = 0; j < Len(tparms); j++) { jlen = Len(tparms);
for (j = 0; j < jlen; j++) {
SwigType_typename_replace(Getitem(tparms,j), pat, rep); SwigType_typename_replace(Getitem(tparms,j), pat, rep);
StringAppend(nt,Getitem(tparms,j)); StringAppend(nt,Getitem(tparms,j));
if (j < (Len(tparms)-1)) Putc(',',nt); if (j < (jlen-1)) Putc(',',nt);
} }
tsuffix = SwigType_templatesuffix(e); tsuffix = SwigType_templatesuffix(e);
Printf(nt,")>%s", tsuffix); Printf(nt,")>%s", tsuffix);
@ -1042,14 +1044,15 @@ SwigType_typename_replace(SwigType *t, String *pat, String *rep) {
Delete(rest); Delete(rest);
} }
} else if (SwigType_isfunction(e)) { } else if (SwigType_isfunction(e)) {
int j; int j, jlen;
List *fparms = SwigType_parmlist(e); List *fparms = SwigType_parmlist(e);
Clear(e); Clear(e);
StringAppend(e,"f("); StringAppend(e,"f(");
for (j = 0; j < Len(fparms); j++) { jlen = Len(fparms);
for (j = 0; j < jlen; j++) {
SwigType_typename_replace(Getitem(fparms,j), pat, rep); SwigType_typename_replace(Getitem(fparms,j), pat, rep);
StringAppend(e,Getitem(fparms,j)); StringAppend(e,Getitem(fparms,j));
if (j < (Len(fparms)-1)) Putc(',',e); if (j < (jlen-1)) Putc(',',e);
} }
StringAppend(e,")."); StringAppend(e,").");
Delete(fparms); Delete(fparms);

5
SWIG/Source/Swig/symbol.c
View file

@ -474,7 +474,7 @@ Swig_symbol_alias(String_or_char *aliasname, Symtab *s) {
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
void Swig_symbol_inherit(Symtab *s) { void Swig_symbol_inherit(Symtab *s) {
int i; int i, ilen;
List *inherit = HashGetAttr(current_symtab,k_inherit); List *inherit = HashGetAttr(current_symtab,k_inherit);
if (!inherit) { if (!inherit) {
inherit = NewList(); inherit = NewList();
@ -482,7 +482,8 @@ void Swig_symbol_inherit(Symtab *s) {
Delete(inherit); Delete(inherit);
} }
assert(s != current_symtab); assert(s != current_symtab);
for (i = 0; i < Len(inherit); i++) { ilen = Len(inherit);
for (i = 0; i < ilen; i++) {
Node *n = Getitem(inherit,i); Node *n = Getitem(inherit,i);
if (n == s) return; /* Already inherited */ if (n == s) return; /* Already inherited */
} }

5
SWIG/Source/Swig/typemap.c
View file

@ -1724,11 +1724,12 @@ static void replace_embedded_typemap(String *s) {
List *l; List *l;
Hash *vars; Hash *vars;
String *method; String *method;
int i; int i, ilen;
l = split_embedded(tmp); l = split_embedded(tmp);
vars = NewHash(); vars = NewHash();
for (i = 1; i < Len(l); i++) { ilen = Len(l);
for (i = 1; i < ilen; i++) {
String *n, *v; String *n, *v;
split_var(Getitem(l,i),&n,&v); split_var(Getitem(l,i),&n,&v);
if (n && v) { if (n && v) {