types refactoring

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

diff --git a/src/types/set_value.h b/src/types/set_value.h
index 0b6b269f7b58911efbbb6c29b1cec82c49ddaa55..6a5ee82918cf3c87bb070b0020bd60090f39e1b3 100644 (file)
--- a/src/types/set_value.h
+++ b/src/types/set_value.h
@@ -1,5 +1,36 @@
-#ifndef _PSI_TYPES_SET_VALUE_H
-#define _PSI_TYPES_SET_VALUE_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_SET_VALUE_H
+#define PSI_TYPES_SET_VALUE_H
+
+#include "set_func.h"
+#include "decl_vars.h"
+#include "decl_args.h"
+#include "num_exp.h"
+#include "impl_val.h"
 
 typedef struct set_value {
        set_func *func;
@@ -12,34 +43,16 @@ typedef struct set_value {
        struct set_values *inner;
 } set_value;
 
-static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
-       set_value *val = calloc(1, sizeof(*val));
-       val->func = func;
-       val->vars = vars;
-       return val;
-}
-
-static inline struct set_values *add_set_value(struct set_values *vals, struct set_value *val);
-static inline set_value *add_inner_set_value(set_value *val, set_value *inner) {
-       val->inner = add_set_value(val->inner, inner);
-       inner->outer.set = val;
-       return val;
-}
-
-static inline void free_set_value(set_value *val) {
-       if (val->func) {
-               free_set_func(val->func);
-       }
-       if (val->vars) {
-               free_decl_vars(val->vars);
-       }
-       if (val->inner && (!val->outer.set || val->outer.set->inner != val->inner)) {
-               free_set_values(val->inner);
-       }
-       if (val->num) {
-               free_num_exp(val->num);
-       }
-       free(val);
-}
+set_value *init_set_value(set_func *func, decl_vars *vars);
+set_value *add_inner_set_value(set_value *val, set_value *inner);
+void free_set_value(set_value *val);
+void dump_set_value(int fd, set_value *set, unsigned level, int last);
+
+#include <stdarg.h>
+
+struct psi_data;
+
+int validate_set_value(struct psi_data *data, set_value *set, ...);
+int validate_set_value_ex(struct psi_data *data, set_value *set, decl_arg *ref, decl_args *ref_list);
 
 #endif