types refactoring

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

diff --git a/src/types/decl.h b/src/types/decl.h
index 0a84998e97d349b2cf909bfd3677008680018377..5a51104e4c627aad838397dafbbd41f773cbe9a3 100644 (file)
--- a/src/types/decl.h
+++ b/src/types/decl.h
@@ -1,5 +1,35 @@
-#ifndef _PSI_TYPES_DECL_H
-#define _PSI_TYPES_DECL_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_H
+#define PSI_TYPES_DECL_H
+
+#include "decl_abi.h"
+#include "decl_arg.h"
+#include "decl_args.h"
+#include "decl_callinfo.h"
 
 typedef struct decl {
        decl_abi *abi;
@@ -9,21 +39,13 @@ typedef struct decl {
        decl_callinfo call;
 } decl;
 
-static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
-       decl *d = calloc(1, sizeof(*d));
-       d->abi = abi;
-       d->func = func;
-       d->args = args;
-       return d;
-}
-
-static inline void free_decl(decl *d) {
-       free_decl_abi(d->abi);
-       free_decl_arg(d->func);
-       if (d->args) {
-               free_decl_args(d->args);
-       }
-       free(d);
-}
+decl *init_decl(decl_abi *abi, decl_arg *func, decl_args *args);
+void free_decl(decl *d);
+void dump_decl(int fd, decl *decl);
+
+struct psi_data;
+
+int validate_decl(struct psi_data *data, void *dl, decl *decl);
+int validate_decl_nodl(struct psi_data *data, decl *decl);
 
 #endif