1.1 --- a/templates/progops.c Mon Feb 27 11:57:15 2017 +0100
1.2 +++ b/templates/progops.c Mon Feb 27 14:41:27 2017 +0100
1.3 @@ -31,7 +31,7 @@
1.4 {
1.5 __ref obj = (__ref) __ALLOCATE(1, size);
1.6 obj->table = table;
1.7 - __store_via_object(obj, __ATTRPOS(__class__), (__attr) {.value=cls});
1.8 + __store_via_object(obj, __class__, (__attr) {.value=cls});
1.9 return (__attr) {.value=obj};
1.10 }
1.11
1.12 @@ -72,7 +72,7 @@
1.13
1.14 /* Store a reference to the data in the object's __data__ attribute. */
1.15
1.16 - __store_via_object(args[0].value, __ATTRPOS(__data__), attr);
1.17 + __store_via_object(args[0].value, __data__, attr);
1.18 }
1.19
1.20 #ifdef __HAVE___builtins___dict_dict
1.21 @@ -191,7 +191,7 @@
1.22 /* Obtain the __args__ special member, referencing the parameter table. */
1.23 /* Refer to the table and minimum/maximum. */
1.24
1.25 - const __ptable *ptable = __check_and_load_via_object(target.value, __ATTRPOS(__args__), __ATTRCODE(__args__)).ptable;
1.26 + const __ptable *ptable = __check_and_load_via_object(target.value, __args__).ptable;
1.27 const unsigned int min = ptable->min, max = ptable->max;
1.28
1.29 /* Reserve enough space for the arguments. */
1.30 @@ -266,12 +266,12 @@
1.31
1.32 void __SETDEFAULT(__ref obj, int pos, __attr value)
1.33 {
1.34 - __store_via_object(obj, __FUNCTION_INSTANCE_SIZE + pos, value);
1.35 + __store_via_object__(obj, __FUNCTION_INSTANCE_SIZE + pos, value);
1.36 }
1.37
1.38 __attr __GETDEFAULT(__ref obj, int pos)
1.39 {
1.40 - return __load_via_object(obj, __FUNCTION_INSTANCE_SIZE + pos);
1.41 + return __load_via_object__(obj, __FUNCTION_INSTANCE_SIZE + pos);
1.42 }
1.43
1.44 int __BOOL(__attr attr)