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

account for explicitly qualified scopes

Browse source
This commit is contained in:
Frank Schlimbach 2016-10-11 07:05:44 -05:00
commit 4eb7fb8123
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/Swig/symbol.c
View file

@ -1907,8 +1907,12 @@ SwigType *Swig_symbol_template_deftype(const SwigType *type, Symtab *tscope) {
int i; int i;
#ifdef SWIG_TEMPLATE_DEFTYPE_CACHE #ifdef SWIG_TEMPLATE_DEFTYPE_CACHE
static Hash *deftype_cache = 0; static Hash *deftype_cache = 0;
String *scopetype = tscope ? NewStringf("%s::%s", Swig_symbol_qualifiedscopename(tscope), type) /* The lookup depends on the current scope and potential namespace qualification.
: NewStringf("%s::%s", Swig_symbol_qualifiedscopename(current_symtab), type); Looking up x in namespace y is not the same as looking up x::y in outer scope.
-> we contruct an "artificial" key. */
String *scopetype = tscope
? NewStringf("%s..%s::%s", Swig_symbol_qualifiedscopename(tscope), Getattr(tscope, "name"), type)
: NewStringf("%s..%s::%s", Swig_symbol_qualifiedscopename(current_symtab), Swig_symbol_getscopename(), type);
if (!deftype_cache) { if (!deftype_cache) {
deftype_cache = NewHash(); deftype_cache = NewHash();
} }
@ -1916,10 +1920,10 @@ SwigType *Swig_symbol_template_deftype(const SwigType *type, Symtab *tscope) {
String *cres = Getattr(deftype_cache, scopetype); String *cres = Getattr(deftype_cache, scopetype);
if (cres) { if (cres) {
Append(result, cres); Append(result, cres);
Delete(scopetype);
#ifdef SWIG_DEBUG #ifdef SWIG_DEBUG
Printf(stderr, "found cached deftype %s -> %s\n", type, result); Printf(stderr, "cached deftype %s(%s) -> %s\n", type, scopetype, result);
#endif #endif
Delete(scopetype);
return result; return result;
} }
} }