typedef struct PSI_Token {
token_t type;
- size_t size, line, col;
+ unsigned size, *line;
char *text, *file;
char buf[1];
} PSI_Token;
}
typedef struct decl_typedef {
+ PSI_Token *token;
char *alias;
decl_type *type;
} decl_typedef;
}
static inline void free_decl_typedef(decl_typedef *t) {
+ if (t->token) {
+ free(t->token);
+ }
free(t->alias);
free_decl_type(t->type);
free(t);
}
typedef struct decl_var {
+ PSI_Token *token;
char *name;
unsigned pointer_level;
unsigned array_size;
}
static inline void free_decl_var(decl_var *var) {
+ if (var->token) {
+ free(var->token);
+ }
free(var->name);
free(var);
}
}
typedef struct decl_arg {
+ PSI_Token *token;
decl_type *type;
decl_var *var;
decl_struct_layout *layout;
static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) {
decl_arg *arg = calloc(1, sizeof(*arg));
+ arg->token = var->token;
arg->type = type;
arg->var = var;
var->arg = arg;
}
typedef struct decl_abi {
+ PSI_Token *token;
char *convention;
} decl_abi;
}
static inline void free_decl_abi(decl_abi *abi) {
+ if (abi->token) {
+ free(abi->token);
+ }
free(abi->convention);
free(abi);
}
}
typedef struct decl_struct {
+ PSI_Token *token;
char *name;
decl_args *args;
size_t size;
}
static inline void free_decl_struct(decl_struct *s) {
+ if (s->token) {
+ free(s->token);
+ }
if (s->args) {
free_decl_args(s->args);
}
}
typedef struct impl_var {
+ PSI_Token *token;
char *name;
unsigned reference:1;
} impl_var;
}
static inline void free_impl_var(impl_var *var) {
+ if (var->token) {
+ free(var->token);
+ }
free(var->name);
free(var);
}
}
typedef struct impl_func {
+ PSI_Token *token;
char *name;
impl_args *args;
impl_type *return_type;
}
static inline void free_impl_func(impl_func *f) {
+ if (f->token) {
+ free(f->token);
+ }
free_impl_type(f->return_type);
free_impl_args(f->args);
free(f->name);
}
typedef struct num_exp {
+ PSI_Token *token;
token_t t;
union {
char *numb;
}
static inline void free_num_exp(num_exp *exp) {
+ if (exp->token) {
+ free(exp->token);
+ }
switch (exp->t) {
case PSI_T_NUMBER:
free(exp->u.numb);
struct set_value;
typedef struct set_func {
+ PSI_Token *token;
token_t type;
char *name;
void (*handler)(zval *, struct set_value *set, impl_val *ret_val);
}
static inline void free_set_func(set_func *func) {
+ if (func->token) {
+ free(func->token);
+ }
free(func->name);
free(func);
}
}
typedef struct return_stmt {
+ PSI_Token *token;
set_value *set;
decl_arg *decl;
} return_stmt;
}
static inline void free_return_stmt(return_stmt *ret) {
- //free_set_func(ret->func);
- //free_decl_var(ret->decl);
+ if (ret->token) {
+ free(ret->token);
+ }
free_set_value(ret->set);
free(ret);
}
typedef struct free_call {
+ PSI_Token *token;
char *func;
decl_vars *vars;
decl *decl;
}
static inline void free_free_call(free_call *f) {
+ if (f->token) {
+ free(f->token);
+ }
free(f->func);
free_decl_vars(f->vars);
free(f);
#define PSI_ERROR 16
#define PSI_WARNING 32
-typedef void (*psi_error_cb)(int type, const char *msg, ...);
+typedef void (*psi_error_cb)(PSI_Token *token, int type, const char *msg, ...);
#define PSI_DATA(D) ((PSI_Data *) (D))
#define PSI_DATA_MEMBERS \
typedef struct PSI_Parser {
PSI_DATA_MEMBERS;
FILE *fp;
- unsigned flags;
- unsigned errors;
- void *proc;
- size_t line, col;
token_t num;
+ void *proc;
+ unsigned flags, errors, line, col;
char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
} PSI_Parser;
token_len = P->cur - P->tok;
fname_len = strlen(P->psi.file.fn);
- T = calloc(1, sizeof(*T) + token_len + fname_len + 1);
+ T = calloc(1, sizeof(*T) + token_len + fname_len + sizeof(unsigned) + 2);
T->type = token_typ;
T->size = token_len;
- T->line = P->line;
- T->col = P->col;
- T->file = &T->buf[0];
- T->text = &T->buf[fname_len + 1];
+ T->text = &T->buf[0];
+ T->file = &T->buf[token_len + 1];
+ T->line = (void *) &T->buf[fname_len + token_len + 2];
- memcpy(T->file, P->psi.file.fn, fname_len);
memcpy(T->text, P->tok, token_len);
+ memcpy(T->file, P->psi.file.fn, fname_len);
+ memcpy(T->line, &P->line, sizeof(unsigned));
return T;
}
static inline PSI_Token *PSI_TokenCopy(PSI_Token *src) {
size_t fname_len = strlen(src->file);
- size_t strct_len = sizeof(*src) + src->size + fname_len + 1;
+ size_t strct_len = sizeof(*src) + src->size + fname_len + sizeof(unsigned) + 2;
PSI_Token *ptr = malloc(strct_len);
memcpy(ptr, src, strct_len);
- ptr->file = &ptr->buf[0];
- ptr->text = &ptr->buf[fname_len + 1];
+ ptr->text = &ptr->buf[0];
+ ptr->file = &ptr->buf[ptr->size + 1];
return ptr;
}
+static inline const char *PSI_TokenLocation(PSI_Token *t) {
+ return t ? t->file : "<builtin>:0:0";
+}
+
#define PSI_PARSER_DEBUG 0x1
PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb error, unsigned flags);