unsigned as)
{
struct psi_decl_var *v = calloc(1, sizeof(*v));
- v->name = strdup(name);
- v->fqn = strdup(name);
+ if (name) {
+ v->name = strdup(name);
+ v->fqn = strdup(name);
+ }
v->pointer_level = pl;
v->array_size = as;
return v;
struct psi_decl_var *dest = calloc(1, sizeof(*dest));
*dest = *src;
- dest->name = strdup(dest->name);
- dest->fqn = strdup(dest->fqn);
+
+ if (dest->name) {
+ dest->name = strdup(dest->name);
+ dest->fqn = strdup(dest->fqn);
+ }
if (dest->token) {
dest->token = psi_token_copy(dest->token);
if (var->token) {
free(var->token);
}
- free(var->name);
- free(var->fqn);
+ if (var->name) {
+ free(var->name);
+ free(var->fqn);
+ }
free(var);
}
}
{
dprintf(fd, "%s%s",
psi_t_indirection(var->pointer_level - !!var->array_size),
- var->name);
- if (var->array_size) {
+ var->name ? var->name : "/**/");
+ if (var->array_size && var->arg->type->type != PSI_T_FUNCTION) {
dprintf(fd, "[%u]", var->array_size);
}
}
bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
- struct psi_decl *decl, struct psi_let_exp *let_exp,
- struct psi_set_exp *set_exp)
+ struct psi_validate_scope *scope)
{
bool okay = false;
- struct psi_let_exp *current_let_exp = let_exp;
- struct psi_set_exp *current_set_exp = set_exp;
- if (current_let_exp) {
+ if (scope && scope->current_let) {
+ struct psi_let_exp *current_let_exp = scope->current_let;
+
/* walk up the let expression tree until found */
while ((current_let_exp = current_let_exp->outer)) {
struct psi_decl_var *svar = current_let_exp->var;
dvar->fqn = psi_decl_var_name_prepend(dvar->fqn, svar->name);
}
}
- } else if (current_set_exp) {
+ } else if (scope && scope->current_set) {
+ struct psi_set_exp *current_set_exp = scope->current_set;
+
/* walk up the set expression tree until found */
while ((current_set_exp = current_set_exp->outer)) {
struct psi_decl_var *svar = psi_set_exp_get_decl_var(
}
}
- if (decl && !okay && psi_decl_get_arg(decl, dvar)) {
+ if (!okay && scope && scope->impl && psi_impl_get_decl_arg(scope->impl, dvar)) {
+ okay = true;
+ }
+ if (!okay && scope && scope->cb_decl && psi_decl_get_arg(scope->cb_decl, dvar)) {
okay = true;
}