ADD: array additions.

main
bog 2023-08-24 19:30:31 +02:00
parent 7f5b5486c0
commit 85a5475fb4
7 changed files with 68 additions and 14 deletions

View File

@ -64,6 +64,11 @@ void compile_node(compiler* self, node* root, program* prog)
compile_children(self, root, prog); compile_children(self, root, prog);
program_add_instr(prog, OP_CAT, NO_PARAM); program_add_instr(prog, OP_CAT, NO_PARAM);
} }
else if (lhs == rhs && lhs == TY_ARRAY)
{
compile_children(self, root, prog);
program_add_instr(prog, OP_ACAT, NO_PARAM);
}
else else
{ {
compile_number(self, root, prog, OP_IADD, OP_FADD); compile_number(self, root, prog, OP_IADD, OP_FADD);

View File

@ -70,15 +70,7 @@ type* cstatic_resolve_new(cstatic* self, node* ast)
else if (ast->type == NODE_ADD) else if (ast->type == NODE_ADD)
{ {
int lhs = cstatic_resolve_base_type(self, ast->children.data[0]); return cstatic_resolve_new(self, ast->children.data[0]);
int rhs = cstatic_resolve_base_type(self, ast->children.data[1]);
if (lhs == TY_STRING && rhs == TY_STRING)
{
return cstatic_new_type(self, TY_STRING);
}
return cstatic_new_type(self, lhs);
} }
else if (ast->type == NODE_STRING) else if (ast->type == NODE_STRING)
@ -214,6 +206,24 @@ int cstatic_check(cstatic* self, node* ast, char* msg, size_t size)
return 1; return 1;
} }
// Array Operations
if (ast->type == NODE_ADD)
{
type* lhs = cstatic_resolve_new(self, ast->children.data[0]);
type* rhs = cstatic_resolve_new(self, ast->children.data[1]);
if (lhs->base_type == TY_ARRAY
&& type_equals(lhs, rhs))
{
type_free(lhs); free(lhs);
type_free(rhs); free(rhs);
return 1;
}
type_free(lhs); free(lhs);
type_free(rhs); free(rhs);
}
// String Operations // String Operations
if (ast->type == NODE_ADD) if (ast->type == NODE_ADD)
{ {

View File

@ -29,7 +29,8 @@
G(OP_CAT), \ G(OP_CAT), \
G(OP_SMUL), \ G(OP_SMUL), \
G(OP_MKARRAY), \ G(OP_MKARRAY), \
G(OP_ADEREF) G(OP_ADEREF), \
G(OP_ACAT)
enum Opcodes { enum Opcodes {
OPCODES(GEN_ENUM) OPCODES(GEN_ENUM)

View File

@ -71,6 +71,7 @@ void vm_exec(vm* self, program* prog)
case OP_MKARRAY: vm_mkarray(self, param); break; case OP_MKARRAY: vm_mkarray(self, param); break;
case OP_ADEREF: vm_aderef(self); break; case OP_ADEREF: vm_aderef(self); break;
case OP_ACAT: vm_acat(self); break;
default: { default: {
fprintf(stderr, "unknown opcode %s\n", fprintf(stderr, "unknown opcode %s\n",
@ -620,3 +621,38 @@ void vm_aderef(vm* self)
self->pc++; self->pc++;
} }
void vm_acat(vm* self)
{
assert(self);
value* rhs = vm_pop_value(self);
value* lhs = vm_pop_value(self);
array* lhs_arr = lhs->val.array_val;
array* rhs_arr = rhs->val.array_val;
array result_arr;
array_init(&result_arr, lhs->type->array_type);
for (size_t i=0; i<lhs_arr->children.size; i++)
{
array_push(&result_arr, lhs_arr->children.data[i]);
}
for (size_t i=0; i<rhs_arr->children.size; i++)
{
array_push(&result_arr, rhs_arr->children.data[i]);
}
value* result = malloc(sizeof(value));
value_init_array(result, &result_arr, lhs->lineno);
array_free(&result_arr);
value_free(lhs); free(lhs);
value_free(rhs); free(rhs);
vm_push_value(self, result);
self->pc++;
}

View File

@ -55,5 +55,6 @@ void vm_cat(vm* self);
void vm_mkarray(vm* self, int param); void vm_mkarray(vm* self, int param);
void vm_aderef(vm* self); void vm_aderef(vm* self);
void vm_acat(vm* self);
#endif #endif

View File

@ -6,3 +6,5 @@
[1, 2, 3][3.14] [1, 2, 3][3.14]
[1, 2, 3][ [0, 1] ] [1, 2, 3][ [0, 1] ]
[1, 2, 3][0, 0] [1, 2, 3][0, 0]
[1] + 1
[[1, 2]] + [1]

View File

@ -16,8 +16,7 @@ assert "8" == ["3", "8", "9"][2 - 1]
assert 7 == [[4, 6], [9, 2, 7], [3, 3, 2]][1, 2] assert 7 == [[4, 6], [9, 2, 7], [3, 3, 2]][1, 2]
assert 9 == [[4, 6], [9, 2, 7], [3, 3, 2]][[2, 9, 1][2], 0] assert 9 == [[4, 6], [9, 2, 7], [3, 3, 2]][[2, 9, 1][2], 0]
assert [1, 2] == [1] + [2]
assert [3, 4, 5, 6] == [3] + [4] + [5, 6]
assert [[2, 4], [6, 8]] == [[2, 4]] + [[6, 8]]