fixes and docs in %rename

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8160 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/CHANGES.current

@@ -18,38 +18,129 @@ Version 1.3.28 (unreleased).
 	       %rename("%(title)s")  import;     -> Import
 	       %rename("%(upper)s")  import;     -> IMPORT
 	       %rename("%(lower)s")  Import;     -> import
+	       %rename("%(ctitle)s") camel_case; -> CamelCase
 	       
-	    This will allow us to add more encoders, as the next
+	    This will allow us to add more encoders, as the 
-	    expected 'regexp'.
+	    expected one for regular expressions. 
 
-	  - In the meantime, add the 'command' encoder, you can use it as follows
+	  - Add the above 'ctitle' encoder, which does the camel case:
 
-               %rename(%(command:sed -e 's/\([a-z]\)/\U\\1/' <<< %s)s) import;  -> Import
+	        camel_case -> CamelCase
   
-	    where swig executes the command defined as %(command:<command here>)s.
+	  - Also, while we get the regexp support, add the 'command' encoder,
-	    Note that swig pass the name and the prefix as parameters
+            you can use it as follows
-	    that can capture via '%s'. Another example
 
-	       #define awk_cmd "%(command:awk '{if (NF==2) {print $2_$1} else {print _$1}}' <<< %s %s)s"
+               %rename("%(command:sed -e 's/\([a-z]\)/\U\\1/' <<< )s") import; 
 
-	       %rename(awk_cmd) ns1::import; -> ns1_import;
+	    then swig will popen the command
-	       %rename(awk_cmd) import; -> _import
 	    
-	    Just remember, first parameter is the name, the second is
+		"sed -e 's/\([a-z]\)/\U\\1/' <<< import"
-	    the prefix. If you don't need the prefix, just put one '%s'
-	    argument in your command.
 		
-	    Note that the 'command' encoder requires popen in your platform.
+            see below for anonymous renames for better examples.		
 
-           - The rename directive has its first option 'match', to
+          - The rename directive now also allows:
-             match  the node type, for example:
 
-		 %rename(%(title)s,match="enumitem") *;
+	    - simple match: only apply the rename if a type match
+	      happen, for example
+
+		 %rename(%(title)s,match="enumitem") hello;
 
 		 enum Hello {
-		   hi, hello     ->  Hi, Hello
+		   hi, hello  ->  hi, Hello  
+		 };
+		 int hello()  ->  hello; 
+
+	    - extended match: only apply the rename if the 'extended attribute' match
+	      occurred, for example: 
+
+	         // same as simple match 		
+		 %rename(%(title)s,match$nodeType="enumitem") hello; 
+
+		 enum Hello {
+		   hi, hello  ->  hi, Hello  
 		 };
 
+	       Note that the symbol '$' is used to define the attribute name in
+	       a 'recursive' way, for example:
+
+		 // match only hello in 'enum Hello'
+		 %rename(%(title)s,match$parentNode$type="enum Hello") hello; 
+
+		 enum Hello {
+ 		   hi, hello  ->  hi, Hello   // match
+		 };
+
+
+		 enum Hi {
+ 		   hi, hello  ->  hi, hello   // no match
+		 };
+
+               here, for Hello::hi, the "parentNode" is "Hello", and its "type"
+               is "enum Hello".
+	       
+	       
+            - Anonymous renames: you can use 'anonymous' rename directives, for example: 
+
+	         // rename all the enum items in Hello
+		 %rename(%(title)s,match$parentNode$type="enum Hello") ""; 
+
+		 enum Hello {
+ 		   hi, hello  ->  Hi, Hello   // match both
+		 };
+
+		 enum Hi {
+ 		   hi, hello  ->  hi, hello   // no match
+		 };
+		 
+	         // rename all the enum items 
+		 %rename(%(title)s,match$nodeType="enumitem") ""; 
+
+	         // rename all the items in given command (sloooow, but...)
+		 %rename(%(command:<my external cmd>)s) ""; 
+
+	
+	      Anonymous renames with commands can be very powerful, since you
+	      can 'outsource' all the renaming mechanism (or part of it) to an
+	      external program:
+	      
+	        // Uppercase all (and only) the names that start with 'i'
+	        %rename("%(command:awk '/^i/{print toupper($1)}' <<<)s") "";   
+	       
+	        int imported() -> IMPORTED;
+	        int hello()    -> hello
+
+	      Note that if the 'command' encoder returns an empty string, swig
+	      understand that no rename is necessary.
+
+	      Also note that %rename 'passes' the matched name. For example, in
+	      this case
+
+	        namespace ns1 {
+		  int foo();
+		}
+
+	        namespace ns2 {
+		  int bar();
+		}
+
+	      the external program only receives "foo" and "bar". If needed,
+	      however, you can request the 'fullname' 
+	       	
+	        %rename("%(command:awk 'awk '/ns1::/{l=split($1,a,"::"); print toupper(a[l])}'' <<<)s",fullname=1) "";   
+                
+		ns1::foo -> FOO
+		ns2::bar -> bar	
+	
+	    - Mixing encoders and matching: of course, you can do mix commands
+	      and match fields, for example:
+
+	        %rename("%(<my encoder for fncs>)",match="cdecl") "";
+	        %rename("%(<my encoder for enums>)",match="enumitem") "";
+	        %rename("%(<my encoder for enums inside a class>)",match="enumitem",
+		        match$parentNode$parentNode$nodeType="class") "";
+		
+	      Use "swig -dump_tree" to see the attributes names you can use to
+	      match an specific case.
 	
 12/30/2005: mmatus
 

SWIG/Examples/test-suite/rename_camel.i

@@ -1,18 +1,18 @@
 %module rename_camel
 
 
-%define CamelCase "%(command:sed -e 's/\([a-z]\)/\U\\1/' -e 's/\(_\)\([a-z]\)/\U\\2/g' <<< %s)s" %enddef
+%define SedCmd "%(command:sed -e 's/\([a-z]\)/\U\\1/' -e 's/\(_\)\([a-z]\)/\U\\2/g' <<<)s" %enddef
 
+%rename(CamelCase1) camel_case_1;
+%rename(SedCmd)     camel_case_2;
+%rename("%(ctitle)s") camel_case_3;
 
-%rename("CamelCase1") camel_case_1;
+%rename("%(title)s",match$parentNode$type="enum HelloEnum") "";
-%rename("_%s")        camel_case_2;
+%rename("%(ctitle)s",match$parentNode$type="enum ChaoEnum") "";
-%rename("%(mangle)s") camel_case_3;
-%rename("%(title)s")  camel_case_4;
-%rename(CamelCase)    camel_case;
-%rename(CamelCase)    also_works_here;
 
-%rename("%(title)s",match="enumitem") "*";
+#define awk_cmd "%(command:awk '/^i/{print toupper($1)}' <<<)s"
 
+%rename(awk_cmd) "";
 
 %inline 
 {
@@ -24,8 +24,15 @@
   int also_works_here(int);
 
   enum HelloEnum {
-    hi, hello
+    hello, hi_there
   };
   
 
+  enum ChaoEnum {
+    bye, see_you
+  };
+
+  int import(int);
+  int foo(int);
+  
 }

SWIG/Source/CParse/parser.y

@@ -1,4 +1,7 @@
 %{
+#if 0
+} /* cc-mode */
+#endif
 /* -----------------------------------------------------------------------------
  * parser.y
  *
@@ -205,23 +208,37 @@ static Hash   *rename_hash = 0;
 static Hash   *namewarn_hash = 0;
 static Hash   *features_hash = 0;
 
+static List   *rename_list = 0;
+static List   *namewarn_list = 0;
+
 static String *resolve_node_scope(String *cname);
 
-Hash *Swig_cparse_namewarn() {
+Hash *Swig_cparse_namewarn_hash() {
   if (!namewarn_hash) namewarn_hash = NewHash();
   return namewarn_hash;
 }
 
+Hash *Swig_cparse_rename_hash() {
+  if (!rename_hash) rename_hash = NewHash();
+  return rename_hash;
+}
+
 Hash *Swig_cparse_features() {
   if (!features_hash) features_hash = NewHash();
   return features_hash;
 }
 
-Hash *Swig_cparse_rename() {
+List *Swig_cparse_namewarn_list() {
-  if (!rename_hash) rename_hash = NewHash();
+  if (!namewarn_list) namewarn_list = NewList();
-  return rename_hash;
+  return namewarn_list;
 }
 
+List *Swig_cparse_rename_list() {
+  if (!rename_list) rename_list = NewList();
+  return rename_list;
+}
+
+
 static String *feature_identifier_fix(String *s) {
   if (SwigType_istemplate(s)) {
     String *tp, *ts, *ta, *tq;
@@ -240,23 +257,65 @@ static String *feature_identifier_fix(String *s) {
   }
 }
 
-static void single_rename_add(const char *name, SwigType *decl, Hash *newname) {
+static void 
-  String *nname;
+Swig_cparse_add_name_object(Hash *name_hash, List *name_list,
-  if (Namespaceprefix) {
+			    String *prefix, const char *name, SwigType *decl, Hash *nameobj) {
-    nname = NewStringf("%s::%s",Namespaceprefix, name);
+  String *nname = 0;
-  } else {
+
-    nname = NewString(name);
+  if (name && Len(name)) {
+    String *target_fmt = Getattr(nameobj,"target_fmt");
+    nname = prefix ? NewStringf("%s::%s",prefix, name) : NewString(name);
+    if (target_fmt) {
+      String *tmp = NewStringf(Getattr(nameobj,"target_fmt"), nname);
+      Delete(nname);
+      nname = tmp;
+    }
+  }
+  
+  if (!nname || !Len(nname) || Getattr(nameobj,"source_fmt")) {
+    if (decl) Setattr(nameobj,"decl", decl);
+    if (nname && Len(nname)) Setattr(nameobj,"target_name", nname);
+    Append(name_list, nameobj);
+  } else {  
+    Swig_name_object_set(name_hash,nname,decl,nameobj);
   }
-  Swig_name_object_set(Swig_cparse_rename(),nname,decl,newname);
   Delete(nname);
 }
 
+
+static void single_rename_add(const char *name, SwigType *decl, Hash *newname) {
+  Swig_cparse_add_name_object(Swig_cparse_rename_hash(), Swig_cparse_rename_list(),
+			      Namespaceprefix, name, decl, newname);
+}
+
+
+static void Swig_name_object_attach_keys(const char *keys[], Hash *nameobj) 
+{
+  Node *kw = nextSibling(nameobj);
+  while (kw) {
+    Node *next = nextSibling(kw);
+    String *kname = Getattr(kw,"name");
+    char *ckey = kname ? Char(kname) :  0;
+    if (ckey) {
+      const char **rkey;
+      for (rkey = keys; *rkey != 0; ++rkey) {
+	if (strcmp(ckey,*rkey) == 0) {
+	  Setattr(nameobj, *rkey, Getattr(kw,"value"));
+	  deleteNode(kw);
+	}
+      }
+    }
+    kw = next;
+  }
+}
+
 /* Add a new rename. Works much like new_feature including default argument handling. */
-static void rename_add(const char *name, SwigType *decl, Hash *kwargs, ParmList *declaratorparms) {
+static void rename_add(const char *name, SwigType *decl, Hash *newname, ParmList *declaratorparms) {
   
   ParmList *declparms = declaratorparms;
   
-  String *newname = kwargs;
+  const char *rename_keys[] = {"fullname", "source_fmt", "target_fmt", 0};
+  Swig_name_object_attach_keys(rename_keys, newname);
   
   /* Add the name */
   single_rename_add(name, decl, newname);
@@ -288,22 +347,17 @@ static void rename_add(const char *name, SwigType *decl, Hash *kwargs, ParmList
   }
 }
 
-static void namewarn_add(const char *name, SwigType *decl, Hash *warning) {
+static void namewarn_add(const char *name, SwigType *decl, Hash *namewrn) {
-  String *nname;
+  const char *namewrn_keys[] = {"rename", "error", "fullname", "source_fmt", "target_fmt", 0};
-  if (Namespaceprefix) {
+  Swig_name_object_attach_keys(namewrn_keys, namewrn);
-    nname = NewStringf("%s::%s",Namespaceprefix, name);
+  Swig_cparse_add_name_object(Swig_cparse_namewarn_hash(), Swig_cparse_namewarn_list(),
-  } else {
+			      Namespaceprefix, name, decl, namewrn);
-    nname = NewString(name);
-  }
-
-  Swig_name_object_set(Swig_cparse_namewarn(),nname,decl,warning);
-  Delete(nname);
 }
 
 static void rename_inherit(String *base, String *derived) {
   /*  Printf(stdout,"base = '%s', derived = '%s'\n", base, derived); */
-  Swig_name_object_inherit(Swig_cparse_rename(),base,derived);
+  Swig_name_object_inherit(Swig_cparse_rename_hash(),base,derived);
-  Swig_name_object_inherit(Swig_cparse_namewarn(),base,derived);
+  Swig_name_object_inherit(Swig_cparse_namewarn_hash(),base,derived);
   Swig_name_object_inherit(features_hash,base,derived);
 }
 
@@ -311,12 +365,93 @@ static void rename_inherit(String *base, String *derived) {
 /* This is a bit of a mess. Need to clean up */
 static String *add_oldname = 0;
 
+DOH *Swig_node_getattr(Node *n, const char *cattr)
+{
+  const char *rattr = strstr(cattr,"$");
+  if (rattr) {
+    String *nattr = NewStringWithSize(cattr, rattr-cattr);
+    Node *rn = Getattr(n,nattr);
+    if (rn) {
+      DOH *res = Swig_node_getattr(rn, rattr + 1);
+      Delete(nattr);
+      return res;
+    } else {
+      return 0;
+    }  
+  } else {
+    return Getattr(n,cattr);
+  }
+}
+
+int Swig_cparse_match(Hash *rn, Node *n) {
+  int match = 1;
+  Node *kw = nextSibling(rn);
+  while (match && kw) {
+    String *key = Getattr(kw,"name");
+    char *ckey = key ? Char(key) : 0;
+    if (ckey && (strncmp(ckey,"match",5) == 0)) {
+      match = 0;
+      if (n) {
+	const char *csep = strstr(ckey,"$");
+	const char *cattr = csep ? csep + 1 : "nodeType";
+	String *nval = Swig_node_getattr(n,cattr);
+	String *kwval = Getattr(kw,"value");
+	if (nval && Equal(nval, kwval)) {
+	  match = 1;
+	}
+      }
+    }
+    kw = nextSibling(kw);
+  }
+  return match;
+}
+
+Hash *Swig_cparse_name_object(List *namelist, Node *n, String *prefix, String *name, String *decl) {
+  Hash *res = 0;
+  if (namelist) {
+    int len = Len(namelist);
+    int i;
+    int match = 0;
+    for (i = 0; !match && (i < len); i++) {
+      Hash *rn = Getitem(namelist,i);
+      String *rdecl = Getattr(rn,"decl");
+      if (rdecl && (!decl || !Equal(rdecl,decl))) {
+	continue;
+      } else {
+	String *tname = Getattr(rn,"target_name");
+	String *sfmt = Getattr(rn,"source_fmt");
+	String *sname = 0;
+	int fullname = GetFlag(namelist,"fullname");
+	if (sfmt) {
+	  if (fullname && prefix) {
+	    sname = NewStringf(sfmt, prefix, name);
+	  } else {
+	    sname = NewStringf(sfmt, name);
+	  }
+	} else {
+	  if (fullname && prefix) {
+	    sname = NewStringf("%s::%s", prefix, name);
+	  } else {
+	    sname = NewString(name);
+	  }
+	}
+	match = (!tname || Equal(sname,tname)) && Swig_cparse_match(rn, n);
+	Delete(sname);
+      }
+      if (match) {
+	res = rn;
+	break;
+      }
+    }
+  }
+  return res;
+}
 
 /* Return the node name when it requires to emit a name warning */
-String *Swig_cparse_name_warning(Node *n, String *prefix, String *name,SwigType *decl) {
+Hash *Swig_cparse_warning_object(Node *n, String *prefix, String *name,SwigType *decl) {
   if (n) {
     /* Return in the obvious cases */
-    if (!Swig_cparse_namewarn() || !name || !need_name_warning(n)) {
+    if (!Swig_cparse_namewarn_hash() || !name || !need_name_warning(n)) {
       return 0;
     } else {
       String *access = Getattr(n,"access");	
@@ -328,100 +463,96 @@ String *Swig_cparse_name_warning(Node *n, String *prefix, String *name,SwigType
   }
   if (name) {
     /* Check to see if the name is in the hash */
-    Hash *res = Swig_name_object_get(Swig_cparse_namewarn(),prefix,name,decl);
+    Hash *wrn = Swig_name_object_get(Swig_cparse_namewarn_hash(),prefix,name,decl);
-    return res ? Getattr(res,"name"): 0;
+    if (!wrn || !Swig_cparse_match(wrn, n)) {
+      wrn = Swig_cparse_name_object(Swig_cparse_namewarn_list(), n, prefix, name, decl);
+    }
+    if (wrn && Getattr(wrn,"error")) {
+      if (n) {
+	Swig_error(Getfile(n), Getline(n), "%s\n", Getattr(wrn,"name"));
+      } else {
+	Swig_error(cparse_file, cparse_line,"%s\n", Getattr(wrn,"name"));
+      }
+    } 
+    return wrn;
   } else {
     return 0;
   }
 }
 
+String *Swig_cparse_name_warning(Node *n, String *prefix, String *name,SwigType *decl) {
+  Hash *wrn = Swig_cparse_warning_object(n, prefix, name,decl);
+  return (name && wrn) ? Getattr(wrn,"name") : 0;
+}
+
+
 /* Create a name applying rename/namewarn if needed */
-String *Swig_cparse_symbol_name(Node *n, String *prefix, String *name, SwigType *decl, String *oldname) {
+String *apply_rename(String *newname, int fullname, String *prefix, String *name)
-  String *rn = 0;
+{
-  Hash *wrn;
+  String *result = 0;
-  int destructor = name && (*(Char(name)) == '~');
+  if (newname) {
-  int need_wrn = 1;
+    if (Strcmp(newname,"$ignore") == 0) {
-  if (n) {
+      result = Copy(newname);
-    /* Return in the obvious cases */
-    if (!Swig_cparse_namewarn() || !name || !need_name_warning(n)) {
-      need_wrn = 0;
     } else {
-      String *access = Getattr(n,"access");	
+      int destructor = name && (*(Char(name)) == '~');
-      int is_public = !access || (Strcmp(access,"public") == 0);
+      String *fmt = newname;
-      if (!is_public && !need_protected(n,dirprot_mode)) {
+      String *tmp = 0;
-	need_wrn = 0;
+      if (destructor && (*(Char(newname)) != '~')) {
+	fmt = tmp = NewStringf("~%s", newname);
+      }
+      if (fullname && prefix) {
+	result = NewStringf(fmt,prefix,name);
+      } else {
+	result = NewStringf(fmt,name);
+      }
+      if (tmp) Delete(tmp);
     }
   }
+  return result;
 }
-  wrn = need_wrn ? Swig_name_object_get(Swig_cparse_namewarn(),prefix,name,decl) : 0;
+
+String *
+Swig_cparse_symbol_name(Node *n, String *prefix, String *name, SwigType *decl, String *oldname) {
+  String *nname = 0;
+  String *result = 0;
+  Hash *wrn = 0;
+
+  Hash *rn =  Swig_name_object_get(Swig_cparse_rename_hash(), prefix, name, decl);
+  if (!rn || !Swig_cparse_match(rn,n)) {
+    rn = Swig_cparse_name_object(Swig_cparse_rename_list(), n, prefix, name, decl);
+  }
+  if (rn) {
+    String *newname = Getattr(rn,"name");
+    int fullname = GetFlag(rn,"fullname");
+    result = apply_rename(newname, fullname, prefix, name);
+  }
+
+  nname = result ? result : name;
+  wrn = Swig_cparse_warning_object(n, prefix, nname, decl);
   if (wrn) {
-    String *fmt = 0;
+    String *rename = Getattr(wrn,"rename");
-    Hash *kw = nextSibling(wrn);
+    if (rename) {
-    while (kw) {
+      String *msg = Getattr(wrn,"name");
-      String *kname = Getattr(kw,"name");
+      int fullname = GetFlag(wrn,"fullname");
-      if (kname && (Cmp(kname,"rename") == 0)) {
+      if (result) Delete(result);
-	fmt = Getattr(kw,"value");
+      result = apply_rename(rename, fullname, prefix, name);
-	break;
+      if ((msg) && (Len(msg))) {
-      }
-      kw = nextSibling(kw);
-    }
-    if (fmt) {
-      char *cprefix = prefix ? Char(prefix) : "";
-      if ((wrn) && (Len(wrn))) {
 	if (n) {
 	  SWIG_WARN_NODE_BEGIN(n);
-	  Swig_warning(0,Getfile(n),Getline(n), "%s\n", Getattr(wrn,"name"));
+	  Swig_warning(0,Getfile(n), Getline(n), "%s\n", msg);
 	  SWIG_WARN_NODE_END(n);
 	} else {
-	  Swig_warning(0,Getfile(name),Getline(name), "%s\n", Getattr(wrn,"name"));
+	  Swig_warning(0,Getfile(name),Getline(name), "%s\n", msg);
 	}
       }
-      return NewStringf(fmt,name,cprefix);
     }
   }
 
-  rn = Swig_name_object_get(Swig_cparse_rename(), prefix, name, decl);
+  if (!result || !Len(result)) {
-  if (!rn) {
+    if (result) Delete(result);
-    return oldname ? Copy(oldname): Copy(name);
+    result = oldname ? Copy(oldname): Copy(name);
-  } else {
-    String *type = 0;
-    String *newname = Getattr(rn,"name");
-    Hash *kw = nextSibling(rn);
-    while (kw) {
-      String *kname = Getattr(kw,"name");
-      if (kname && (Cmp(kname,"match") == 0)) {
-	type = Getattr(kw,"value");
-	break;
-      }
-      kw = nextSibling(kw);
-    }
-    if (type){
-      int match = 0;
-      if (n) {
-	String *ntype = Getattr(n,"nodeType");
-	if (ntype && Equal(ntype,type)) {
-	  match = 1;
-	}
-      }
-      if (!match) {
-	return oldname ? Copy(oldname): Copy(name);
-      }
-    }
-    if (Strcmp(newname,"$ignore") == 0) {
-      return Copy(newname);
-    } else {    
-      char *cprefix = prefix ? Char(prefix) : "";
-      if (destructor && (*(Char(newname)) != '~')) {
-	String *fmt = NewStringf("~%s", newname);
-	String *res = NewStringf(fmt,name,cprefix);
-	Delete(fmt);
-	return res;
-      } else {
-	String *res = NewStringf(newname,name,cprefix);
-	return res;
-      }
-    }
   }
+  return result;
 }
 
 static String *make_name(Node *n, String *name,SwigType *decl) {
@@ -906,14 +1037,15 @@ static void append_previous_extension(Node *cls, Node *am) {
 }
 
 static List *make_inherit_list(String *clsname, List *names) {
-   int i;
+  int i, ilen;
   String *derived;
   List *bases = NewList();
 
   if (Namespaceprefix) derived = NewStringf("%s::%s", Namespaceprefix,clsname);
   else derived = NewString(clsname);
 
-   for (i = 0; i < Len(names); i++) {
+  ilen = Len(names);
+  for (i = 0; i < ilen; i++) {
     Node *s;
     String *base;
     String *n = Getitem(names,i);
@@ -1468,6 +1600,9 @@ static void default_arguments(Node *n) {
   }
 }
 
+#if 0
+{ /* cc-mode */
+#endif
 %}
 
 %union {
@@ -3059,7 +3194,6 @@ c_enum_decl : storage_class ENUM ename LBRACE enumlist RBRACE SEMI {
 		  add_symbols($$);       /* Add to tag space */
 		  add_symbols($5);       /* Add enum values to id space */
                }
-
                | storage_class ENUM ename LBRACE enumlist RBRACE declarator c_decl_tail {
 		 Node *n;
 		 SwigType *ty = 0;
@@ -3132,7 +3266,6 @@ c_enum_decl : storage_class ENUM ename LBRACE enumlist RBRACE SEMI {
 		 add_symbols($$);       /* Add enum to tag space */
 		 set_nextSibling($$,n);
 		 Delete(n);
-
 		 add_symbols($5);       /* Add enum values to id space */
 	         add_symbols(n);
 		 Delete(unnamed);
@@ -3696,14 +3829,15 @@ cpp_template_decl : TEMPLATE LESSTHAN template_parms GREATERTHAN { template_para
 			    String *ffname = 0;
 
 			    char   tmp[32];
-			    int    i;
+			    int    i, ilen;
 			    while (p) {
 			      String *n = Getattr(p,"name");
 			      if (!n) {
 				p = nextSibling(p);
 				continue;
 			      }
-			      for (i = 0; i < Len(tlist); i++) {
+			      ilen = Len(tlist);
+			      for (i = 0; i < ilen; i++) {
 				if (Strstr(Getitem(tlist,i),n)) {
 				  sprintf(tmp,"$%d",i+1);
 				  Replaceid(fname,n,tmp);

SWIG/Source/DOH/fio.c

@@ -58,7 +58,8 @@ static DOH *encode(char *name,  DOH *s) {
   char *cfmt = strstr(name,":");
   DOH *tmp = 0;  
   if (cfmt) {
-    tmp = NewStringf(cfmt + 1, s);
+    tmp = NewString(cfmt + 1);
+    Append(tmp,s);
     Setfile(tmp,Getfile((DOH *)s));
     Setline(tmp,Getline((DOH *)s));
     *cfmt = '\0';

SWIG/Source/Preprocessor/cpp.c

@@ -696,11 +696,12 @@ expand_macro(String *name, List *args)
     ns = NewStringEmpty();
     StringAppend(ns,name);
     if (args) {
-      if (Len(args))
+      int lenargs = Len(args);
+      if (lenargs)
 	StringPutc('(',ns);
-      for (i = 0; i < Len(args); i++) {
+      for (i = 0; i < lenargs; i++) {
 	StringAppend(ns,Getitem(args,i));
-	if (i < (Len(args) -1)) StringPutc(',',ns);
+	if (i < (lenargs -1)) StringPutc(',',ns);
       }
       if (i)
 	StringPutc(')',ns);
@@ -970,6 +971,7 @@ Preprocessor_replace(DOH *s)
 	StringUngetc(c,s);
 	/* See if this is the special "defined" macro */
 	if (StringEqual(k_defined,id)) {
+	  int lenargs = 0;
 	  DOH *args = 0;
 	  /* See whether or not a paranthesis has been used */
 	  skip_whitespace(s,0);
@@ -993,19 +995,20 @@ Preprocessor_replace(DOH *s)
 	  } else {
 	    Seek(s,-1,SEEK_CUR);
 	  }
-	  if ((!args) || (!Len(args))) {
+	  lenargs = Len(args);
+	  if ((!args) || (!lenargs)) {
 	    /* This is not a defined() macro. */
 	    StringAppend(ns,id);
 	    state = 0;
 	    break;
 	  }
-	  for (i = 0; i < Len(args); i++) {
+	  for (i = 0; i < lenargs; i++) {
 	    DOH *o = Getitem(args,i);
 	    if (!HashGetAttr(symbols,o)) {
 	      break;
 	    }
 	  }
-	  if (i < Len(args)) StringPutc('0',ns);
+	  if (i < lenargs) StringPutc('0',ns);
 	  else StringPutc('1',ns);
 	  Delete(args);
 	  state = 0;

SWIG/Source/Swig/include.c

@@ -141,7 +141,7 @@ Swig_search_path_any(int syspath) {
   String *filename;
   String *dirname;
   List   *slist, *llist;
-  int i;
+  int i, ilen;
 
   llist = 0;
   slist = NewList();
@@ -160,8 +160,8 @@ Swig_search_path_any(int syspath) {
   } else {
     Append(slist,filename);
   }  
-  
+  ilen = Len(directories);
-  for (i = 0; i < Len(directories); i++) {
+  for (i = 0; i < ilen; i++) {
     dirname =  Getitem(directories,i);
     filename = NewStringEmpty();
     assert(filename);
@@ -174,7 +174,8 @@ Swig_search_path_any(int syspath) {
     Delete(filename);
   }
   if (syspath) {
-    for (i = 0; i < Len(llist); i++) {
+    int ilen = Len(llist);
+    for (i = 0; i < ilen; i++) {
       Append(slist,Getitem(llist,i));
     }
     Delete(llist);
@@ -202,7 +203,7 @@ Swig_open_any(const String_or_char *name, int sysfile) {
   String   *filename;
   List     *spath = 0;
   char        *cname;
-  int          i;
+  int          i, ilen;
 
   if (!directories) directories = NewList();
   assert(directories);
@@ -213,7 +214,8 @@ Swig_open_any(const String_or_char *name, int sysfile) {
   f = fopen(Char(filename),"r");
   if (!f) {
       spath = Swig_search_path_any(sysfile);
-      for (i = 0; i < Len(spath); i++) {
+      ilen = Len(spath);
+      for (i = 0; i < ilen; i++) {
 	  Clear(filename);
 	  Printf(filename,"%s%s", Getitem(spath,i), cname);
 	  f = fopen(Char(filename),"r");
@@ -349,13 +351,14 @@ char *
 Swig_file_suffix(const String_or_char *filename) {
   char *d;
   char *c = Char(filename);
+  int len = Len(filename);
   if (strlen(c)) {
-    d = c + Len(filename) - 1;
+    d = c + len - 1;
     while (d != c) {
       if (*d == '.') return d;
       d--;
     }
-    return c+Len(filename);  
+    return c+len;  
   }
   return c;
 }

SWIG/Source/Swig/misc.c

@@ -151,6 +151,33 @@ String *Swig_string_title(String *s) {
   return ns;
 }
 
+/* -----------------------------------------------------------------------------
+ * Swig_string_ctitle()
+ *
+ * Takes a string object and returns a copy that is lowercase with thefirst letter
+ * capitalized and the one following '_', which are removed.
+ *
+ *      camel_case -> CamelCase
+ * ----------------------------------------------------------------------------- */
+
+String *Swig_string_ctitle(String *s) {
+  String *ns;
+  int first = 1;
+  int c;
+  ns = NewStringEmpty();
+
+  Seek(s,0,SEEK_SET);
+  while ((c = Getc(s)) != EOF) {
+    if (c == '_') { 
+      first = 1;
+      continue;
+    }
+    Putc(first ? toupper(c) : tolower(c),ns);
+    first = 0;
+  }
+  return ns;
+}
+
 /* -----------------------------------------------------------------------------
  * Swig_string_typecode()
  *
@@ -642,7 +669,7 @@ String *Swig_string_command(String *s) {
       }
       pclose(fp);
     }
-    if (!fp || (errno) || (StringLen(res) == 0)) {
+    if (!fp || (errno)) {
       Swig_error("SWIG",Getline(s), "Command encoder fails attempting '%s'.\n", s);
       exit(1);
     }
@@ -665,6 +692,7 @@ Swig_init() {
   DohEncoding("upper", Swig_string_upper);
   DohEncoding("lower", Swig_string_lower);
   DohEncoding("title", Swig_string_title);
+  DohEncoding("ctitle", Swig_string_ctitle);
   DohEncoding("typecode",Swig_string_typecode);
   DohEncoding("mangle",Swig_string_emangle);
 #if defined(HAVE_POPEN)