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;
if (val->vars) {
free_decl_vars(val->vars);
}
- if (val->inner) {
+ 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]);
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)(PSI_Token *token, int type, const char *msg, ...);
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, fname_len;
token_len = P->cur - P->tok;
fname_len = strlen(P->psi.file.fn);
- T = calloc(1, sizeof(*T) + token_len + fname_len + sizeof(unsigned) + 2);
+ T = calloc(1, PSI_TokenAllocSize(token_len, fname_len);
T->type = token_typ;
T->size = token_len;
T->text = &T->buf[0];
}
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 + sizeof(unsigned) + 2;
+ size_t strct_len = PSI_TokenAllocSize(src->size, strlen(src->file));
PSI_Token *ptr = malloc(strct_len);
memcpy(ptr, src, strct_len);
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";
}