X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_union.c;h=3ab8f6909e36f78cb3512351656040001f0a6589;hp=f3299976d53eaf9c3e393a5fbf512ac7769622d6;hb=216e7ac3b97aed5a5d65c511dc061c78be90e79d;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index f329997..3ab8f69 100644
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -28,11 +28,11 @@
 
 #include <assert.h>
 
-struct psi_decl_union* psi_decl_union_init(const char *name,
+struct psi_decl_union* psi_decl_union_init(zend_string *name,
 		struct psi_plist *args)
 {
-	struct psi_decl_union *u = calloc(1, sizeof(*u));
-	u->name = strdup(name);
+	struct psi_decl_union *u = pecalloc(1, sizeof(*u), 1);
+	u->name = zend_string_copy(name);
 	u->args = args;
 	return u;
 }
@@ -43,20 +43,18 @@ void psi_decl_union_free(struct psi_decl_union **u_ptr)
 		struct psi_decl_union *u = *u_ptr;
 
 		*u_ptr = NULL;
-		if (u->token) {
-			free(u->token);
-		}
+		psi_token_free(&u->token);
 		if (u->args) {
 			psi_plist_free(u->args);
 		}
-		free(u->name);
+		zend_string_release(u->name);
 		free(u);
 	}
 }
 
 void psi_decl_union_dump(int fd, struct psi_decl_union *unn)
 {
-	dprintf(fd, "union %s::(%zu, %zu)", unn->name, unn->align, unn->size);
+	dprintf(fd, "union %s::(%zu, %zu)", unn->name->val, unn->align, unn->size);
 	if (psi_plist_count(unn->args)) {
 		psi_decl_type_dump_args_with_layout(fd, unn->args, 0);
 	} else {
@@ -74,47 +72,66 @@ struct psi_decl_arg *psi_decl_union_get_arg(struct psi_decl_union *u,
 	return NULL;
 }
 
-bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
+bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
+		struct psi_validate_scope *scope)
 {
 	size_t i, pos, len, size = 0, align;
 	struct psi_decl_arg *darg;
 
+	if (psi_validate_scope_has_union(scope, u->name)) {
+		return true;
+	}
+
 	if (!u->size && !psi_plist_count(u->args)) {
 		data->error(data, u->token, PSI_WARNING,
-				"Cannot compute size of empty union %s", u->name);
+				"Cannot compute size of empty union %s", u->name->val);
 		return false;
 	}
 
+	psi_validate_scope_add_union(scope, u->name, u);
+
 	for (i = 0; psi_plist_get(u->args, i, &darg); ++i) {
 		darg->var->arg = darg;
 
-		if (!psi_decl_arg_validate(data, darg)) {
+		if (!psi_decl_arg_validate(data, darg, scope)) {
+			psi_validate_scope_del_union(scope, u->name);
 			return false;
 		}
 
-		if (darg->layout) {
+		if (darg->layout && darg->layout->len) {
 			pos = darg->layout->pos;
 
 			align = psi_decl_arg_align(darg, &pos, &len);
 
 			if (darg->layout->pos != 0) {
 				data->error(data, darg->token, PSI_WARNING,
-						"Offset of %s.%s should be 0", u->name,
-						darg->var->name);
+						"Offset of %s.%s should be 0", u->name->val,
+						darg->var->name->val);
 				darg->layout->pos = 0;
 			}
 			if (darg->layout->len != len) {
 				data->error(data, darg->token, PSI_WARNING,
 						"Computed size %zu of %s.%s does not match"
 						" pre-defined size %zu of type '%s'",
-						len, u->name, darg->var->name, darg->layout->len,
-						darg->type->name);
+						len, u->name->val, darg->var->name->val,
+						darg->layout->len, darg->type->name->val);
 			}
 		} else {
 			pos = 0;
 
 			align = psi_decl_arg_align(darg, &pos, &len);
-			darg->layout = psi_layout_init(pos, len);
+
+			if (darg->layout) {
+				if (darg->layout->pos != 0) {
+					data->error(data, darg->token, PSI_WARNING,
+							"Offset of %s.%s should be 0", u->name->val,
+							darg->var->name->val);
+					darg->layout->pos = 0;
+				}
+				darg->layout->len = len;
+			} else {
+				darg->layout = psi_layout_init(pos, len, NULL);
+			}
 		}
 		if (len > size) {
 			size = len;
@@ -130,6 +147,8 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
 		u->size = psi_align(size, u->align);
 	}
 
+	assert(u->size);
+
 	return true;
 }