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

Minor codegen cleanup Texts(...)

Browse Source
This commit is contained in:
Bruce Hill 2024-09-03 23:35:42 -04:00
parent f60edfbe7f
commit 805082d299
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtins/text.h
View File

@ -20,6 +20,7 @@ int Text$print(FILE *stream, Text_t t);
void Text$visualize(Text_t t);
Text_t Text$_concat(int n, Text_t items[n]);
#define Text$concat(...) Text$_concat(sizeof((Text_t[]){__VA_ARGS__})/sizeof(Text_t), (Text_t[]){__VA_ARGS__})
#define Texts(...) Text$concat(__VA_ARGS__)
Text_t Text$slice(Text_t text, Int_t first_int, Int_t last_int);
Text_t Text$from_str(const char *str);
uint64_t Text$hash(Text_t *text);

6
compile.c
View File

@ -593,7 +593,7 @@ CORD compile_statement(env_t *env, ast_t *ast)
return CORD_all(lhs, " ^= ", rhs, ";");
case BINOP_CONCAT: {
if (lhs_t->tag == TextType) {
return CORD_all(lhs, " = Text$concat(", lhs, ", ", rhs, ");");
return CORD_all(lhs, " = Texts(", lhs, ", ", rhs, ");");
} else if (lhs_t->tag == ArrayType) {
CORD padded_item_size = CORD_asprintf("%ld", padded_type_size(Match(lhs_t, ArrayType)->item_type));
if (promote(env, &rhs, rhs_t, Match(lhs_t, ArrayType)->item_type)) {
@ -822,7 +822,7 @@ CORD compile_statement(env_t *env, ast_t *ast)
if (!to_print)
return CORD_EMPTY;
CORD code = "say(Text$concat(";
CORD code = "say(Texts(";
for (ast_list_t *chunk = to_print; chunk; chunk = chunk->next) {
if (chunk->ast->tag == TextLiteral) {
code = CORD_cat(code, compile(env, chunk->ast));
@ -1845,7 +1845,7 @@ CORD compile(env_t *env, ast_t *ast)
if (chunk->next) code = CORD_cat(code, ", ");
}
if (chunks->next)
return CORD_all("Text$concat(", code, ")");
return CORD_all("Texts(", code, ")");
else
return code;
}