struct psi_decl_arg *psi_decl_arg_init(struct psi_decl_type *type,
struct psi_decl_var *var)
{
- struct psi_decl_arg *arg = calloc(1, sizeof(*arg));
+ struct psi_decl_arg *arg = pecalloc(1, sizeof(*arg), 1);
arg->token = var->token;
arg->type = type;
arg->var = var;
*arg_ptr = NULL;
if (arg->token && arg->token != arg->var->token) {
- free(arg->token);
+ psi_token_free(&arg->token);
}
psi_decl_type_free(&arg->type);
psi_decl_var_free(&arg->var);
}
}
-void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
+void psi_decl_arg_dump(struct psi_dump *dump, struct psi_decl_arg *arg, unsigned level)
{
if (arg->type->type == PSI_T_FUNCTION) {
- psi_decl_type_dump(fd, arg->type->real.func->func->type, level);
- dprintf(fd, " (*");
- psi_decl_var_dump(fd, arg->var);
- dprintf(fd, ")(");
+ psi_decl_type_dump(dump, arg->type->real.func->func->type, level);
+ if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+ PSI_DUMP(dump, "(");
+ }
+ PSI_DUMP(dump, " %s(*%s)",
+ psi_t_indirection(arg->var->pointer_level - !! arg->var->array_size),
+ arg->var->name->val);
+ PSI_DUMP(dump, "(");
if (arg->type->real.func->args) {
size_t j = 0;
struct psi_decl_arg *farg;
++level;
while (psi_plist_get(arg->type->real.func->args, j++, &farg)) {
if (j > 1) {
- dprintf(fd, ", ");
+ PSI_DUMP(dump, ", ");
}
- psi_decl_arg_dump(fd, farg, level);
+ psi_decl_arg_dump(dump, farg, level);
}
--level;
if (arg->type->real.func->varargs) {
- dprintf(fd, ", ...");
+ PSI_DUMP(dump, ", ...");
+ }
+ }
+ PSI_DUMP(dump, ")");
+ if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+ struct psi_decl *decl = arg->type->real.func->func->type->real.func;
+
+ PSI_DUMP(dump, "(");
+ if (decl->args) {
+ size_t i;
+ struct psi_decl_arg *arg;
+
+ for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+ if (i) {
+ PSI_DUMP(dump, ", ");
+ }
+ psi_decl_arg_dump(dump, arg, 0);
+ }
+ if (decl->varargs) {
+ PSI_DUMP(dump, ", ...");
+ }
}
+ PSI_DUMP(dump, "))");
}
- dprintf(fd, ")");
} else {
- psi_decl_type_dump(fd, arg->type, level);
- dprintf(fd, " ");
- psi_decl_var_dump(fd, arg->var);
+ psi_decl_type_dump(dump, arg->type, level);
+ PSI_DUMP(dump, " ");
+ psi_decl_var_dump(dump, arg->var);
}
}
-bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg)
+bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg,
+ struct psi_validate_scope *scope)
{
- if (!psi_decl_type_validate(data, arg->type, NULL)) {
- data->error(data, arg->type->token, PSI_WARNING,
- "Cannot use '%s' as type for '%s': %s", arg->type->name,
- arg->var->name, data->last_error);
- return false;
+ if (!psi_decl_type_validate(data, arg->type, NULL, scope)) {
+ if (!arg->var->pointer_level) {
+ data->error(data, arg->type->token, PSI_WARNING,
+ "Cannot use '%s' as type for '%s'%s%s",
+ arg->type->name->val,
+ arg->var->name->val,
+ *data->last_error ? ": " : "", data->last_error);
+ return false;
+ }
}
return true;
}
-bool psi_decl_arg_validate_typedef(struct psi_data *data, struct psi_decl_arg *def)
+bool psi_decl_arg_validate_typedef(struct psi_data *data,
+ struct psi_decl_arg *def, struct psi_validate_scope *scope)
{
- if (!psi_decl_type_validate(data, def->type, def)) {
+ if (psi_validate_scope_has_type(scope, def->var->name)) {
+ return true;
+ }
+ psi_validate_scope_add_type(scope, def->var->name, def);
+
+ if (def->type->type == PSI_T_VOID) {
+ if (def->var->pointer_level) {
+ def->type->type = PSI_T_POINTER;
+ } else {
+ data->error(data, def->token, PSI_WARNING,
+ "Type '%s' cannot be aliased to 'void'",
+ def->type->name->val);
+ return false;
+ }
+ } else if (!psi_decl_type_validate(data, def->type, def, scope)) {
const char *pre;
switch (def->type->type) {
break;
}
data->error(data, def->token, PSI_WARNING,
- "Type '%s' cannot be aliased to '%s%s': %s", def->var->name, pre,
- def->type->name, data->last_error);
+ "Type '%s' cannot be aliased to '%s%s'%s%s",
+ def->var->name->val, pre,
+ def->type->name->val,
+ *data->last_error ? ": " : "", data->last_error);
return false;
}
- if (def->type->type == PSI_T_VOID) {
- if (def->var->pointer_level) {
- def->type->type = PSI_T_POINTER;
- } else {
- data->error(data, def->token, PSI_WARNING,
- "Type '%s' cannot be aliased to 'void'", def->type->name);
- return false;
- }
- }
return true;
}
+bool psi_decl_arg_is_pointer(struct psi_decl_arg *darg)
+{
+ if (darg->var->pointer_level) {
+ if (darg->var->array_size) {
+ return darg->var->pointer_level > 1;
+ }
+ return true;
+ } else if (psi_decl_type_is_weak(darg->type) && darg->type->real.def) {
+ return psi_decl_arg_is_pointer(darg->type->real.def);
+ }
+ return false;
+}
+
size_t psi_decl_arg_align(struct psi_decl_arg *darg, size_t *pos, size_t *len)
{
size_t align = psi_decl_arg_get_align(darg);
- assert(align > 0);
-
- *len = psi_decl_arg_get_size(darg);
- *pos = psi_align(align, *pos);
+ if (align) {
+ *len = psi_decl_arg_get_size(darg);
+ *pos = psi_align(align, *pos);
+ }
return align;
}
{
size_t align;
- if (darg->var->pointer_level
- && (!darg->var->array_size || darg->var->pointer_level > 2)) {
+ if (psi_decl_arg_is_pointer(darg)) {
align = psi_t_alignment(PSI_T_POINTER);
} else {
align = psi_decl_type_get_align(darg->type);
size_t size;
struct psi_decl_type *real = psi_decl_type_get_real(darg->type);
- if (darg->var->array_size) {
- if (darg->var->pointer_level > 2) {
- size = psi_t_size(PSI_T_POINTER) * darg->var->array_size;
- } else {
- size = psi_t_size(real->type) * darg->var->array_size;
- }
- } else if (darg->var->pointer_level) {
+ if (darg->var->array_size && darg->var->pointer_level > 1) {
+ size = psi_t_size(PSI_T_POINTER) * darg->var->array_size;
+ } else if (psi_decl_arg_is_pointer(darg)) {
size = psi_t_size(PSI_T_POINTER);
} else {
switch (real->type) {
size = psi_t_size(real->type);
break;
}
+
+ if (darg->var->array_size) {
+ size *= darg->var->array_size;
+ }
}
return size;
}
struct psi_decl_arg *psi_decl_arg_get_by_name(struct psi_plist *args,
- const char *name)
+ zend_string *name)
{
size_t i = 0;
struct psi_decl_arg *arg;
if (args)
while (psi_plist_get(args, i++, &arg)) {
- if (!strcmp(name, arg->var->name)) {
+ if (zend_string_equals(name, arg->var->name)) {
return arg;
}
}
return var->arg = arg;
}
- if (func && !strcmp(var->name, func->var->name)) {
+ if (func && zend_string_equals(var->name, func->var->name)) {
return var->arg = func;
}
projects / m6w6 / ext-psi / blobdiff