types refactoring

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

diff --git a/src/types/impl_arg.h b/src/types/impl_arg.h
index 4f870e0f96c7a1a756eecef72d4a475c88487fac..4bf5129ceadc5c5bac9854ca9592ec305afa51e1 100644 (file)
--- a/src/types/impl_arg.h
+++ b/src/types/impl_arg.h
@@ -1,5 +1,39 @@
-#ifndef _PSI_TYPES_IMPL_ARG_H
-#define _PSI_TYPES_IMPL_ARG_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_ARG_H
+#define PSI_TYPES_IMPL_ARG_H
+
+#include "token.h"
+
+#include "impl_type.h"
+#include "impl_var.h"
+#include "impl_def_val.h"
+#include "impl_val.h"
+
+#include "Zend/zend_types.h"
 
 typedef struct impl_arg {
        impl_type *type;
@@ -17,22 +51,7 @@ typedef struct impl_vararg {
        void **free_list;
 } impl_vararg;
 
-static inline impl_arg *init_impl_arg(impl_type *type, impl_var *var, impl_def_val *def) {
-       impl_arg *arg = calloc(1, sizeof(*arg));
-       arg->type = type;
-       arg->var = var;
-       arg->var->arg = arg;
-       arg->def = def;
-       return arg;
-}
-
-static inline void free_impl_arg(impl_arg *arg) {
-       free_impl_type(arg->type);
-       free_impl_var(arg->var);
-       if (arg->def) {
-               free_impl_def_val(arg->def);
-       }
-       free(arg);
-}
+impl_arg *init_impl_arg(impl_type *type, impl_var *var, impl_def_val *def);
+void free_impl_arg(impl_arg *arg);
 
 #endif