Misc fixes

5 files changed, 10 insertions, 4 deletions

diff --git a/src/compile/assertions.c b/src/compile/assertions.c
index 18531fd9..7cb202e8 100644
--- a/src/compile/assertions.c
+++ b/src/compile/assertions.c
@@ -13,7 +13,7 @@ public
 Text_t compile_assertion(env_t *env, ast_t *ast) {
     ast_t *expr = Match(ast, Assert)->expr;
     ast_t *message = Match(ast, Assert)->message;
-    const char *failure = NULL;
+    const char *failure = "vs";
     switch (expr->tag) {
     case And: {
         DeclareMatch(and_, expr, And);
diff --git a/src/compile/optionals.c b/src/compile/optionals.c
index f54d8931..bf8bf4aa 100644
--- a/src/compile/optionals.c
+++ b/src/compile/optionals.c
@@ -71,6 +71,7 @@ Text_t compile_none(type_t *t) {
     case PointerType: return Texts("((", compile_type(t), ")NULL)");
     case ClosureType: return Text("NONE_CLOSURE");
     case FloatType: return Text("nan(\"none\")");
+    case RealType: return Text("NONE_REAL");
     case StructType: return Texts("((", compile_type(Type(OptionalType, .type = t)), "){.has_value=false})");
     case EnumType: {
         env_t *enum_env = Match(t, EnumType)->env;
@@ -91,6 +92,7 @@ Text_t check_none(type_t *t, Text_t value) {
     else if (t->tag == ClosureType) return Texts("((", value, ").fn == NULL)");
     else if (t->tag == FloatType)
         return Texts(Match(t, FloatType)->bits == TYPE_NBITS64 ? "Float64$isnan(" : "Float32$isnan(", value, ")");
+    else if (t->tag == RealType) return Texts("Real$is_none(", value, ")");
     else if (t->tag == ListType) return Texts("((", value, ").data == NULL)");
     else if (t->tag == TableType) return Texts("((", value, ").entries.data == NULL)");
     else if (t->tag == BoolType) return Texts("((", value, ") == NONE_BOOL)");
diff --git a/src/environment.c b/src/environment.c
index 1dfeb6bc..7949893f 100644
--- a/src/environment.c
+++ b/src/environment.c
@@ -308,8 +308,8 @@ env_t *global_env(bool source_mapping) {
             {"log10", "Real$log10", "func(x:Real -> Real)"}, //
             {"minus", "Real$minus", "func(x,y:Real -> Real)"}, //
             {"mix", "Real$mix", "func(amount,x,y:Real -> Real)"}, //
-            {"mod", "Real$mod", "func(n,modulus:Real -> Real)"}, //
-            {"mod1", "Real$mod1", "func(n,modulus:Real -> Real)"}, //
+            {"modulo", "Real$mod", "func(n,modulus:Real -> Real)"}, //
+            {"modulo1", "Real$mod1", "func(n,modulus:Real -> Real)"}, //
             {"negative", "Real$negative", "func(x:Real -> Real)"}, //
             {"parse", "Real$parse", "func(text:Text, remainder:&Text?=none -> Real?)"}, //
             {"plus", "Real$plus", "func(x,y:Real -> Real)"}, //
diff --git a/src/stdlib/reals.c b/src/stdlib/reals.c
index 87d1e64a..616fd38d 100644
--- a/src/stdlib/reals.c
+++ b/src/stdlib/reals.c
@@ -700,7 +700,8 @@ OptionalReal_t Real$parse(Text_t text, Text_t *remainder) {
     return box_ptr(r, REAL_TAG_RATIONAL);
 }
 
-static bool Real$is_none(const void *vn, const TypeInfo_t *type) {
+public
+PUREFUNC bool Real$is_none(const void *vn, const TypeInfo_t *type) {
     (void)type;
     Real_t n = *(Real_t *)vn;
     return is_boxed(n) && get_tag(n) == REAL_TAG_NONE;
diff --git a/src/stdlib/reals.h b/src/stdlib/reals.h
index 10c071f9..d03e4e5f 100644
--- a/src/stdlib/reals.h
+++ b/src/stdlib/reals.h
@@ -3,6 +3,7 @@
 
 #include "datatypes.h"
 #include "types.h"
+#include "util.h"
 
 // NaN-boxing scheme: use quiet NaN space for pointers
 // IEEE 754: NaN = exponent all 1s, mantissa non-zero
@@ -21,6 +22,7 @@
 
 Int_t Real$as_int(Real_t x, bool truncate);
 OptionalReal_t Real$parse(Text_t text, Text_t *remainder);
+PUREFUNC bool Real$is_none(const void *vn, const TypeInfo_t *type);
 Real_t Real$abs(Real_t x);
 Real_t Real$acos(Real_t x);
 Real_t Real$asin(Real_t x);
@@ -49,6 +51,7 @@ Real_t Real$sin(Real_t x);
 Real_t Real$sqrt(Real_t x);
 Real_t Real$tan(Real_t x);
 Real_t Real$times(Real_t x, Real_t y);
+Text_t Real$as_text(const void *n, bool colorize, const TypeInfo_t *type);
 Text_t Real$value_as_text(Real_t x);
 bool Real$equal(const void *va, const void *vb, const TypeInfo_t *t);
 bool Real$is_between(Real_t x, Real_t low, Real_t high);