From 81ef122ca97035fee722441fc20151fd55cf9d0e Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Fri, 21 Feb 2025 18:17:05 -0800 Subject: [PATCH] gen_stub: move `findEquivalentFuncInfo()` into `FuncInfo` Reduce the number of global functions by moving it to instance method `FuncInfo::findEquivalent()`. --- build/gen_stub.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/gen_stub.php b/build/gen_stub.php index 889e6df9c57..f8e16064ee2 100755 --- a/build/gen_stub.php +++ b/build/gen_stub.php @@ -2088,6 +2088,16 @@ OUPUT_EXAMPLE return $methodSynopsis; } + /** @param FuncInfo[] $generatedFuncInfos */ + public function findEquivalent(array $generatedFuncInfos): ?FuncInfo { + foreach ($generatedFuncInfos as $generatedFuncInfo) { + if ($generatedFuncInfo->equalsApartFromNameAndRefcount($this)) { + return $generatedFuncInfo; + } + } + return null; + } + public function __clone() { foreach ($this->args as $key => $argInfo) { @@ -5053,16 +5063,6 @@ function funcInfoToCode(FileInfo $fileInfo, FuncInfo $funcInfo): string { return $code . "\n"; } -/** @param FuncInfo[] $generatedFuncInfos */ -function findEquivalentFuncInfo(array $generatedFuncInfos, FuncInfo $funcInfo): ?FuncInfo { - foreach ($generatedFuncInfos as $generatedFuncInfo) { - if ($generatedFuncInfo->equalsApartFromNameAndRefcount($funcInfo)) { - return $generatedFuncInfo; - } - } - return null; -} - /** * @template T * @param iterable $infos @@ -5136,7 +5136,7 @@ function generateArgInfoCode( $fileInfo->getAllFuncInfos(), "\n", static function (FuncInfo $funcInfo) use (&$generatedFuncInfos, $fileInfo) { /* If there already is an equivalent arginfo structure, only emit a #define */ - if ($generatedFuncInfo = findEquivalentFuncInfo($generatedFuncInfos, $funcInfo)) { + if ($generatedFuncInfo = $funcInfo->findEquivalent($generatedFuncInfos)) { $code = sprintf( "#define %s %s\n", $funcInfo->getArgInfoName(), $generatedFuncInfo->getArgInfoName()