aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2025-09-06 15:11:26 -0400
committerBruce Hill <bruce@bruce-hill.com>2025-09-06 15:11:26 -0400
commitfb216e955f04a803f11953be27e76bd4d2c9e76d (patch)
treede2c471c5416ec2ee490bdb33f5e3e202d94675a /src
parent73246764f88f6f652316ee0c138a990d836698a7 (diff)
Use colons instead of '=' for tables (e.g. {1: 2})
Diffstat (limited to 'src')
-rw-r--r--src/environment.c2
-rw-r--r--src/parse/containers.c2
-rw-r--r--src/parse/types.c5
-rw-r--r--src/stdlib/tables.c4
-rw-r--r--src/types.c2
5 files changed, 7 insertions, 8 deletions
diff --git a/src/environment.c b/src/environment.c
index 7ac54a7a..421f993e 100644
--- a/src/environment.c
+++ b/src/environment.c
@@ -372,7 +372,7 @@ env_t *global_env(bool source_mapping) {
{"starts_with", "Text$starts_with", "func(text,prefix:Text, remainder:&Text? = none -> Bool)"}, //
{"title", "Text$title", "func(text:Text, language='C' -> Text)"}, //
{"to", "Text$to", "func(text:Text, last:Int -> Text)"}, //
- {"translate", "Text$translate", "func(text:Text, translations:{Text=Text} -> Text)"}, //
+ {"translate", "Text$translate", "func(text:Text, translations:{Text:Text} -> Text)"}, //
{"trim", "Text$trim", "func(text:Text, to_trim=\" \t\r\n\", left=yes, right=yes -> Text)"}, //
{"upper", "Text$upper", "func(text:Text, language='C' -> Text)"}, //
{"utf32_codepoints", "Text$utf32_codepoints", "func(text:Text -> [Int32])"}, //
diff --git a/src/parse/containers.c b/src/parse/containers.c
index 73d30ecd..c6362623 100644
--- a/src/parse/containers.c
+++ b/src/parse/containers.c
@@ -50,7 +50,7 @@ ast_t *parse_table(parse_ctx_t *ctx, const char *pos) {
ast_t *key = optional(ctx, &pos, parse_extended_expr);
if (!key) break;
whitespace(ctx, &pos);
- if (!match(&pos, "=")) return NULL;
+ if (!match(&pos, ":")) return NULL;
ast_t *value = expect(ctx, pos - 1, &pos, parse_expr, "I couldn't parse the value for this table entry");
ast_t *entry = NewAST(ctx->file, entry_start, pos, TableEntry, .key = key, .value = value);
ast_t *suffixed = parse_comprehension_suffix(ctx, entry);
diff --git a/src/parse/types.c b/src/parse/types.c
index ffb7d869..987be7a1 100644
--- a/src/parse/types.c
+++ b/src/parse/types.c
@@ -23,15 +23,14 @@ type_ast_t *parse_table_type(parse_ctx_t *ctx, const char *pos) {
pos = key_type->end;
whitespace(ctx, &pos);
type_ast_t *value_type = NULL;
- if (match(&pos, "=")) {
+ if (match(&pos, ":")) {
value_type = expect(ctx, start, &pos, parse_type, "I couldn't parse the rest of this table type");
} else {
return NULL;
}
spaces(&pos);
ast_t *default_value = NULL;
- if (match(&pos, ";") && match_word(&pos, "default")) {
- expect_str(ctx, pos, &pos, "=", "I expected an '=' here");
+ if (match(&pos, "=")) {
default_value =
expect(ctx, start, &pos, parse_extended_expr, "I couldn't parse the default value for this table");
}
diff --git a/src/stdlib/tables.c b/src/stdlib/tables.c
index 974e3542..65b09f60 100644
--- a/src/stdlib/tables.c
+++ b/src/stdlib/tables.c
@@ -535,7 +535,7 @@ Text_t Table$as_text(const void *obj, bool colorize, const TypeInfo_t *type) {
if (!t) {
if (table.value != &Void$info)
- return Text$concat(Text("{"), generic_as_text(NULL, false, table.key), Text("="),
+ return Text$concat(Text("{"), generic_as_text(NULL, false, table.key), Text(":"),
generic_as_text(NULL, false, table.value), Text("}"));
else return Text$concat(Text("|"), generic_as_text(NULL, false, table.key), Text("|"));
}
@@ -547,7 +547,7 @@ Text_t Table$as_text(const void *obj, bool colorize, const TypeInfo_t *type) {
void *entry = GET_ENTRY(*t, i);
text = Text$concat(text, generic_as_text(entry, colorize, table.key));
if (table.value != &Void$info)
- text = Text$concat(text, Text("="), generic_as_text(entry + val_off, colorize, table.value));
+ text = Text$concat(text, Text(": "), generic_as_text(entry + val_off, colorize, table.value));
}
if (t->fallback) {
diff --git a/src/types.c b/src/types.c
index b0caca1a..024bb688 100644
--- a/src/types.c
+++ b/src/types.c
@@ -328,7 +328,7 @@ PUREFUNC bool can_promote(type_t *actual, type_t *needed) {
return true; // || -> |T|
if (actual->tag == TableType && needed->tag == TableType && Match(actual, TableType)->key_type == NULL
&& Match(actual, TableType)->value_type == NULL)
- return true; // {} -> {K=V}
+ return true; // {} -> {K:V}
// Cross-promotion between tables with default values and without
if (needed->tag == TableType && actual->tag == TableType) {