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

more fixes for %features, now doint it right, ie, deleting code instead of adding

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6635 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-11-03 00:58:49 +00:00
commit 94a6a89af7
2 changed files with 63 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SWIG/Examples/test-suite/virtual_poly.i
View file

@ -8,7 +8,10 @@
// //
//%feature("director"); //%feature("director");
%newobject *::copy(); // This shouldn't get used.
// %newobject *::copy();
%newobject *::copy() const;
%inline %{ %inline %{

149
SWIG/Source/Swig/naming.c
View file

@ -18,6 +18,7 @@ char cvsroot_naming_c[] = "$Header$";
static Hash *naming_hash = 0; static Hash *naming_hash = 0;
/* #define SWIG_DEBUG */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Swig_name_register() * Swig_name_register()
* *
@ -206,6 +207,10 @@ Swig_name_get(const String_or_char *vname) {
String *r; String *r;
String *f; String *f;
#ifdef SWIG_DEBUG
Printf(stdout,"name get: '%s'\n", vname);
#endif
r = NewString(""); r = NewString("");
if (!naming_hash) naming_hash = NewHash(); if (!naming_hash) naming_hash = NewHash();
f = Getattr(naming_hash,"get"); f = Getattr(naming_hash,"get");
@ -389,7 +394,9 @@ void
Swig_name_object_set(Hash *namehash, String *name, SwigType *decl, DOH *object) { Swig_name_object_set(Hash *namehash, String *name, SwigType *decl, DOH *object) {
DOH *n; DOH *n;
/* Printf(stdout,"name: '%s', '%s'\n", name, decl); */ #ifdef SWIG_DEBUG
Printf(stdout,"name set: '%s', '%s'\n", name, decl);
#endif
n = Getattr(namehash,name); n = Getattr(namehash,name);
if (!n) { if (!n) {
n = NewHash(); n = NewHash();
@ -422,11 +429,23 @@ static DOH *get_object(Hash *n, String *decl) {
return rn; return rn;
} }
static
DOH *
name_object_get(Hash *namehash, String *tname, SwigType *decl, SwigType *ncdecl) {
DOH* rn = 0;
Hash *n = Getattr(namehash,tname);
if (n) {
rn = get_object(n,decl);
if ((!rn) && ncdecl) rn = get_object(n,ncdecl);
if (!rn) rn = get_object(n,0);
}
return rn;
}
DOH * DOH *
Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *decl) { Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *decl) {
String *tname; String *tname;
DOH *rn = 0; DOH *rn = 0;
Hash *n;
char *ncdecl = 0; char *ncdecl = 0;
if (!namehash) return 0; if (!namehash) return 0;
@ -442,47 +461,32 @@ Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *dec
if (prefix) { if (prefix) {
if (Len(prefix)) { if (Len(prefix)) {
tname = NewStringf("%s::%s",prefix,name); tname = NewStringf("%s::%s",prefix,name);
n = Getattr(namehash,tname); rn = name_object_get(namehash, tname, decl, ncdecl);
rn = get_object(n,decl);
if ((!rn) && ncdecl) rn = get_object(n,ncdecl);
if (!rn) rn = get_object(n,0);
Delete(tname); Delete(tname);
/* A template-based class lookup */ /* A template-based class lookup */
if (!rn && SwigType_istemplate(prefix)) { if (!rn && SwigType_istemplate(prefix)) {
String *rname = SwigType_templateprefix(prefix); String *tprefix = SwigType_templateprefix(prefix);
tname = NewStringf("%s::%s",rname,name); tname = NewStringf("%s::%s",tprefix,name);
n = Getattr(namehash,tname); rn = name_object_get(namehash, tname, decl, ncdecl);
rn = get_object(n,decl);
if ((!rn) && ncdecl) rn = get_object(n,ncdecl);
if (!rn) rn = get_object(n,0);
Delete(tname); Delete(tname);
Delete(rname); Delete(tprefix);
} }
} }
/* A wildcard-based class lookup */ /* A wildcard-based class lookup */
if (!rn) { if (!rn) {
tname = NewStringf("*::%s",name); tname = NewStringf("*::%s",name);
n = Getattr(namehash,tname); rn = name_object_get(namehash, tname, decl, ncdecl);
rn = get_object(n,decl);
if ((!rn) && ncdecl) rn = get_object(n,ncdecl);
if (!rn) rn = get_object(n,0);
Delete(tname); Delete(tname);
} }
} else { } else {
/* Lookup in the global namespace only */ /* Lookup in the global namespace only */
tname = NewStringf("::%s",name); tname = NewStringf("::%s",name);
n = Getattr(namehash,tname); rn = name_object_get(namehash, tname, decl, ncdecl);
rn = get_object(n,decl);
if ((!rn) && ncdecl) rn = get_object(n,ncdecl);
if (!rn) rn = get_object(n,0);
Delete(tname); Delete(tname);
} }
/* Catch-all */ /* Catch-all */
if (!rn) { if (!rn) {
n = Getattr(namehash,name); rn = name_object_get(namehash, name, decl, ncdecl);
rn = get_object(n,decl);
if ((!rn) && ncdecl) rn = get_object(n,ncdecl);
if (!rn) rn = get_object(n,0);
} }
return rn; return rn;
} }
@ -541,11 +545,6 @@ static void merge_features(Hash *features, Node *n) {
if (!features) return; if (!features) return;
for (ki = First(features); ki.key; ki = Next(ki)) { for (ki = First(features); ki.key; ki = Next(ki)) {
/*
if (Getattr(n,ki.key)) {
continue;
}
*/
Setattr(n,ki.key,Copy(ki.item)); Setattr(n,ki.key,Copy(ki.item));
} }
} }
@ -557,11 +556,23 @@ static void merge_features(Hash *features, Node *n) {
* the declaration, decl. * the declaration, decl.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
static
void features_get(Hash *features, String *tname, SwigType *decl, SwigType *ncdecl, Node *node)
{
Node *n = Getattr(features,tname);
#ifdef SWIG_DEBUG
Printf(stdout," feature_get: %s\n", tname);
#endif
if (n) {
merge_features(get_object(n,0),node);
if (ncdecl) merge_features(get_object(n,ncdecl),node);
merge_features(get_object(n,decl),node);
}
}
void void
Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl, Node *node) { Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl, Node *node) {
String *tname; String *tname;
DOH *rn = 0;
Hash *n;
char *ncdecl = 0; char *ncdecl = 0;
String *rdecl = 0; String *rdecl = 0;
SwigType *rname = 0; SwigType *rname = 0;
@ -586,92 +597,48 @@ Swig_features_get(Hash *features, String *prefix, String *name, SwigType *decl,
name = rname; name = rname;
} }
/* Printf(stdout,"feature_get: %s %s %s\n", prefix, name, decl);*/ #ifdef SWIG_DEBUG
Printf(stdout,"feature_get: %s %s %s\n", prefix, name, decl);
#endif
/* Global features */ /* Global features */
n = Getattr(features,""); features_get(features, "", 0, 0, node);
rn = get_object(n,0);
merge_features(rn,node);
if (name) { if (name) {
/* Catch-all */ /* Catch-all */
n = Getattr(features,name); features_get(features, name, decl, ncdecl, node);
rn = get_object(n,0);
merge_features(rn,node);
if (ncdecl) {
rn = get_object(n,ncdecl);
merge_features(rn,node);
}
rn = get_object(n,decl);
merge_features(rn,node);
/* Perform a class-based lookup (if class prefix supplied) */ /* Perform a class-based lookup (if class prefix supplied) */
if (prefix) { if (prefix) {
/* A class-generic feature */ /* A class-generic feature */
if (Len(prefix)) { if (Len(prefix)) {
tname = NewStringf("%s::",prefix); tname = NewStringf("%s::",prefix);
n = Getattr(features,tname); features_get(features, tname, decl, ncdecl, node);
rn = get_object(n,0);
merge_features(rn,node);
Delete(tname); Delete(tname);
} }
/* A wildcard-based class lookup */ /* A wildcard-based class lookup */
tname = NewStringf("*::%s",name); tname = NewStringf("*::%s",name);
n = Getattr(features,tname); features_get(features, tname, decl, ncdecl, node);
rn = get_object(n,0);
merge_features(rn,node);
if (ncdecl) {
rn = get_object(n,ncdecl);
merge_features(rn,node);
}
rn = get_object(n,decl);
merge_features(rn,node);
Delete(tname); Delete(tname);
/* A specific class lookup */ /* A specific class lookup */
if (Len(prefix)) { if (Len(prefix)) {
/* A template-based class lookup */ /* A template-based class lookup */
if (SwigType_istemplate(prefix)) { if (SwigType_istemplate(prefix)) {
String *rname = SwigType_templateprefix(prefix); String *tprefix = SwigType_templateprefix(prefix);
tname = NewStringf("%s::%s",rname,name); tname = NewStringf("%s::%s",tprefix,name);
n = Getattr(features,tname); features_get(features, tname, decl, ncdecl, node);
rn = get_object(n,0);
merge_features(rn,node);
if (ncdecl) {
rn = get_object(n,ncdecl);
merge_features(rn,node);
}
rn = get_object(n,decl);
merge_features(rn,node);
Delete(tname); Delete(tname);
Delete(rname); Delete(tprefix);
} }
tname = NewStringf("%s::%s",prefix,name); tname = NewStringf("%s::%s",prefix,name);
n = Getattr(features,tname); features_get(features, tname, decl, ncdecl, node);
rn = get_object(n,0);
merge_features(rn,node);
if (ncdecl) {
rn = get_object(n,ncdecl);
merge_features(rn,node);
}
rn = get_object(n,decl);
merge_features(rn,node);
Delete(tname); Delete(tname);
} }
} else { } else {
/* Lookup in the global namespace only */ /* Lookup in the global namespace only */
tname = NewStringf("::%s",name); tname = NewStringf("::%s",name);
n = Getattr(features,tname); features_get(features, tname, decl, ncdecl, node);
rn = get_object(n,0);
merge_features(rn,node);
if (ncdecl) {
rn = get_object(n,ncdecl);
merge_features(rn,node);
}
rn = get_object(n,decl);
merge_features(rn,node);
Delete(tname); Delete(tname);
} }
} }
Delete(rname); Delete(rname);
Delete(rdecl); Delete(rdecl);
} }
@ -690,7 +657,9 @@ Swig_feature_set(Hash *features, const String_or_char *name, SwigType *decl, con
Hash *n; Hash *n;
Hash *fhash; Hash *fhash;
/* Printf(stdout,"feature_set: %s %s %s %s\n", name, decl, featurename, value); */ #ifdef SWIG_DEBUG
Printf(stdout,"feature_set: %s %s %s %s\n", name, decl, featurename,value);
#endif
n = Getattr(features,name); n = Getattr(features,name);
if (!n) { if (!n) {