Switch naming convention to use '$' in symbols more

1 files changed, 27 insertions, 27 deletions

diff --git a/builtins/table.h b/builtins/table.h
index 38c66427..fdde32ae 100644
--- a/builtins/table.h
+++ b/builtins/table.h
@@ -12,7 +12,7 @@
 
 #define $Table(key_t, val_t, key_info, value_info, fb, def, N, ...)  ({ \
     struct { key_t k; val_t v; } $ents[N] = {__VA_ARGS__}; \
-    table_t $table = Table_from_entries((array_t){ \
+    table_t $table = Table$from_entries((array_t){ \
                        .data=memcpy(GC_MALLOC(sizeof($ents)), $ents, sizeof($ents)), \
                        .length=sizeof($ents)/sizeof($ents[0]), \
                        .stride=(void*)&$ents[1] - (void*)&$ents[0], \
@@ -22,36 +22,36 @@
     $table; })
 #define $Table_get(table_expr, key_t, val_t, key_expr, info_expr, filename, start, end) ({ \
     const table_t $t = table_expr; key_t $k = key_expr; const TypeInfo* $info = info_expr; \
-    const val_t *$v = Table_get($t, &$k, $info); \
+    const val_t *$v = Table$get($t, &$k, $info); \
     if (__builtin_expect($v == NULL, 0)) \
         fail_source(filename, start, end, "The key %r is not in this table\n", generic_as_text(&$k, USE_COLOR, $info->TableInfo.key)); \
     *$v; })
 
-table_t Table_from_entries(array_t entries, const TypeInfo *type);
-void *Table_get(table_t t, const void *key, const TypeInfo *type);
-void *Table_get_raw(table_t t, const void *key, const TypeInfo *type);
-void *Table_entry(table_t t, int64_t n);
-void *Table_reserve(table_t *t, const void *key, const void *value, const TypeInfo *type);
-void Table_set(table_t *t, const void *key, const void *value, const TypeInfo *type);
-#define Table_set_value(t, key_expr, value_expr, type) ({ __typeof(key_expr) $k = key_expr; __typeof(value_expr) $v = value_expr; \
-                                                        Table_set(t, &$k, &$v, type); })
-#define Table_reserve_value(t, key_expr, type) ({ __typeof(key_expr) $k = key_expr; Table_reserve(t, &$k, NULL, type); })
-void Table_remove(table_t *t, const void *key, const TypeInfo *type);
-void Table_clear(table_t *t);
-void Table_mark_copy_on_write(table_t *t);
-int32_t Table_compare(const table_t *x, const table_t *y, const TypeInfo *type);
-bool Table_equal(const table_t *x, const table_t *y, const TypeInfo *type);
-uint32_t Table_hash(const table_t *t, const TypeInfo *type);
-CORD Table_as_text(const table_t *t, bool colorize, const TypeInfo *type);
-
-void *Table_str_entry(table_t t, int64_t n);
-void *Table_str_get(table_t t, const char *key);
-void *Table_str_get_raw(table_t t, const char *key);
-void Table_str_set(table_t *t, const char *key, const void *value);
-void *Table_str_reserve(table_t *t, const char *key, const void *value);
-void Table_str_remove(table_t *t, const char *key);
-
-#define Table_length(t) ((t).entries.length)
+table_t Table$from_entries(array_t entries, const TypeInfo *type);
+void *Table$get(table_t t, const void *key, const TypeInfo *type);
+void *Table$get_raw(table_t t, const void *key, const TypeInfo *type);
+void *Table$entry(table_t t, int64_t n);
+void *Table$reserve(table_t *t, const void *key, const void *value, const TypeInfo *type);
+void Table$set(table_t *t, const void *key, const void *value, const TypeInfo *type);
+#define Table$set_value(t, key_expr, value_expr, type) ({ __typeof(key_expr) $k = key_expr; __typeof(value_expr) $v = value_expr; \
+                                                        Table$set(t, &$k, &$v, type); })
+#define Table$reserve_value(t, key_expr, type) ({ __typeof(key_expr) $k = key_expr; Table$reserve(t, &$k, NULL, type); })
+void Table$remove(table_t *t, const void *key, const TypeInfo *type);
+void Table$clear(table_t *t);
+void Table$mark_copy_on_write(table_t *t);
+int32_t Table$compare(const table_t *x, const table_t *y, const TypeInfo *type);
+bool Table$equal(const table_t *x, const table_t *y, const TypeInfo *type);
+uint32_t Table$hash(const table_t *t, const TypeInfo *type);
+CORD Table$as_text(const table_t *t, bool colorize, const TypeInfo *type);
+
+void *Table$str_entry(table_t t, int64_t n);
+void *Table$str_get(table_t t, const char *key);
+void *Table$str_get_raw(table_t t, const char *key);
+void Table$str_set(table_t *t, const char *key, const void *value);
+void *Table$str_reserve(table_t *t, const char *key, const void *value);
+void Table$str_remove(table_t *t, const char *key);
+
+#define Table$length(t) ((t).entries.length)
 
 extern const TypeInfo StrToVoidStarTable;