X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_arg.c;h=f9ed34766965ac8109b0618947bab22f25632bbc;hp=bec8ddc77f1132c87a140c4232aa326aac62e0d0;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=18ca609e4fa08a1c8fcdbb58e9aeb5fe55538b3c

diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c
index bec8ddc..f9ed347 100644
--- a/src/types/decl_arg.c
+++ b/src/types/decl_arg.c
@@ -46,7 +46,7 @@ void psi_decl_arg_free(struct psi_decl_arg **arg_ptr)
 
 		*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);
@@ -61,9 +61,12 @@ void psi_decl_arg_dump(int fd, 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);
+		if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+			dprintf(fd, "(");
+		}
 		dprintf(fd, " %s(*%s)",
 				psi_t_indirection(arg->var->pointer_level - !! arg->var->array_size),
-				arg->var->name);
+				arg->var->name->val);
 		dprintf(fd, "(");
 		if (arg->type->real.func->args) {
 			size_t j = 0;
@@ -82,8 +85,25 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 			}
 		}
 		dprintf(fd, ")");
-		if (arg->var->array_size) {
-			dprintf(fd, "[%u]", arg->var->array_size);
+		if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+			struct psi_decl *decl = arg->type->real.func->func->type->real.func;
+
+			dprintf(fd, "(");
+			if (decl->args) {
+				size_t i;
+				struct psi_decl_arg *arg;
+
+				for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+					if (i) {
+						dprintf(fd, ", ");
+					}
+					psi_decl_arg_dump(fd, arg, 0);
+				}
+				if (decl->varargs) {
+					dprintf(fd, ", ...");
+				}
+			}
+			dprintf(fd, "))");
 		}
 	} else {
 		psi_decl_type_dump(fd, arg->type, level);
@@ -93,61 +113,74 @@ 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, type_stack)) {
-		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,
+					arg->var->name, *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, 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) {
 			def->type->type = PSI_T_POINTER;
 		} else {
 			data->error(data, def->token, PSI_WARNING,
-					"Type '%s' cannot be aliased to 'void'", def->type->name);
+					"Type '%s' cannot be aliased to 'void'", def->type->name->val);
 			return false;
 		}
-	} else if (!def->var->pointer_level) {
-		if (!psi_decl_type_validate(data, def->type, type_stack)) {
-			const char *pre;
-
-			switch (def->type->type) {
-			case PSI_T_STRUCT:
-				pre = "struct ";
-				break;
-			case PSI_T_UNION:
-				pre = "union ";
-				break;
-			case PSI_T_ENUM:
-				pre = "enum ";
-				break;
-			default:
-				pre = "";
-				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);
-			return false;
+	} else if (!psi_decl_type_validate(data, def->type, def, scope)) {
+		const char *pre;
+
+		switch (def->type->type) {
+		case PSI_T_STRUCT:
+			pre = "struct ";
+			break;
+		case PSI_T_UNION:
+			pre = "union ";
+			break;
+		case PSI_T_ENUM:
+			pre = "enum ";
+			break;
+		default:
+			pre = "";
+			break;
 		}
+		data->error(data, def->token, PSI_WARNING,
+				"Type '%s' cannot be aliased to '%s%s'%s%s", def->var->name, pre,
+				def->type->name->val, *data->last_error ? ": " : "", data->last_error);
+		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);
@@ -164,8 +197,7 @@ size_t psi_decl_arg_get_align(struct psi_decl_arg *darg)
 {
 	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);
@@ -179,13 +211,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 > 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) {
@@ -200,20 +228,24 @@ 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;
 }
 
 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;
 			}
 		}
@@ -232,7 +264,7 @@ struct psi_decl_arg *psi_decl_arg_get_by_var(struct psi_decl_var *var,
 		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;
 	}