# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1489343961 -3600
# Node ID c2106f746c8816a7647fbd3c01c95a05a3dbdbb7
# Parent  07bc2bf9377f85e707403b91c2cde845c2b27535# Parent  0e446cf36ed2fe1aa37e2b35cce43f61fa742ff2
Merged changes from the default branch.

diff -r 07bc2bf9377f -r c2106f746c88 templates/ops.c
--- a/templates/ops.c	Sun Mar 12 18:04:08 2017 +0100
+++ b/templates/ops.c	Sun Mar 12 19:39:21 2017 +0100
@@ -34,17 +34,17 @@
 
 __attr __load_static_ignore(__ref obj)
 {
-    return (__attr) {.value=obj};
+    return __ATTRVALUE(obj);
 }
 
 __attr __load_static_replace(__ref context, __ref obj)
 {
-    return __update_context(context, (__attr) {.value=obj});
+    return __update_context(context, __ATTRVALUE(obj));
 }
 
 __attr __load_static_test(__ref context, __ref obj)
 {
-    return __test_context(context, (__attr) {.value=obj});
+    return __test_context(context, __ATTRVALUE(obj));
 }
 
 /* Direct retrieval operations, returning and setting attributes. */
@@ -281,9 +281,9 @@
 {
     /* Set the local context to the specified context if appropriate. */
 
-    if (__test_context_update(context, (__attr) {.value=value}))
+    if (__test_context_update(context, __ATTRVALUE(value)))
         contexts[target] = context;
-    return (__attr) {.value=value};
+    return __ATTRVALUE(value);
 }
 
 /* Context testing for invocations. */