Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Add array:sorted()

Browse Source
This commit is contained in:
Bruce Hill 2024-04-02 13:13:33 -04:00
parent c73e96ff91
commit 95100469b6
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtins/array.c
View File

@ -151,6 +151,13 @@ public void Array$sort(array_t *arr, closure_t comparison, const TypeInfo *type)
qsort_r(arr->data, arr->length, item_size, comparison.fn, comparison.userdata);
}
public array_t Array$sorted(array_t arr, closure_t comparison, const TypeInfo *type)
{
arr.data_refcount = 3;
Array$sort(&arr, comparison, type);
return arr;
}
public void Array$shuffle(array_t *arr, const TypeInfo *type)
{
int64_t item_size = get_item_size(type);

1
builtins/array.h
View File

@ -57,6 +57,7 @@ void Array$insert(array_t *arr, const void *item, int64_t index, const TypeInfo
void Array$insert_all(array_t *arr, array_t to_insert, int64_t index, const TypeInfo *type);
void Array$remove(array_t *arr, int64_t index, int64_t count, const TypeInfo *type);
void Array$sort(array_t *arr, closure_t comparison, const TypeInfo *type);
array_t Array$sorted(array_t arr, closure_t comparison, const TypeInfo *type);
void Array$shuffle(array_t *arr, const TypeInfo *type);
void *Array$random(array_t arr);
void Array$clear(array_t *array);

6
compile.c
View File

@ -1485,8 +1485,8 @@ CORD compile(env_t *env, ast_t *ast)
CORD self = compile_to_pointer_depth(env, call->self, 1, false);
(void)compile_arguments(env, ast, NULL, call->args);
return CORD_all("Array$shuffle(", self, ", ", compile_type_info(env, self_value_t), ")");
} else if (streq(call->name, "sort")) {
CORD self = compile_to_pointer_depth(env, call->self, 1, false);
} else if (streq(call->name, "sort") || streq(call->name, "sorted")) {
CORD self = compile_to_pointer_depth(env, call->self, streq(call->name, "sort") ? 1 : 0, false);
CORD comparison;
if (call->args) {
type_t *item_ptr = Type(PointerType, .pointed=item_t, .is_stack=true, .is_readonly=true);
@ -1497,7 +1497,7 @@ CORD compile(env_t *env, ast_t *ast)
} else {
comparison = CORD_all("(closure_t){.fn=generic_compare, .userdata=(void*)", compile_type_info(env, item_t), "}");
}
return CORD_all("Array$sort(", self, ", ", comparison, ", ", compile_type_info(env, self_value_t), ")");
return CORD_all("Array$", call->name, "(", self, ", ", comparison, ", ", compile_type_info(env, self_value_t), ")");
} else if (streq(call->name, "clear")) {
CORD self = compile_to_pointer_depth(env, call->self, 1, false);
(void)compile_arguments(env, ast, NULL, call->args);

7
test/arrays.tm
View File

@ -76,9 +76,16 @@ if yes
if yes
>> nums := [10, -20, 30]
// Sorted function doesn't mutate original:
>> nums:sorted()
= [-20, 10, 30]
>> nums
= [10, -20, 30]
// Sort function does mutate in place:
>> nums:sort()
>> nums
= [-20, 10, 30]
// Custom sort functions:
>> nums:sort(func(x:&%Int,y:&%Int) x:abs() <> y:abs())
>> nums
= [10, -20, 30]

1
typecheck.c
View File

@ -505,6 +505,7 @@ type_t *get_type(env_t *env, ast_t *ast)
else if (streq(call->name, "insert_all")) return Type(VoidType);
else if (streq(call->name, "remove")) return Type(VoidType);
else if (streq(call->name, "sort")) return Type(VoidType);
else if (streq(call->name, "sorted")) return self_value_t;
else if (streq(call->name, "shuffle")) return Type(VoidType);
else if (streq(call->name, "random"))
return Type(PointerType, .pointed=Match(self_value_t, ArrayType)->item_type, .is_optional=true, .is_readonly=true);