raising the head after a three-weeks refactoring

[m6w6/ext-psi] / src / types / decl_enum.h

diff --git a/src/types/decl_enum.h b/src/types/decl_enum.h
index 69d1ee4be4150a3feab7d3befba9339a2bf02a9d..8082f3c61b836d69d0b0f454d8c554f4167cbbb0 100644 (file)
--- a/src/types/decl_enum.h
+++ b/src/types/decl_enum.h
@@ -26,21 +26,19 @@
 #ifndef PSI_TYPES_DECL_ENUM_H
 #define PSI_TYPES_DECL_ENUM_H
 
-#include "token.h"
-#include "decl_enum_items.h"
+struct psi_data;
+struct psi_token;
+struct psi_plist;
 
-typedef struct decl_enum {
+struct psi_decl_enum {
        struct psi_token *token;
        char *name;
-       decl_enum_items *items;
-} decl_enum;
-
-decl_enum *init_decl_enum(const char *name, decl_enum_items *l);
-void free_decl_enum(decl_enum *e);
-void dump_decl_enum(int fd, decl_enum *e, unsigned level);
-
-struct psi_data;
+       struct psi_plist *items;
+};
 
-int validate_decl_enum(struct psi_data *data, decl_enum *e);
+struct psi_decl_enum *psi_decl_enum_init(const char *name, struct psi_plist *l);
+void psi_decl_enum_free(struct psi_decl_enum **e_ptr);
+void psi_decl_enum_dump(int fd, struct psi_decl_enum *e, unsigned level);
+bool psi_decl_enum_validate(struct psi_data *data, struct psi_decl_enum *e);
 
 #endif