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

revert to original typemap matching rules for now

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6955 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-02-15 22:27:09 +00:00
commit faac32387d
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
SWIG/Source/Swig/typemap.c
View file

@ -1157,6 +1157,10 @@ String *Swig_typemap_lookup(const String_or_char *op, SwigType *type, String_or_
* Swig_typemap_lookup_new() * Swig_typemap_lookup_new()
* *
* Attach one or more typemaps to a node * Attach one or more typemaps to a node
* op - typemap name, eg "out", "newfree"
* node - the node to attach the typemaps to
* lname -
* f -
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
String *Swig_typemap_lookup_new(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f) String *Swig_typemap_lookup_new(const String_or_char *op, Node *node, const String_or_char *lname, Wrapper *f)
@ -1170,12 +1174,15 @@ String *Swig_typemap_lookup_new(const String_or_char *op, Node *node, const Stri
ParmList *locals; ParmList *locals;
ParmList *kw; ParmList *kw;
char temp[256]; char temp[256];
String *symname, *qsn; String *symname;
String *cname = 0; String *cname = 0;
String *clname = 0; String *clname = 0;
#if 0
String *qsn;
Symtab *st; Symtab *st;
#endif
/* special case, we need to check for 'ref' call /* special case, we need to check for 'ref' call
and set the defaul code 'sdef' */ and set the default code 'sdef' */
if (Cmp(op,"newfree") == 0) { if (Cmp(op,"newfree") == 0) {
sdef = Swig_ref_call(node, lname); sdef = Swig_ref_call(node, lname);
} }
@ -1184,6 +1191,20 @@ String *Swig_typemap_lookup_new(const String_or_char *op, Node *node, const Stri
if (!type) return sdef; if (!type) return sdef;
pname = Getattr(node,"name"); pname = Getattr(node,"name");
#if 0
/* removed for now as it breaks old code and introduces inconsistencies and adds about 25% to the execution time of the test-suite - WSF */
This is my plan to fix this longer term:
The following debug shows that some typemap lookups use fully qualified names and some do not.
Printf(stdout, "Swig_typemap_lookup %s [%s %s]\n", op, type, pname ? pname : "NONAME");
So even the current typemap lookups are inconsistent.
The "name" attribute is often changed, particularly in lang.cxx. I hope to either remove this name changing to fix this or introduce
a new attribute to use for the name. Possibly introduce a new attribute called fqname - fully qualified name, that holds the name
to use for the Swig_typemap_search. If this typemap search fails then use the unqualified name.
Need to check non-simple return types, eg pointers/references.
st = Getattr(node,"sym:symtab"); st = Getattr(node,"sym:symtab");
qsn = st ? Swig_symbol_qualifiedscopename(st) : 0; qsn = st ? Swig_symbol_qualifiedscopename(st) : 0;
if (qsn && Len(qsn)) { if (qsn && Len(qsn)) {
@ -1198,10 +1219,11 @@ String *Swig_typemap_lookup_new(const String_or_char *op, Node *node, const Stri
Delete(qsn); Delete(qsn);
/* look now for simple name, such as /* look now for simple name, such as
int *Foo::foo(int bar) -> foo int *Foo::foo(int bar) -> foo
*/ */
if (!tm) tm = Swig_typemap_search(op,type,pname,&mtype); if (!tm)
#endif
tm = Swig_typemap_search(op,type,pname,&mtype);
if (!tm) return sdef; if (!tm) return sdef;
s = Getattr(tm,"code"); s = Getattr(tm,"code");