diff options
Diffstat (limited to 'src/enums.c')
| -rw-r--r-- | src/enums.c | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/src/enums.c b/src/enums.c index 113eb91d..698d2c3e 100644 --- a/src/enums.c +++ b/src/enums.c @@ -21,8 +21,8 @@ Text_t compile_enum_typeinfo(env_t *env, ast_t *ast) for (tag_ast_t *tag = def->tags; tag; tag = tag->next) { if (!tag->fields) continue; - const char *tag_name = String(def->name, "$", tag->name); - type_t *tag_type = Table$str_get(*env->types, tag_name); + const char *tag_name = String(def->name, "ヽ", tag->name); + type_t *tag_type = Tableヽstr_get(*env->types, tag_name); assert(tag_type && tag_type->tag == StructType); member_typeinfos = Texts( member_typeinfos, compile_struct_typeinfo(env, tag_type, tag_name, tag->fields, tag->secret, false)); @@ -32,17 +32,17 @@ Text_t compile_enum_typeinfo(env_t *env, ast_t *ast) for (tag_ast_t *t = def->tags; t; t = t->next) num_tags += 1; - type_t *t = Table$str_get(*env->types, def->name); - const char *metamethods = is_packed_data(t) ? "PackedDataEnum$metamethods" : "Enum$metamethods"; - Text_t info = namespace_name(env, env->namespace, Texts(def->name, "$$info")); + type_t *t = Tableヽstr_get(*env->types, def->name); + const char *metamethods = is_packed_data(t) ? "PackedDataEnumヽmetamethods" : "Enumヽmetamethods"; + Text_t info = namespace_name(env, env->namespace, Texts(Textヽfrom_str(def->name), SEP, INTERNAL_ID("info"))); Text_t typeinfo = Texts("public const TypeInfo_t ", info, " = {", String((int64_t)type_size(t)), "u, ", String((int64_t)type_align(t)), "u, .metamethods=", metamethods, - ", {.tag=EnumInfo, .EnumInfo={.name=\"", def->name, "\", " + ", {.tag=EnumInfo, .EnumInfo={.name=\"", Textヽfrom_str(def->name), "\", " ".num_tags=", String((int64_t)num_tags), ", .tags=(NamedType_t[]){"); for (tag_ast_t *tag = def->tags; tag; tag = tag->next) { - const char *tag_type_name = String(def->name, "$", tag->name); - type_t *tag_type = Table$str_get(*env->types, tag_type_name); + const char *tag_type_name = String(def->name, SEP, tag->name); + type_t *tag_type = Tableヽstr_get(*env->types, tag_type_name); if (tag_type && Match(tag_type, StructType)->fields) typeinfo = Texts(typeinfo, "{\"", tag->name, "\", ", compile_type_info(tag_type), "}, "); else @@ -62,17 +62,17 @@ Text_t compile_enum_constructors(env_t *env, ast_t *ast) Text_t arg_sig = EMPTY_TEXT; for (arg_ast_t *field = tag->fields; field; field = field->next) { type_t *field_t = get_arg_ast_type(env, field); - arg_sig = Texts(arg_sig, compile_declaration(field_t, Texts("$", field->name))); + arg_sig = Texts(arg_sig, compile_declaration(field_t, Texts(SEP, field->name))); if (field->next) arg_sig = Texts(arg_sig, ", "); } if (arg_sig.length == 0) arg_sig = Text("void"); - Text_t type_name = namespace_name(env, env->namespace, Texts(def->name, "$$type")); - Text_t tagged_name = namespace_name(env, env->namespace, Texts(def->name, "$tagged$", tag->name)); - Text_t tag_name = namespace_name(env, env->namespace, Texts(def->name, "$tag$", tag->name)); + Text_t type_name = namespace_name(env, env->namespace, Texts(Textヽfrom_str(def->name), SEP, INTERNAL_ID("type"))); + Text_t tagged_name = namespace_name(env, env->namespace, Texts(Textヽfrom_str(def->name), SEP, "tagged", SEP, tag->name)); + Text_t tag_name = namespace_name(env, env->namespace, Texts(Textヽfrom_str(def->name), SEP, INTERNAL_ID("tag"), SEP, tag->name)); Text_t constructor_impl = Texts("public inline ", type_name, " ", tagged_name, "(", arg_sig, ") { return (", - type_name, "){.$tag=", tag_name, ", .", valid_c_name(tag->name), "={"); + type_name, "){.", INTERNAL_ID("tag"), "=", tag_name, ", .", valid_c_name(tag->name), "={"); for (arg_ast_t *field = tag->fields; field; field = field->next) { - constructor_impl = Texts(constructor_impl, "$", field->name); + constructor_impl = Texts(constructor_impl, SEP, field->name); if (field->next) constructor_impl = Texts(constructor_impl, ", "); } constructor_impl = Texts(constructor_impl, "}}; }\n"); @@ -85,13 +85,14 @@ Text_t compile_enum_header(env_t *env, ast_t *ast) { DeclareMatch(def, ast, EnumDef); Text_t all_defs = EMPTY_TEXT; - Text_t none_name = namespace_name(env, env->namespace, Texts(def->name, "$none")); - Text_t enum_name = namespace_name(env, env->namespace, Texts(def->name, "$$enum")); + Text_t name = Textヽfrom_str(def->name); + Text_t none_name = namespace_name(env, env->namespace, Texts(name, SEP, "none")); + Text_t enum_name = namespace_name(env, env->namespace, Texts(name, SEP, INTERNAL_ID("enum"))); Text_t enum_tags = Texts("{ ", none_name, "=0, "); bool has_any_tags_with_fields = false; for (tag_ast_t *tag = def->tags; tag; tag = tag->next) { - Text_t tag_name = namespace_name(env, env->namespace, Texts(def->name, "$tag$", tag->name)); + Text_t tag_name = namespace_name(env, env->namespace, Texts(name, SEP, INTERNAL_ID("tag"), SEP, tag->name)); enum_tags = Texts(enum_tags, tag_name); if (tag->next) enum_tags = Texts(enum_tags, ", "); has_any_tags_with_fields = has_any_tags_with_fields || (tag->fields != NULL); @@ -100,26 +101,26 @@ Text_t compile_enum_header(env_t *env, ast_t *ast) if (!has_any_tags_with_fields) { Text_t enum_def = Texts("enum ", enum_name, " ", enum_tags, ";\n"); - Text_t info = namespace_name(env, env->namespace, Texts(def->name, "$$info")); + Text_t info = namespace_name(env, env->namespace, Texts(name, SEP, INTERNAL_ID("info"))); return Texts(enum_def, "extern const TypeInfo_t ", info, ";\n"); } - Text_t struct_name = namespace_name(env, env->namespace, Texts(def->name, "$$struct")); + Text_t struct_name = namespace_name(env, env->namespace, Texts(name, SEP, INTERNAL_ID("struct"))); Text_t enum_def = Texts("struct ", struct_name, " {\n" - "enum ", enum_tags, " $tag;\n" + "enum ", enum_tags, " ", INTERNAL_ID("tag"), ";\n" "union {\n"); for (tag_ast_t *tag = def->tags; tag; tag = tag->next) { if (!tag->fields) continue; Text_t field_def = compile_struct_header( - env, WrapAST(ast, StructDef, .name=Text$as_c_string(Texts(def->name, "$", tag->name)), .fields=tag->fields)); + env, WrapAST(ast, StructDef, .name=Textヽas_c_string(Texts(name, SEP, tag->name)), .fields=tag->fields)); all_defs = Texts(all_defs, field_def); - Text_t tag_type = namespace_name(env, env->namespace, Texts(def->name, "$", tag->name, "$$type")); + Text_t tag_type = namespace_name(env, env->namespace, Texts(name, SEP, tag->name, SEP, INTERNAL_ID("type"))); enum_def = Texts(enum_def, tag_type, " ", valid_c_name(tag->name), ";\n"); } enum_def = Texts(enum_def, "};\n};\n"); all_defs = Texts(all_defs, enum_def); - Text_t info = namespace_name(env, env->namespace, Texts(def->name, "$$info")); + Text_t info = namespace_name(env, env->namespace, Texts(name, SEP, INTERNAL_ID("info"))); all_defs = Texts(all_defs, "extern const TypeInfo_t ", info, ";\n"); for (tag_ast_t *tag = def->tags; tag; tag = tag->next) { if (!tag->fields) continue; @@ -127,12 +128,12 @@ Text_t compile_enum_header(env_t *env, ast_t *ast) Text_t arg_sig = EMPTY_TEXT; for (arg_ast_t *field = tag->fields; field; field = field->next) { type_t *field_t = get_arg_ast_type(env, field); - arg_sig = Texts(arg_sig, compile_declaration(field_t, Texts("$", field->name))); + arg_sig = Texts(arg_sig, compile_declaration(field_t, USER_ID(field->name))); if (field->next) arg_sig = Texts(arg_sig, ", "); } if (arg_sig.length == 0) arg_sig = Text("void"); - Text_t enum_type = namespace_name(env, env->namespace, Texts(def->name, "$$type")); - Text_t tagged_name = namespace_name(env, env->namespace, Texts(def->name, "$tagged$", tag->name)); + Text_t enum_type = namespace_name(env, env->namespace, Texts(name, SEP, INTERNAL_ID("type"))); + Text_t tagged_name = namespace_name(env, env->namespace, Texts(name, SEP, "tagged", SEP, tag->name)); Text_t constructor_def = Texts(enum_type, " ", tagged_name, "(", arg_sig, ");\n"); all_defs = Texts(all_defs, constructor_def); } |