Using the same mangling method whenever is needed.

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

Source/Swig/misc.c

@@ -192,11 +192,28 @@ String *Swig_string_typecode(String *s) {
 /* -----------------------------------------------------------------------------
  * Swig_string_mangle()
  * 
- * Take a string and mangle it by stripping all non-valid C identifier characters
+ * Take a string and mangle it by stripping all non-valid C identifier
+ * characters.
+ *
+ * This routine skips unnecessary blank spaces, therefore mangling
+ * 'char *' and 'char*', 'std::pair<int, int >' and
+ * 'std::pair<int,int>', produce the same result.
+ *
+ * However, note that 'long long' and 'long_long' produce different
+ * mangled strings.
+ *
+ * The mangling method still is not 'perfect', for example std::pair and
+ * std_pair return the same mangling. This is just a little better
+ * than before, but it seems to be enough for most of the purposes.
+ *
+ * Having a perfect mangling will break some examples and code which
+ * assume, for example, that A::get_value will be mangled as
+ * A_get_value. 
  * ----------------------------------------------------------------------------- */
 
 String *Swig_string_mangle(String *s) {
-#if 0
+#if 0 
+  /* old mangling, not suitable for using in macros */
   String *t = Copy(s);
   char *c = Char(t);
   while (*c) {
@@ -205,26 +222,34 @@ String *Swig_string_mangle(String *s) {
   }
   return t;
 #else
-  char *pc;
+  String *result = NewString("");
+  int space = 0;
+  int state = 0;
+  char *pc, *cb;
   String *b = Copy(s);
   if (SwigType_istemplate(b)) {
     String *t = SwigType_namestr(b);
     Delete(b);
     b = t ;
   }
-  pc = Char(b);
+  pc = cb = Char(b);
-  String *result = NewString("");
-  int space = 0;
-  int state = 0;
   while (*pc) {
     char c = *pc;
-    if (isalnum((int)c)) {
+    if (isalnum((int)c) || (c == '_')) {
       state = 1;
       if (space && (space == state)) {
-	Printf(result,"_b");
+	Printf(result,"__b");
       }
-      space = 0;      
+      space = 0;
-      Printf(result,"%c",c);
+      if (c == '_' && *(pc + 1) == 'S' && *(pc + 2) == '_') {
+	/* '_S_' is use replaced because it is the special mangling symbol */
+	Printf(result,"_S_%02X",0);
+	pc += 3;
+	continue;
+      } else {
+	Printf(result,"%c",c);
+      }
+      
     } else {
       if (isspace((int)c)) {
 	space = state;
@@ -234,21 +259,90 @@ String *Swig_string_mangle(String *s) {
 	state = 3;
 	space = 0;
       }
-      if (c == '*') c = 'p';
+      switch(c) {
-      else if (c == '&') c = 'R';
+      case '.':
-      else if (c == ':') c = 's';
+	if ((cb != pc) && (*(pc - 1) == 'p')) {
-      else if (c == ',') c = 'c';
+	  Append(result,"_");
-      else if (c == '<') c = 't';
+	  ++pc;
-      else if (c == '>') c = 'T';
+	  continue;
-      else if (c == '[') c = 'a';
+	} else {
-      else if (c == ']') c = 'A';
+	  c = 'f';
-      else if (c == '(') c = 'f';
+	}
-      else if (c == ')') c = 'F';
+	break;
+      case ':':
+	if (*(pc + 1) == ':') {
+	  Append(result,"_");
+	  ++pc; ++pc;
+	  continue;
+	} else {
+	  c = 's';
+	}
+	break;
+      case '*':
+	c = 'm';
+	break;
+      case '&':
+	c = 'A';
+	break;
+      case '<':
+	c = 'l';
+	break;
+      case '>':
+	c = 'g';
+	break;
+      case '=':
+	c = 'e';
+	break;
+      case ',':
+	c = 'c';
+	break;
+      case '(':
+	c = 'p';
+	break;
+      case ')':
+	c = 'P';
+	break;
+      case '[':
+	c = 'b';
+	break;
+      case ']':
+	c = 'B';
+	break;
+      case '^':
+	c = 'x';
+	break;
+      case '|':
+	c = 'o';
+	break;
+      case '~':
+	c = 'n';
+	break;
+      case '!':
+	c = 'N';
+	break;
+      case '%':
+	c = 'M';
+	break;
+      case '?':
+	c = 'q';
+	break;
+      case '+':
+	c = 'a';
+	break;
+      case '-':
+	c = 's';
+	break;
+      case '/':
+	c = 'd';
+	break;
+      default:
+	break;
+      }
       if (isalpha((int)c)) {
-	Printf(result,"_%c",(int)c);
+	Printf(result,"_S_%c",(int)c);
       } else{
-	Printf(result,"_%02X",(int)c);
+	Printf(result,"_S_%02X",(int)c);
-      }     
+      }
     }
     ++pc;
   }

Source/Swig/naming.c

@@ -126,9 +126,13 @@ static int name_mangle(String *r) {
 
 String *
 Swig_name_mangle(const String_or_char *s) {
+#if 0
   String *r = NewString(s);
   name_mangle(r);
   return r;
+#else
+  return Swig_string_mangle(s);
+#endif
 }
 
 /* -----------------------------------------------------------------------------

Source/Swig/stype.c

@@ -759,8 +759,8 @@ String *SwigType_lcaststr(SwigType *s, const String_or_char *name) {
 
 String *SwigType_manglestr_default(SwigType *s) {
   char *c;
-  String *result,*base;
+  String *result,*base,*mbase;
-  SwigType *lt;
+  SwigType *lt, *ltp;
   SwigType *ss = 0;
 
   if (SwigType_istemplate(s)) {
@@ -768,14 +768,11 @@ String *SwigType_manglestr_default(SwigType *s) {
     s = ss;
   }
   lt = SwigType_ltype(s);
-  result = SwigType_prefix(lt);
+  ltp = SwigType_prefix(lt);
   base = SwigType_base(lt);
 
-  c = Char(result);
+  result = Swig_string_mangle(ltp);
-  while (*c) {
+  
-    if (!isalnum((int)*c)) *c = '_';
-    c++;
-  }
   if (SwigType_istemplate(base)) {
     String *b = SwigType_namestr(base);
     Delete(base);
@@ -786,23 +783,13 @@ String *SwigType_manglestr_default(SwigType *s) {
   Replace(base,"class ","", DOH_REPLACE_ANY);
   Replace(base,"union ","", DOH_REPLACE_ANY);
 
-  c = Char(base);
+  mbase = Swig_string_mangle(base);
-  while (*c) {
+  Append(result,mbase);
-    if (*c == '<') *c = 'T';
-    else if (*c == '>') *c = 't';
-    else if (*c == '*') *c = 'p';
-    else if (*c == '[') *c = 'a';
-    else if (*c == ']') *c = 'A';
-    else if (*c == '&') *c = 'R';
-    else if (*c == '(') *c = 'f';
-    else if (*c == ')') *c = 'F';
-    else if (!isalnum((int)*c)) *c = '_';
-    c++;
-  }
-  Append(result,base);
   Insert(result,0,"_");
   Delete(lt);
+  Delete(ltp);
   Delete(base);
+  Delete(mbase);
   if (ss) Delete(ss);
   return result;
 }