types refactoring

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

diff --git a/src/types/decl_typedefs.h b/src/types/decl_typedefs.h
index e58a2f59b5db64857aa976bbef98da5f347e582c..7b6a5152d8de0c194429a29af1a1af87891fe903 100644 (file)
--- a/src/types/decl_typedefs.h
+++ b/src/types/decl_typedefs.h
@@ -1,28 +1,44 @@
-#ifndef _PSI_TYPES_DECL_TYPEDEFS_H
-#define _PSI_TYPES_DECL_TYPEDEFS_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ 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_TYPEDEFS_H
+#define PSI_TYPES_DECL_TYPEDEFS_H
+
+#include "decl_arg.h"
 
 typedef struct decl_typedefs {
        size_t count;
        decl_arg **list;
 } decl_typedefs;
 
-static inline decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_arg *def) {
-       if (!defs) {
-               defs = calloc(1, sizeof(*defs));
-       }
-       defs->list = realloc(defs->list, ++defs->count * sizeof(*defs->list));
-       defs->list[defs->count-1] = def;
-       return defs;
-}
-
-static inline void free_decl_typedefs(decl_typedefs *defs) {
-       size_t i;
-
-       for (i = 0; i < defs->count; ++i) {
-               free_decl_arg(defs->list[i]);
-       }
-       free(defs->list);
-       free(defs);
-}
+decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_arg *def);
+void free_decl_typedefs(decl_typedefs *defs);
+void dump_decl_typedefs(int fd, decl_typedefs *defs);
+
+struct psi_data;
+
+int validate_decl_typedef(struct psi_data *data, decl_arg *def);
 
 #endif