Use colons instead of '=' for tables (e.g. {1: 2})

5 files changed, 7 insertions, 8 deletions

diff --git a/src/environment.c b/src/environment.c
index ccbe4a8f..42182eac 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)"}, //
             {"utf8", "Text$utf8", "func(text:Text -> [Byte])"}, //
diff --git a/src/parse/containers.c b/src/parse/containers.c
index b7378b18..55ff336e 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 f08578e9..192103dc 100644
--- a/src/parse/types.c
+++ b/src/parse/types.c
@@ -25,15 +25,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 6e37751e..bda55375 100644
--- a/src/stdlib/tables.c
+++ b/src/stdlib/tables.c
@@ -534,7 +534,7 @@ Text_t Table$as_text(const void *obj, bool colorize, const TypeInfo_t *type) {
     __typeof(type->TableInfo) table = type->TableInfo;
 
     if (!t) {
-        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("}"));
     }
 
@@ -545,7 +545,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 b4466b3b..897f1ee2 100644
--- a/src/types.c
+++ b/src/types.c
@@ -334,7 +334,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) {