typedef struct PSI_Token {
token_t type;
- unsigned line;
- size_t size;
- char text[1];
+ unsigned size, *line;
+ char *text, *file;
+ char buf[1];
} PSI_Token;
typedef union impl_val {
} impl_val;
typedef struct decl_type {
+ PSI_Token *token;
char *name;
token_t type;
struct decl_type *real;
return t;
}
+static inline decl_type *init_decl_type_ex(token_t type, int argc, ...) {
+ va_list argv;
+ char *ptr, *arg;
+ unsigned i;
+ size_t len, pos = 0, all = 0;
+ decl_type *t = calloc(1, sizeof(*t));
+
+ va_start(argv, argc);
+ for (i = 0; i < argc; ++i) {
+ arg = va_arg(argv, char *);
+ len = va_arg(argv, size_t);
+
+ if (len) {
+ if (all) {
+ pos = all;
+ ptr = realloc(ptr, 1 + (all += len));
+ } else {
+ ptr = malloc(ptr, 1 + (all = len));
+ }
+ memcpy(ptr + pos, arg, len);
+ }
+ }
+ va_end(argv);
+
+ if (!all) {
+ ptr = calloc(1, 1);
+ } else {
+ ptr[all] = 0;
+ }
+ t->type = type;
+ t->name = ptr;
+ return t;
+}
+
static inline decl_type *real_decl_type(decl_type *type) {
while (type->real) {
type = type->real;
}
static inline void free_decl_type(decl_type *type) {
+ if (type->token) {
+ free(type->token);
+ }
free(type->name);
free(type);
}
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_args {
decl_arg **args;
size_t count;
+ unsigned varargs:1;
} decl_args;
static inline decl_args *init_decl_args(decl_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_callinfo {
+ void *sym;
+ void *info;
+ size_t argc;
+ void **args;
+ void *rval;
+} decl_callinfo;
+
typedef struct decl {
decl_abi *abi;
decl_arg *func;
decl_args *args;
struct impl *impl;
- struct {
- void *sym;
- void *info;
- void **args;
- } call;
+ decl_callinfo call;
} decl;
static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
}
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);
}
free(arg);
}
+typedef struct impl_vararg {
+ impl_arg *name;
+ struct impl_args *args;
+ token_t *types;
+ impl_val *values;
+ void **free_list;
+} impl_vararg;
+
typedef struct impl_args {
impl_arg **args;
size_t count;
+ impl_vararg vararg;
} impl_args;
static inline impl_args *init_impl_args(impl_arg *arg) {
for (i = 0; i < args->count; ++i) {
free_impl_arg(args->args[i]);
}
+ if (args->vararg.name) {
+ free_impl_arg(args->vararg.name);
+ }
free(args->args);
free(args);
}
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);
}
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;
+ inner->outer.set = val;
return val;
}
static inline void free_set_value(set_value *val) {
- free_set_func(val->func);
- free_decl_vars(val->vars);
- if (val->inner) {
+ if (val->func) {
+ free_set_func(val->func);
+ }
+ if (val->vars) {
+ free_decl_vars(val->vars);
+ }
+ if (val->inner && (!val->outer.set || val->outer.set->inner != val->inner)) {
size_t i;
for (i = 0; i < val->count; ++i) {
free_set_value(val->inner[i]);
}
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);
static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
unsigned i;
- if (var->arg->var != var) for (i = 1; i < var->pointer_level; ++i) {
+ ZEND_ASSERT(var->arg->var != var);
+#if 0
+ fprintf(stderr, "deref: %s pl=%u:%u as=%u:%u %p\n",
+ var->name, var->pointer_level, var->arg->var->pointer_level,
+ var->array_size, var->arg->var->array_size, ret_val);
+#endif
+ for (i = 0; i < var->pointer_level; ++i) {
+#if 0
+ fprintf(stderr, "-- %p %p %p\n", ret_val, *(void**)ret_val, ret_val->ptr);
+#endif
ret_val = *(void **) ret_val;
}
return ret_val;
impl_val *val, *val_ptr;
unsigned i;
+ ZEND_ASSERT(var->arg->var == var);
+#if 0
+ fprintf(stderr, "enref: %s pl=%u:%u as=%u:%u\n",
+ var->name, var->pointer_level, var->arg->var->pointer_level,
+ var->array_size, var->arg->var->array_size);
+#endif
if (!var->pointer_level && real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
return ptr;
}
+
val = val_ptr = calloc(var->pointer_level + 1, sizeof(void *));
- for (i = 1; i < var->pointer_level; ++i) {
+ for (i = !var->arg->var->array_size; i < var->pointer_level; ++i) {
+#if 0
+ fprintf(stderr, "++\n");
+#endif
val_ptr->ptr = (void **) val_ptr + 1;
val_ptr = val_ptr->ptr;
}
}
static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
- void *ptr = (char *) struct_ptr->ptr + set_arg->layout->pos;
- impl_val *val = enref_impl_val(ptr, set_arg->var);
-
- if (val != ptr) {
- *to_free = val;
- }
-
- return val;
+ void *ptr = (char *) struct_ptr + set_arg->layout->pos;
+#if 0
+ fprintf(stderr, "struct member %s: %p\n", set_arg->var->name, ptr);
+#endif
+ return ptr;
}
+
#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;
token_t num;
+ void *proc;
+ unsigned flags, errors, line, col;
char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
} PSI_Parser;
+static inline size_t PSI_TokenAllocSize(size_t token_len, size_t fname_len) {
+ return sizeof(PSI_Token) + token_len + fname_len + sizeof(unsigned) + 2;
+}
+
static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
PSI_Token *T;
- size_t token_len;
+ size_t token_len, fname_len;
+ token_t token_typ;
if (P->cur < P->tok) {
return NULL;
}
+ token_typ = P->num;
token_len = P->cur - P->tok;
+ fname_len = strlen(P->psi.file.fn);
- T = calloc(1, sizeof(*T) + token_len);
- T->type = P->num;
- T->line = P->line;
+ T = calloc(1, PSI_TokenAllocSize(token_len, fname_len);
+ T->type = token_typ;
T->size = token_len;
- T->text[token_len] = 0;
+ T->text = &T->buf[0];
+ T->file = &T->buf[token_len + 1];
+ T->line = (void *) &T->buf[fname_len + token_len + 2];
+
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 strct_len = PSI_TokenAllocSize(src->size, strlen(src->file));
+ PSI_Token *ptr = malloc(strct_len);
+
+ memcpy(ptr, src, strct_len);
+
+ ptr->text = &ptr->buf[0];
+ ptr->file = &ptr->buf[ptr->size + 1];
+
+ return ptr;
+}
+
+static inline PSI_Token *PSI_TokenCat(unsigned argc, ...) {
+ va_list argv;
+ unsigned i;
+ PSI_Token *T = NULL;
+
+ va_start(argv, argc);
+ for (i = 0; i < argc; ++i) {
+ PSI_Token *arg = va_arg(argv, PSI_Token *);
+
+ if (T) {
+ size_t fname_len = strlen(T->file);
+
+ T = realloc(T, PSI_TokenAllocSize(T->size + arg->size, fname_len));
+ memmove(&T->buf[T->size + 1], T->file, fname_len + 1);
+ memcpy(T->file - 1, arg->text, arg->size + 1)
+ T->file = &T->buf[T->size + 1];
+ } else {
+ T = PSI_TokenCopy(arg);
+ T->type = PSI_T_NAME;
+ }
+ }
+ va_end(argv);
+
+ return T;
+}
+
+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);
void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...);
size_t PSI_ParserFill(PSI_Parser *P, size_t n);
token_t PSI_ParserScan(PSI_Parser *P);
-void PSI_ParserParse(PSI_Parser *P, PSI_Token *T);
+void PSI_ParserParse(PSI_Parser *P, PSI_Token *src);
void PSI_ParserDtor(PSI_Parser *P);
void PSI_ParserFree(PSI_Parser **P);
projects / m6w6 / ext-psi / blobdiff