case PSI_T_BOOL:
return _IS_BOOL;
case PSI_T_INT:
- case PSI_T_LONG:
return IS_LONG;
case PSI_T_FLOAT:
case PSI_T_DOUBLE:
void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
{
switch (t) {
- case PSI_T_CHAR:
- case PSI_T_SINT8:
+ case PSI_T_INT8:
case PSI_T_UINT8:
if (!var->arg->var->pointer_level) {
RETVAL_STRINGL(&ret_val->cval, 1);
} else {
ret_val = deref_impl_val(ret_val, var);
- if (ret_val) {
+ if (ret_val && ret_val->ptr) {
RETVAL_STRING(ret_val->ptr);
} else {
RETVAL_EMPTY_STRING();
PSI_TAS_C(T); \
}
switch (t) {
- case PSI_T_CHAR:
- PSI_TAS_CASE(char);
- break;
- case PSI_T_SINT8:
+ case PSI_T_INT8:
PSI_TAS_CASE(int8_t);
break;
case PSI_T_UINT8:
PSI_TAS_CASE(uint8_t);
break;
- case PSI_T_SHORT:
- PSI_TAS_CASE(short);
- break;
- case PSI_T_SINT16:
+ case PSI_T_INT16:
PSI_TAS_CASE(int16_t);
break;
case PSI_T_UINT16:
PSI_TAS_CASE(uint16_t);
break;
- case PSI_T_INT:
- PSI_TAS_CASE(int);
- break;
- case PSI_T_SINT32:
+ case PSI_T_INT32:
PSI_TAS_CASE(int32_t);
break;
case PSI_T_UINT32:
PSI_TAS_CASE(uint32_t);
break;
- case PSI_T_LONG:
- PSI_TAS_CASE(long);
- break;
- case PSI_T_SINT64:
+ case PSI_T_INT64:
PSI_TAS_CASE(int64_t);
break;
case PSI_T_UINT64:
case PSI_T_DOUBLE:
PSI_TAS_CASE(double);
break;
- case PSI_T_SIZE_T:
- PSI_TAS_CASE(size_t);
- break;
case PSI_T_POINTER:
{
PSI_TAS_P(char);
size_t size;
switch (t) {
- case PSI_T_CHAR:
- size = sizeof(char);
- break;
- case PSI_T_SINT8:
+ case PSI_T_INT8:
case PSI_T_UINT8:
size = 1;
break;
- case PSI_T_SHORT:
- size = sizeof(short);
- break;
- case PSI_T_SINT16:
+ case PSI_T_INT16:
case PSI_T_UINT16:
size = 2;
break;
case PSI_T_INT:
size = sizeof(int);
break;
- case PSI_T_SINT32:
+ case PSI_T_INT32:
case PSI_T_UINT32:
size = 4;
break;
- case PSI_T_LONG:
- size = sizeof(long);
- break;
- case PSI_T_SINT64:
+ case PSI_T_INT64:
case PSI_T_UINT64:
size = 8;
break;
case PSI_T_DOUBLE:
size = sizeof(double);
break;
- case PSI_T_SIZE_T:
- size = sizeof(size_t);
- break;
case PSI_T_POINTER:
size = sizeof(char *);
break;
case PSI_T_DOUBLE:
mem->dval = zval_get_double(zv);
break;
- case PSI_T_CHAR:
- case PSI_T_SINT8:
+ case PSI_T_INT8:
case PSI_T_UINT8:
if (spec->var->pointer_level) {
zend_string *zs = zval_get_string(zv);
zend_string_release(zs);
break;
}
+ /* no break */
default:
mem->zend.lval = zval_get_long(zv);
break;
size_t i, j = 0, size = decl_struct_size(s);
char *mem = ecalloc(1, size + s->args->count * sizeof(void *));
- for (i = 0; i < s->args->count; ++i) {
+ if (arr) for (i = 0; i < s->args->count; ++i) {
decl_struct_layout *layout = &s->layout[i];
decl_arg *darg = s->args->args[i];
zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
decl_struct_layout layout = s->layout[i];
impl_val tmp;
zval ztmp;
- char *ptr = (char *) ret_val + layout.pos;
+ char *ptr = (char *) ret_val->ptr + layout.pos;
memset(&tmp, 0, sizeof(tmp));
memcpy(&tmp, ptr, layout.len);
switch (real_decl_type(darg->type)->type) {
- case PSI_T_CHAR:
+ case PSI_T_FLOAT:
+ case PSI_T_DOUBLE:
+ psi_to_double(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
+ break;
+ case PSI_T_INT8:
+ case PSI_T_UINT8:
if (darg->var->pointer_level) {
psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
break;
}
- /* nobreak */
- case PSI_T_INT:
- case PSI_T_LONG:
+ /* no break */
+ case PSI_T_INT16:
+ case PSI_T_UINT16:
+ case PSI_T_INT32:
+ case PSI_T_UINT32:
+ case PSI_T_INT64:
+ case PSI_T_UINT64:
psi_to_int(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
break;
default:
iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
}
Z_PARAM_BOOL(iarg->val.zend.bval);
- } else if (PSI_T_INT == iarg->type->type || PSI_T_LONG == iarg->type->type) {
+ } else if (PSI_T_INT == iarg->type->type) {
if (iarg->def) {
iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
}
return ecalloc(alloc->n, size);
}
-impl_val *psi_do_let(decl_arg *darg)
+void *psi_do_let(decl_arg *darg)
{
- impl_val *arg_val = &darg->let->out;
impl_arg *iarg = darg->let->arg;
+ impl_val *arg_val;
+
+ darg->let->ptr = &darg->let->out;
+ arg_val = darg->let->ptr;
if (!iarg) {
/* let foo = calloc(1, long);
* let foo = NULL;
* let foo;
*/
- if (darg->let->val->func->type == PSI_T_CALLOC) {
+ if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
darg->let->mem = arg_val->ptr;
} else if (darg->var->array_size) {
} else {
memset(arg_val, 0, sizeof(*arg_val));
}
- return arg_val;
- }
-
- switch (darg->let->val->func->type) {
- case PSI_T_BOOLVAL:
- if (iarg->type->type == PSI_T_BOOL) {
- arg_val->cval = iarg->val.zend.bval;
- } else {
- arg_val->cval = zend_is_true(iarg->_zv);
- }
- break;
- case PSI_T_INTVAL:
- if (iarg->type->type == PSI_T_INT || iarg->type->type == PSI_T_LONG) {
- arg_val->lval = iarg->val.zend.lval;
- } else {
- arg_val->lval = zval_get_long(iarg->_zv);
- }
- break;
- case PSI_T_STRVAL:
- if (iarg->type->type == PSI_T_STRING) {
- arg_val->ptr = estrdup(iarg->val.zend.str->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(iarg->val.zend.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->ptr = estrdup(zs->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(zs);
- }
- break;
- case PSI_T_STRLEN:
- if (iarg->type->type == PSI_T_STRING) {
- arg_val->lval = iarg->val.zend.str->len;
- zend_string_release(iarg->val.zend.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->lval = zs->len;
- zend_string_release(zs);
- }
- break;
- case PSI_T_ARRVAL:
- if (iarg->type->type == PSI_T_ARRAY) {
- decl_type *type = real_decl_type(darg->type);
+ } else {
- switch (type->type) {
- case PSI_T_STRUCT:
- arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
+ switch (darg->let->val->func->type) {
+ case PSI_T_BOOLVAL:
+ if (iarg->type->type == PSI_T_BOOL) {
+ arg_val->cval = iarg->val.zend.bval;
+ } else {
+ arg_val->cval = zend_is_true(iarg->_zv);
+ }
+ break;
+ case PSI_T_INTVAL:
+ if (iarg->type->type == PSI_T_INT) {
+ arg_val->lval = iarg->val.zend.lval;
+ } else {
+ arg_val->lval = zval_get_long(iarg->_zv);
+ }
+ break;
+ case PSI_T_STRVAL:
+ if (iarg->type->type == PSI_T_STRING) {
+ arg_val->ptr = estrdup(iarg->val.zend.str->val);
darg->let->mem = arg_val->ptr;
- break;
+ zend_string_release(iarg->val.zend.str);
+ } else {
+ zend_string *zs = zval_get_string(iarg->_zv);
+ arg_val->ptr = estrdup(zs->val);
+ darg->let->mem = arg_val->ptr;
+ zend_string_release(zs);
}
+ break;
+ case PSI_T_STRLEN:
+ if (iarg->type->type == PSI_T_STRING) {
+ arg_val->lval = iarg->val.zend.str->len;
+ zend_string_release(iarg->val.zend.str);
+ } else {
+ zend_string *zs = zval_get_string(iarg->_zv);
+ arg_val->lval = zs->len;
+ zend_string_release(zs);
+ }
+ break;
+ case PSI_T_ARRVAL:
+ if (iarg->type->type == PSI_T_ARRAY) {
+ decl_type *type = real_decl_type(darg->type);
+
+ switch (type->type) {
+ case PSI_T_STRUCT:
+ arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
+ darg->let->mem = arg_val->ptr;
+ break;
+ }
+ }
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
}
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
}
- return arg_val;
+ if (darg->let->val && darg->let->val->is_reference) {
+ return &darg->let->ptr;
+ } else {
+ return darg->let->ptr;
+ }
}
void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
projects / m6w6 / ext-psi / blobdiff