diff --git a/compile.c b/compile.c index 7739fad..0cd3423 100644 --- a/compile.c +++ b/compile.c @@ -2024,6 +2024,10 @@ CORD compile(env_t *env, ast_t *ast) CORD self = compile_to_pointer_depth(env, call->self, 0, false); (void)compile_arguments(env, ast, NULL, call->args); return CORD_all("Array$reversed(", self, ", ", padded_item_size, ")"); + } else if (streq(call->name, "unique")) { + CORD self = compile_to_pointer_depth(env, call->self, 0, false); + (void)compile_arguments(env, ast, NULL, call->args); + return CORD_all("Table$from_entries(", self, ", $SetInfo(", compile_type_info(env, item_t), "))"); } else code_err(ast, "There is no '%s' method for arrays", call->name); } case SetType: { @@ -2304,9 +2308,13 @@ CORD compile(env_t *env, ast_t *ast) } case SetType: { if (streq(f->field, "items")) { - return CORD_all("({ table_t *t = ", compile_to_pointer_depth(env, f->fielded, 1, false), ";\n" - "ARRAY_INCREF(t->entries);\n" - "t->entries; })"); + if (can_be_mutated(env, f->fielded)) { + return CORD_all("({ table_t *t = ", compile_to_pointer_depth(env, f->fielded, 1, false), ";\n" + "ARRAY_INCREF(t->entries);\n" + "t->entries; })"); + } else { + return CORD_all("(", compile_to_pointer_depth(env, f->fielded, 0, false), ").entries"); + } } else if (streq(f->field, "fallback")) { return CORD_all("(", compile_to_pointer_depth(env, f->fielded, 0, false), ").fallback"); } diff --git a/typecheck.c b/typecheck.c index 4938bc9..0083989 100644 --- a/typecheck.c +++ b/typecheck.c @@ -706,6 +706,7 @@ type_t *get_type(env_t *env, ast_t *ast) else if (streq(call->name, "to")) return self_value_t; else if (streq(call->name, "by")) return self_value_t; else if (streq(call->name, "reversed")) return self_value_t; + else if (streq(call->name, "unique")) return Type(SetType, .item_type=Match(self_value_t, ArrayType)->item_type); else if (streq(call->name, "heapify")) return Type(VoidType); else if (streq(call->name, "heap_push")) return Type(VoidType); else if (streq(call->name, "heap_pop")) return Match(self_value_t, ArrayType)->item_type;