1.1 --- a/templates/native/list.c Mon Feb 27 11:57:15 2017 +0100
1.2 +++ b/templates/native/list.c Mon Feb 27 14:41:27 2017 +0100
1.3 @@ -31,7 +31,7 @@
1.4 {
1.5 __attr * const size = &__args[1];
1.6 /* size.__data__ interpreted as int */
1.7 - unsigned int n = __load_via_object(size->value, __ATTRPOS(__data__)).intvalue;
1.8 + unsigned int n = __load_via_object(size->value, __data__).intvalue;
1.9 __attr attr = {.seqvalue=__new_fragment(n)};
1.10
1.11 /* Return the __data__ attribute. */
1.12 @@ -45,7 +45,7 @@
1.13 /* _data interpreted as list */
1.14 __fragment *data = _data->seqvalue;
1.15 /* size.__data__ interpreted as int */
1.16 - unsigned int n = __load_via_object(size->value, __ATTRPOS(__data__)).intvalue;
1.17 + unsigned int n = __load_via_object(size->value, __data__).intvalue;
1.18
1.19 data->size = n;
1.20 return __builtins___none_None;
1.21 @@ -56,12 +56,12 @@
1.22 __attr * const self = &__args[1];
1.23 __attr * const value = &__args[2];
1.24 /* self.__data__ interpreted as list */
1.25 - __fragment *data = __load_via_object(self->value, __ATTRPOS(__data__)).seqvalue;
1.26 + __fragment *data = __load_via_object(self->value, __data__).seqvalue;
1.27 __fragment *newdata = __fragment_append(data, value);
1.28
1.29 /* Replace the __data__ attribute if appropriate. */
1.30 if (newdata != data)
1.31 - __store_via_object(self->value, __ATTRPOS(__data__), ((__attr) {.seqvalue=newdata}));
1.32 + __store_via_object(self->value, __data__, ((__attr) {.seqvalue=newdata}));
1.33 return __builtins___none_None;
1.34 }
1.35
1.36 @@ -70,7 +70,7 @@
1.37 __attr * const self = &__args[1];
1.38 __attr * const other = &__args[2];
1.39 /* self.__data__, other interpreted as list */
1.40 - __fragment *data = __load_via_object(self->value, __ATTRPOS(__data__)).seqvalue;
1.41 + __fragment *data = __load_via_object(self->value, __data__).seqvalue;
1.42 __fragment *other_data = other->seqvalue;
1.43 __fragment *newdata = data;
1.44 unsigned int size = data->size, capacity = data->capacity;
1.45 @@ -92,7 +92,7 @@
1.46
1.47 /* Replace the __data__ attribute if appropriate. */
1.48 if (newdata != data)
1.49 - __store_via_object(self->value, __ATTRPOS(__data__), ((__attr) {.seqvalue=newdata}));
1.50 + __store_via_object(self->value, __data__, ((__attr) {.seqvalue=newdata}));
1.51 return __builtins___none_None;
1.52 }
1.53
1.54 @@ -120,7 +120,7 @@
1.55 /* _data interpreted as fragment */
1.56 __attr *elements = _data->seqvalue->attrs;
1.57 /* index.__data__ interpreted as int */
1.58 - int i = __load_via_object(index->value, __ATTRPOS(__data__)).intvalue;
1.59 + int i = __load_via_object(index->value, __data__).intvalue;
1.60
1.61 return elements[i];
1.62 }
1.63 @@ -133,7 +133,7 @@
1.64 /* _data interpreted as fragment */
1.65 __attr *elements = _data->seqvalue->attrs;
1.66 /* index.__data__ interpreted as int */
1.67 - int i = __load_via_object(index->value, __ATTRPOS(__data__)).intvalue;
1.68 + int i = __load_via_object(index->value, __data__).intvalue;
1.69
1.70 /* Set the element. */
1.71 elements[i] = *value;