Reimplement strtr()

dstogov · dstogov · commit b1ff15278271 · 2014-04-24T19:14:29.000+04:00
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
@@ -313,6 +313,15 @@ ZEND_API zval *_zend_hash_str_add_or_update(HashTable *ht, const char *str, int
 	return ret;
 }
 
+ZEND_API zval *zend_hash_index_add_empty_element(HashTable *ht, ulong h)
+{
+	
+	zval dummy;
+
+	ZVAL_NULL(&dummy);
+	return zend_hash_index_add(ht, h, &dummy);
+}
+
 ZEND_API zval *zend_hash_add_empty_element(HashTable *ht, zend_string *key)
 {
 	
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
@@ -96,6 +96,7 @@ ZEND_API zval *_zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, zv
 #define zend_hash_next_index_insert(ht, pData) \
 		_zend_hash_index_update_or_next_insert(ht, 0, pData, HASH_NEXT_INSERT ZEND_FILE_LINE_CC)
 
+ZEND_API zval *zend_hash_index_add_empty_element(HashTable *ht, ulong h);
 ZEND_API zval *zend_hash_add_empty_element(HashTable *ht, zend_string *key);
 ZEND_API zval *zend_hash_str_add_empty_element(HashTable *ht, const char *key, int len);
 
@@ -569,6 +570,10 @@ static inline void *zend_hash_get_current_data_ptr_ex(HashTable *ht, HashPositio
 	ZEND_HASH_FOREACH(ht, 0); \
 	_ptr = Z_PTR_P(_z);
 
+#define ZEND_HASH_FOREACH_NUM_KEY(ht, _h) \
+	ZEND_HASH_FOREACH(ht, 0); \
+	_h = _p->h;
+
 #define ZEND_HASH_FOREACH_STR_KEY(ht, _key) \
 	ZEND_HASH_FOREACH(ht, 0); \
 	_key = _p->key;
diff --git a/ext/standard/string.c b/ext/standard/string.c

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,15 @@ ZEND_API zval _zend_hash_str_add_or_update(HashTable ht, const char *str, int`
`313`	`313`	`return ret;`
`314`	`314`	`}`
`315`	`315`
	`316`	`+ZEND_API zval zend_hash_index_add_empty_element(HashTable ht, ulong h)`
	`317`	`+{`
	`318`	`+`
	`319`	`+ zval dummy;`
	`320`	`+`
	`321`	`+ ZVAL_NULL(&dummy);`
	`322`	`+ return zend_hash_index_add(ht, h, &dummy);`
	`323`	`+}`
	`324`	`+`
`316`	`325`	`ZEND_API zval zend_hash_add_empty_element(HashTable ht, zend_string *key)`
`317`	`326`	`{`
`318`	`327`