types refactoring

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

diff --git a/src/types/impl_stmt.h b/src/types/impl_stmt.h
index c110ddda413294674c1037f2a30e62917c8cede4..0a916eda284a2bdd4c013c755817481720ce8627 100644 (file)
--- a/src/types/impl_stmt.h
+++ b/src/types/impl_stmt.h
@@ -1,5 +1,37 @@
-#ifndef _PSI_TYPES_IMPL_STMT_H
-#define _PSI_TYPES_IMPL_STMT_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_STMT_H
+#define PSI_TYPES_IMPL_STMT_H
+
+#include "token.h"
+
+#include "let_stmt.h"
+#include "set_stmt.h"
+#include "return_stmt.h"
+#include "free_stmt.h"
 
 typedef struct impl_stmt {
        token_t type;
@@ -12,29 +44,7 @@ typedef struct impl_stmt {
        } s;
 } impl_stmt;
 
-static inline impl_stmt *init_impl_stmt(token_t type, void *ptr) {
-       impl_stmt *stmt = calloc(1, sizeof(*stmt));
-       stmt->type = type;
-       stmt->s.ptr = ptr;
-       return stmt;
-}
-
-static inline void free_impl_stmt(impl_stmt *stmt) {
-       switch (stmt->type) {
-       case PSI_T_LET:
-               free_let_stmt(stmt->s.let);
-               break;
-       case PSI_T_SET:
-               free_set_stmt(stmt->s.set);
-               break;
-       case PSI_T_RETURN:
-               free_return_stmt(stmt->s.ret);
-               break;
-       case PSI_T_FREE:
-               free_free_stmt(stmt->s.fre);
-               break;
-       }
-       free(stmt);
-}
+impl_stmt *init_impl_stmt(token_t type, void *ptr);
+void free_impl_stmt(impl_stmt *stmt);
 
 #endif