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

Fixing registerClass. No more wrap: unnecessary attributes

Browse source
This commit is contained in:
Artem Serebriyskiy 2014-02-25 14:36:03 +04:00
commit c6dd6b0726
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Modules/lua.cxx
View file

@ -1014,7 +1014,6 @@ public:
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* variableWrapper() * variableWrapper()
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
virtual int variableWrapper(Node *n) { virtual int variableWrapper(Node *n) {
/* NEW LANGUAGE NOTE:*********************************************** /* NEW LANGUAGE NOTE:***********************************************
Language::variableWrapper(n) will generate two wrapper fns Language::variableWrapper(n) will generate two wrapper fns
@ -1239,8 +1238,7 @@ public:
* Helper function that adds record to appropriate * Helper function that adds record to appropriate
* C arrays * C arrays
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
void registerClass(String *scope, Node *n) { void registerClass(String *scope, String *wrap_class) {
String *wrap_class = Getattr(n,"wrap:class_name");
assert(wrap_class); assert(wrap_class);
Hash *nspaceHash = getCArraysHash(scope); Hash *nspaceHash = getCArraysHash(scope);
String *ns_classes = Getattr(nspaceHash, "classes"); String *ns_classes = Getattr(nspaceHash, "classes");
@ -1354,16 +1352,15 @@ public:
SwigType_add_pointer(t); SwigType_add_pointer(t);
// Catch all: eg. a class with only static functions and/or variables will not have 'remembered' // Catch all: eg. a class with only static functions and/or variables will not have 'remembered'
String *wrap_class_name = NewStringf("_wrap_class_%s", mangled_full_proxy_class_name); String *wrap_class_name = Swig_name_wrapper(NewStringf("class_%s", mangled_full_proxy_class_name));
String *wrap_class = NewStringf("&%s", wrap_class_name); String *wrap_class = NewStringf("&%s", wrap_class_name);
Setattr(n, "wrap:class_name", wrap_class_name);
SwigType_remember_clientdata(t, wrap_class); SwigType_remember_clientdata(t, wrap_class);
String *rt = Copy(getClassType()); String *rt = Copy(getClassType());
SwigType_add_pointer(rt); SwigType_add_pointer(rt);
// Adding class to apropriate namespace // Adding class to apropriate namespace
registerClass(nspace, n); registerClass(nspace, wrap_class_name);
Hash *nspaceHash = getCArraysHash(nspace); Hash *nspaceHash = getCArraysHash(nspace);
// Register the class structure with the type checker // Register the class structure with the type checker