exp->data.ival.ldval = *(long double *) num;
break;
#endif
+ case PSI_T_NULL:
+ break;
case PSI_T_QUOTED_CHAR:
case PSI_T_NUMBER:
case PSI_T_NSNAME:
case PSI_T_FUNCTION:
exp->data.call = num;
break;
+ case PSI_T_SIZEOF:
+ exp->data.dtyp = num;
+ break;
default:
assert(0);
}
#endif
case PSI_T_ENUM:
case PSI_T_CONST:
+ case PSI_T_NULL:
break;
case PSI_T_NUMBER:
case PSI_T_NSNAME:
case PSI_T_FUNCTION:
num->data.call = psi_cpp_macro_call_copy(num->data.call);
break;
+ case PSI_T_SIZEOF:
+ num->data.dtyp = psi_decl_type_copy(num->data.dtyp);
+ break;
default:
assert(0);
}
#endif
case PSI_T_ENUM:
case PSI_T_CONST:
+ case PSI_T_NULL:
break;
case PSI_T_FUNCTION:
psi_cpp_macro_call_free(&exp->data.call);
case PSI_T_NAME:
psi_decl_var_free(&exp->data.dvar);
break;
+ case PSI_T_SIZEOF:
+ psi_decl_type_free(&exp->data.dtyp);
+ break;
default:
assert(0);
}
dprintf(fd, "%" PRIldval, exp->data.ival.ldval);
break;
#endif
+ case PSI_T_NULL:
+ dprintf(fd, "NULL");
+ break;
case PSI_T_NUMBER:
case PSI_T_NSNAME:
case PSI_T_DEFINE:
case PSI_T_QUOTED_CHAR:
dprintf(fd, "%s", exp->data.numb);
break;
+ case PSI_T_FUNCTION:
+ psi_cpp_macro_call_dump(fd, exp->data.call);
+ break;
case PSI_T_CONST:
dprintf(fd, "%s", exp->data.cnst->name);
break;
case PSI_T_NAME:
psi_decl_var_dump(fd, exp->data.dvar);
break;
+ case PSI_T_SIZEOF:
+ psi_decl_type_dump(fd, exp->data.dtyp, 0);
+ break;
default:
assert(0);
}
struct psi_decl_enum *enm;
switch (exp->type) {
+ case PSI_T_NULL:
+ exp->type = PSI_T_UINT8;
+ /* no break */
case PSI_T_CONST:
case PSI_T_INT8:
case PSI_T_UINT8:
if (exp->data.dvar->arg) {
return true;
}
- if (psi_decl_var_validate(data, exp->data.dvar, impl ? impl->decl : NULL,
- current_let, current_set)) {
+ if (psi_decl_var_validate(data, exp->data.dvar, impl,
+ impl ? impl->decl : NULL, current_let, current_set)) {
return true;
}
- if (cb_decl && psi_decl_var_validate(data, exp->data.dvar, cb_decl, NULL, NULL)) {
+ if (cb_decl && psi_decl_var_validate(data, exp->data.dvar,
+ NULL, cb_decl, NULL, NULL)) {
return true;
}
data->error(data, exp->token, PSI_WARNING,
exp->data.dvar->name);
return false;
+ case PSI_T_SIZEOF:
+ if (psi_decl_type_validate(data, exp->data.dtyp, 0, NULL)) {
+ struct psi_decl_type *dtyp = exp->data.dtyp;
+
+ exp->type = PSI_T_UINT64;
+ exp->data.ival.u64 = psi_decl_type_get_size(dtyp, NULL);
+ return true;
+ } else {
+ data->error(data, exp->token, PSI_WARNING,
+ "Cannot compute sizeof(%s) (%u)",
+ exp->data.dtyp->name, exp->data.dtyp->type);
+ }
+ break;
+
case PSI_T_NSNAME:
while (psi_plist_get(data->consts, i++, &cnst)) {
if (!strcmp(cnst->name, exp->data.numb)) {
if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval);
return PSI_T_DOUBLE;
default:
- if (frame) PSI_DEBUG_PRINT(frame->context, " ?(t=%d)", exp->data.cnst->type->type);
+ if (frame) PSI_DEBUG_PRINT(frame->context, " ?(t=%u)", exp->data.cnst->type->type);
return 0;
}
}
impl_val *ref;
struct psi_call_frame_symbol *sym;
struct psi_decl_type *real;
+ struct psi_decl_var *var;
size_t size;
- real = psi_decl_type_get_real(exp->data.dvar->arg->type);
- size = psi_decl_arg_get_size(exp->data.dvar->arg);
- sym = psi_call_frame_fetch_symbol(frame, exp->data.dvar);
- ref = deref_impl_val(sym->ptr, exp->data.dvar);
+ var = exp->data.dvar;
+ real = psi_decl_type_get_real(var->arg->type);
+ size = psi_decl_arg_get_size(var->arg);
+ sym = psi_call_frame_fetch_symbol(frame, var);
+ ref = deref_impl_val(sym->ptr, var);
memcpy(res, ref, size);
+ if (var->arg->var->pointer_level > var->pointer_level) {
+ switch (SIZEOF_VOID_P) {
+ case 4:
+ return PSI_T_INT32;
+ case 8:
+ return PSI_T_INT64;
+ default:
+ assert(0);
+ }
+ }
return real->type;
}
if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIi64, res->i64);
return PSI_T_INT64;
+ case PSI_T_NUMBER:
+ res->i64 = atol(exp->data.numb);
+ return PSI_T_INT64;
+
case PSI_T_CONST:
return psi_number_eval_constant(exp, res, frame);