types refactoring

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

diff --git a/src/types/impl_func.h b/src/types/impl_func.h
index a9d6270956d249d24f2c35c31b3d2b9f4e40be63..740a7aa77217e271d8f9afb6ffa62bc08cbaf786 100644 (file)
--- a/src/types/impl_func.h
+++ b/src/types/impl_func.h
@@ -1,5 +1,33 @@
-#ifndef _PSI_TYPES_IMPL_FUNC_H
-#define _PSI_TYPES_IMPL_FUNC_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_IMPL_FUNC_H
+#define PSI_TYPES_IMPL_FUNC_H
+
+#include "impl_args.h"
+#include "impl_type.h"
 
 typedef struct impl_func {
        struct psi_token *token;
@@ -9,23 +37,9 @@ typedef struct impl_func {
        unsigned return_reference:1;
 } impl_func;
 
-static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *type, int ret_reference) {
-       impl_func *func = calloc(1, sizeof(*func));
-       func->name = strdup(name);
-       func->args = args ? args : init_impl_args(NULL);
-       func->return_type = type;
-       func->return_reference = ret_reference;
-       return func;
-}
-
-static inline void free_impl_func(impl_func *f) {
-       if (f->token) {
-               free(f->token);
-       }
-       free_impl_type(f->return_type);
-       free_impl_args(f->args);
-       free(f->name);
-       free(f);
-}
+impl_func *init_impl_func(char *name, impl_args *args, impl_type *type,
+               int ret_reference);
+void free_impl_func(impl_func *f);
+void dump_impl_func(int fd, impl_func *func);
 
 #endif