diff options
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/parser.h | 8 | ||||
| -rw-r--r-- | src/parser/parser_expr.c | 10 | ||||
| -rw-r--r-- | src/parser/parser_type.c | 10 | ||||
| -rw-r--r-- | src/parser/parser_utils.c | 55 |
4 files changed, 61 insertions, 22 deletions
diff --git a/src/parser/parser.h b/src/parser/parser.h index ca8c447..3f2e763 100644 --- a/src/parser/parser.h +++ b/src/parser/parser.h @@ -116,6 +116,7 @@ typedef struct Instantiation char *name; char *template_name; char *concrete_arg; + char *unmangled_arg; // For code substitution (e.g. "struct T*") ASTNode *struct_node; struct Instantiation *next; } Instantiation; @@ -320,7 +321,8 @@ void add_to_impl_list(ParserContext *ctx, ASTNode *node); void add_to_global_list(ParserContext *ctx, ASTNode *node); void register_builtins(ParserContext *ctx); void add_instantiated_func(ParserContext *ctx, ASTNode *fn); -void instantiate_generic(ParserContext *ctx, const char *name, const char *concrete_type, Token t); +void instantiate_generic(ParserContext *ctx, const char *name, const char *concrete_type, + const char *unmangled_type, Token t); void instantiate_generic_multi(ParserContext *ctx, const char *name, char **args, int arg_count, Token t); char *sanitize_mangled_name(const char *name); @@ -390,8 +392,8 @@ void init_builtins(); // Expression rewriting char *rewrite_expr_methods(ParserContext *ctx, char *raw); char *process_fstring(ParserContext *ctx, const char *content, char ***used_syms, int *count); -char *instantiate_function_template(ParserContext *ctx, const char *name, - const char *concrete_type); +char *instantiate_function_template(ParserContext *ctx, const char *name, const char *concrete_type, + const char *unmangled_type); FuncSig *find_func(ParserContext *ctx, const char *name); Type *parse_type_formal(ParserContext *ctx, Lexer *l); diff --git a/src/parser/parser_expr.c b/src/parser/parser_expr.c index d0f3337..975d237 100644 --- a/src/parser/parser_expr.c +++ b/src/parser/parser_expr.c @@ -1464,7 +1464,10 @@ ASTNode *parse_primary(ParserContext *ctx, Lexer *l) if (lexer_peek(&lookahead).type == TOK_RANGLE) { lexer_next(l); - char *concrete_type = parse_type(ctx, l); + Type *formal_type = parse_type_formal(ctx, l); + char *concrete_type = type_to_string(formal_type); // mangled for naming + char *unmangled_type = + type_to_c_string(formal_type); // C-compatible for substitution lexer_next(l); int is_struct = 0; @@ -1485,7 +1488,7 @@ ASTNode *parse_primary(ParserContext *ctx, Lexer *l) if (is_struct) { - instantiate_generic(ctx, acc, concrete_type, t); + instantiate_generic(ctx, acc, concrete_type, unmangled_type, t); char *clean_type = sanitize_mangled_name(concrete_type); @@ -1498,7 +1501,8 @@ ASTNode *parse_primary(ParserContext *ctx, Lexer *l) } else { - char *m = instantiate_function_template(ctx, acc, concrete_type); + char *m = + instantiate_function_template(ctx, acc, concrete_type, unmangled_type); if (m) { free(acc); diff --git a/src/parser/parser_type.c b/src/parser/parser_type.c index 7dded00..b966a4d 100644 --- a/src/parser/parser_type.c +++ b/src/parser/parser_type.c @@ -12,10 +12,15 @@ Type *parse_type_base(ParserContext *ctx, Lexer *l) if (t.type == TOK_IDENT) { + int explicit_struct = 0; // Handle "struct Name" or "enum Name" if ((t.len == 6 && strncmp(t.start, "struct", 6) == 0) || (t.len == 4 && strncmp(t.start, "enum", 4) == 0)) { + if (strncmp(t.start, "struct", 6) == 0) + { + explicit_struct = 1; + } lexer_next(l); // consume keyword t = lexer_peek(l); if (t.type != TOK_IDENT) @@ -381,6 +386,7 @@ Type *parse_type_base(ParserContext *ctx, Lexer *l) Type *ty = type_new(TYPE_STRUCT); ty->name = name; + ty->is_explicit_struct = explicit_struct; // Handle Generics <T> or <K, V> if (lexer_peek(l).type == TOK_LANGLE) @@ -463,7 +469,9 @@ Type *parse_type_base(ParserContext *ctx, Lexer *l) zpanic_at(t, "Expected > after generic"); } - instantiate_generic(ctx, name, first_arg_str, t); + char *unmangled_arg = type_to_c_string(first_arg); + instantiate_generic(ctx, name, first_arg_str, unmangled_arg, t); + free(unmangled_arg); char *clean_arg = sanitize_mangled_name(first_arg_str); char mangled[256]; diff --git a/src/parser/parser_utils.c b/src/parser/parser_utils.c index 51d89d7..7c45178 100644 --- a/src/parser/parser_utils.c +++ b/src/parser/parser_utils.c @@ -8,7 +8,8 @@ #include <string.h> void instantiate_methods(ParserContext *ctx, GenericImplTemplate *it, - const char *mangled_struct_name, const char *arg); + const char *mangled_struct_name, const char *arg, + const char *unmangled_arg); Token expect(Lexer *l, TokenType type, const char *msg) { @@ -388,7 +389,7 @@ void register_impl_template(ParserContext *ctx, const char *sname, const char *p { if (inst->template_name && strcmp(inst->template_name, sname) == 0) { - instantiate_methods(ctx, t, inst->name, inst->concrete_arg); + instantiate_methods(ctx, t, inst->name, inst->concrete_arg, inst->unmangled_arg); } inst = inst->next; } @@ -1578,7 +1579,8 @@ FuncSig *find_func(ParserContext *ctx, const char *name) return NULL; } -char *instantiate_function_template(ParserContext *ctx, const char *name, const char *concrete_type) +char *instantiate_function_template(ParserContext *ctx, const char *name, const char *concrete_type, + const char *unmangled_type) { GenericFuncTemplate *tpl = find_func_template(ctx, name); if (!tpl) @@ -1596,8 +1598,8 @@ char *instantiate_function_template(ParserContext *ctx, const char *name, const return mangled; } - ASTNode *new_fn = - copy_ast_replacing(tpl->func_node, tpl->generic_param, concrete_type, NULL, NULL); + const char *subst_arg = unmangled_type ? unmangled_type : concrete_type; + ASTNode *new_fn = copy_ast_replacing(tpl->func_node, tpl->generic_param, subst_arg, NULL, NULL); if (!new_fn || new_fn->type != NODE_FUNCTION) { return NULL; @@ -1820,7 +1822,20 @@ ASTNode *copy_fields_replacing(ParserContext *ctx, ASTNode *fields, const char * if (found) { - instantiate_generic(ctx, template_name, concrete_arg, fields->token); + char *unmangled = xstrdup(concrete_arg); + size_t alen = strlen(concrete_arg); + if (alen > 3 && strcmp(concrete_arg + alen - 3, "Ptr") == 0) + { + char *base = xstrdup(concrete_arg); + base[alen - 3] = '\0'; + // heuristic: Ptr likely maps to struct T* + free(unmangled); + unmangled = xmalloc(strlen(base) + 16); + sprintf(unmangled, "struct %s*", base); + free(base); + } + instantiate_generic(ctx, template_name, concrete_arg, unmangled, fields->token); + free(unmangled); } } free(type_copy); @@ -1832,7 +1847,8 @@ ASTNode *copy_fields_replacing(ParserContext *ctx, ASTNode *fields, const char * } void instantiate_methods(ParserContext *ctx, GenericImplTemplate *it, - const char *mangled_struct_name, const char *arg) + const char *mangled_struct_name, const char *arg, + const char *unmangled_arg) { if (check_impl(ctx, "Methods", mangled_struct_name)) { @@ -1841,8 +1857,9 @@ void instantiate_methods(ParserContext *ctx, GenericImplTemplate *it, ASTNode *backup_next = it->impl_node->next; it->impl_node->next = NULL; // Break link to isolate node - ASTNode *new_impl = copy_ast_replacing(it->impl_node, it->generic_param, arg, it->struct_name, - mangled_struct_name); + const char *subst_arg = unmangled_arg ? unmangled_arg : arg; + ASTNode *new_impl = copy_ast_replacing(it->impl_node, it->generic_param, subst_arg, + it->struct_name, mangled_struct_name); it->impl_node->next = backup_next; // Restore new_impl->impl.struct_name = xstrdup(mangled_struct_name); @@ -1878,7 +1895,8 @@ void instantiate_methods(ParserContext *ctx, GenericImplTemplate *it, if (strcmp(gt->name, template_name) == 0) { // Found matching template, instantiate it - instantiate_generic(ctx, template_name, arg, meth->token); + const char *subst_arg = unmangled_arg ? unmangled_arg : arg; + instantiate_generic(ctx, template_name, arg, subst_arg, meth->token); break; } gt = gt->next; @@ -1892,7 +1910,8 @@ void instantiate_methods(ParserContext *ctx, GenericImplTemplate *it, add_instantiated_func(ctx, new_impl); } -void instantiate_generic(ParserContext *ctx, const char *tpl, const char *arg, Token token) +void instantiate_generic(ParserContext *ctx, const char *tpl, const char *arg, + const char *unmangled_arg, Token token) { // Ignore generic placeholders if (strlen(arg) == 1 && isupper(arg[0])) @@ -1937,8 +1956,11 @@ void instantiate_generic(ParserContext *ctx, const char *tpl, const char *arg, T ni->name = xstrdup(m); ni->template_name = xstrdup(tpl); ni->concrete_arg = xstrdup(arg); - ni->struct_node = NULL; // Placeholder to break cycles + ni->unmangled_arg = unmangled_arg ? xstrdup(unmangled_arg) + : xstrdup(arg); // Fallback to arg if unmangled is generic + ni->struct_node = NULL; // Placeholder to break cycles ni->next = ctx->instantiations; + ni->struct_node = NULL; // Duplicate assignment, ignore. ctx->instantiations = ni; ASTNode *struct_node_copy = NULL; @@ -1952,7 +1974,8 @@ void instantiate_generic(ParserContext *ctx, const char *tpl, const char *arg, T const char *gp = (t->struct_node->strct.generic_param_count > 0) ? t->struct_node->strct.generic_params[0] : "T"; - i->strct.fields = copy_fields_replacing(ctx, t->struct_node->strct.fields, gp, arg); + const char *subst_arg = unmangled_arg ? unmangled_arg : arg; + i->strct.fields = copy_fields_replacing(ctx, t->struct_node->strct.fields, gp, subst_arg); struct_node_copy = i; register_struct_def(ctx, m, i); } @@ -1968,8 +1991,9 @@ void instantiate_generic(ParserContext *ctx, const char *tpl, const char *arg, T ASTNode *nv = ast_create(NODE_ENUM_VARIANT); nv->variant.name = xstrdup(v->variant.name); nv->variant.tag_id = v->variant.tag_id; + const char *subst_arg = unmangled_arg ? unmangled_arg : arg; nv->variant.payload = replace_type_formal( - v->variant.payload, t->struct_node->enm.generic_param, arg, NULL, NULL); + v->variant.payload, t->struct_node->enm.generic_param, subst_arg, NULL, NULL); char mangled_var[512]; sprintf(mangled_var, "%s_%s", m, nv->variant.name); register_enum_variant(ctx, m, mangled_var, nv->variant.tag_id); @@ -2001,7 +2025,8 @@ void instantiate_generic(ParserContext *ctx, const char *tpl, const char *arg, T { if (strcmp(it->struct_name, tpl) == 0) { - instantiate_methods(ctx, it, m, arg); + const char *subst_arg = unmangled_arg ? unmangled_arg : arg; + instantiate_methods(ctx, it, m, arg, subst_arg); } it = it->next; } |