Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / types / decl_arg.c

diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c
index 0423c9728fb4ab6355bb821a2a23f4e55b5323b3..46ce8e01942d9dc0b248333d9d79c6d4ecde880c 100644 (file)
--- a/src/types/decl_arg.c
+++ b/src/types/decl_arg.c
@@ -93,9 +93,9 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 }
 
 bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg,
-               struct psi_validate_stack *type_stack)
+               struct psi_validate_scope *scope)
 {
-       if (!psi_decl_type_validate(data, arg->type, arg->var->pointer_level, type_stack)) {
+       if (!psi_decl_type_validate(data, arg->type, arg, 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,
@@ -107,12 +107,12 @@ bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg,
 }
 
 bool psi_decl_arg_validate_typedef(struct psi_data *data,
-               struct psi_decl_arg *def, struct psi_validate_stack *type_stack)
+               struct psi_decl_arg *def, struct psi_validate_scope *scope)
 {
-       if (psi_validate_stack_has_type(type_stack, def->var->name)) {
+       if (psi_validate_scope_has_type(scope, def->var->name)) {
                return true;
        }
-       psi_validate_stack_add_type(type_stack, def->var->name, def);
+       psi_validate_scope_add_type(scope, def->var->name, def);
 
        if (def->type->type == PSI_T_VOID) {
                if (def->var->pointer_level) {
@@ -122,7 +122,7 @@ bool psi_decl_arg_validate_typedef(struct psi_data *data,
                                        "Type '%s' cannot be aliased to 'void'", def->type->name);
                        return false;
                }
-       } else if (!psi_decl_type_validate(data, def->type, def->var->pointer_level, type_stack)) {
+       } else if (!psi_decl_type_validate(data, def->type, def, scope)) {
                const char *pre;
 
                switch (def->type->type) {
@@ -179,13 +179,9 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg)
        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 > 1) {
-                       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 (!darg->var->array_size && darg->var->pointer_level) {
                size = psi_t_size(PSI_T_POINTER);
        } else {
                switch (real->type) {
@@ -200,6 +196,10 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg)
                        size = psi_t_size(real->type);
                        break;
                }
+
+               if (darg->var->array_size) {
+                       size *= darg->var->array_size;
+               }
        }
 
        return size;