cvs: php-gtk /src php_gtk_util.c

From: Date: Fri, 09 Mar 2001 05:38:01 +0000
Subject: cvs: php-gtk /src php_gtk_util.c
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-594@lists.php.net to get a copy of this message
andrei Thu Mar 8 21:38:01 2001 EDT Modified files: /php-gtk/src php_gtk_util.c Log: Just in case, modifying php_gtk_build_value() to allow building associative arrays. Index: php-gtk/src/php_gtk_util.c diff -u php-gtk/src/php_gtk_util.c:1.10 php-gtk/src/php_gtk_util.c:1.11 --- php-gtk/src/php_gtk_util.c:1.10 Mon Mar 5 20:53:39 2001 +++ php-gtk/src/php_gtk_util.c Thu Mar 8 21:38:01 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_util.c,v 1.10 2001/03/06 04:53:39 andrei Exp $ */ +/* $Id: php_gtk_util.c,v 1.11 2001/03/09 05:38:01 andrei Exp $ */ #include "php_gtk.h" @@ -535,16 +535,20 @@ return -1; case '(': + case '{': if (level == 0) count++; level++; break; case ')': + case '}': level--; break; case '#': + case ':': + case ',': case ' ': case '\t': break; @@ -552,7 +556,6 @@ default: if (level == 0) count++; - break; } format++; } @@ -572,6 +575,9 @@ case '(': return php_gtk_build_hash(format, va, ')', php_gtk_count_specs(*format, ')')); + case '{': + return php_gtk_build_hash(format, va, '}', php_gtk_count_specs(*format, '}')); + case 'b': MAKE_STD_ZVAL(result); ZVAL_BOOL(result, (zend_bool)va_arg(*va, int)); @@ -620,6 +626,8 @@ zval_add_ref(&result); return result; + case ':': + case ',': case ' ': case '\t': break; @@ -642,17 +650,45 @@ MAKE_STD_ZVAL(result); array_init(result); + + if (endchar == ')') { + for (i = 0; i < count; i++) { + single = php_gtk_build_single(format, va); + if (!single) { + zval_ptr_dtor(&result); + return NULL; + } + zend_hash_next_index_insert(Z_ARRVAL_P(result), &single, sizeof(zval *), NULL); + } + } else if (endchar == '}') { + zval *key; + + for (i = 0; i < count; i += 2) { + key = php_gtk_build_single(format, va); + if (!key) { + zval_ptr_dtor(&result); + return NULL; + } + + single = php_gtk_build_single(format, va); + if (!single) { + zval_ptr_dtor(&key); + zval_ptr_dtor(&result); + return NULL; + } + + if (Z_TYPE_P(key) != IS_STRING && Z_TYPE_P(key) != IS_LONG) + convert_to_string(key); - for (i = 0; i < count; i++) { - single = php_gtk_build_single(format, va); - if (!single) { - zval_dtor(result); - return NULL; + if (Z_TYPE_P(key) == IS_LONG) + add_index_zval(result, Z_LVAL_P(key), single); + else + add_assoc_zval_ex(result, Z_STRVAL_P(key), Z_STRLEN_P(key)+1, single); + zval_ptr_dtor(&key); } - zend_hash_next_index_insert(Z_ARRVAL_P(result), &single, sizeof(zval *), NULL); } if (**format != endchar) { - zval_dtor(result); + zval_ptr_dtor(&result); php_error(E_WARNING, "%s(): internal error: unmatched parenthesis in format", get_active_function_name()); return NULL; } else if (endchar) @@ -667,9 +703,7 @@ zval *result; va_list va; - if (count < 0) - return NULL; - else if (count == 0) { + if (count <= 0) { MAKE_STD_ZVAL(result); ZVAL_NULL(result); return result; @@ -683,6 +717,12 @@ result = php_gtk_build_hash(&format, &va, '\0', count); va_end(va); + + if (result == NULL) { + MAKE_STD_ZVAL(result); + ZVAL_NULL(result); + } + return result; }

« previous php.gtk (#594) next »