# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1486858978 -3600
# Node ID d015ced36450b1c4d3a8cd63dbb1c79bc42c4f66
# Parent  b53f4dc7f3be7442aa05f22f0ffdb77cb3add0a1# Parent  afe747e589b31538af82eeea8ebb56cef6e0d7f0
Merged changes from the default branch.

diff -r b53f4dc7f3be -r d015ced36450 templates/native/common.c
--- a/templates/native/common.c	Sun Feb 12 00:26:41 2017 +0100
+++ b/templates/native/common.c	Sun Feb 12 01:22:58 2017 +0100
@@ -29,7 +29,7 @@
 __attr __new_int(int i)
 {
     /* Create a new integer and mutate the __data__ attribute. */
-    __attr attr = __new(&__InstanceTable___builtins___int_int, &__builtins___int_int, sizeof(__obj___builtins___int_int));
+    __attr attr = __NEWINSTANCE(__builtins___int_int);
     attr.value->attrs[__pos___data__].intvalue = i;
     return attr;
 }
@@ -37,7 +37,7 @@
 __attr __new_str(char *s)
 {
     /* Create a new string and mutate the __data__ and __key__ attributes. */
-    __attr attr = __new(&__InstanceTable___builtins___str_string, &__builtins___str_string, sizeof(__obj___builtins___str_string));
+    __attr attr = __NEWINSTANCE(__builtins___str_string);
     attr.value->attrs[__pos___data__].strvalue = s;
     attr.value->attrs[__pos___key__] = __NULL;
     return attr;
@@ -46,7 +46,7 @@
 __attr __new_list(__fragment *f)
 {
     /* Create a new list and mutate the __data__ attribute. */
-    __attr attr = __new(&__InstanceTable___builtins___list_list, &__builtins___list_list, sizeof(__obj___builtins___list_list));
+    __attr attr = __NEWINSTANCE(__builtins___list_list);
     attr.value->attrs[__pos___data__].seqvalue = f;
     return attr;
 }