Implement strtr frameless handlers

Author: iluuu1994

ext/standard/basic_functions.stub.php

@@ -2472,6 +2472,8 @@ function ucwords(string $string, string $separators = " \t\r\n\f\v"): string {}
 
 /**
  * @compile-time-eval
+ * @frameless-function {"arity": 2}
+ * @frameless-function {"arity": 3}
  */
 function strtr(string $string, string|array $from, ?string $to = null): string {}
 

ext/standard/basic_functions_arginfo.h

@@ -2875,8 +2875,7 @@ static zend_string *php_strtr_ex(zend_string *str, const char *str_from, const c
 }
 /* }}} */
 
-/* {{{ php_strtr_array */
-static void php_strtr_array(zval *return_value, zend_string *input, HashTable *pats)
+static void php_strtr_array_ex(zval *return_value, zend_string *input, HashTable *pats)
 {
 	const char *str = ZSTR_VAL(input);
 	size_t slen = ZSTR_LEN(input);
@@ -3010,7 +3009,6 @@ static void php_strtr_array(zval *return_value, zend_string *input, HashTable *p
 	}
 	efree(num_bitset);
 }
-/* }}} */
 
 /* {{{ count_chars */
 static zend_always_inline zend_long count_chars(const char *p, zend_long length, char ch)
@@ -3369,6 +3367,46 @@ PHPAPI zend_string *php_str_to_str(const char *haystack, size_t length, const ch
 }
 /* }}} */
 
+static void php_strtr_array(zval *return_value, zend_string *str, HashTable *from_ht)
+{
+	if (zend_hash_num_elements(from_ht) < 1) {
+		RETURN_STR_COPY(str);
+	} else if (zend_hash_num_elements(from_ht) == 1) {
+		zend_long num_key;
+		zend_string *str_key, *tmp_str, *replace, *tmp_replace;
+		zval *entry;
+
+		ZEND_HASH_FOREACH_KEY_VAL(from_ht, num_key, str_key, entry) {
+			tmp_str = NULL;
+			if (UNEXPECTED(!str_key)) {
+				str_key = tmp_str = zend_long_to_str(num_key);
+			}
+			replace = zval_get_tmp_string(entry, &tmp_replace);
+			if (ZSTR_LEN(str_key) < 1) {
+				php_error_docref(NULL, E_WARNING, "Ignoring replacement of empty string");
+				RETVAL_STR_COPY(str);
+			} else if (ZSTR_LEN(str_key) == 1) {
+				RETVAL_STR(php_char_to_str_ex(str,
+							ZSTR_VAL(str_key)[0],
+							ZSTR_VAL(replace),
+							ZSTR_LEN(replace),
+							/* case_sensitive */ true,
+							NULL));
+			} else {
+				zend_long dummy;
+				RETVAL_STR(php_str_to_str_ex(str,
+							ZSTR_VAL(str_key), ZSTR_LEN(str_key),
+							ZSTR_VAL(replace), ZSTR_LEN(replace), &dummy));
+			}
+			zend_tmp_string_release(tmp_str);
+			zend_tmp_string_release(tmp_replace);
+			return;
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		php_strtr_array_ex(return_value, str, from_ht);
+	}
+}
+
 /* {{{ Translates characters in str using given translation tables */
 PHP_FUNCTION(strtr)
 {
@@ -3396,42 +3434,7 @@ PHP_FUNCTION(strtr)
 	}
 
 	if (!to) {
-		if (zend_hash_num_elements(from_ht) < 1) {
-			RETURN_STR_COPY(str);
-		} else if (zend_hash_num_elements(from_ht) == 1) {
-			zend_long num_key;
-			zend_string *str_key, *tmp_str, *replace, *tmp_replace;
-			zval *entry;
-
-			ZEND_HASH_FOREACH_KEY_VAL(from_ht, num_key, str_key, entry) {
-				tmp_str = NULL;
-				if (UNEXPECTED(!str_key)) {
-					str_key = tmp_str = zend_long_to_str(num_key);
-				}
-				replace = zval_get_tmp_string(entry, &tmp_replace);
-				if (ZSTR_LEN(str_key) < 1) {
-					php_error_docref(NULL, E_WARNING, "Ignoring replacement of empty string");
-					RETVAL_STR_COPY(str);
-				} else if (ZSTR_LEN(str_key) == 1) {
-					RETVAL_STR(php_char_to_str_ex(str,
-								ZSTR_VAL(str_key)[0],
-								ZSTR_VAL(replace),
-								ZSTR_LEN(replace),
-								/* case_sensitive */ true,
-								NULL));
-				} else {
-					zend_long dummy;
-					RETVAL_STR(php_str_to_str_ex(str,
-								ZSTR_VAL(str_key), ZSTR_LEN(str_key),
-								ZSTR_VAL(replace), ZSTR_LEN(replace), &dummy));
-				}
-				zend_tmp_string_release(tmp_str);
-				zend_tmp_string_release(tmp_replace);
-				return;
-			} ZEND_HASH_FOREACH_END();
-		} else {
-			php_strtr_array(return_value, str, from_ht);
-		}
+		php_strtr_array(return_value, str, from_ht);
 	} else {
 		RETURN_STR(php_strtr_ex(str,
 				  ZSTR_VAL(from_str),
@@ -3441,6 +3444,48 @@ PHP_FUNCTION(strtr)
 }
 /* }}} */
 
+ZEND_FRAMELESS_FUNCTION(strtr, 2)
+{
+	zval str_tmp;
+	zend_string *str;
+	zval *from;
+
+	Z_FLF_PARAM_STR(1, str, str_tmp);
+	Z_FLF_PARAM_ARRAY(2, from);
+
+	if (ZSTR_LEN(str) == 0) {
+		RETVAL_EMPTY_STRING();
+		goto flf_clean;
+	}
+
+	php_strtr_array(return_value, str, Z_ARR_P(from));
+
+flf_clean:
+	Z_FLF_PARAM_FREE_STR(1, str_tmp);
+}
+
+ZEND_FRAMELESS_FUNCTION(strtr, 3)
+{
+	zval str_tmp, from_tmp, to_tmp;
+	zend_string *str, *from, *to;
+
+	Z_FLF_PARAM_STR(1, str, str_tmp);
+	Z_FLF_PARAM_STR(2, from, from_tmp);
+	Z_FLF_PARAM_STR(3, to, to_tmp);
+
+	if (ZSTR_LEN(str) == 0) {
+		RETVAL_EMPTY_STRING();
+		goto flf_clean;
+	}
+
+	RETVAL_STR(php_strtr_ex(str, ZSTR_VAL(from), ZSTR_VAL(to), MIN(ZSTR_LEN(from), ZSTR_LEN(to))));
+
+flf_clean:
+	Z_FLF_PARAM_FREE_STR(1, str_tmp);
+	Z_FLF_PARAM_FREE_STR(2, from_tmp);
+	Z_FLF_PARAM_FREE_STR(3, to_tmp);
+}
+
 /* {{{ Reverse a string */
 #ifdef ZEND_INTRIN_SSSE3_NATIVE
 #include <tmmintrin.h>