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

Bug fixes.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@661 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-08-15 21:29:46 +00:00
commit fb7bd0ca36
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Swig/stype.c
View file

@ -597,12 +597,20 @@ void SwigType_array_setdim(SwigType *t, int n, String_or_char *rep) {
* *
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
static Hash *default_cache = 0;
SwigType *SwigType_default(SwigType *t) { SwigType *SwigType_default(SwigType *t) {
String *r1, *def; String *r1, *def;
String *r = NewString(t); String *r = 0;
if (!default_cache) default_cache = NewHash();
r = Getattr(default_cache,t);
if (r) return Copy(r);
r = t;
while ((r1 = SwigType_typedef_resolve(r))) { while ((r1 = SwigType_typedef_resolve(r))) {
Delete(r); if (r != t) Delete(r);
r = r1; r = r1;
} }
if (SwigType_ispointer(r)) { if (SwigType_ispointer(r)) {
@ -614,7 +622,8 @@ SwigType *SwigType_default(SwigType *t) {
} else { } else {
def = NewString("SWIGTYPE"); def = NewString("SWIGTYPE");
} }
Delete(r); if (r != t) Delete(r);
Setattr(default_cache,t,Copy(def));
return def; return def;
} }
@ -1037,6 +1046,8 @@ int SwigType_typedef(SwigType *type, String_or_char *name) {
init_scopes(); init_scopes();
if (Getattr(scopes[scope_level],name)) return -1; if (Getattr(scopes[scope_level],name)) return -1;
Setattr(scopes[scope_level],name,type); Setattr(scopes[scope_level],name,type);
if (default_cache)
Delattr(default_cache,type);
return 0; return 0;
} }
@ -1554,8 +1565,6 @@ SwigType_emit_type_table(File *f_forward, File *f_table) {
Delete(ckey); Delete(ckey);
} }
Delete(el); Delete(el);
/* Printv(types, "{\"", key, "\",0},", 0); */
/* Printv(types, check_equivalent((DataType *)GetVoid(remembered,key)), "};\n", 0);*/
Printf(types,"{0,0}};\n"); Printf(types,"{0,0}};\n");
Printv(table, "_swigt_", key, ", \n", 0); Printv(table, "_swigt_", key, ", \n", 0);
key = Nextkey(r_mangled); key = Nextkey(r_mangled);

5
Source/Swig/typemap.c
View file

@ -416,6 +416,11 @@ char *Swig_typemap_lookup(char *op, SwigType *type, String_or_char *pname, Strin
Replace(s,"$source",source,DOH_REPLACE_ANY); Replace(s,"$source",source,DOH_REPLACE_ANY);
Replace(s,"$target",target,DOH_REPLACE_ANY); Replace(s,"$target",target,DOH_REPLACE_ANY);
Replace(s,"$type",SwigType_str(type,0),DOH_REPLACE_ANY); Replace(s,"$type",SwigType_str(type,0),DOH_REPLACE_ANY);
{
SwigType *ltype = SwigType_ltype(type);
Replace(s,"$ltype",SwigType_str(ltype,0), DOH_REPLACE_ANY);
Delete(ltype);
}
Replace(s,"$parmname",pname, DOH_REPLACE_ANY); Replace(s,"$parmname",pname, DOH_REPLACE_ANY);
/* Print base type (without any pointers) */ /* Print base type (without any pointers) */