types refactoring

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

diff --git a/src/types/decl_var.h b/src/types/decl_var.h
index 166a69e8985a3e9e1d825812280cba3e3b882d81..8fd75db431b85ad3f3537bd9f8e0aadb4609f306 100644 (file)
--- a/src/types/decl_var.h
+++ b/src/types/decl_var.h
@@ -1,5 +1,30 @@
-#ifndef _PSI_TYPES_DECL_VAR_H
-#define _PSI_TYPES_DECL_VAR_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_VAR_H
+#define PSI_TYPES_DECL_VAR_H
 
 typedef struct decl_var {
        struct psi_token *token;
@@ -9,31 +34,14 @@ typedef struct decl_var {
        struct decl_arg *arg;
 } decl_var;
 
-static inline decl_var *init_decl_var(const char *name, unsigned pl, unsigned as) {
-       decl_var *v = calloc(1, sizeof(*v));
-       v->name = (char *) strdup((const char *) name);
-       v->pointer_level = pl;
-       v->array_size = as;
-       return v;
-}
-
-static inline decl_var *copy_decl_var(decl_var *src) {
-       decl_var *dest = calloc(1, sizeof(*dest));
-
-       memcpy(dest, src, sizeof(*dest));
-       dest->name = strdup(dest->name);
-       if (dest->token) {
-               dest->token = psi_token_copy(dest->token);
-       }
-       return dest;
-}
-
-static inline void free_decl_var(decl_var *var) {
-       if (var->token) {
-               free(var->token);
-       }
-       free(var->name);
-       free(var);
-}
+decl_var *init_decl_var(const char *name, unsigned pl, unsigned as);
+decl_var *copy_decl_var(decl_var *src);
+void free_decl_var(decl_var *var);
+void dump_decl_var(int fd, decl_var *var);
+
+struct decl_arg;
+struct decl_args;
+
+struct decl_arg *locate_decl_var_arg(decl_var *var, struct decl_args *args, struct decl_arg *func);
 
 #endif