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]);
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, ...);