Skip to content

Commit bf0f6aa

Browse files
kocsismatekocsismate
committed
Improve class entry generation
Related to GH-6701
1 parent 1f04f16 commit bf0f6aa

File tree

85 files changed

+177
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+177
-253
lines changed

‎Zend/zend_attributes_arginfo.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ static const zend_function_entry class_Attribute_methods[] = {
1414
ZEND_FE_END
1515
};
1616

17-
zend_class_entry *register_class_Attribute()
17+
static zend_class_entry *register_class_Attribute(void)
1818
{
1919
zend_class_entry ce, *class_entry;
2020

@@ -30,4 +30,3 @@ zend_class_entry *register_class_Attribute()
3030

3131
return class_entry;
3232
}
33-

‎Zend/zend_builtin_functions_arginfo.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,4 +333,3 @@ static const zend_function_entry ext_functions[] = {
333333
ZEND_FE(gc_status, arginfo_gc_status)
334334
ZEND_FE_END
335335
};
336-

‎Zend/zend_closures_arginfo.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static const zend_function_entry class_Closure_methods[] = {
4141
ZEND_FE_END
4242
};
4343

44-
zend_class_entry *register_class_Closure()
44+
static zend_class_entry *register_class_Closure(void)
4545
{
4646
zend_class_entry ce, *class_entry;
4747

@@ -51,4 +51,3 @@ zend_class_entry *register_class_Closure()
5151

5252
return class_entry;
5353
}
54-

‎Zend/zend_exceptions_arginfo.h

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static const zend_function_entry class_UnhandledMatchError_methods[] = {
186186
ZEND_FE_END
187187
};
188188

189-
zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringable)
189+
static zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringable)
190190
{
191191
zend_class_entry ce, *class_entry;
192192

@@ -197,7 +197,7 @@ zend_class_entry *register_class_Throwable(zend_class_entry *class_entry_Stringa
197197
return class_entry;
198198
}
199199

200-
zend_class_entry *register_class_Exception(zend_class_entry *class_entry_Throwable)
200+
static zend_class_entry *register_class_Exception(zend_class_entry *class_entry_Throwable)
201201
{
202202
zend_class_entry ce, *class_entry;
203203

@@ -251,7 +251,7 @@ zend_class_entry *register_class_Exception(zend_class_entry *class_entry_Throwab
251251
return class_entry;
252252
}
253253

254-
zend_class_entry *register_class_ErrorException(zend_class_entry *class_entry_Exception)
254+
static zend_class_entry *register_class_ErrorException(zend_class_entry *class_entry_Exception)
255255
{
256256
zend_class_entry ce, *class_entry;
257257

@@ -261,7 +261,7 @@ zend_class_entry *register_class_ErrorException(zend_class_entry *class_entry_Ex
261261
return class_entry;
262262
}
263263

264-
zend_class_entry *register_class_Error(zend_class_entry *class_entry_Throwable)
264+
static zend_class_entry *register_class_Error(zend_class_entry *class_entry_Throwable)
265265
{
266266
zend_class_entry ce, *class_entry;
267267

@@ -315,7 +315,7 @@ zend_class_entry *register_class_Error(zend_class_entry *class_entry_Throwable)
315315
return class_entry;
316316
}
317317

318-
zend_class_entry *register_class_CompileError(zend_class_entry *class_entry_Error)
318+
static zend_class_entry *register_class_CompileError(zend_class_entry *class_entry_Error)
319319
{
320320
zend_class_entry ce, *class_entry;
321321

@@ -325,7 +325,7 @@ zend_class_entry *register_class_CompileError(zend_class_entry *class_entry_Erro
325325
return class_entry;
326326
}
327327

328-
zend_class_entry *register_class_ParseError(zend_class_entry *class_entry_CompileError)
328+
static zend_class_entry *register_class_ParseError(zend_class_entry *class_entry_CompileError)
329329
{
330330
zend_class_entry ce, *class_entry;
331331

@@ -335,7 +335,7 @@ zend_class_entry *register_class_ParseError(zend_class_entry *class_entry_Compil
335335
return class_entry;
336336
}
337337

338-
zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_Error)
338+
static zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_Error)
339339
{
340340
zend_class_entry ce, *class_entry;
341341

@@ -345,7 +345,7 @@ zend_class_entry *register_class_TypeError(zend_class_entry *class_entry_Error)
345345
return class_entry;
346346
}
347347

348-
zend_class_entry *register_class_ArgumentCountError(zend_class_entry *class_entry_TypeError)
348+
static zend_class_entry *register_class_ArgumentCountError(zend_class_entry *class_entry_TypeError)
349349
{
350350
zend_class_entry ce, *class_entry;
351351

@@ -355,7 +355,7 @@ zend_class_entry *register_class_ArgumentCountError(zend_class_entry *class_entr
355355
return class_entry;
356356
}
357357

358-
zend_class_entry *register_class_ValueError(zend_class_entry *class_entry_Error)
358+
static zend_class_entry *register_class_ValueError(zend_class_entry *class_entry_Error)
359359
{
360360
zend_class_entry ce, *class_entry;
361361

@@ -365,7 +365,7 @@ zend_class_entry *register_class_ValueError(zend_class_entry *class_entry_Error)
365365
return class_entry;
366366
}
367367

368-
zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_entry_Error)
368+
static zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_entry_Error)
369369
{
370370
zend_class_entry ce, *class_entry;
371371

@@ -375,7 +375,7 @@ zend_class_entry *register_class_ArithmeticError(zend_class_entry *class_entry_E
375375
return class_entry;
376376
}
377377

378-
zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *class_entry_ArithmeticError)
378+
static zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *class_entry_ArithmeticError)
379379
{
380380
zend_class_entry ce, *class_entry;
381381

@@ -385,7 +385,7 @@ zend_class_entry *register_class_DivisionByZeroError(zend_class_entry *class_ent
385385
return class_entry;
386386
}
387387

388-
zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *class_entry_Error)
388+
static zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *class_entry_Error)
389389
{
390390
zend_class_entry ce, *class_entry;
391391

@@ -394,4 +394,3 @@ zend_class_entry *register_class_UnhandledMatchError(zend_class_entry *class_ent
394394

395395
return class_entry;
396396
}
397-

‎Zend/zend_generators_arginfo.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static const zend_function_entry class_ClosedGeneratorException_methods[] = {
5252
ZEND_FE_END
5353
};
5454

55-
zend_class_entry *register_class_Generator(zend_class_entry *class_entry_Iterator)
55+
static zend_class_entry *register_class_Generator(zend_class_entry *class_entry_Iterator)
5656
{
5757
zend_class_entry ce, *class_entry;
5858

@@ -64,7 +64,7 @@ zend_class_entry *register_class_Generator(zend_class_entry *class_entry_Iterato
6464
return class_entry;
6565
}
6666

67-
zend_class_entry *register_class_ClosedGeneratorException(zend_class_entry *class_entry_Exception)
67+
static zend_class_entry *register_class_ClosedGeneratorException(zend_class_entry *class_entry_Exception)
6868
{
6969
zend_class_entry ce, *class_entry;
7070

@@ -73,4 +73,3 @@ zend_class_entry *register_class_ClosedGeneratorException(zend_class_entry *clas
7373

7474
return class_entry;
7575
}
76-

‎Zend/zend_interfaces_arginfo.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static const zend_function_entry class_InternalIterator_methods[] = {
120120
ZEND_FE_END
121121
};
122122

123-
zend_class_entry *register_class_Traversable()
123+
static zend_class_entry *register_class_Traversable(void)
124124
{
125125
zend_class_entry ce, *class_entry;
126126

@@ -130,7 +130,7 @@ zend_class_entry *register_class_Traversable()
130130
return class_entry;
131131
}
132132

133-
zend_class_entry *register_class_IteratorAggregate(zend_class_entry *class_entry_Traversable)
133+
static zend_class_entry *register_class_IteratorAggregate(zend_class_entry *class_entry_Traversable)
134134
{
135135
zend_class_entry ce, *class_entry;
136136

@@ -141,7 +141,7 @@ zend_class_entry *register_class_IteratorAggregate(zend_class_entry *class_entry
141141
return class_entry;
142142
}
143143

144-
zend_class_entry *register_class_Iterator(zend_class_entry *class_entry_Traversable)
144+
static zend_class_entry *register_class_Iterator(zend_class_entry *class_entry_Traversable)
145145
{
146146
zend_class_entry ce, *class_entry;
147147

@@ -152,7 +152,7 @@ zend_class_entry *register_class_Iterator(zend_class_entry *class_entry_Traversa
152152
return class_entry;
153153
}
154154

155-
zend_class_entry *register_class_ArrayAccess()
155+
static zend_class_entry *register_class_ArrayAccess(void)
156156
{
157157
zend_class_entry ce, *class_entry;
158158

@@ -162,7 +162,7 @@ zend_class_entry *register_class_ArrayAccess()
162162
return class_entry;
163163
}
164164

165-
zend_class_entry *register_class_Serializable()
165+
static zend_class_entry *register_class_Serializable(void)
166166
{
167167
zend_class_entry ce, *class_entry;
168168

@@ -172,7 +172,7 @@ zend_class_entry *register_class_Serializable()
172172
return class_entry;
173173
}
174174

175-
zend_class_entry *register_class_Countable()
175+
static zend_class_entry *register_class_Countable(void)
176176
{
177177
zend_class_entry ce, *class_entry;
178178

@@ -182,7 +182,7 @@ zend_class_entry *register_class_Countable()
182182
return class_entry;
183183
}
184184

185-
zend_class_entry *register_class_Stringable()
185+
static zend_class_entry *register_class_Stringable(void)
186186
{
187187
zend_class_entry ce, *class_entry;
188188

@@ -192,7 +192,7 @@ zend_class_entry *register_class_Stringable()
192192
return class_entry;
193193
}
194194

195-
zend_class_entry *register_class_InternalIterator(zend_class_entry *class_entry_Iterator)
195+
static zend_class_entry *register_class_InternalIterator(zend_class_entry *class_entry_Iterator)
196196
{
197197
zend_class_entry ce, *class_entry;
198198

@@ -203,4 +203,3 @@ zend_class_entry *register_class_InternalIterator(zend_class_entry *class_entry_
203203

204204
return class_entry;
205205
}
206-

‎Zend/zend_weakrefs_arginfo.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static const zend_function_entry class_WeakMap_methods[] = {
6464
ZEND_FE_END
6565
};
6666

67-
zend_class_entry *register_class_WeakReference()
67+
static zend_class_entry *register_class_WeakReference(void)
6868
{
6969
zend_class_entry ce, *class_entry;
7070

@@ -75,7 +75,7 @@ zend_class_entry *register_class_WeakReference()
7575
return class_entry;
7676
}
7777

78-
zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_ArrayAccess, zend_class_entry *class_entry_Countable, zend_class_entry *class_entry_IteratorAggregate)
78+
static zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_ArrayAccess, zend_class_entry *class_entry_Countable, zend_class_entry *class_entry_IteratorAggregate)
7979
{
8080
zend_class_entry ce, *class_entry;
8181

@@ -86,4 +86,3 @@ zend_class_entry *register_class_WeakMap(zend_class_entry *class_entry_ArrayAcce
8686

8787
return class_entry;
8888
}
89-

‎build/gen_stub.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ public function getRegistration(): string
12171217

12181218
$escapedName = implode("_", $this->name->parts);
12191219

1220-
$code = "zend_class_entry *register_class_$escapedName(" . implode(", ", $params) . ")\n";
1220+
$code = "static zend_class_entry *register_class_$escapedName(" . (empty($params) ? "void" : implode(", ", $params)) . ")\n";
12211221

12221222
$code .= "{\n";
12231223
$code .= "\tzend_class_entry ce, *class_entry;\n\n";
@@ -1260,7 +1260,7 @@ function (Name $item) {
12601260

12611261
$code .= "\n\treturn class_entry;\n";
12621262

1263-
$code .= "}\n\n";
1263+
$code .= "}\n";
12641264

12651265
return $code;
12661266
}
@@ -1981,10 +1981,10 @@ function (FuncInfo $funcInfo) use($fileInfo, &$generatedFunctionDeclarations) {
19811981
}
19821982

19831983
function generateClassEntryCode(FileInfo $fileInfo): string {
1984-
$code = "\n";
1984+
$code = "";
19851985

19861986
foreach ($fileInfo->classInfos as $class) {
1987-
$code .= $class->getRegistration();
1987+
$code .= "\n" . $class->getRegistration();
19881988
}
19891989

19901990
return $code;

‎ext/bcmath/bcmath_arginfo.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,3 @@ static const zend_function_entry ext_functions[] = {
6969
ZEND_FE(bcscale, arginfo_bcscale)
7070
ZEND_FE_END
7171
};
72-

‎ext/bz2/bz2_arginfo.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,3 @@ static const zend_function_entry ext_functions[] = {
7272
ZEND_FE(bzdecompress, arginfo_bzdecompress)
7373
ZEND_FE_END
7474
};
75-

‎ext/calendar/calendar_arginfo.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,3 @@ static const zend_function_entry ext_functions[] = {
116116
ZEND_FE(unixtojd, arginfo_unixtojd)
117117
ZEND_FE_END
118118
};
119-

‎ext/ctype/ctype_arginfo.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,3 @@ static const zend_function_entry ext_functions[] = {
5353
ZEND_FE(ctype_xdigit, arginfo_ctype_xdigit)
5454
ZEND_FE_END
5555
};
56-

‎ext/curl/curl_arginfo.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static const zend_function_entry class_CurlShareHandle_methods[] = {
242242
ZEND_FE_END
243243
};
244244

245-
zend_class_entry *register_class_CurlHandle()
245+
static zend_class_entry *register_class_CurlHandle(void)
246246
{
247247
zend_class_entry ce, *class_entry;
248248

@@ -253,7 +253,7 @@ zend_class_entry *register_class_CurlHandle()
253253
return class_entry;
254254
}
255255

256-
zend_class_entry *register_class_CurlMultiHandle()
256+
static zend_class_entry *register_class_CurlMultiHandle(void)
257257
{
258258
zend_class_entry ce, *class_entry;
259259

@@ -264,7 +264,7 @@ zend_class_entry *register_class_CurlMultiHandle()
264264
return class_entry;
265265
}
266266

267-
zend_class_entry *register_class_CurlShareHandle()
267+
static zend_class_entry *register_class_CurlShareHandle(void)
268268
{
269269
zend_class_entry ce, *class_entry;
270270

@@ -274,4 +274,3 @@ zend_class_entry *register_class_CurlShareHandle()
274274

275275
return class_entry;
276276
}
277-

‎ext/curl/curl_file_arginfo.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const zend_function_entry class_CURLStringFile_methods[] = {
5454
ZEND_FE_END
5555
};
5656

57-
zend_class_entry *register_class_CURLFile()
57+
static zend_class_entry *register_class_CURLFile(void)
5858
{
5959
zend_class_entry ce, *class_entry;
6060

@@ -82,7 +82,7 @@ zend_class_entry *register_class_CURLFile()
8282
return class_entry;
8383
}
8484

85-
zend_class_entry *register_class_CURLStringFile()
85+
static zend_class_entry *register_class_CURLStringFile(void)
8686
{
8787
zend_class_entry ce, *class_entry;
8888

@@ -109,4 +109,3 @@ zend_class_entry *register_class_CURLStringFile()
109109

110110
return class_entry;
111111
}
112-

0 commit comments

Comments
 (0)