#include "types/decl_arg.h"
#include "types/decl_abi.h"
#include "types/decl.h"
+#include "types/decl_extvar.h"
#include "types/decl_struct.h"
#include "types/decl_union.h"
#include "types/impl_type.h"
#include "types/impl_var.h"
#include "types/impl_def_val.h"
-#include "types/const_type.h"
#include "types/const.h"
#include "types/impl_arg.h"
#include "types/impl_func.h"
#include "types/set_exp.h"
#include "types/set_stmt.h"
#include "types/return_stmt.h"
+#include "types/return_exp.h"
#include "types/free_stmt.h"
#include "types/impl.h"
#include "types/decl_file.h"
#include "types/free_exp.h"
#include "types/free_stmt.h"
+#include "types/assert_stmt.h"
#include "types/layout.h"
+#include "types/cpp_exp.h"
+#include "types/cpp_macro_call.h"
+#include "types/cpp_macro_decl.h"
static inline impl_val *deref_impl_val(impl_val *ret_val, struct psi_decl_var *var) {
unsigned i;
ZEND_ASSERT(!var->arg || 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->name->val, 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) {
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->name->val, 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) {
static inline impl_val *struct_member_ref(struct psi_decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
void *ptr = (char *) struct_ptr + set_arg->layout->pos;
#if 0
- fprintf(stderr, "struct member %s: %p\n", set_arg->var->name, ptr);
+ fprintf(stderr, "struct member %s: %p\n", set_arg->var->name->val, ptr);
#endif
return ptr;
}