types refactoring

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

diff --git a/src/types/decl_struct.h b/src/types/decl_struct.h
index 439b4e91175d7f1956aa989a3573180b9bbf3a56..e72aa38ebc6a427ebcd2c252e2bb38696c57602f 100644 (file)
--- a/src/types/decl_struct.h
+++ b/src/types/decl_struct.h
@@ -1,5 +1,32 @@
-#ifndef _PSI_TYPES_DECL_STRUCT_H
-#define _PSI_TYPES_DECL_STRUCT_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_STRUCT_H
+#define PSI_TYPES_DECL_STRUCT_H
+
+#include "decl_args.h"
 
 typedef struct decl_struct {
        struct psi_token *token;
@@ -13,25 +40,16 @@ typedef struct decl_struct {
        } engine;
 } decl_struct;
 
-static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {
-       decl_struct *s = calloc(1, sizeof(*s));
-       s->name = strdup(name);
-       s->args = args;
-       return s;
-}
-
-static inline void free_decl_struct(decl_struct *s) {
-       if (s->token) {
-               free(s->token);
-       }
-       if (s->args) {
-               free_decl_args(s->args);
-       }
-       if (s->engine.type && s->engine.dtor) {
-               s->engine.dtor(s->engine.type);
-       }
-       free(s->name);
-       free(s);
-}
+decl_struct *init_decl_struct(const char *name, decl_args *args);
+void free_decl_struct(decl_struct *s);
+void dump_decl_struct(int fd, decl_struct *strct);
+
+decl_arg *locate_decl_struct_member(decl_struct *s, decl_var *var);
+
+struct psi_data;
+
+int validate_decl_struct(struct psi_data *data, decl_struct *s);
+
+size_t alignof_decl_struct(decl_struct *s);
 
 #endif