Changeset 254 for trunk

Timestamp:

03/05/2007 09:34:56 (21 months ago)

Author:

indeyets

Message:

micro-optimizations

Location:

trunk/ext/php

Files:

• php_syck.h (modified) (1 diff)
• phpext.c (modified) (3 diffs)

trunk/ext/php/php_syck.h

@@ -36 +36 @@
 
 PHP_MINIT_FUNCTION(syck);
-PHP_MSHUTDOWN_FUNCTION(syck);
-PHP_RINIT_FUNCTION(syck);
-PHP_RSHUTDOWN_FUNCTION(syck);
 PHP_MINFO_FUNCTION(syck);
-
-PHP_FUNCTION(mergekey_init);
 
 PHP_FUNCTION(syck_load);

trunk/ext/php/phpext.c

@@ -119 +119 @@
 SYMID php_syck_handler(SyckParser *p, SyckNode *n)
 {
-        SYMID oid;
-        zval *o, *o2, *o3;
-        unsigned int i;
+        zval *o;
 
         MAKE_STD_ZVAL(o);
+
         switch (n->kind) {
                 case syck_str_kind:
@@ -166 +165 @@
 
                 case syck_seq_kind:
+                {
+                        SYMID oid;
+                        size_t i;
+                        zval *o2;
+
                         array_init(o);
+
                         for (i = 0; i < n->data.list->idx; i++) {
                                 oid = syck_seq_read(n, i);
@@ -173 +178 @@
                                 add_index_zval(o, i, o2);
                         }
+                }
                 break;
 
                 case syck_map_kind:
+                {
+                        SYMID oid;
+                        size_t i;
+                        zval *o2, *o3;
+
                         array_init(o);
+
                         for (i = 0; i < n->data.pairs->idx; i++) {
                                 oid = syck_map_read(n, map_key, i);
                                 syck_lookup_sym(p, oid, (char **) &o2); /* retrieving key-node */
 
-                                oid = syck_map_read(n, map_value, i);
-                                syck_lookup_sym(p, oid, (char **) &o3); /* retrieving value-node */
-
                                 if (o2->type == IS_STRING) {
+                                        oid = syck_map_read(n, map_value, i);
+                                        syck_lookup_sym(p, oid, (char **) &o3); /* retrieving value-node */
+
                                         add_assoc_zval(o, o2->value.str.val, o3);
-                                        zval_ptr_dtor(&o2);
                                 }
+
+                                zval_ptr_dtor(&o2);
                         }
+                }
                 break;
         }