Open-Argon/Chloride
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix scope bug in if statement

Browse Source
This commit is contained in:
William Bell
2025-08-10 22:14:06 +01:00
parent c71375c7a4
commit bbf8794dd5
4 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/translator/if/if.c
View File

@@ -10,25 +10,48 @@
#include <stdint.h>
#include <stdio.h>
size_t translate_parsed_if(Translated *translated, DArray *parsedIf, ArErr * err) {
size_t translate_parsed_if(Translated *translated, DArray *parsedIf,
ArErr *err) {
size_t *jump_after_body_positions =
checked_malloc(parsedIf->size * sizeof(size_t));
checked_malloc((parsedIf->size) * sizeof(size_t));
size_t first = translated->bytecode.size;
set_registers(translated, 1);
DArray return_jumps;
DArray *old_return_jumps = NULL;
if (translated->return_jumps) {
darray_init(&return_jumps, sizeof(size_t));
old_return_jumps = translated->return_jumps;
translated->return_jumps = &return_jumps;
}
for (uint64_t i = 0; i < parsedIf->size; i++) {
ParsedConditional *condition = darray_get(parsedIf, i);
push_instruction_byte(translated, OP_NEW_SCOPE);
if (condition->condition) {
translate_parsed(translated, condition->condition, err);
if (err->exists) {
if (translated->return_jumps) {
darray_free(&return_jumps, NULL);
translated->return_jumps = old_return_jumps;
}
return 0;
}
push_instruction_byte(translated, OP_BOOL);
push_instruction_byte(translated, 0);
push_instruction_byte(translated, OP_JUMP_IF_FALSE);
push_instruction_byte(translated, 0);
uint64_t last_jump_index = push_instruction_code(translated, 0);
translate_parsed(translated, condition->content, err);
if (err->exists) {
if (translated->return_jumps) {
darray_free(&return_jumps, NULL);
translated->return_jumps = old_return_jumps;
}
return 0;
}
push_instruction_byte(translated, OP_POP_SCOPE);
push_instruction_byte(translated, OP_JUMP);
jump_after_body_positions[i] = push_instruction_code(translated, 0);
@@ -42,9 +65,27 @@ size_t translate_parsed_if(Translated *translated, DArray *parsedIf, ArErr * err
jump_after_body_positions[i] = push_instruction_code(translated, 0);
}
}
if (translated->return_jumps) {
push_instruction_byte(translated, OP_JUMP);
size_t skip_return = push_instruction_code(translated, 0);
size_t return_jump_to = push_instruction_byte(translated, OP_POP_SCOPE);
push_instruction_byte(translated, OP_JUMP);
size_t return_up = push_instruction_code(translated, 0);
darray_push(old_return_jumps, &return_up);
for (size_t i = 0; i < return_jumps.size; i++) {
size_t *index = darray_get(&return_jumps, i);
set_instruction_code(translated, *index, return_jump_to);
}
set_instruction_code(translated, skip_return, translated->bytecode.size);
darray_free(&return_jumps, NULL);
translated->return_jumps = old_return_jumps;
}
for (uint64_t i = 0; i < parsedIf->size; i++) {
set_instruction_code(translated, jump_after_body_positions[i],
translated->bytecode.size);
translated->bytecode.size);
}
free(jump_after_body_positions);
return first;