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

[D] nspace: Correctly generate identifiers for base classes when

Browse source 
not in split proxy mode.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12641 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
David Nadlinger 2011-04-23 13:34:08 +00:00
commit 1dcc81fced
2 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -4,6 +4,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.4 (in progress) Version 2.0.4 (in progress)
=========================== ===========================
2011-04-23: klickverbot
[D] nspace: Correctly generate identifiers for base classes when
not in split proxy mode.
2011-04-13: szager 2011-04-13: szager
Fixed bug 3286333: infite recursion with mutual 'using namespace' clauses. Fixed bug 3286333: infite recursion with mutual 'using namespace' clauses.

37
Source/Modules/d.cxx
View file

@ -3156,7 +3156,7 @@ private:
if (base.item) { if (base.item) {
basenode = base.item; basenode = base.item;
c_baseclassname = Getattr(base.item, "name"); c_baseclassname = Getattr(base.item, "name");
basename = Copy(getProxyName(c_baseclassname)); basename = createProxyName(c_baseclassname);
if (basename) if (basename)
c_baseclass = SwigType_namestr(Getattr(base.item, "name")); c_baseclass = SwigType_namestr(Getattr(base.item, "name"));
base = Next(base); base = Next(base);
@ -3212,9 +3212,6 @@ private:
// generated for it in scope. // generated for it in scope.
if (derived) { if (derived) {
requireDType(Getattr(basenode, "sym:nspace"), Getattr(basenode, "sym:name")); requireDType(Getattr(basenode, "sym:nspace"), Getattr(basenode, "sym:name"));
// Fully qualify the baseclass name.
Insert(basename, 0, package);
} }
// Write any custom import statements to the proxy module header. // Write any custom import statements to the proxy module header.
@ -4287,37 +4284,23 @@ private:
} }
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
* D::getProxyName() * D::createProxyName()
* *
* Returns the D class name if a type corresponds to something wrapped with a * Returns the D class name if a type corresponds to something wrapped with a
* proxy class, NULL otherwise. * proxy class, NULL otherwise.
* --------------------------------------------------------------------------- */ * --------------------------------------------------------------------------- */
const String *getProxyName(SwigType *t) { String *createProxyName(SwigType *t) {
String *proxyname = NULL; String *proxyname = NULL;
Node *n = classLookup(t); Node *n = classLookup(t);
if (n) { if (n) {
proxyname = Getattr(n, "proxyname"); String *nspace = Getattr(n, "sym:nspace");
if (!proxyname) { String *symname = Getattr(n, "sym:name");
String *nspace = Getattr(n, "sym:nspace");
String *symname = Getattr(n, "sym:name");
if (nspace) { String *module = createModuleName(nspace, symname);
proxyname = NewStringf("%s.%s", nspace, symname); if (inProxyModule(module)) {
} else { proxyname = Copy(symname);
proxyname = Copy(symname); } else {
} proxyname = NewStringf("%s%s.%s", package, module, symname);
if (split_proxy_dmodule) {
Printf(proxyname, ".%s", symname);
} else {
if (!inProxyModule(proxyname)) {
Delete(proxyname);
String *inner = createLastNamespaceName(nspace);
proxyname = NewStringf("%s.%s.%s", nspace, inner, symname);
Delete(inner);
}
}
Setattr(n, "proxyname", proxyname);
Delete(proxyname); // Return value still valid because of the ref from n.
} }
} }
return proxyname; return proxyname;