types refactoring

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

diff --git a/src/types/return_stmt.h b/src/types/return_stmt.h
index 12e371e02c115e2057bd28e884325788854adde8..ee4dc6dd000b1823b936ee9145d26149cbe6f7f2 100644 (file)
--- a/src/types/return_stmt.h
+++ b/src/types/return_stmt.h
@@ -1,5 +1,33 @@
-#ifndef _PSI_TYPES_RETURN_STMT_H
-#define _PSI_TYPES_RETURN_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_RETURN_STMT_H
+#define PSI_TYPES_RETURN_STMT_H
+
+#include "set_value.h"
+#include "decl_arg.h"
 
 typedef struct return_stmt {
        struct psi_token *token;
@@ -7,18 +35,13 @@ typedef struct return_stmt {
        decl_arg *decl;
 } return_stmt;
 
-static inline return_stmt *init_return_stmt(set_value *val) {
-       return_stmt *ret = calloc(1, sizeof(*ret));
-       ret->set = val;
-       return ret;
-}
-
-static inline void free_return_stmt(return_stmt *ret) {
-       if (ret->token) {
-               free(ret->token);
-       }
-       free_set_value(ret->set);
-       free(ret);
-}
+return_stmt *init_return_stmt(set_value *val);
+void free_return_stmt(return_stmt *ret);
+void dump_return_stmt(int fd, return_stmt *ret);
+
+struct psi_data;
+struct impl;
+
+int validate_return_stmt(struct psi_data *data, struct impl *impl);
 
 #endif