struct psi_return_stmt *psi_return_stmt_init(struct psi_return_exp *exp)
{
- struct psi_return_stmt *ret = calloc(1, sizeof(*ret));
+ struct psi_return_stmt *ret = pecalloc(1, sizeof(*ret), 1);
ret->exp = exp;
return ret;
}
struct psi_return_stmt *ret = *ret_ptr;
*ret_ptr = NULL;
- if (ret->token) {
- free(ret->token);
- }
+ psi_token_free(&ret->token);
psi_return_exp_free(&ret->exp);
free(ret);
}
}
-void psi_return_stmt_dump(int fd, struct psi_return_stmt *ret)
+void psi_return_stmt_dump(struct psi_dump *dump, struct psi_return_stmt *ret)
{
- dprintf(fd, "\treturn ");
- psi_return_exp_dump(fd, ret->exp);
- dprintf(fd, ";\n");
+ PSI_DUMP(dump, "\treturn ");
+ psi_return_exp_dump(dump, ret->exp);
+ PSI_DUMP(dump, ";\n");
}
-bool psi_return_stmt_validate(struct psi_data *data, struct psi_impl *impl)
+bool psi_return_stmt_validate(struct psi_data *data,
+ struct psi_validate_scope *scope)
{
struct psi_return_stmt *ret;
- size_t count = psi_plist_count(impl->stmts.ret);
+ size_t count = psi_plist_count(scope->impl->stmts.ret);
- psi_plist_get(impl->stmts.ret, 0, &ret);
+ psi_plist_get(scope->impl->stmts.ret, 0, &ret);
/*
* we must have exactly one ret stmt declaring the native func to call
data->error(data, ret->token, PSI_WARNING,
"Too many `return` statements for implementation %s;"
" found %zu, exactly one is required",
- impl->func->name, count);
+ scope->impl->func->name->val, count);
return false;
case 0:
- data->error(data, impl->func->token, PSI_WARNING,
+ data->error(data, scope->impl->func->token, PSI_WARNING,
"Missing `return` statement for implementation %s",
- impl->func->name);
+ scope->impl->func->name->val);
return false;
case 1:
break;
}
- if (!psi_return_exp_validate(data, ret->exp, impl)) {
+ if (!psi_return_exp_validate(data, ret->exp, scope)) {
return false;
}