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

Add array:to() to split out functionality of array:from()

Browse Source
This commit is contained in:
Bruce Hill 2024-07-10 13:42:58 -04:00
parent 10e86153a2
commit 068d0e8563
5 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
builtins/array.c
View File

@ -261,24 +261,38 @@ public array_t Array$sample(array_t arr, int64_t n, array_t weights, const TypeI
return selected;
}
public array_t Array$from(array_t *array, int64_t first, int64_t last)
public array_t Array$from(array_t *array, int64_t first)
{
if (first < 0)
first = array->length + first + 1;
if (last < 0)
last = array->length + last + 1;
if (first < 1 || first > array->length || last < first)
if (first < 1 || first > array->length)
return (array_t){.atomic=array->atomic};
if (last > array->length)
last = array->length;
return (array_t){
.atomic=array->atomic,
.data=array->data + array->stride*(first-1),
.length=last - first + 1,
.length=array->length - first + 1,
.stride=array->stride,
.data_refcount=array->data_refcount,
};
}
public array_t Array$to(array_t *array, int64_t last)
{
if (last < 0)
last = array->length + last + 1;
if (last > array->length)
last = array->length;
if (last == 0)
return (array_t){.atomic=array->atomic};
return (array_t){
.atomic=array->atomic,
.data=array->data,
.length=last,
.stride=array->stride,
.data_refcount=array->data_refcount,
};

3
builtins/array.h
View File

@ -64,7 +64,8 @@ array_t Array$sample(array_t arr, int64_t n, array_t weights, const TypeInfo *ty
void Array$clear(array_t *array);
void Array$compact(array_t *arr, const TypeInfo *type);
bool Array$contains(array_t array, void *item, const TypeInfo *type);
array_t Array$from(array_t *array, int64_t first, int64_t last);
array_t Array$from(array_t *array, int64_t first);
array_t Array$to(array_t *array, int64_t last);
array_t Array$by(array_t *array, int64_t stride);
array_t Array$reversed(array_t array);
array_t Array$concat(array_t x, array_t y, const TypeInfo *type);

7
compile.c
View File

@ -1815,9 +1815,12 @@ CORD compile(env_t *env, ast_t *ast)
return CORD_all("Array$clear(", self, ")");
} else if (streq(call->name, "from")) {
CORD self = compile_to_pointer_depth(env, call->self, 1, false);
arg_t *arg_spec = new(arg_t, .name="first", .type=Type(IntType, .bits=64), .default_val=FakeAST(Int, .i=1, .bits=64),
.next=new(arg_t, .name="last", .type=Type(IntType, .bits=64), .default_val=FakeAST(Int, .i=-1, .bits=64)));
arg_t *arg_spec = new(arg_t, .name="first", .type=Type(IntType, .bits=64));
return CORD_all("Array$from(", self, ", ", compile_arguments(env, ast, arg_spec, call->args), ")");
} else if (streq(call->name, "to")) {
CORD self = compile_to_pointer_depth(env, call->self, 1, false);
arg_t *arg_spec = new(arg_t, .name="last", .type=Type(IntType, .bits=64));
return CORD_all("Array$to(", self, ", ", compile_arguments(env, ast, arg_spec, call->args), ")");
} else if (streq(call->name, "by")) {
CORD self = compile_to_pointer_depth(env, call->self, 1, false);
arg_t *arg_spec = new(arg_t, .name="stride", .type=Type(IntType, .bits=64));

4
test/arrays.tm
View File

@ -121,9 +121,9 @@ func main():
do:
>> [i*10 for i in 5]:from(3)
= [30, 40, 50]
>> [i*10 for i in 5]:from(last=3)
>> [i*10 for i in 5]:to(3)
= [10, 20, 30]
>> [i*10 for i in 5]:from(last=-2)
>> [i*10 for i in 5]:to(-2)
= [10, 20, 30, 40]
>> [i*10 for i in 5]:from(-2)
= [40, 50]

1
typecheck.c
View File

@ -670,6 +670,7 @@ type_t *get_type(env_t *env, ast_t *ast)
else if (streq(call->name, "sample")) return self_value_t;
else if (streq(call->name, "clear")) return Type(VoidType);
else if (streq(call->name, "from")) return self_value_t;
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, "heapify")) return Type(VoidType);