flush

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

diff --git a/src/parser.h b/src/parser.h
index 0ed55ca97391d8f7daa0ccd066a630a46740d96a..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));
        }
@@ -689,18 +704,81 @@ static void free_impls(impls *impls) {
        free(impls);
 }
 
+typedef struct const_type {
+       token_t type;
+       char *name;
+} const_type;
+
+static inline const_type *init_const_type(token_t type, const char *name) {
+       const_type *ct = malloc(sizeof(*ct));
+       ct->type = type;
+       ct->name = strdup(name);
+       return ct;
+}
+
+static inline void free_const_type(const_type *type) {
+       free(type->name);
+       free(type);
+}
+
+typedef struct constant {
+       const_type *type;
+       char *name;
+       impl_def_val *val;
+} constant;
+
+static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
+       constant *c = malloc(sizeof(*c));
+       c->type = type;
+       c->name = strdup(name);
+       c->val = val;
+       return c;
+}
+
+static inline void free_constant(constant *constant) {
+       free_const_type(constant->type);
+       free(constant->name);
+       free_impl_def_val(constant->val);
+       free(constant);
+}
+
+typedef struct constants {
+       size_t count;
+       constant **list;
+} constants;
+
+static inline constants *add_constant(constants *constants, constant *constant) {
+       if (!constants) {
+               constants = calloc(1, sizeof(*constants));
+       }
+       constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
+       constants->list[constants->count-1] = constant;
+       return constants;
+}
+
+static inline void free_constants(constants *c) {
+       size_t i;
+
+       for (i = 0; i < c->count; ++i) {
+               free_constant(c->list[i]);
+       }
+       free(c->list);
+       free(c);
+}
+
 #define PSI_ERROR 16
 #define PSI_WARNING 32
 typedef void (*psi_error_cb)(int type, const char *msg, ...);
 
-typedef struct PSI_Data {
 #define PSI_DATA_MEMBERS \
+       constants *consts; \
        decl_typedefs *defs; \
        decls *decls; \
        impls *impls; \
        char *lib; \
        char *fn; \
        psi_error_cb error
+typedef struct PSI_Data {
        PSI_DATA_MEMBERS;
 } PSI_Data;
 
@@ -710,6 +788,9 @@ static inline void PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
 }
 
 static inline void PSI_DataDtor(PSI_Data *data) {
+       if (data->consts) {
+               free_constants(data->consts);
+       }
        if (data->defs) {
                free_decl_typedefs(data->defs);
        }