X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_type.c;h=932475faea785f275b744c9ca2d971d53a073bc7;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hp=9db6de14a3c87c1e34f1e7f692884ade87a45f0d;hpb=2d34b0c215608bc3eae007ce5f4e80eae3c1e147;p=m6w6%2Fext-psi

diff --git a/src/types/decl_type.c b/src/types/decl_type.c
index 9db6de1..932475f 100644
--- a/src/types/decl_type.c
+++ b/src/types/decl_type.c
@@ -23,12 +23,16 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "token.h"
 #include "data.h"
 
 #define PSI_STD_TYPES
-#include "php_psi_posix.h"
+#include "php_psi_predef.h"
 
 struct psi_decl_type *psi_decl_type_init(token_t type, zend_string *name)
 {
@@ -326,29 +330,17 @@ void psi_decl_type_dump(struct psi_dump *dump, struct psi_decl_type *t, unsigned
 		return;
 
 	case PSI_T_ENUM:
-		PSI_DUMP(dump, "enum ");
 		if (psi_decl_type_is_anon(t->name, "enum")) {
-			size_t i = 0, c = psi_plist_count(t->real.enm->items);
-			struct psi_decl_enum_item *item;
-
-			PSI_DUMP(dump, "{\n");
-			++level;
-			while (psi_plist_get(t->real.enm->items, i++, &item)) {
-				PSI_DUMP(dump, "%s", psi_t_indent(level));
-				psi_decl_enum_item_dump(dump, item);
-				if (i < c) {
-					PSI_DUMP(dump, "%s\n", i < c ? "," : "");
-				}
-			}
-			--level;
-			PSI_DUMP(dump, "%s\n} ", psi_t_indent(level));
+			psi_decl_enum_dump(dump, t->real.enm, level);
 			return;
 		}
+		PSI_DUMP(dump, "enum ");
 		break;
 
 	case PSI_T_STRUCT:
 		PSI_DUMP(dump, "struct ");
 		if (psi_decl_type_is_anon(t->name, "struct")) {
+			PSI_DUMP(dump, "/*::(%zu, %zu)*/", t->real.strct->align, t->real.strct->size);
 			psi_decl_type_dump_args_with_layout(dump, t->real.strct->args, level);
 			return;
 		}
@@ -357,6 +349,7 @@ void psi_decl_type_dump(struct psi_dump *dump, struct psi_decl_type *t, unsigned
 	case PSI_T_UNION:
 		PSI_DUMP(dump, "union ");
 		if (psi_decl_type_is_anon(t->name, "union")) {
+			PSI_DUMP(dump, "/*::(%zu, %zu)*/", t->real.unn->align, t->real.unn->size);
 			psi_decl_type_dump_args_with_layout(dump, t->real.unn->args, level);
 			return;
 		}