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

Runtime tables deterministic ordering (3)

Browse source 
Output conversion functions used in the type tables in sorted order.
Sorted order in this case is the type being converted from.
So _p_BarTo_p_Foo comes before _p_ZarTo_p_Foo.

Previously the order was roughly in the order that the types were
parsed, but not necessarily due to the use of internal hash tables
which do not have an ordering guarantee.
This commit is contained in:
William S Fulton 2022-09-23 20:12:23 +01:00
commit 5fdb591a62
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Swig/typesys.c
View file

@ -2007,6 +2007,7 @@ void SwigType_inherit_equiv(File *out) {
r_resolved_sorted_keys = sorted_list_from_hash(r_resolved);
rk = First(r_resolved_sorted_keys);
while (rk.item) {
List *sub_sorted_keys;
/* rkey is a fully qualified type. We strip all of the type constructors off of it just to get the base */
base = SwigType_base(rk.item);
/* Check to see whether the base is recorded in the subclass table */
@ -2027,10 +2028,11 @@ void SwigType_inherit_equiv(File *out) {
/* Printf(stdout,"rk.item = '%s'\n", rk.item);
Printf(stdout,"rh = %p '%s'\n", rh,rh); */
bk = First(sub);
while (bk.key) {
sub_sorted_keys = sorted_list_from_hash(sub);
bk = First(sub_sorted_keys);
while (bk.item) {
prefix = SwigType_prefix(rk.item);
Append(prefix, bk.key);
Append(prefix, bk.item);
/* Printf(stdout,"set %p = '%s' : '%s'\n", rh, SwigType_manglestr(prefix),prefix); */
mprefix = SwigType_manglestr(prefix);
Setattr(rh, mprefix, prefix);
@ -2040,7 +2042,7 @@ void SwigType_inherit_equiv(File *out) {
String *convname = NewStringf("%sTo%s", mprefix, mkey);
String *lkey = SwigType_lstr(rk.item, 0);
String *lprefix = SwigType_lstr(prefix, 0);
Hash *subhash = Getattr(sub, bk.key);
Hash *subhash = Getattr(sub, bk.item);
String *convcode = Getattr(subhash, "convcode");
if (convcode) {
char *newmemoryused = Strstr(convcode, "newmemory"); /* see if newmemory parameter is used in order to avoid unused parameter warnings */
@ -2101,6 +2103,7 @@ void SwigType_inherit_equiv(File *out) {
Delete(mkey);
bk = Next(bk);
}
Delete(sub_sorted_keys);
rk = Next(rk);
Delete(rlist);
}