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

Consolidate name mangling functions

Browse source 
Swig_string_mangle      => Swig_name_mangle_string
Swig_name_mangle        => Swig_name_mangle_string
Swig_string_mangle_type => Swig_name_mangle_type
This commit is contained in:
William S Fulton 2022-11-12 09:18:19 +00:00
commit 46f2778412
16 changed files with 194 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Modules/go.cxx
View file

@ -4677,7 +4677,7 @@ private:
u[2] = '\0';
Replace(copy, l, u, DOH_REPLACE_FIRST);
}
String *ret = Swig_string_mangle_type(copy);
String *ret = Swig_name_mangle_type(copy);
Delete(copy);
return ret;
}
@ -4725,7 +4725,7 @@ private:
Append(nw, c3);
Delete(c2);
Delete(c3);
String *ret = Swig_name_mangle(nw);
String *ret = Swig_name_mangle_string(nw);
Delete(nw);
return ret;
}
@ -4742,7 +4742,7 @@ private:
String *buildGoWrapperName(String *name, String *overname) {
String *s1 = NewString("_swig_wrap_");
Append(s1, name);
String *s2 = Swig_name_mangle(s1);
String *s2 = Swig_name_mangle_string(s1);
Delete(s1);
if (overname) {
Append(s2, overname);
@ -5576,7 +5576,7 @@ private:
}
}
ret = Swig_string_mangle_type(s);
ret = Swig_name_mangle_type(s);
Delete(s);
return ret;
}

2
Source/Modules/guile.cxx
View file

@ -1396,7 +1396,7 @@ public:
SwigType *ct = NewStringf("p.%s", Getattr(n, "name"));
swigtype_ptr = SwigType_manglestr(ct);
String *mangled_classname = Swig_name_mangle(Getattr(n, "sym:name"));
String *mangled_classname = Swig_name_mangle_string(Getattr(n, "sym:name"));
/* Export clientdata structure */
Printf(f_runtime, "static swig_guile_clientdata _swig_guile_clientdata%s = { NULL, SCM_EOL };\n", mangled_classname);

2
Source/Modules/javascript.cxx
View file

@ -1461,7 +1461,7 @@ Hash *JSEmitter::createNamespaceEntry(const char *_name, const char *parent, con
Hash *entry = NewHash();
String *name = NewString(_name);
Setattr(entry, NAME, Swig_scopename_last(name));
Setattr(entry, NAME_MANGLED, Swig_name_mangle(name));
Setattr(entry, NAME_MANGLED, Swig_name_mangle_string(name));
Setattr(entry, PARENT, NewString(parent));
Setattr(entry, PARENT_MANGLED, NewString(parent_mangled));

6
Source/Modules/lang.cxx
View file

@ -1311,7 +1311,7 @@ int Language::staticmemberfunctionHandler(Node *n) {
cname = NewStringf("%s::%s", sname, name);
} else {
String *classname_str = SwigType_namestr(ClassName);
String *mname = Swig_name_mangle(classname_str);
String *mname = Swig_name_mangle_string(classname_str);
cname = Swig_name_member(NSpace, mname, name);
Delete(mname);
Delete(classname_str);
@ -1321,7 +1321,7 @@ int Language::staticmemberfunctionHandler(Node *n) {
if (Extend) {
String *code = Getattr(n, "code");
String *defaultargs = Getattr(n, "defaultargs");
String *mangled = Swig_name_mangle(mrename);
String *mangled = Swig_name_mangle_string(mrename);
Delete(mrename);
mrename = mangled;
@ -1335,7 +1335,7 @@ int Language::staticmemberfunctionHandler(Node *n) {
if (!defaultargs) {
/* Hmmm. An added static member. We have to create a little wrapper for this */
String *mangled_cname = Swig_name_mangle(cname);
String *mangled_cname = Swig_name_mangle_string(cname);
Swig_add_extension_code(n, mangled_cname, parms, type, code, CPlusPlus, 0);
Setattr(n, "extendname", mangled_cname);
Delete(mangled_cname);

4
Source/Modules/lua.cxx
View file

@ -1269,7 +1269,7 @@ public:
full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
assert(full_proxy_class_name);
mangled_full_proxy_class_name = Swig_name_mangle(full_proxy_class_name);
mangled_full_proxy_class_name = Swig_name_mangle_string(full_proxy_class_name);
SwigType *t = Copy(Getattr(n, "name"));
SwigType *fr_t = SwigType_typedef_resolve_all(t); /* Create fully resolved type */
@ -1803,7 +1803,7 @@ public:
if (nspace == 0 || Len(nspace) == 0)
mangled_name = NewString("SwigModule");
else
mangled_name = Swig_name_mangle(nspace);
mangled_name = Swig_name_mangle_string(nspace);
String *cname = NewStringf("swig_%s", mangled_name);
Setattr(carrays_hash, "cname", cname);

4
Source/Modules/mzscheme.cxx
View file

@ -569,7 +569,7 @@ public:
// Make a static variable;
Printf(var_name, "_wrap_const_%s", Swig_name_mangle(Getattr(n, "sym:name")));
Printf(var_name, "_wrap_const_%s", Swig_name_mangle_string(Getattr(n, "sym:name")));
// Build the name for scheme.
Printv(proc_name, iname, NIL);
@ -656,7 +656,7 @@ public:
convert_proto_tab = NewString("");
struct_name = Getattr(n, "sym:name");
mangled_struct_name = Swig_name_mangle(Getattr(n, "sym:name"));
mangled_struct_name = Swig_name_mangle_string(Getattr(n, "sym:name"));
Printv(scm_structname, struct_name, NIL);
Replaceall(scm_structname, "_", "-");

2
Source/Modules/octave.cxx
View file

@ -946,7 +946,7 @@ public:
// This is a bug, due to the fact that swig_type -> octave_class mapping
// is 1-to-n.
static Hash *emitted = NewHash();
String *mangled_classname = Swig_string_mangle_type(Getattr(n, "name"));
String *mangled_classname = Swig_name_mangle_type(Getattr(n, "name"));
if (Getattr(emitted, mangled_classname)) {
Delete(mangled_classname);
return SWIG_NOWRAP;

2
Source/Modules/ruby.cxx
View file

@ -85,7 +85,7 @@ public:
/* Mangled name */
Delete(mname);
mname = Swig_name_mangle(cname);
mname = Swig_name_mangle_string(cname);
/* Renamed class name */
Clear(name);

4
Source/Modules/tcl8.cxx
View file

@ -740,7 +740,7 @@ public:
return SWIG_ERROR;
real_classname = Getattr(n, "name");
mangled_classname = Swig_string_mangle_type(real_classname);
mangled_classname = Swig_name_mangle_type(real_classname);
if (Getattr(emitted, mangled_classname))
return SWIG_NOWRAP;
@ -816,7 +816,7 @@ public:
Printv(base_classes, bname, " ", NIL);
Printv(base_class_init, " ", bname, "Ptr::constructor $ptr\n", NIL);
}
String *bmangle = Swig_string_mangle_type(bname);
String *bmangle = Swig_name_mangle_type(bname);
// Printv(f_wrappers,"extern swig_class _wrap_class_", bmangle, ";\n", NIL);
// Printf(base_class,"&_wrap_class_%s",bmangle);
Printf(base_class, "0");