#define PSI_FUNC_REDIRS
#include "php_psi_posix.h"
-struct psi_decl *psi_decl_init(struct psi_decl_abi *abi,
- struct psi_decl_arg *func, struct psi_plist *args)
+struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args)
{
struct psi_decl *d = calloc(1, sizeof(*d));
- d->abi = abi;
+
d->func = func;
d->args = args;
+
return d;
}
{
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!)");
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)) {
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 (!psi_decl_abi_validate(data, decl->abi)) {
+ if (!decl->abi) {
+ decl->abi = psi_decl_abi_init("default");
+ } else if (!psi_decl_abi_validate(data, decl->abi)) {
data->error(data, decl->abi->token, PSI_WARNING,
"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) {
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;
}
}