1.1 --- a/deducer.py Thu Nov 24 23:42:19 2016 +0100
1.2 +++ b/deducer.py Fri Nov 25 00:53:22 2016 +0100
1.3 @@ -391,7 +391,7 @@
1.4
1.5 location " " name " " test " " test type " " base " " traversed attributes
1.6 " " attributes to traverse " " context " " access method
1.7 - " " static attribute
1.8 + " " static attribute " " accessor kinds
1.9 """
1.10
1.11 f_attrs = open(join(self.output, "attribute_plans"), "w")
1.12 @@ -401,9 +401,11 @@
1.13 locations.sort()
1.14
1.15 for location in locations:
1.16 - name, test, test_type, base, traversed, traversal_modes, attrnames, \
1.17 + name, test, test_type, base, \
1.18 + traversed, traversal_modes, attrnames, \
1.19 context, context_test, \
1.20 - first_method, final_method, attr = self.access_plans[location]
1.21 + first_method, final_method, \
1.22 + attr, accessor_kinds = self.access_plans[location]
1.23
1.24 print >>f_attrs, encode_access_location(location), \
1.25 name or "{}", \
1.26 @@ -413,7 +415,8 @@
1.27 ".".join(traversal_modes) or "{}", \
1.28 ".".join(attrnames) or "{}", \
1.29 context, context_test, \
1.30 - first_method, final_method, attr or "{}"
1.31 + first_method, final_method, attr or "{}", \
1.32 + ",".join(accessor_kinds)
1.33
1.34 finally:
1.35 f_attrs.close()
1.36 @@ -2099,6 +2102,10 @@
1.37 (base and "base" or "original-accessor") or \
1.38 "final-accessor"
1.39
1.40 - return name, test, test_type, base, traversed, traversal_modes, remaining, context, context_test, first_method, final_method, origin
1.41 + return name, test, test_type, base, \
1.42 + traversed, traversal_modes, remaining, \
1.43 + context, context_test, \
1.44 + first_method, final_method, \
1.45 + origin, accessor_kinds
1.46
1.47 # vim: tabstop=4 expandtab shiftwidth=4