X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.c;h=a3db8bbcd52827c0f1258d4a841a77fa55975042;hp=72fa07bac306736800ec53ec4b762584ccb8d462;hb=d3fbce1b02b41d7ee1f3d0b60dc8df411aae7d79;hpb=9e37136f3b7f6d2d2d35b5626cd56dab0d5acce3 diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c index 72fa07b..a3db8bb 100644 --- a/src/php_pq_misc.c +++ b/src/php_pq_misc.c @@ -17,18 +17,18 @@ #include #include #include -#if defined(HAVE_JSON) && !defined(COMPILE_DL_JSON) -# include -#endif #include #include #include "php_pq.h" +#include "php_pqexc.h" #include "php_pq_misc.h" +#undef PHP_PQ_TYPE +#include "php_pq_type.h" -char *rtrim(char *e) +char *php_pq_rtrim(char *e) { size_t l = strlen(e); @@ -38,7 +38,7 @@ char *rtrim(char *e) return e; } -const char *strmode(long mode) +const char *php_pq_strmode(long mode) { switch (mode & (INV_READ|INV_WRITE)) { case INV_READ|INV_WRITE: @@ -52,7 +52,7 @@ const char *strmode(long mode) } } -int compare_index(const void *lptr, const void *rptr TSRMLS_DC) +int php_pq_compare_index(const void *lptr, const void *rptr TSRMLS_DC) { const Bucket *l = *(const Bucket **) lptr; const Bucket *r = *(const Bucket **) rptr; @@ -66,141 +66,51 @@ int compare_index(const void *lptr, const void *rptr TSRMLS_DC) return 0; } -static int apply_to_oid(void *p, void *arg TSRMLS_DC) -{ - Oid **types = arg; - zval **ztype = p; - - if (Z_TYPE_PP(ztype) != IS_LONG) { - convert_to_long_ex(ztype); - } - - **types = Z_LVAL_PP(ztype); - ++*types; - - if (*ztype != *(zval **)p) { - zval_ptr_dtor(ztype); - } - return ZEND_HASH_APPLY_KEEP; -} - -static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) -{ - char ***params; - HashTable *zdtor; - zval **zparam = p; - - params = (char ***) va_arg(argv, char ***); - zdtor = (HashTable *) va_arg(argv, HashTable *); - - switch (Z_TYPE_PP(zparam)) { - case IS_NULL: - **params = NULL; - ++*params; - break; - - case IS_BOOL: - **params = Z_BVAL_PP(zparam) ? "t" : "f"; - ++*params; - break; - - case IS_DOUBLE: - SEPARATE_ZVAL(zparam); - Z_TYPE_PP(zparam) = IS_STRING; - Z_STRLEN_PP(zparam) = spprintf(&Z_STRVAL_PP(zparam), 0, "%F", Z_DVAL_PP((zval **)p)); - /* no break */ - - default: - convert_to_string_ex(zparam); - /* no break */ - - case IS_STRING: - **params = Z_STRVAL_PP(zparam); - ++*params; - - if (*zparam != *(zval **)p) { - zend_hash_next_index_insert(zdtor, zparam, sizeof(zval *), NULL); - } - break; - } - - return ZEND_HASH_APPLY_KEEP; -} - -int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC) -{ - int count = zend_hash_num_elements(ht); - - *types = NULL; - - if (count) { - Oid *tmp; - - /* +1 for when less types than params are specified */ - *types = tmp = ecalloc(count + 1, sizeof(**types)); - zend_hash_apply_with_argument(ht, apply_to_oid, &tmp TSRMLS_CC); - } - - return count; -} - -int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdtor TSRMLS_DC) -{ - int count = zend_hash_num_elements(ht); - - *params = NULL; - - if (count) { - char **tmp; - - *params = tmp = ecalloc(count, sizeof(char *)); - zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_param, 2, &tmp, zdtor); - } - - return count; -} - -/* -Oid *php_pq_ntypes_to_array(zend_bool fill, int argc, ...) -{ - int i; - Oid *oids = ecalloc(argc + 1, sizeof(*oids)); - va_list argv; - - va_start(argv, argc); - for (i = 0; i < argc; ++i) { - if (!fill || !i) { - oids[i] = va_arg(argv, Oid); - } else { - oids[i] = oids[0]; - } - } - va_end(argv); - - return oids; -} -*/ - zend_class_entry *php_pqdt_class_entry; ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_to_string, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(pqdt, __toString) { - zval *rv; + zval *rv = NULL; zend_call_method_with_1_params(&getThis(), php_pqdt_class_entry, NULL, "format", &rv, zend_read_property(php_pqdt_class_entry, getThis(), ZEND_STRL("format"), 0 TSRMLS_CC)); - RETVAL_ZVAL(rv, 1, 1); + if (rv) { + RETVAL_ZVAL(rv, 1, 1); + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_create_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, datetime) + ZEND_ARG_INFO(0, timezone) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqdt, createFromFormat) +{ + zend_error_handling zeh; + char *fmt_str, *dt_str; + int fmt_len, dt_len; + zval *ztz = NULL; + ZEND_RESULT_CODE rv; + + zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC); + rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|O", &fmt_str, &fmt_len, &dt_str, &dt_len, &ztz, php_date_get_timezone_ce()); + zend_restore_error_handling(&zeh TSRMLS_CC); + + if (SUCCESS == rv) { + php_pqdt_from_string(return_value, fmt_str, dt_str, dt_len, "Y-m-d H:i:s.uO", ztz TSRMLS_CC); + } } static zend_function_entry php_pqdt_methods[] = { + PHP_ME(pqdt, createFromFormat, ai_pqdt_create_from_format, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(pqdt, __toString, ai_pqdt_to_string, ZEND_ACC_PUBLIC) PHP_MALIAS(pqdt, jsonSerialize, __toString, ai_pqdt_to_string, ZEND_ACC_PUBLIC) {0} }; -zval *php_pqdt_from_string(char *dt_str, size_t dt_len, char *fmt, zval *zv TSRMLS_DC) +zval *php_pqdt_from_string(zval *zv, char *input_fmt, char *dt_str, size_t dt_len, char *output_fmt, zval *ztimezone TSRMLS_DC) { php_date_obj *dobj; @@ -210,24 +120,81 @@ zval *php_pqdt_from_string(char *dt_str, size_t dt_len, char *fmt, zval *zv TSRM php_date_instantiate(php_pqdt_class_entry, zv TSRMLS_CC); dobj = zend_object_store_get_object(zv TSRMLS_CC); - if (!php_date_initialize(dobj, dt_str, dt_len, NULL, NULL, 1 TSRMLS_CC)) { + if (!php_date_initialize(dobj, dt_str, dt_len, input_fmt, ztimezone, 1 TSRMLS_CC)) { zval_dtor(zv); ZVAL_NULL(zv); - } else if (fmt) { - zend_update_property_string(php_pqdt_class_entry, zv, ZEND_STRL("format"), fmt TSRMLS_CC); + } else if (output_fmt) { + zend_update_property_string(php_pqdt_class_entry, zv, ZEND_STRL("format"), output_fmt TSRMLS_CC); } return zv; } +void php_pqdt_to_string(zval *zdt, const char *format, char **str_buf, size_t *str_len TSRMLS_DC) +{ + zval rv; + + INIT_PZVAL(&rv); + ZVAL_NULL(&rv); + + if (Z_OBJ_HT_P(zdt)->cast_object + && SUCCESS == Z_OBJ_HT_P(zdt)->cast_object(zdt, &rv, IS_STRING TSRMLS_CC) + ) { + *str_len = Z_STRLEN(rv); + *str_buf = Z_STRVAL(rv); + } else if (instanceof_function(Z_OBJCE_P(zdt), php_date_get_date_ce() TSRMLS_CC)) { + zval *rv = NULL, *zfmt; + + MAKE_STD_ZVAL(zfmt); + ZVAL_STRING(zfmt, format, 1); + zend_call_method_with_1_params(&zdt, Z_OBJCE_P(zdt), NULL, "format", &rv, zfmt); + zval_ptr_dtor(&zfmt); + + if (rv) { + if (Z_TYPE_P(rv) == IS_STRING) { + *str_len = Z_STRLEN_P(rv); + *str_buf = estrndup(Z_STRVAL_P(rv), *str_len); + } + zval_ptr_dtor(&rv); + } + } +} + +zend_class_entry *php_pqconv_class_entry; + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_types, 0, 0, 0) +ZEND_END_ARG_INFO(); + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_from_string, 0, 0, 2) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO(); + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_to_string, 0, 0, 2) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO(); + +zend_function_entry php_pqconv_methods[] = { + PHP_ABSTRACT_ME(pqconv, convertTypes, ai_pqconv_convert_types) + PHP_ABSTRACT_ME(pqconv, convertFromString, ai_pqconv_convert_from_string) + PHP_ABSTRACT_ME(pqconv, convertToString, ai_pqconv_convert_to_string) + {0} +}; + + PHP_MINIT_FUNCTION(pq_misc) { zend_class_entry **json, ce = {0}; + INIT_NS_CLASS_ENTRY(ce, "pq", "Converter", php_pqconv_methods); + php_pqconv_class_entry = zend_register_internal_interface(&ce TSRMLS_CC); + + memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce ,"pq", "DateTime", php_pqdt_methods); php_pqdt_class_entry = zend_register_internal_class_ex(&ce, php_date_get_date_ce(), "DateTime" TSRMLS_CC); - zend_declare_property_stringl(php_pqdt_class_entry, ZEND_STRL("format"), ZEND_STRL("Y-m-d H:i:s.u"), ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_stringl(php_pqdt_class_entry, ZEND_STRL("format"), ZEND_STRL("Y-m-d H:i:s.uO"), ZEND_ACC_PUBLIC TSRMLS_CC); /* stop reading this file right here! */ if (SUCCESS == zend_hash_find(CG(class_table), ZEND_STRS("jsonserializable"), (void *) &json)) { @@ -245,9 +212,11 @@ typedef struct _HashTableList { typedef struct _ArrayParserState { const char *ptr, *end; HashTableList *list; + php_pqres_t *res; #ifdef ZTS void ***ts; #endif + Oid typ; unsigned quotes:1; unsigned escaped:1; } ArrayParserState; @@ -268,42 +237,39 @@ static char caa(ArrayParserState *a, const char *any, unsigned advance) return 0; } -static STATUS add_element(ArrayParserState *a, const char *start) +static ZEND_RESULT_CODE add_element(ArrayParserState *a, const char *start) { zval *zelem; + size_t el_len = a->ptr - start; + char *el_str = estrndup(start, el_len); TSRMLS_FETCH_FROM_CTX(a->ts); - MAKE_STD_ZVAL(zelem); if (a->quotes) { - ZVAL_STRINGL(zelem, start, a->ptr - start, 1); - php_stripslashes(Z_STRVAL_P(zelem), &Z_STRLEN_P(zelem) TSRMLS_CC); + int tmp_len = el_len; + + php_stripslashes(el_str, &tmp_len TSRMLS_CC); + el_len = tmp_len; } else if ((a->ptr - start == 4) && !strncmp(start, "NULL", 4)) { + efree(el_str); + el_str = NULL; + el_len = 0; + } + + if (!el_str) { + MAKE_STD_ZVAL(zelem); ZVAL_NULL(zelem); } else { - long lval = 0; - double dval = 0; - - switch (is_numeric_string(start, a->ptr - start, &lval, &dval, 0)) { - case IS_LONG: - ZVAL_LONG(zelem, lval); - break; - - case IS_DOUBLE: - ZVAL_DOUBLE(zelem, dval); - break; + zelem = php_pqres_typed_zval(a->res, el_str, el_len, a->typ TSRMLS_CC); - default: - ZVAL_STRINGL(zelem, start, a->ptr - start, 1); - break; - } + efree(el_str); } return zend_hash_next_index_insert(&a->list->ht, &zelem, sizeof(zval *), NULL); } -static STATUS parse_array(ArrayParserState *a); +static ZEND_RESULT_CODE parse_array(ArrayParserState *a); -static STATUS parse_element(ArrayParserState *a) +static ZEND_RESULT_CODE parse_element(ArrayParserState *a, char delim) { const char *el; TSRMLS_FETCH_FROM_CTX(a->ts); @@ -320,6 +286,10 @@ static STATUS parse_element(ArrayParserState *a) for (el = a->ptr; a->ptr < a->end; ++a->ptr) { switch (*a->ptr) { + case '\\': + a->escaped = !a->escaped; + break; + case '"': if (a->escaped) { a->escaped = 0; @@ -336,20 +306,18 @@ static STATUS parse_element(ArrayParserState *a) } break; - case ',': + default: + if (delim != *a->ptr) { + a->escaped = 0; + break; + } + /* no break */ case '}': if (!a->quotes) { return add_element(a, el); } break; - case '\\': - a->escaped = !a->escaped; - break; - - default: - a->escaped = 0; - break; } } @@ -357,12 +325,13 @@ static STATUS parse_element(ArrayParserState *a) return FAILURE; } -static STATUS parse_elements(ArrayParserState *a) +static ZEND_RESULT_CODE parse_elements(ArrayParserState *a) { + char delims[] = {'}', PHP_PQ_DELIM_OF_ARRAY(a->typ), 0}; TSRMLS_FETCH_FROM_CTX(a->ts); - while (SUCCESS == parse_element(a)) { - switch (caa(a, ",}", 0)) { + while (SUCCESS == parse_element(a, delims[1])) { + switch (caa(a, delims, 0)) { case 0: return FAILURE; @@ -381,7 +350,7 @@ static STATUS parse_elements(ArrayParserState *a) return FAILURE; } -static STATUS parse_array(ArrayParserState *a) +static ZEND_RESULT_CODE parse_array(ArrayParserState *a) { HashTableList *list; @@ -420,14 +389,16 @@ static STATUS parse_array(ArrayParserState *a) return SUCCESS; } -HashTable *php_pq_parse_array(const char *val_str, size_t val_len TSRMLS_DC) +HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ TSRMLS_DC) { HashTable *ht = NULL; ArrayParserState a = {0}; TSRMLS_SET_CTX(a.ts); + a.typ = typ; a.ptr = val_str; a.end = val_str + val_len; + a.res = res; if (SUCCESS != parse_array(&a)) { while (a.list) { @@ -451,6 +422,7 @@ HashTable *php_pq_parse_array(const char *val_str, size_t val_len TSRMLS_DC) return ht; } + /* * Local variables: * tab-width: 4