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 4a616afc998a764d6a1d0264cddc4c68572ae1cf..8082f3c61b836d69d0b0f454d8c554f4167cbbb0 100644 (file)
--- a/src/types/decl_enum.h
+++ b/src/types/decl_enum.h
@@ -1,29 +1,44 @@
-#ifndef _PSI_TYPES_DECL_ENUM_H
-#define _PSI_TYPES_DECL_ENUM_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
 
-typedef struct decl_enum {
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_TYPES_DECL_ENUM_H
+#define PSI_TYPES_DECL_ENUM_H
+
+struct psi_data;
+struct psi_token;
+struct psi_plist;
+
+struct psi_decl_enum {
        struct psi_token *token;
        char *name;
-       decl_enum_items *items;
-} decl_enum;
-
-static inline decl_enum *init_decl_enum(const char *name, decl_enum_items *l) {
-       decl_enum *e = calloc(1, sizeof(*e));
-
-       e->name = strdup(name);
-       e->items = l;
-       return e;
-}
-
-static inline void free_decl_enum(decl_enum *e) {
-       if (e->token) {
-               free(e->token);
-       }
-       if (e->items) {
-               free_decl_enum_items(e->items);
-       }
-       free(e->name);
-       free(e);
-}
+       struct psi_plist *items;
+};
+
+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