travis trusty
[m6w6/ext-psi] / src / marshal.c
index 95ea6d9b51c103f926b6974bb98baf94342582a0..00c1a815254ec9de6307bd6af1e76fddc57783c5 100644 (file)
@@ -1,10 +1,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+#else
+# include "php_config.h"
 #endif
 
 #include "php.h"
 #include "php_psi.h"
-
+#include "parser.h"
 #include "marshal.h"
 #include "calc.h"
 
@@ -13,12 +15,70 @@ void psi_to_void(zval *return_value, set_value *set, impl_val *ret_val)
        RETVAL_NULL();
 }
 
+impl_val *psi_let_void(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       return tmp;
+}
+
+void psi_to_zval(zval *return_value, set_value *set, impl_val *ret_val) {
+       RETVAL_ZVAL(ret_val->ptr, 1, 0);
+}
+
+impl_val *psi_let_zval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       *to_free = tmp->ptr = emalloc(sizeof(zval));
+       ZVAL_COPY_VALUE(tmp->ptr, zvalue);
+       return tmp;
+}
+
 void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
 {
        psi_to_int(return_value, set, ret_val);
        convert_to_boolean(return_value);
 }
 
+static inline impl_val *psi_val_boolval(impl_val *tmp, token_t real_type, zend_bool boolval) {
+       switch (real_type) {
+       case PSI_T_INT8:                tmp->i8 = boolval;              break;
+       case PSI_T_UINT8:               tmp->u8 = boolval;              break;
+       case PSI_T_INT16:               tmp->i16 = boolval;             break;
+       case PSI_T_UINT16:              tmp->u16 = boolval;             break;
+       case PSI_T_INT32:               tmp->i32 = boolval;             break;
+       case PSI_T_UINT32:              tmp->u32 = boolval;             break;
+       case PSI_T_INT64:               tmp->i64 = boolval;             break;
+       case PSI_T_UINT64:              tmp->u64 = boolval;             break;
+       case PSI_T_FLOAT:               tmp->fval = boolval;    break;
+       case PSI_T_DOUBLE:              tmp->dval = boolval;    break;
+#ifdef HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE: tmp->ldval = boolval;   break;
+#endif
+       EMPTY_SWITCH_DEFAULT_CASE();
+       }
+       return tmp;
+}
+
+impl_val *psi_let_boolval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       zend_bool boolval;
+       token_t real_type = spec ? real_decl_type(spec)->type : PSI_T_UINT8;
+
+       if (ival && impl_type == PSI_T_BOOL) {
+               boolval = ival->zend.bval;
+       } else {
+               boolval = zend_is_true(zvalue);
+       }
+
+       return psi_val_boolval(tmp, real_type, boolval);
+}
+
+# define RETVAL_LONG_U64(V) \
+               if (V > ZEND_LONG_MAX) { \
+                       char d[24] = {0}; \
+                       RETVAL_STRING(zend_print_ulong_to_buf(&d[22], V)); \
+               } else { \
+                       RETVAL_LONG(V); \
+               }
+
 void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
 {
        decl_var *var = set->vars->vars[0];
@@ -26,56 +86,60 @@ void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
        impl_val *v = deref_impl_val(ret_val, var);
 
        switch (t) {
-       case PSI_T_FLOAT:
-               RETVAL_DOUBLE((double) v->fval);
-               convert_to_long(return_value);
-               break;
-       case PSI_T_DOUBLE:
-               RETVAL_DOUBLE(v->dval);
-               convert_to_long(return_value);
-               break;
-       case PSI_T_INT8:
-               RETVAL_LONG(v->i8);
-               break;
-       case PSI_T_UINT8:
-               RETVAL_LONG(v->u8);
-               break;
-       case PSI_T_INT16:
-               RETVAL_LONG(v->i16);
-               break;
-       case PSI_T_UINT16:
-               RETVAL_LONG(v->u16);
-               break;
-       case PSI_T_INT32:
-               RETVAL_LONG(v->i32);
-               break;
-       case PSI_T_UINT32:
-#if UINT32_MAX >= ZEND_LONG_MAX
-               if (v->u32 > ZEND_LONG_MAX) {
-                       char d[12] = {0};
-
-                       RETVAL_STRING(zend_print_ulong_to_buf(&d[10], v->u32));
-               } else {
-#endif
-                       RETVAL_LONG(v->u32);
-#if UINT32_MAX >= ZEND_LONG_MAX
-               }
+       case PSI_T_INT8:                RETVAL_LONG(v->i8);                                     break;
+       case PSI_T_UINT8:               RETVAL_LONG(v->u8);                                     break;
+       case PSI_T_INT16:               RETVAL_LONG(v->i16);                            break;
+       case PSI_T_UINT16:              RETVAL_LONG(v->u16);                            break;
+       case PSI_T_INT32:               RETVAL_LONG(v->i32);                            break;
+       case PSI_T_UINT32:              RETVAL_LONG(v->u32);                            break;
+       case PSI_T_INT64:               RETVAL_LONG(v->i64);                            break;
+       case PSI_T_UINT64:              RETVAL_LONG_U64(v->u64);                        break;
+       case PSI_T_FLOAT:               RETVAL_DOUBLE((double) v->fval);        break;
+       case PSI_T_DOUBLE:              RETVAL_DOUBLE(v->dval);                         break;
+#ifdef HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE: RETVAL_DOUBLE((double) v->ldval);       break;
 #endif
-               break;
-       case PSI_T_INT64:
-               RETVAL_LONG(v->i64);
-               break;
-       case PSI_T_UINT64:
-               if (v->u64 > ZEND_LONG_MAX) {
-                       char d[24] = {0};
+       EMPTY_SWITCH_DEFAULT_CASE();
+       }
 
-                       RETVAL_STRING(zend_print_ulong_to_buf(&d[22], v->u64));
-               } else {
-                       RETVAL_LONG(v->u64);
-               }
-               break;
+       convert_to_long(return_value);
+}
+
+static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_long intval) {
+       switch (real_type) {
+       case PSI_T_INT8:                tmp->i8 = intval;               break;
+       case PSI_T_UINT8:               tmp->u8 = intval;               break;
+       case PSI_T_INT16:               tmp->i16 = intval;              break;
+       case PSI_T_UINT16:              tmp->u16 = intval;              break;
+       case PSI_T_INT32:               tmp->i32 = intval;              break;
+       case PSI_T_UINT32:              tmp->u32 = intval;              break;
+       case PSI_T_INT64:               tmp->i64 = intval;              break;
+       case PSI_T_UINT64:              tmp->u64 = intval;              break;
+       case PSI_T_INT:                 tmp->ival = intval;             break;
+       case PSI_T_LONG:                tmp->lval = intval;             break;
+       case PSI_T_FLOAT:               tmp->fval = intval;             break;
+       case PSI_T_DOUBLE:              tmp->dval = intval;             break;
+#ifdef HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE: tmp->ldval = intval;    break;
+#endif
        EMPTY_SWITCH_DEFAULT_CASE();
        }
+
+       return tmp;
+}
+
+impl_val *psi_let_intval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       zend_long intval;
+       token_t real_type = spec ? real_decl_type(spec)->type : PSI_T_LONG;
+
+       if (ival && impl_type == PSI_T_INT) {
+               intval = ival->zend.lval;
+       } else {
+               intval = zval_get_long(zvalue);
+       }
+
+       return psi_val_intval(tmp, real_type, intval);
 }
 
 void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
@@ -85,43 +149,56 @@ void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
        impl_val *v = deref_impl_val(ret_val, var);
 
        switch (t) {
-       case PSI_T_FLOAT:
-               RETVAL_DOUBLE((double) v->fval);
-               break;
-       case PSI_T_DOUBLE:
-               RETVAL_DOUBLE(v->dval);
-               break;
+       case PSI_T_FLOAT:               RETVAL_DOUBLE((double) v->fval);        break;
+       case PSI_T_DOUBLE:              RETVAL_DOUBLE(v->dval);                         break;
 #ifdef HAVE_LONG_DOUBLE
-       case PSI_T_LONG_DOUBLE:
-               RETVAL_DOUBLE((double) v->ldval);
-               break;
+       case PSI_T_LONG_DOUBLE: RETVAL_DOUBLE((double) v->ldval);       break;
+#endif
+       case PSI_T_INT8:                RETVAL_DOUBLE((double) v->i8);          break;
+       case PSI_T_UINT8:               RETVAL_DOUBLE((double) v->u8);          break;
+       case PSI_T_INT16:               RETVAL_DOUBLE((double) v->i16);         break;
+       case PSI_T_UINT16:              RETVAL_DOUBLE((double) v->u16);         break;
+       case PSI_T_INT32:               RETVAL_DOUBLE((double) v->i32);         break;
+       case PSI_T_UINT32:              RETVAL_DOUBLE((double) v->u32);         break;
+       case PSI_T_INT64:               RETVAL_DOUBLE((double) v->i64);         break;
+       case PSI_T_UINT64:              RETVAL_DOUBLE((double) v->u64);         break;
+       EMPTY_SWITCH_DEFAULT_CASE();
+       }
+}
+
+static inline impl_val *psi_val_floatval(impl_val *tmp, token_t real_type, double floatval) {
+       switch (real_type) {
+       case PSI_T_INT8:                tmp->i8 = floatval;             break;
+       case PSI_T_UINT8:               tmp->u8 = floatval;             break;
+       case PSI_T_INT16:               tmp->i16 = floatval;    break;
+       case PSI_T_UINT16:              tmp->u16 = floatval;    break;
+       case PSI_T_INT32:               tmp->i32 = floatval;    break;
+       case PSI_T_UINT32:              tmp->u32 = floatval;    break;
+       case PSI_T_INT64:               tmp->i64 = floatval;    break;
+       case PSI_T_UINT64:              tmp->u64 = floatval;    break;
+       case PSI_T_FLOAT:               tmp->fval = floatval;   break;
+       case PSI_T_DOUBLE:              tmp->dval = floatval;   break;
+#ifdef HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE: tmp->ldval = floatval;  break;
 #endif
-       case PSI_T_INT8:
-               RETVAL_DOUBLE((double) v->i8);
-               break;
-       case PSI_T_UINT8:
-               RETVAL_DOUBLE((double) v->u8);
-               break;
-       case PSI_T_INT16:
-               RETVAL_DOUBLE((double) v->i16);
-               break;
-       case PSI_T_UINT16:
-               RETVAL_DOUBLE((double) v->u16);
-               break;
-       case PSI_T_INT32:
-               RETVAL_DOUBLE((double) v->i32);
-               break;
-       case PSI_T_UINT32:
-               RETVAL_DOUBLE((double) v->u32);
-               break;
-       case PSI_T_INT64:
-               RETVAL_DOUBLE((double) v->i64);
-               break;
-       case PSI_T_UINT64:
-               RETVAL_DOUBLE((double) v->u64);
-               break;
        EMPTY_SWITCH_DEFAULT_CASE();
        }
+
+       return tmp;
+}
+
+impl_val *psi_let_floatval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       double floatval;
+       token_t real_type = spec ? real_decl_type(spec)->type : PSI_T_DOUBLE;
+
+       if (ival && (impl_type == PSI_T_FLOAT || impl_type == PSI_T_DOUBLE)) {
+               floatval = ival->dval;
+       } else {
+               floatval = zval_get_double(zvalue);
+       }
+
+       return psi_val_floatval(tmp, real_type, floatval);
 }
 
 void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
@@ -131,16 +208,10 @@ void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
        token_t t = real_decl_type(var->arg->type)->type;
 
        switch (t) {
-       case PSI_T_FLOAT:
-               RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-               break;
-       case PSI_T_DOUBLE:
-               RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-               break;
+       case PSI_T_FLOAT:               RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);             break;
+       case PSI_T_DOUBLE:              RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);                              break;
 #ifdef HAVE_LONG_DOUBLE
-       case PSI_T_LONG_DOUBLE:
-               RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->ldval);
-               break;
+       case PSI_T_LONG_DOUBLE: RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->ldval);    break;
 #endif
        default:
                if (!var->arg->var->pointer_level) {
@@ -165,9 +236,56 @@ void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
                }
                return;
        }
+
        convert_to_string(return_value);
 }
 
+impl_val *psi_let_strval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       if (ival && impl_type == PSI_T_STRING) {
+               if (ival->zend.str) {
+                       tmp->ptr = estrndup(ival->zend.str->val, ival->zend.str->len);
+                       *to_free = tmp->ptr;
+               } else {
+                       tmp->ptr = "";
+               }
+       } else {
+               zend_string *zs = zval_get_string(zvalue);
+               tmp->ptr = estrdup(zs->val);
+               *to_free = tmp->ptr;
+               zend_string_release(zs);
+       }
+
+       return tmp;
+}
+
+impl_val *psi_let_pathval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       tmp = psi_let_strval(tmp, spec, impl_type, ival, zvalue, to_free);
+       if (SUCCESS != php_check_open_basedir(tmp->ptr)) {
+               efree(tmp->ptr);
+               tmp->ptr = NULL;
+               return *to_free = NULL;
+       }
+       return tmp;
+}
+
+impl_val *psi_let_strlen(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       if (ival && impl_type == PSI_T_STRING) {
+               if (ival->zend.str) {
+                       tmp->lval = ival->zend.str->len;
+               } else {
+                       tmp->lval = 0;
+               }
+       } else {
+               zend_string *zs = zval_get_string(zvalue);
+               tmp->lval = zs->len;
+               zend_string_release(zs);
+       }
+
+       return tmp;
+}
 
 static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
 {
@@ -176,35 +294,78 @@ static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
        return tmp;
 }
 
-void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
+void psi_from_zval_ex(void *cb_ctx, impl_val **ptr, decl_arg *spec, token_t cast, zval *zv, void **tmp)
 {
-       decl_type *type = real_decl_type(spec->type);
+       decl_type *real = real_decl_type(spec->type);
+       impl_val *val = *ptr;
 
-       switch (type->type) {
+       switch (real->type) {
+       default:
+               ZEND_ASSERT(0);
+               val->i64 = zval_get_long(zv);
+               break;
+       case PSI_T_INT8:
+               val->i8 = zval_get_long(zv);
+               break;
+       case PSI_T_UINT8:
+               val->u8 = zval_get_long(zv);
+               break;
+       case PSI_T_INT16:
+               val->i16 = zval_get_long(zv);
+               break;
+       case PSI_T_UINT16:
+               val->u16 = zval_get_long(zv);
+               break;
+       case PSI_T_INT32:
+               val->i32 = zval_get_long(zv);
+               break;
+       case PSI_T_UINT32:
+               val->u32 = zval_get_long(zv);
+               break;
+       case PSI_T_INT64:
+               val->i64 = zval_get_long(zv);
+               break;
+       case PSI_T_UINT64:
+               val->u64 = zval_get_long(zv);
+               break;
        case PSI_T_FLOAT:
-               mem->fval = (float) zval_get_double(zv);
+               val->fval = zval_get_double(zv);
                break;
        case PSI_T_DOUBLE:
-               mem->dval = zval_get_double(zv);
+               val->dval = zval_get_double(zv);
+               break;
+#ifdef HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE:
+               val->ldval = zval_get_double(zv);
+               break;
+#endif
+       case PSI_T_ENUM:
+               val->ival = zval_get_long(zv);
+               break;
+       case PSI_T_STRUCT:
+               *tmp = *ptr = psi_array_to_struct_ex(real->real.strct, HASH_OF(zv), psi_from_zval_ex, cb_ctx);
+               break;
+       case PSI_T_UNION:
+               *tmp = *ptr = psi_array_to_union_ex(real->real.unn, HASH_OF(zv), psi_from_zval_ex, cb_ctx);
+               break;
+       case PSI_T_FUNCTION:
+               /*FIXME*/
+               val->ptr = NULL;
                break;
        case PSI_T_VOID:
-       case PSI_T_INT8:
-       case PSI_T_UINT8:
-               if (spec->var->pointer_level) {
+               val->ptr = NULL;
+               if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), psi_object_get_class_entry())) {
+                       *ptr = PSI_OBJ(zv, NULL)->data;
+               } else {
                        zend_string *zs = zval_get_string(zv);
-                       *tmp = mem->ptr = estrndup(zs->val, zs->len);
+                       *tmp = val->ptr = estrndup(zs->val, zs->len);
                        zend_string_release(zs);
-                       break;
                }
-               /* no break */
-       default:
-               mem->zend.lval = zval_get_long(zv);
                break;
        }
 }
 
-void *psi_array_to_struct(decl_struct *s, HashTable *arr)
-{
+void *psi_array_to_struct_ex(decl_struct *s, HashTable *arr, psi_marshal_zval cb, void *cb_ctx) {
        size_t i, j = 0;
        char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
 
@@ -213,12 +374,12 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
                zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
 
                if (entry) {
-                       impl_val val;
+                       impl_val val, *ptr = &val;
                        void *tmp = NULL;
 
-                       memset(&tmp, 0, sizeof(tmp));
-                       psi_from_zval(&val, darg, entry, &tmp);
-                       memcpy(mem + darg->layout->pos, &val, darg->layout->len);
+                       memset(&val, 0, sizeof(val));
+                       cb(cb_ctx, &ptr, darg, /*FIXME*/0, entry, &tmp);
+                       memcpy(mem + darg->layout->pos, ptr, darg->layout->len);
                        if (tmp) {
                                ((void **)(mem + s->size))[j++] = tmp;
                        }
@@ -227,8 +388,42 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
        return mem;
 }
 
-void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val)
+void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 {
+       return psi_array_to_struct_ex(s, arr, psi_from_zval_ex, NULL);
+}
+
+void *psi_array_to_union_ex(decl_union *u, HashTable *arr, psi_marshal_zval cb, void *cb_ctx) {
+       size_t i;
+       char *mem = ecalloc(1, u->size + sizeof(void *));
+
+       if (arr) for (i = 0; i < u->args->count; ++i) {
+               decl_arg *darg = u->args->args[i];
+               zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
+
+               if (entry) {
+                       impl_val val, *ptr = &val;
+                       void *tmp = NULL;
+
+                       memset(&val, 0, sizeof(val));
+                       cb(cb_ctx, &ptr, darg, /*FIXME*/0, entry, &tmp);
+                       memcpy(mem, &val, darg->layout->len);
+                       if (tmp) {
+                               ((void **)(mem + u->size))[0] = tmp;
+                       }
+                       /* first found entry wins */
+                       break;
+               }
+       }
+
+       return mem;
+}
+
+void *psi_array_to_union(decl_union *u, HashTable *arr) {
+       return psi_array_to_union_ex(u, arr, psi_from_zval_ex, NULL);
+}
+
+void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val) {
        set->outer.set->func->handler(return_value, set, r_val);
 }
 
@@ -245,7 +440,7 @@ void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 
        array_init(return_value);
 
-       if (t == PSI_T_STRUCT) {
+       if (t == PSI_T_STRUCT || t == PSI_T_UNION) {
                // decl_struct *s = real_decl_type(var->arg->type)->strct;
 
                if (set->inner && set->inner->count) {
@@ -269,8 +464,8 @@ void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
                                        }
                                }
                        }
+                       return;
                }
-               return;
        }
 
        if (var->arg->var->array_size) {
@@ -325,17 +520,55 @@ void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
        }
 }
 
+impl_val *psi_let_arrval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       decl_type *real = real_decl_type(spec);
+       HashTable *arr;
+
+       if (impl_type != PSI_T_ARRAY) {
+               SEPARATE_ARG_IF_REF(zvalue);
+               convert_to_array(zvalue);
+       }
+       arr = HASH_OF(zvalue);
+
+       switch (real->type) {
+       case PSI_T_STRUCT:
+               *to_free = tmp = psi_array_to_struct(real->real.strct, arr);
+               break;
+       case PSI_T_UNION:
+               *to_free = tmp = psi_array_to_union(real->real.unn, arr);
+               break;
+       EMPTY_SWITCH_DEFAULT_CASE();
+       }
+
+       return tmp;
+}
+
 void psi_to_object(zval *return_value, set_value *set, impl_val *r_val)
 {
        decl_var *var = set->vars->vars[0];
        impl_val *ret_val = deref_impl_val(r_val, var);
-       psi_object *obj;
 
        if ((intptr_t) ret_val->ptr > (intptr_t) 0) {
                object_init_ex(return_value, psi_object_get_class_entry());
-               obj = PSI_OBJ(return_value, NULL);
-               obj->data = ret_val->ptr;
+               PSI_OBJ(return_value, NULL)->data = ret_val->ptr;
        } else {
                RETVAL_NULL();
        }
 }
+
+impl_val *psi_let_objval(impl_val *tmp, decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+{
+       psi_object *obj;
+
+       if (Z_TYPE_P(zvalue) != IS_OBJECT
+       ||      !instanceof_function(Z_OBJCE_P(zvalue), psi_object_get_class_entry())) {
+               return NULL;
+       }
+
+       obj = PSI_OBJ(zvalue, NULL);
+       tmp->ptr = obj->data;
+
+       return tmp;
+}
+