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

[D] Fixed referencing types in the root namespace when not in split proxy mode.

Browse source 
Previously, invalid code would be generated for cases like the following if the nspace feature was active, but the split proxy mode not:
---
struct Foo {};
namespace Ns {
  struct Bar {
    void bar(const Foo &f) {}
  };
}
---

Thanks to Johannes Pfau for reporting this.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12629 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
David Nadlinger 2011-04-10 14:02:52 +00:00
commit 6c0f3f1a7d
2 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -4,6 +4,9 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.4 (in progress)
===========================
2011-04-10: klickverbot
[D] nspace: Fixed referencing types in the root namespace when
not in split proxy mode.
2011-04-07: wsfulton
Fix wrapping of const array typedefs which were generating uncompileable code as

30
Source/Modules/d.cxx
View file

@ -3607,20 +3607,7 @@ private:
* (i.e. typemap-) specified import statements are handeled seperately.
* --------------------------------------------------------------------------- */
void requireDType(const String *nspace, const String *symname) {
String *dmodule;
if (nspace) {
dmodule = NewStringf("%s.", nspace);
} else {
dmodule = NewString("");
}
if (split_proxy_dmodule) {
Printv(dmodule, symname, NIL);
} else {
String *inner = createLastNamespaceName(nspace);
Printv(dmodule, inner, NIL);
Delete(inner);
}
String *dmodule = createModuleName(nspace, symname);
if (!inProxyModule(dmodule)) {
String *import = createImportStatement(dmodule);
@ -3684,9 +3671,9 @@ private:
* Determines if the specified proxy type is declared in the currently
* processed proxy D module.
*
* This function is used to determine if fully qualified type names have to be
* used (package, module and type name). If the split proxy mode is not used,
* this solely depends on whether the type is in the current namespace or.
* This function is used to determine if fully qualified type names have to
* be used (package, module and type name). If the split proxy mode is not
* used, this solely depends on whether the type is in the current namespace.
* --------------------------------------------------------------------------- */
bool inProxyModule(const String *type_name) const {
if (!split_proxy_dmodule) {
@ -4124,21 +4111,20 @@ private:
} else {
type_name = NewStringf("%s%s.%s", package, module, class_name);
}
Delete(module);
} else {
// SWIG does not know anything about the type (after resolving typedefs).
// Just mangle the type name string like $descriptor(type) would do.
String *descriptor = NewStringf("SWIGTYPE%s", SwigType_manglestr(type));
requireDType(NULL, descriptor);
String *module = NULL;
if (split_proxy_dmodule) {
module = Copy(descriptor);
}
String *module = createModuleName(NULL, descriptor);
if (inProxyModule(module)) {
type_name = Copy(descriptor);
} else {
type_name = NewStringf("%s%s.%s", package, module, descriptor);
}
Delete(module);
// Add to hash table so that a type wrapper class can be created later.
Setattr(unknown_types, descriptor, type);
@ -4172,7 +4158,7 @@ private:
if (split_proxy_dmodule) {
module = Copy(type_name);
} else {
module = proxy_dmodule_name;
module = Copy(proxy_dmodule_name);
}
}
return module;