X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.c;h=a3db8bbcd52827c0f1258d4a841a77fa55975042;hp=589be7713e4378b426901d143a0b925d8ae84f80;hb=f593714e2c393c83f6224adf116f18ffae094d06;hpb=74657a40eda33c53f79fb132b64fe1a045232fd9

diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c
index 589be77..a3db8bb 100644
--- a/src/php_pq_misc.c
+++ b/src/php_pq_misc.c
@@ -25,6 +25,8 @@
 #include "php_pq.h"
 #include "php_pqexc.h"
 #include "php_pq_misc.h"
+#undef PHP_PQ_TYPE
+#include "php_pq_type.h"
 
 char *php_pq_rtrim(char *e)
 {
@@ -82,7 +84,6 @@ static PHP_METHOD(pqdt, __toString)
 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_OBJ_INFO(0, timezone, DateTimezone, 1) date's arginfo is not specific */
 	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqdt, createFromFormat)
@@ -91,7 +92,7 @@ static PHP_METHOD(pqdt, createFromFormat)
 	char *fmt_str, *dt_str;
 	int fmt_len, dt_len;
 	zval *ztz = NULL;
-	STATUS rv;
+	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());
@@ -236,7 +237,7 @@ 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;
@@ -266,9 +267,9 @@ static STATUS add_element(ArrayParserState *a, const char *start)
 	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);
@@ -285,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;
@@ -301,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;
 		}
 	}
 
@@ -322,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;
 
@@ -346,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;