Changeset 273 for trunk/ext/php

Timestamp:

10/04/2007 15:22:32 (14 months ago)

Author:

indeyets

Message:

- fixed dumping of mixed arrays and numeric-arrays starting from non-zero digit
- added some Dump-tests

Location:

trunk/ext/php

Files:

• CHANGELOG (modified) (1 diff)
• phpext.c (modified) (6 diffs)
• phpunit-tests/TestDump.php (added)

trunk/ext/php/CHANGELOG

@@ -1 +1 @@
 --- %YAML:1.0
 - version: 0.9.2
-  date: 2007-08-??
+  date: 2007-09-??
   status: beta
   changes:
     - short-and-flat arrays are dumped using inline-mode now (for readability)
     - gcc-2.95 compatibility (patch by Brian J. France)
+    - fixed dumping of mixed arrays and numeric-arrays starting from non-zero digit
 
 - version: 0.9.1

trunk/ext/php/phpext.c

@@ -32 +32 @@
 #include "php_syck.h"
 
-#define PHP_SYCK_VERSION "@PACKAGE_VERSION@"
+#define PHP_SYCK_VERSION "0.9.2-dev"
 
 /**
@@ -134 +134 @@
         return ptr->stack[(ptr->level)--];
 }
+
+
+
+
+/**
+ * returns
+ *   0 for sequential numeric arrays
+ *   1 for insequential or associative arrays
+ */
+static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */
+{
+        int i = myht ? zend_hash_num_elements(myht) : 0;
+
+        if (i > 0) {
+                char *key;
+                uint key_len;
+                HashPosition pos;
+                ulong index, idx = 0;
+
+                zend_hash_internal_pointer_reset_ex(myht, &pos);
+
+                for (;; zend_hash_move_forward_ex(myht, &pos)) {
+                        i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos);
+
+                        if (i == HASH_KEY_NON_EXISTANT)
+                                break;
+
+                        if (i == HASH_KEY_IS_STRING) {
+                                return 1;
+                        } else {
+                                if (index != idx) {
+                                        return 1;
+                                }
+                        }
+
+                        idx++;
+                }
+        }
+
+        return 0;
+}
+
+
+
 
 function_entry syck_functions[] = {
@@ -416 +460 @@
         php_syck_emitter_xtra *bonus = (php_syck_emitter_xtra *) e->bonus;
         zval *data = bonus->stack[id];
+        TSRMLS_FETCH();
 
         switch (Z_TYPE_P(data)) {
@@ -481 +526 @@
                         }
 
-                        if (zend_hash_index_exists(tbl, 0)) {
+                        if (0 == psex_determine_array_type(tbl TSRMLS_CC)) {
                                 /* indexed array */
                                 if (flat_and_short)
@@ -509 +554 @@
                                         zval **ppzval, kzval;
                                         char *key;
-                                        size_t key_len, idx;
+                                        size_t key_len, idx, key_type;
 
                                         zend_hash_get_current_key_ex(tbl, (char **)&key, (uint *)&key_len, &idx, 0, NULL);
                                         zend_hash_get_current_data(tbl, (void **)&ppzval);
+                                        key_type = zend_hash_get_current_key_type_ex(tbl, NULL);
+
+                                        if (key_type == HASH_KEY_IS_LONG) {
+                                                key_len = 1 + snprintf(key, 0, "%ld", idx); /* getting size ("0" doesn't let output) */
+                                                key = emalloc(key_len);
+                                                snprintf(key, key_len, "%ld", idx);
+                                        }
 
                                         ZVAL_STRINGL(&kzval, key, key_len - 1, 1);
@@ -527 +579 @@
 
                                         zval_dtor(&kzval);
+
+                                        if (key_type == HASH_KEY_IS_LONG) {
+                                                efree(key);
+                                        }
                                 }