struct decl_struct *strct;
} decl_type;
-static inline decl_type *init_decl_type(token_t type, char *name) {
+static inline decl_type *init_decl_type(token_t type, const char *name) {
decl_type *t = calloc(1, sizeof(*t));
t->type = type;
t->name = strdup(name);
decl_type *type;
} decl_typedef;
-static inline decl_typedef *init_decl_typedef(char *name, decl_type *type) {
+static inline decl_typedef *init_decl_typedef(const char *name, decl_type *type) {
decl_typedef *t = calloc(1, sizeof(*t));
t->alias = strdup(name);
t->type = type;
struct decl_arg *arg;
} decl_var;
-static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
+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;
free(var);
}
+typedef struct decl_struct_layout {
+ size_t pos;
+ size_t len;
+} decl_struct_layout;
+
+static inline decl_struct_layout *init_decl_struct_layout(size_t pos, size_t len) {
+ decl_struct_layout *l = calloc(1, sizeof(*l));
+
+ l->pos = pos;
+ l->len = len;
+ return l;
+}
+
+static inline void free_decl_struct_layout(decl_struct_layout *l) {
+ free(l);
+}
+
typedef struct decl_arg {
decl_type *type;
decl_var *var;
+ decl_struct_layout *layout;
struct let_stmt *let;
} decl_arg;
decl_arg *arg = calloc(1, sizeof(*arg));
arg->type = type;
arg->var = var;
- arg->let = NULL;
return arg;
}
static inline void free_decl_arg(decl_arg *arg) {
free_decl_type(arg->type);
free_decl_var(arg->var);
+ if (arg->layout) {
+ free_decl_struct_layout(arg->layout);
+ }
free(arg);
}
static inline decl_vars *init_decl_vars(decl_var *var) {
decl_vars *vars = calloc(1, sizeof(*vars));
- vars->count = 1;
- vars->vars = calloc(1, sizeof(*vars->vars));
- vars->vars[0] = var;
+ if (var) {
+ vars->count = 1;
+ vars->vars = calloc(1, sizeof(*vars->vars));
+ vars->vars[0] = var;
+ }
return vars;
}
static inline decl_args *init_decl_args(decl_arg *arg) {
decl_args *args = calloc(1, sizeof(*args));
- args->count = 1;
- args->args = calloc(1, sizeof(*args->args));
- args->args[0] = arg;
+ if (arg) {
+ args->count = 1;
+ args->args = calloc(1, sizeof(*args->args));
+ args->args[0] = arg;
+ }
return args;
}
char *convention;
} decl_abi;
-static inline decl_abi *init_decl_abi(char *convention) {
+static inline decl_abi *init_decl_abi(const char *convention) {
decl_abi *abi = calloc(1, sizeof(*abi));
abi->convention = strdup(convention);
return abi;
free(decls);
}
-typedef struct decl_struct_layout {
- size_t pos;
- size_t len;
-} decl_struct_layout;
-
typedef struct decl_struct {
char *name;
decl_args *args;
- decl_struct_layout *layout;
+ size_t size;
} decl_struct;
-static inline decl_struct *init_decl_struct(char *name, decl_args *args) {
+static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {
decl_struct *s = calloc(1, sizeof(*s));
s->name = strdup(name);
s->args = args;
if (s->args) {
free_decl_args(s->args);
}
- if (s->layout) {
- free(s->layout);
- }
free(s->name);
free(s);
}
-static inline size_t decl_struct_size(decl_struct *s) {
- size_t c = s->args->count - 1;
- decl_type *type = real_decl_type(s->args->args[c]->type);
- return s->layout[c].pos + psi_t_alignment(type->type);
-}
-
typedef struct decl_structs {
size_t count;
decl_struct **list;
token_t type;
} impl_type;
-static inline impl_type *init_impl_type(token_t type, char *name) {
+static inline impl_type *init_impl_type(token_t type, const char *name) {
impl_type *t = calloc(1, sizeof(*t));
t->type = type;
- t->name = (char *) strdup((const char *) name);
+ t->name = strdup(name);
return t;
}
unsigned reference:1;
} impl_var;
-static inline impl_var *init_impl_var(char *name, int is_reference) {
+static inline impl_var *init_impl_var(const char *name, int is_reference) {
impl_var *var = calloc(1, sizeof(*var));
var->name = strdup(name);
var->reference = is_reference;
char *text;
} impl_def_val;
-static inline impl_def_val *init_impl_def_val(token_t t, char *text) {
+static inline impl_def_val *init_impl_def_val(token_t t, const char *text) {
impl_def_val *def = calloc(1, sizeof(*def));
def->type = t;
def->text = strdup(text);
static inline impl_args *init_impl_args(impl_arg *arg) {
impl_args *args = calloc(1, sizeof(*args));
- args->args = calloc(1, sizeof(*args->args));
if (arg) {
args->count = 1;
+ args->args = calloc(1, sizeof(*args->args));
args->args[0] = arg;
- } else {
- args->count = 0;
- args->args = NULL;
}
return args;
}
let_calloc *alloc;
} let_func;
-static inline let_func *init_let_func(token_t type, char *name, let_calloc *alloc) {
+static inline let_func *init_let_func(token_t type, const char *name, let_calloc *alloc) {
let_func *func = calloc(1, sizeof(*func));
func->type = type;
func->name = strdup(name);
typedef struct set_func {
token_t type;
char *name;
+ void (*handler)(zval *, token_t, impl_val *, decl_var *);
} set_func;
-static inline set_func *init_set_func(token_t type, char *name) {
+static inline set_func *init_set_func(token_t type, const char *name) {
set_func *func = calloc(1, sizeof(*func));
func->type = type;
- func->name = (char *) strdup((const char *) name);
+ func->name = strdup(name);
return func;
}
typedef struct set_value {
set_func *func;
decl_vars *vars;
+ struct set_value **inner;
+ size_t count;
} set_value;
static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
val->vars = vars;
return val;
}
+static inline set_value *add_inner_set_value(set_value *val, set_value *inner) {
+ val->inner = realloc(val->inner, ++val->count * sizeof(*val->inner));
+ val->inner[val->count-1] = inner;
+ return val;
+}
static inline void free_set_value(set_value *val) {
free_set_func(val->func);
free_decl_vars(val->vars);
+ if (val->inner) {
+ size_t i;
+ for (i = 0; i < val->count; ++i) {
+ free_set_value(val->inner[i]);
+ }
+ }
free(val);
}
}
typedef struct return_stmt {
- set_func *func;
- decl_var *decl;
+ set_value *set;
+ decl_arg *decl;
} return_stmt;
-static inline return_stmt *init_return_stmt(set_func *func, decl_var *decl) {
+static inline return_stmt *init_return_stmt(set_value *val) {
return_stmt *ret = calloc(1, sizeof(*ret));
- ret->func = func;
- ret->decl = decl;
+ ret->set = val;
return ret;
}
static inline void free_return_stmt(return_stmt *ret) {
- free_set_func(ret->func);
- free_decl_var(ret->decl);
+ //free_set_func(ret->func);
+ //free_decl_var(ret->decl);
+ free_set_value(ret->set);
free(ret);
}
impl_def_val *val;
} constant;
-static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
+static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
constant *c = calloc(1, sizeof(*c));
c->type = type;
c->name = strdup(name);
#define PSI_WARNING 32
typedef void (*psi_error_cb)(int type, const char *msg, ...);
+typedef struct decl_file {
+ char *ln;
+ char *fn;
+} decl_file;
+
+static inline void free_decl_file(decl_file *file) {
+ if (file->ln) {
+ free(file->ln);
+ }
+ if (file->fn) {
+ free(file->fn);
+ }
+ memset(file, 0, sizeof(*file));
+}
+
+typedef struct decl_libs {
+ void **dl;
+ size_t count;
+} decl_libs;
+
+static inline void free_decl_libs(decl_libs *libs) {
+ if (libs->dl) {
+ size_t i;
+ for (i = 0; i < libs->count; ++i) {
+ if (libs->dl[i]) {
+ dlclose(libs->dl[i]);
+ }
+ }
+ free(libs->dl);
+ }
+ memset(libs, 0, sizeof(*libs));
+}
+
+static inline void add_decl_lib(decl_libs *libs, void *dlopened) {
+ libs->dl = realloc(libs->dl, ++libs->count * sizeof(*libs->dl));
+ libs->dl[libs->count-1] = dlopened;
+}
+
+#define PSI_DATA(D) ((PSI_Data *) (D))
#define PSI_DATA_MEMBERS \
constants *consts; \
decl_typedefs *defs; \
decl_structs *structs; \
decls *decls; \
impls *impls; \
- char *lib; \
- char *fn; \
+ union { \
+ decl_file file; \
+ decl_libs libs; \
+ } psi; \
psi_error_cb error
typedef struct PSI_Data {
PSI_DATA_MEMBERS;
} PSI_Data;
-static inline void PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
+static inline PSI_Data *PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
+ if (!dest) {
+ dest = malloc(sizeof(*dest));
+ }
memcpy(dest, src, sizeof(*dest));
memset(src, 0, sizeof(*src));
+ return dest;
}
static inline void PSI_DataDtor(PSI_Data *data) {
if (data->impls) {
free_impls(data->impls);
}
- if (data->lib) {
- free(data->lib);
- }
- if (data->fn) {
- free(data->fn);
- }
+ free_decl_file(&data->psi.file);
}
typedef struct PSI_Parser {