X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_enum.c;h=d76bb1ca0260d0d8f94a068a174c7e61c77d651c;hb=4bf8ff5e477da2fa4f82518bb947055c2c0374d6;hp=026c375c4223f6661a4f56e4ad155d6265022308;hpb=ddeb4918bce67ed63c5f4c8c4e250e92ebdef89d;p=m6w6%2Fext-psi

diff --git a/src/types/decl_enum.c b/src/types/decl_enum.c
index 026c375..d76bb1c 100644
--- a/src/types/decl_enum.c
+++ b/src/types/decl_enum.c
@@ -23,13 +23,17 @@
  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 "data.h"
 
-struct psi_decl_enum *psi_decl_enum_init(const char *name, struct psi_plist *l)
+struct psi_decl_enum *psi_decl_enum_init(zend_string *name, struct psi_plist *l)
 {
-	struct psi_decl_enum *e = calloc(1, sizeof(*e));
-	e->name = strdup(name);
+	struct psi_decl_enum *e = pecalloc(1, sizeof(*e), 1);
+	e->name = zend_string_copy(name);
 	e->items = l;
 	return e;
 }
@@ -40,33 +44,35 @@ void psi_decl_enum_free(struct psi_decl_enum **e_ptr)
 		struct psi_decl_enum *e = *e_ptr;
 
 		*e_ptr = NULL;
-		if (e->token) {
-			free(e->token);
-		}
+		psi_token_free(&e->token);
 		if (e->items) {
 			psi_plist_free(e->items);
 		}
-		free(e->name);
+		zend_string_release(e->name);
 		free(e);
 	}
 }
 
-void psi_decl_enum_dump(int fd, struct psi_decl_enum *e, unsigned level)
+void psi_decl_enum_dump(struct psi_dump *dump, struct psi_decl_enum *e, unsigned level)
 {
-	dprintf(fd, "enum %s {\n", e->name);
-	if (e->items) {
-		size_t i = 0;
-		struct psi_decl_enum_item *item;
+	size_t i = 0;
+	struct psi_decl_enum_item *item;
 
+	PSI_DUMP(dump, "enum ");
+	if (!psi_decl_type_is_anon(e->name, "enum")) {
+		PSI_DUMP(dump, "%s ", e->name->val);
+	}
+	if (e->items) {
+		PSI_DUMP(dump, "{\n");
 		while (psi_plist_get(e->items, i++, &item)) {
 			if (i > 1) {
-				dprintf(fd, ",\n");
+				PSI_DUMP(dump, ",\n");
 			}
-			dprintf(fd, "%s", psi_t_indent(level + 1));
-			psi_decl_enum_item_dump(fd, item);
+			PSI_DUMP(dump, "%s", psi_t_indent(level + 1));
+			psi_decl_enum_item_dump(dump, item);
 		}
+		PSI_DUMP(dump, "%s\n} ", psi_t_indent(level));
 	}
-	dprintf(fd, "\n}");
 }
 
 bool psi_decl_enum_validate(struct psi_data *data, struct psi_decl_enum *e)
@@ -75,7 +81,7 @@ bool psi_decl_enum_validate(struct psi_data *data, struct psi_decl_enum *e)
 	struct psi_decl_enum_item *i, *p = NULL;
 
 	if (!psi_plist_count(e->items)) {
-		data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name);
+		data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name->val);
 		return false;
 	}