X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl.c;h=51dd733350b49073fbf4befc921426e1718c5633;hb=ed8afff1d0e557ee702852f6e293c42c621d16e3;hp=df04656a8d41bab720b53a362ed018aa12701f94;hpb=c5b2de8ed1d92dd42f910d4347d9175f27e3acbb;p=m6w6%2Fext-psi diff --git a/src/types/decl.c b/src/types/decl.c index df04656..51dd733 100644 --- a/src/types/decl.c +++ b/src/types/decl.c @@ -85,6 +85,10 @@ static inline bool psi_decl_validate_func(struct psi_data *data, { struct psi_func_redir *redir; + if (!func->var->name) { + data->error(data, func->token, PSI_WARNING, "Anonymous decl!"); + return false; + } if (!strcmp(func->var->name, "dlsym")) { data->error(data, func->token, PSI_WARNING, "Cannot dlsym dlsym (sic!)"); @@ -114,9 +118,10 @@ static inline bool psi_decl_validate_func(struct psi_data *data, return true; } -bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl) +bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl, + struct psi_validate_stack *type_stack) { - if (!psi_decl_validate_nodl(data, decl)) { + if (!psi_decl_validate_nodl(data, decl, type_stack)) { return false; } if (!psi_decl_validate_func(data, decl, decl->func, dl)) { @@ -126,7 +131,8 @@ bool psi_decl_validate(struct psi_data *data, struct psi_decl *decl, void *dl) return true; } -bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl) +bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl, + struct psi_validate_stack *type_stack) { if (!decl->abi) { decl->abi = psi_decl_abi_init("default"); @@ -135,7 +141,7 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl) "Invalid calling convention: '%s'", decl->abi->token->text); return false; } - if (!psi_decl_arg_validate(data, decl->func)) { + if (!psi_decl_arg_validate(data, decl->func, type_stack)) { return false; } if (decl->args) { @@ -143,7 +149,12 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl) struct psi_decl_arg *arg; while (psi_plist_get(decl->args, i++, &arg)) { - if (!psi_decl_arg_validate(data, arg)) { + if (!arg->var->name) { + arg->var->name = malloc(7); + snprintf(arg->var->name, 6, "arg%zu", i); + arg->var->fqn = strdup(arg->var->name); + } + if (!psi_decl_arg_validate(data, arg, type_stack)) { return false; } }