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

Refactor several Swig_name_xxx() functions into a single one

Browse source 
All Swig_name_{construct,copyconstructor,destroy,disown}() functions were
almost exactly identical, just replace them with a single make_full_name_for()
function to avoid code quadplication.
This commit is contained in:
Vadim Zeitlin 2016-04-11 16:50:41 +02:00
commit 891565a3ca
1 changed files with 16 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Source/Swig/naming.c
View file

@ -246,19 +246,14 @@ String *Swig_name_set(const_String_or_char_ptr nspace, const_String_or_char_ptr
return r; return r;
} }
/* ----------------------------------------------------------------------------- /* Common implementation of all Swig_name_<special-method>() functions below. */
* Swig_name_construct() static String *make_full_name_for(const char *method, const char *def_format, const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
*
* Returns the name of the accessor function used to create an object.
* ----------------------------------------------------------------------------- */
String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
String *r; String *r;
String *rclassname; String *rclassname;
char *cname; char *cname;
rclassname = SwigType_namestr(classname); rclassname = SwigType_namestr(classname);
r = get_naming_format_for("construct", "new_%n%c"); r = get_naming_format_for(method, def_format);
cname = Char(rclassname); cname = Char(rclassname);
if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) { if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) {
@ -271,6 +266,16 @@ String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_cha
return r; return r;
} }
/* -----------------------------------------------------------------------------
* Swig_name_construct()
*
* Returns the name of the accessor function used to create an object.
* ----------------------------------------------------------------------------- */
String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
return make_full_name_for("construct", "new_%n%c", nspace, classname);
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Swig_name_copyconstructor() * Swig_name_copyconstructor()
@ -279,22 +284,7 @@ String *Swig_name_construct(const_String_or_char_ptr nspace, const_String_or_cha
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
String *Swig_name_copyconstructor(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) { String *Swig_name_copyconstructor(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
String *r; return make_full_name_for("copy", "copy_%n%c", nspace, classname);
String *rclassname;
char *cname;
rclassname = SwigType_namestr(classname);
r = get_naming_format_for("copy", "copy_%n%c");
cname = Char(rclassname);
if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) {
cname = strchr(cname, ' ') + 1;
}
replace_nspace(r, nspace);
Replace(r, "%c", cname, DOH_REPLACE_ANY);
Delete(rclassname);
return r;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -304,21 +294,7 @@ String *Swig_name_copyconstructor(const_String_or_char_ptr nspace, const_String_
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
String *Swig_name_destroy(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) { String *Swig_name_destroy(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
String *r; return make_full_name_for("destroy", "delete_%n%c", nspace, classname);
String *rclassname;
char *cname;
rclassname = SwigType_namestr(classname);
r = get_naming_format_for("destroy", "delete_%n%c");
cname = Char(rclassname);
if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) {
cname = strchr(cname, ' ') + 1;
}
replace_nspace(r, nspace);
Replace(r, "%c", cname, DOH_REPLACE_ANY);
Delete(rclassname);
return r;
} }
@ -329,21 +305,7 @@ String *Swig_name_destroy(const_String_or_char_ptr nspace, const_String_or_char_
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
String *Swig_name_disown(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) { String *Swig_name_disown(const_String_or_char_ptr nspace, const_String_or_char_ptr classname) {
String *r; return make_full_name_for("disown", "disown_%n%c", nspace, classname);
String *rclassname;
char *cname;
rclassname = SwigType_namestr(classname);
r = get_naming_format_for("disown", "disown_%n%c");
cname = Char(rclassname);
if ((strncmp(cname, "struct ", 7) == 0) || ((strncmp(cname, "class ", 6) == 0)) || ((strncmp(cname, "union ", 6) == 0))) {
cname = strchr(cname, ' ') + 1;
}
replace_nspace(r, nspace);
Replace(r, "%c", cname, DOH_REPLACE_ANY);
Delete(rclassname);
return r;
} }