X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi_struct.m4;h=430baf7e035eab0628372016185b81f6859ef980;hp=f0d273e9750189b8eeacdc5e03dd1adae4744a2f;hb=2421d323be79e4a811a4197914330a8c0124b130;hpb=b4508f6b917660970f887894a6aaed6c220a2c72

diff --git a/m4/psi_struct.m4 b/m4/psi_struct.m4
index f0d273e..430baf7 100644
--- a/m4/psi_struct.m4
+++ b/m4/psi_struct.m4
@@ -1,28 +1,22 @@
 AC_DEFUN(PSI_STRUCT_MEMBER, [
 	m4_define([member_name], PSI_VAR_NAME($2))
 	m4_define([member_type], PSI_VAR_TYPE($2))
-	AC_CHECK_SIZEOF(AS_TR_SH($1)[_]member_name, [], PSI_INCLUDES
+	PSI_CHECK_SIZEOF(AS_TR_SH($1)[_]member_name, PSI_INCLUDES
 		[#define ]AS_TR_SH($1)[_]member_name (($1 *)0)->member_name
 	)
 	if test -n "$AS_TR_SH([ac_cv_sizeof_$1][_]member_name)" \
 	&& test "$AS_TR_SH([ac_cv_sizeof_$1][_]member_name)" -gt 0; then
 		PSI_CHECK_OFFSETOF($1, member_name)
-		m4_define([pointer_level], m4_len(m4_bpatsubst([$2], [[^*]])))
-		m4_define([array_size], [m4_bregexp([$2], [@<:@\([0-9]+\)@:>@], [\1])])
-		ifelse(array_size, [],
-			[m4_define([array_size], 0)],
-			[m4_define([pointer_level], m4_incr(pointer_level))]
-		)
-		m4_define([member_size], PSI_TYPE_SIZE(member_type, pointer_level, array_size))
-		psi_struct_members="[$psi_struct_members, {]PSI_TYPE_PAIR(member_type)[, \"]member_name[\", $]AS_TR_SH([ac_cv_offsetof_]$1[_]member_name)[, ]member_size, pointer_level, array_size[}]"
+		PSI_TYPE_INDIRECTION($2, [$AS_TR_SH([ac_cv_sizeof_]$1[_]member_name)], pl, as)
+		psi_struct_members="[$psi_struct_members, {]PSI_TYPE_PAIR(member_type)[, \"]member_name[\", $]AS_TR_SH([ac_cv_offsetof_]$1[_]member_name)[, $]AS_TR_SH([ac_cv_sizeof_]$1[_]member_name), $pl, $as[}]"
 	fi
 ])
 
 AC_DEFUN(PSI_STRUCT, [
-	AC_CHECK_SIZEOF($1, [], PSI_INCLUDES)
+	PSI_CHECK_SIZEOF($1, PSI_INCLUDES)
 	psi_struct_name=m4_bregexp([$1], [^\(struct \)?\(\w+\)], [\2])
 	psi_struct_members="{PSI_T_STRUCT, \"struct\", \"$psi_struct_name\", 0, $AS_TR_SH([ac_cv_sizeof_]$1), 0, 0}"
-	ifelse([$2],,,[m4_map_args_sep([PSI_STRUCT_MEMBER($1,], [)], [], $2)])
+	ifelse([$2],,,[m4_map_args_sep([PSI_STRUCT_MEMBER($1, m4_normalize(], [))], [], $2)])
 	PSI_STRUCTS="$psi_struct_members, {0}, $PSI_STRUCTS"
 	if test "$1" = "$psi_struct_name"; then
 		PSI_TYPES="{PSI_T_STRUCT, \"$1\", \"$1\"}, $PSI_TYPES"