1.1 --- a/templates/ops.c Fri Oct 28 22:50:55 2016 +0200
1.2 +++ b/templates/ops.c Fri Oct 28 22:58:50 2016 +0200
1.3 @@ -4,8 +4,6 @@
1.4 #include "progconsts.h"
1.5 #include "progtypes.h"
1.6
1.7 -__attr null = {0, 0};
1.8 -
1.9 /* Direct access to functions. */
1.10
1.11 __attr __load_function(__func fn)
1.12 @@ -83,7 +81,7 @@
1.13
1.14 __attr __check_and_load_via_object(__ref obj, int pos, int code)
1.15 {
1.16 - return __HASATTR(obj, pos, code) ? __load_via_object(obj, pos) : null;
1.17 + return __HASATTR(obj, pos, code) ? __load_via_object(obj, pos) : __NULL;
1.18 }
1.19
1.20 __attr __check_and_load_via_any(__ref obj, int pos, int code)
1.21 @@ -124,7 +122,7 @@
1.22
1.23 /* NOTE: An error may be more appropriate. */
1.24
1.25 - return null;
1.26 + return __NULL;
1.27 }
1.28
1.29 __attr __replace_context(__ref context, __attr attr)
1.30 @@ -195,8 +193,8 @@
1.31
1.32 int __ISNULL(__attr value)
1.33 {
1.34 - /* (value.context == null.context) is superfluous */
1.35 - return (value.value == null.value);
1.36 + /* (value.context == __NULL.context) is superfluous */
1.37 + return (value.value == 0); /* __NULL.value */
1.38 }
1.39
1.40 /* Attribute codes and positions for type objects. */