type = psi_decl_type_init(member->type_tag, member->type_name);
dvar = psi_decl_var_init(member->var_name, member->pointer_level, member->array_size);
darg = psi_decl_arg_init(type, dvar);
- darg->layout = psi_layout_init(member->offset, member->size);
+ darg->layout = psi_layout_init(member->offset, member->size, NULL);
switch (predef_composite->type_tag) {
case PSI_T_STRUCT:
struct psi_decl_enum_item *item;
while (psi_plist_get(e->items, j++, &item)) {
- zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
+ zend_string *name;
+
+ if (psi_decl_type_is_anon(e->name, "enum")) {
+ name = strpprintf(0, "psi\\%s", item->name);
+ } else {
+ name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
+ }
zc.name = zend_string_dup(name, 1);
ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL, NULL));
return FAILURE;
}
- psi_call_frame_do_call(frame);
+ C->ops->call(frame);
if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
psi_call_frame_do_return(frame, return_value);