change string literals to be length terminated instead of null terminated, so null characters can be embeded

This commit is contained in:
2025-06-14 01:16:28 +01:00
parent 937a6598fa
commit 20621944e6
15 changed files with 262 additions and 71 deletions

View File

View File

@@ -1,13 +1,18 @@
#include "../translator.h"
#include "../../parser/string/string.h"
#include <stddef.h>
#include <stdio.h>
#include <string.h>
void translate_parsed_string(Translated *translated, ParsedValue *parsedValue) {
size_t string_pos = arena_push_string(&translated->constants, (char*)parsedValue->data);
ParsedString *parsedString = (ParsedString*)parsedValue->data;
size_t string_pos = arena_push(&translated->constants, parsedString->string, parsedString->length);
set_registers(translated, 1);
push_instruction_code(translated, OP_LOAD_CONST);
push_instruction_code(translated, 0);
push_instruction_code(translated, OP_TYPE_STRING);
push_instruction_code(translated,strlen(parsedValue->data)+1);
push_instruction_code(translated,parsedString->length);
push_instruction_code(translated, string_pos);
fwrite(parsedString->string, 1, parsedString->length, stdout);
putchar('\n');
}

View File

@@ -13,15 +13,15 @@ void arena_init(ConstantArena *arena) {
}
void arena_resize(ConstantArena *arena, size_t new_size) {
new_size = ((new_size / CHUNK_SIZE) + 1)*CHUNK_SIZE;
if (new_size == arena->capacity)
size_t new_capacity = ((new_size / CHUNK_SIZE) + 1)*CHUNK_SIZE;
if (new_capacity == arena->capacity)
return;
arena->data = realloc(arena->data, new_size);
arena->data = realloc(arena->data, new_capacity);
if (!arena->data) {
fprintf(stderr, "error: failed to resize arena from %zu to %zu\n", new_size, arena->capacity);
fprintf(stderr, "error: failed to resize arena from %zu to %zu\n", new_capacity, arena->capacity);
exit(EXIT_FAILURE);
}
arena->capacity = new_size;
arena->capacity = new_capacity;
}
@@ -35,16 +35,6 @@ void * arena_get(ConstantArena *arena, size_t offset) {
return arena->data + offset;
}
size_t arena_push_string(ConstantArena *arena, const char *string) {
size_t length = strlen(string)+1;
arena_resize(arena, arena->size+length);
size_t offset = arena->size;
strcpy(arena->data + arena->size, string);
arena->size += length;
return offset;
}
size_t arena_push(ConstantArena *arena, const void *data, size_t length) {
arena_resize(arena, arena->size+length);
size_t offset = arena->size;
@@ -55,6 +45,7 @@ size_t arena_push(ConstantArena *arena, const void *data, size_t length) {
Translated init_translator() {
Translated translated;
translated.registerCount = 0;
darray_init(&translated.bytecode, sizeof(size_t));
arena_init(&translated.constants);
return translated;

View File

@@ -24,8 +24,6 @@ typedef struct {
void * arena_get(ConstantArena *arena, size_t offset);
size_t arena_push_string(ConstantArena *arena, const char *string);
size_t arena_push(ConstantArena *arena, const void *data, size_t length);
size_t push_instruction_code(Translated * translator, size_t code);