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

Didn't fix the virtual member function problem (at least I don't think

Browse source 
so), but I did discover a simple code-generation optimization that
greatly reduces the amount of wrapper code generated for interfaces with
lots of virtual functions.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@816 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-09-03 21:24:13 +00:00
commit d2c2d5ac09
1 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/SWIG1.1/cplus.cxx
View file

@ -190,7 +190,17 @@ public:
int inherited; // Was this member inherited? int inherited; // Was this member inherited?
CPP_member *next; // Next member (for building linked lists) CPP_member *next; // Next member (for building linked lists)
int id; // type id when created int id; // type id when created
String *signature;
CPP_member() {
signature = 0;
is_static = 0;
is_virtual = 0;
base = 0;
code = 0;
file = 0;
next = 0;
}
virtual void inherit(int) { }; // Inheritance rule (optional) virtual void inherit(int) { }; // Inheritance rule (optional)
virtual void emit() = 0; // Emit rule virtual void emit() = 0; // Emit rule
}; };
@ -220,6 +230,7 @@ public:
next = 0; next = 0;
line = line_number; line = line_number;
file = input_file; file = input_file;
signature = NewStringf("%s(%s)", n, ParmList_str(l));
id = cpp_id; id = cpp_id;
if (AddMethods) { if (AddMethods) {
if (strlen(Char(CCode))) if (strlen(Char(CCode)))
@ -356,7 +367,6 @@ public:
void inherit(int mode) { void inherit(int mode) {
// Set up the proper addmethods mode and provide C code (if provided) // Set up the proper addmethods mode and provide C code (if provided)
int oldaddmethods = AddMethods; int oldaddmethods = AddMethods;
int oldnewobject = NewObject;
AddMethods = new_method; AddMethods = new_method;
Clear(CCode); Clear(CCode);
Append(CCode,code); Append(CCode,code);
@ -1142,7 +1152,21 @@ void cplus_member_func(char *name, char *iname, SwigType *type, ParmList *l,
if (Inherit_mode) { if (Inherit_mode) {
CPP_member *m = current_class->search_member(temp_iname); CPP_member *m = current_class->search_member(temp_iname);
if (m) return; if (m) {
/* The current member is already part of the class. However, we might be
able to make some "optimizations" if it's virtual */
if ((is_virtual) && (m->is_virtual)) {
if (m->signature) {
/* Printf(stdout,"Member : %s, %d, '%s'\n", m->name, m->is_virtual, m->signature); */
String *ns = NewStringf("%s(%s)", name, ParmList_str(l));
if (Cmp(ns,m->signature) == 0) {
m->base = Swig_copy_string(inherit_base_class);
}
}
}
return;
}
} }
// Add it to our C++ class list // Add it to our C++ class list