Add table:get_or_null(key) for tables with non-null pointer values,

which lets get() keep the non-null return type

2 files changed, 16 insertions, 2 deletions

diff --git a/compile.c b/compile.c
index 322e3b43..e15d8801 100644
--- a/compile.c
+++ b/compile.c
@@ -2358,6 +2358,13 @@ CORD compile(env_t *env, ast_t *ast)
                                     CORD_asprintf("%ld", (int64_t)(ast->end - f->text)),
                                     ")");
                 }
+            } else if (streq(call->name, "get_or_null")) {
+                if (table->value_type->tag != PointerType)
+                    code_err(ast, "The table method :get_or_null() is only supported for tables whose value type is a pointer, not %T", table->value_type);
+                CORD self = compile_to_pointer_depth(env, call->self, 0, false);
+                arg_t *arg_spec = new(arg_t, .name="key", .type=table->key_type);
+                return CORD_all("Table$get_value_or_default(", self, ", ", compile_type(table->key_type), ", ", compile_type(table->value_type), ", ",
+                                compile_arguments(env, ast, arg_spec, call->args), ", NULL, ", compile_type_info(env, self_value_t), ")");
             } else if (streq(call->name, "has")) {
                 CORD self = compile_to_pointer_depth(env, call->self, 0, false);
                 arg_t *arg_spec = new(arg_t, .name="key", .type=table->key_type);
diff --git a/typecheck.c b/typecheck.c
index be21948c..332f68e1 100644
--- a/typecheck.c
+++ b/typecheck.c
@@ -764,11 +764,18 @@ type_t *get_type(env_t *env, ast_t *ast)
             if (streq(call->name, "bump")) return Type(VoidType);
             else if (streq(call->name, "clear")) return Type(VoidType);
             else if (streq(call->name, "get")) return table->value_type;
-            else if (streq(call->name, "has")) return Type(BoolType);
+            else if (streq(call->name, "get_or_null")) {
+                if (table->value_type->tag != PointerType)
+                    code_err(ast, "The table method :get_or_null() is only supported for tables whose value type is a pointer, not %T",
+                             table->value_type);
+                auto ptr = Match(table->value_type, PointerType);
+                return Type(PointerType, .pointed=ptr->pointed, .is_stack=ptr->is_stack,
+                            .is_readonly=ptr->is_readonly, .is_optional=true);
+            } else if (streq(call->name, "has")) return Type(BoolType);
             else if (streq(call->name, "remove")) return Type(VoidType);
             else if (streq(call->name, "set")) return Type(VoidType);
             else if (streq(call->name, "sorted")) return self_value_t;
-            else code_err(ast, "There is no '%s' method for tables", call->name);
+            code_err(ast, "There is no '%s' method for %T tables", call->name, self_value_t);
         }
         default: {
             type_t *fn_type_t = get_method_type(env, call->self, call->name);