flush

[m6w6/ext-psi] / src / parser.h

diff --git a/src/parser.h b/src/parser.h
index d7393d443cb831b0cde5a08d7d8e1db3a287d921..4e5e0648351d4abcb8eb53b26186635b31dfb341 100644 (file)
--- a/src/parser.h
+++ b/src/parser.h
@@ -70,7 +70,7 @@ typedef struct decl_typedefs {
        decl_typedef **list;
 } decl_typedefs;
 
-static decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_typedef *def) {
+static inline decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_typedef *def) {
        if (!defs) {
                defs = calloc(1, sizeof(*defs));
        }
@@ -89,26 +89,18 @@ static void free_decl_typedefs(decl_typedefs *defs) {
        free(defs);
 }
 
-typedef union impl_val {
-       char cval;
-       short sval;
-       int ival;
-       double dval;
-       zend_long lval;
-       zend_string *str;
-       void *ptr;
-} impl_val;
-
 typedef struct decl_var {
        char *name;
        unsigned pointer_level;
+       unsigned array_size;
        struct decl_arg *arg;
 } decl_var;
 
-static inline decl_var *init_decl_var(char *name, unsigned pl) {
+static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
        decl_var *v = malloc(sizeof(*v));
        v->name = (char *) strdup((const char *) name);
        v->pointer_level = pl;
+       v->array_size = as;
        return v;
 }
 
@@ -256,6 +248,26 @@ static inline void free_decls(decls *decls) {
        free(decls);
 }
 
+typedef union impl_val {
+       unsigned char bval;
+       char cval;
+       short sval;
+       int ival;
+       double dval;
+       zend_long lval;
+       zend_string *str;
+       void *ptr;
+} impl_val;
+
+static inline impl_val *deref_impl_val(unsigned level, impl_val *ret_val, decl_arg *darg) {
+       unsigned i;
+
+       for (i = level; i < darg->var->pointer_level && ret_val->ptr; ++i) {
+               ret_val = *(void **)ret_val;
+       }
+       return ret_val;
+}
+
 typedef struct impl_type {
        char *name;
        token_t type;
@@ -449,7 +461,9 @@ static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
 
 static inline void free_let_stmt(let_stmt *stmt) {
        free_decl_var(stmt->var);
-       free_let_value(stmt->val);
+       if (stmt->val) {
+               free_let_value(stmt->val);
+       }
        free(stmt);
 }
 
@@ -616,6 +630,7 @@ static inline impl_stmts *add_impl_stmt(impl_stmts *stmts, impl_stmt *stmt) {
                stmts->fre.list = add_impl_stmt_ex(stmts->fre.list, ++stmts->fre.count, stmt->s.fre);
                break;
        }
+       free(stmt);
        return stmts;
 }
 
@@ -670,7 +685,7 @@ typedef struct impls {
        impl **list;
 } impls;
 
-static impls *add_impl(impls *impls, impl *impl) {
+static inline impls *add_impl(impls *impls, impl *impl) {
        if (!impls) {
                impls = calloc(1, sizeof(*impls));
        }