Commit ddd33fd

authored

Generated arginfo headers: combine preprocessor conditional blocks (2) (#18667)

When global constants' or class constants' availability is based on some preprocessor condition, the generated arginfo header files wrap the declarations in the preprocessor `#if` conditional blocks, one per declaration, even if they are in the same conditional block based on comments in the stub file. Instead of having multiple conditional blocks one after the other with the same condition, combine them into a single conditional block.

1 parent 4dfba7a commit ddd33fdCopy full SHA for ddd33fd

File tree

25 files changed

+13

-817

lines changed

build
- gen_stub.php
ext
- com_dotnet
  - com_extension_arginfo.h
- curl
  - curl_arginfo.h
- dba
  - dba_arginfo.h
- gd
  - gd_arginfo.h
- intl
  - listformatter
    - listformatter_arginfo.h
  - spoofchecker
    - spoofchecker_arginfo.h
  - uchar
    - uchar_arginfo.h
- ldap
  - ldap_arginfo.h
- odbc
  - odbc_arginfo.h
- openssl
  - openssl_arginfo.h
  - openssl_pwhash_arginfo.h
- pcntl
  - pcntl_arginfo.h
- pdo_mysql
  - pdo_mysql_arginfo.h
- pdo_sqlite
  - pdo_sqlite_arginfo.h
- sockets
  - sockets_arginfo.h
- sodium
  - libsodium_arginfo.h
  - sodium_pwhash_arginfo.h
- standard
- tidy
  - tidy_arginfo.h
- xsl
  - php_xsl_arginfo.h
- zip
  - php_zip_arginfo.h
main
- main_arginfo.h

25 files changed

+13

-817

lines changed

`‎build/gen_stub.php‎`

Lines changed: 13 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -2749,23 +2749,15 @@ public function getDeclaration(array $allConstInfos): string`
`2749`	`2749`	`throw new Exception("Constant " . $this->name->__toString() . " must have a @cvalue annotation");`
`2750`	`2750`	`}`
`2751`	`2751`
`2752`		`- $code = "";`
`2753`		`-`
`2754`		`- if ($this->cond) {`
`2755`		`- $code .= "#if {$this->cond}\n";`
`2756`		`- }`
	`2752`	`+ // Condition will be added by generateCodeWithConditions()`
`2757`	`2753`
`2758`	`2754`	`if ($this->name->isClassConst()) {`
`2759`		`- $code .= $this->getClassConstDeclaration($value, $allConstInfos);`
	`2755`	`+ $code = $this->getClassConstDeclaration($value, $allConstInfos);`
`2760`	`2756`	`} else {`
`2761`		`- $code .= $this->getGlobalConstDeclaration($value);`
	`2757`	`+ $code = $this->getGlobalConstDeclaration($value);`
`2762`	`2758`	`}`
`2763`	`2759`	`$code .= $this->getValueAssertion($value);`
`2764`	`2760`
`2765`		`- if ($this->cond) {`
`2766`		`- $code .= "#endif\n";`
`2767`		`- }`
`2768`		`-`
`2769`	`2761`	`return $code;`
`2770`	`2762`	`}`
`2771`	`2763`
`@@ -3556,9 +3548,11 @@ function (Name $item) {`
`3556`	`3548`	`$code .= "\tzend_register_class_alias(\"" . str_replace("\\", "\\\\", $this->alias) . "\", class_entry);\n";`
`3557`	`3549`	`}`
`3558`	`3550`
`3559`		`- foreach ($this->constInfos as $const) {`
`3560`		`- $code .= $const->getDeclaration($allConstInfos);`
`3561`		`- }`
	`3551`	`+ $code .= generateCodeWithConditions(`
	`3552`	`+ $this->constInfos,`
	`3553`	`+ '',`
	`3554`	`+ static fn (ConstInfo $const): string => $const->getDeclaration($allConstInfos)`
	`3555`	`+ );`
`3562`	`3556`
`3563`	`3557`	`foreach ($this->enumCaseInfos as $enumCase) {`
`3564`	`3558`	`$code .= $enumCase->getDeclaration($allConstInfos);`
`@@ -5192,9 +5186,11 @@ static function (FuncInfo $funcInfo) use ($fileInfo, &$generatedFunctionDeclarat`
`5192`	`5186`	`$code .= "\nstatic void register_{$stubFilenameWithoutExtension}_symbols(int module_number)\n";`
`5193`	`5187`	`$code .= "{\n";`
`5194`	`5188`
`5195`		`- foreach ($fileInfo->constInfos as $constInfo) {`
`5196`		`- $code .= $constInfo->getDeclaration($allConstInfos);`
`5197`		`- }`
	`5189`	`+ $code .= generateCodeWithConditions(`
	`5190`	`+ $fileInfo->constInfos,`
	`5191`	`+ '',`
	`5192`	`+ static fn (ConstInfo $constInfo): string => $constInfo->getDeclaration($allConstInfos)`
	`5193`	`+ );`
`5198`	`5194`
`5199`	`5195`	`if ($attributeInitializationCode !== "" && $fileInfo->constInfos) {`
`5200`	`5196`	`$code .= "\n";`

`‎ext/com_dotnet/com_extension_arginfo.h‎`

Lines changed: 0 additions & 2 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/curl/curl_arginfo.h‎`

Lines changed: 0 additions & 158 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/dba/dba_arginfo.h‎`

Lines changed: 0 additions & 2 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/gd/gd_arginfo.h‎`

Lines changed: 0 additions & 18 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/intl/listformatter/listformatter_arginfo.h‎`

Lines changed: 0 additions & 6 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/intl/spoofchecker/spoofchecker_arginfo.h‎`

Lines changed: 0 additions & 12 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎ext/intl/uchar/uchar_arginfo.h‎`

Lines changed: 0 additions & 4 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ddd33fd

File tree

25 files changed

25 files changed

`‎build/gen_stub.php‎`

`‎ext/com_dotnet/com_extension_arginfo.h‎`

`‎ext/curl/curl_arginfo.h‎`

`‎ext/dba/dba_arginfo.h‎`

`‎ext/gd/gd_arginfo.h‎`

`‎ext/intl/listformatter/listformatter_arginfo.h‎`

`‎ext/intl/spoofchecker/spoofchecker_arginfo.h‎`

`‎ext/intl/uchar/uchar_arginfo.h‎`

0 commit comments