Skip to content

Commit a3f58a3

Browse files
kocsismatekocsismate
committed
Get rid of macro
1 parent 9aeca11 commit a3f58a3

File tree

7 files changed

+234
-234
lines changed

7 files changed

+234
-234
lines changed

‎Zend/zend_exceptions_arginfo.h

Lines changed: 110 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -185,138 +185,138 @@ static const zend_function_entry class_UnhandledMatchError_methods[] = {
185185
ZEND_FE_END
186186
};
187187

188-
#define register_class_Throwable(class_entry, class_entry_Stringable) \
189-
{ \
190-
zend_class_entry ce; \
191-
\
192-
INIT_CLASS_ENTRY(ce, "Throwable", class_Throwable_methods); \
193-
class_entry = zend_register_internal_interface(&ce); \
188+
void register_class_Throwable(zend_class_entry *class_entry, zend_class_entry *class_entry_Stringable)
189+
{
190+
zend_class_entry ce;
191+
192+
INIT_CLASS_ENTRY(ce, "Throwable", class_Throwable_methods);
193+
class_entry = zend_register_internal_interface(&ce);
194194
zend_class_implements(class_entry, 1, class_entry_Stringable);
195195
}
196196

197-
#define register_class_Exception(class_entry, class_entry_Throwable) \
198-
{ \
199-
zend_class_entry ce; \
200-
\
201-
INIT_CLASS_ENTRY(ce, "Exception", class_Exception_methods); \
202-
class_entry = zend_register_internal_class_ex(&ce, NULL); \
203-
zend_class_implements(class_entry, 1, class_entry_Throwable); \
204-
\
205-
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED); \
206-
\
207-
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE); \
208-
\
209-
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED); \
210-
\
211-
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED); \
212-
\
213-
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED); \
214-
\
215-
zval property_trace_default_value; \
216-
ZVAL_EMPTY_ARRAY(&property_trace_default_value); \
217-
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_TRACE), &property_trace_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY)); \
218-
\
219-
zval property_previous_default_value; \
220-
ZVAL_NULL(&property_previous_default_value); \
221-
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_PREVIOUS), &property_previous_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_CE(class_entry_Throwable, 1, 0)); \
197+
void register_class_Exception(zend_class_entry *class_entry, zend_class_entry *class_entry_Throwable)
198+
{
199+
zend_class_entry ce;
200+
201+
INIT_CLASS_ENTRY(ce, "Exception", class_Exception_methods);
202+
class_entry = zend_register_internal_class_ex(&ce, NULL);
203+
zend_class_implements(class_entry, 1, class_entry_Throwable);
204+
205+
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED);
206+
207+
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE);
208+
209+
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED);
210+
211+
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED);
212+
213+
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED);
214+
215+
zval property_trace_default_value;
216+
ZVAL_EMPTY_ARRAY(&property_trace_default_value);
217+
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_TRACE), &property_trace_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY));
218+
219+
zval property_previous_default_value;
220+
ZVAL_NULL(&property_previous_default_value);
221+
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_PREVIOUS), &property_previous_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_CE(class_entry_Throwable, 1, 0));
222222
}
223223

224-
#define register_class_ErrorException(class_entry, class_entry_Exception) \
225-
{ \
226-
zend_class_entry ce; \
227-
\
228-
INIT_CLASS_ENTRY(ce, "ErrorException", class_ErrorException_methods); \
229-
class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); \
224+
void register_class_ErrorException(zend_class_entry *class_entry, zend_class_entry *class_entry_Exception)
225+
{
226+
zend_class_entry ce;
227+
228+
INIT_CLASS_ENTRY(ce, "ErrorException", class_ErrorException_methods);
229+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception);
230230
}
231231

232-
#define register_class_Error(class_entry, class_entry_Throwable) \
233-
{ \
234-
zend_class_entry ce; \
235-
\
236-
INIT_CLASS_ENTRY(ce, "Error", class_Error_methods); \
237-
class_entry = zend_register_internal_class_ex(&ce, NULL); \
238-
zend_class_implements(class_entry, 1, class_entry_Throwable); \
239-
\
240-
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED); \
241-
\
242-
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE); \
243-
\
244-
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED); \
245-
\
246-
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED); \
247-
\
248-
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED); \
249-
\
250-
zval property_trace_default_value; \
251-
ZVAL_EMPTY_ARRAY(&property_trace_default_value); \
252-
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_TRACE), &property_trace_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY)); \
253-
\
254-
zval property_previous_default_value; \
255-
ZVAL_NULL(&property_previous_default_value); \
256-
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_PREVIOUS), &property_previous_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_CE(class_entry_Throwable, 1, 0)); \
232+
void register_class_Error(zend_class_entry *class_entry, zend_class_entry *class_entry_Throwable)
233+
{
234+
zend_class_entry ce;
235+
236+
INIT_CLASS_ENTRY(ce, "Error", class_Error_methods);
237+
class_entry = zend_register_internal_class_ex(&ce, NULL);
238+
zend_class_implements(class_entry, 1, class_entry_Throwable);
239+
240+
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED);
241+
242+
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE);
243+
244+
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED);
245+
246+
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED);
247+
248+
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED);
249+
250+
zval property_trace_default_value;
251+
ZVAL_EMPTY_ARRAY(&property_trace_default_value);
252+
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_TRACE), &property_trace_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY));
253+
254+
zval property_previous_default_value;
255+
ZVAL_NULL(&property_previous_default_value);
256+
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_PREVIOUS), &property_previous_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_CE(class_entry_Throwable, 1, 0));
257257
}
258258

259-
#define register_class_CompileError(class_entry, class_entry_Error) \
260-
{ \
261-
zend_class_entry ce; \
262-
\
263-
INIT_CLASS_ENTRY(ce, "CompileError", class_CompileError_methods); \
264-
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); \
259+
void register_class_CompileError(zend_class_entry *class_entry, zend_class_entry *class_entry_Error)
260+
{
261+
zend_class_entry ce;
262+
263+
INIT_CLASS_ENTRY(ce, "CompileError", class_CompileError_methods);
264+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
265265
}
266266

267-
#define register_class_ParseError(class_entry, class_entry_CompileError) \
268-
{ \
269-
zend_class_entry ce; \
270-
\
271-
INIT_CLASS_ENTRY(ce, "ParseError", class_ParseError_methods); \
272-
class_entry = zend_register_internal_class_ex(&ce, class_entry_CompileError); \
267+
void register_class_ParseError(zend_class_entry *class_entry, zend_class_entry *class_entry_CompileError)
268+
{
269+
zend_class_entry ce;
270+
271+
INIT_CLASS_ENTRY(ce, "ParseError", class_ParseError_methods);
272+
class_entry = zend_register_internal_class_ex(&ce, class_entry_CompileError);
273273
}
274274

275-
#define register_class_TypeError(class_entry, class_entry_Error) \
276-
{ \
277-
zend_class_entry ce; \
278-
\
279-
INIT_CLASS_ENTRY(ce, "TypeError", class_TypeError_methods); \
280-
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); \
275+
void register_class_TypeError(zend_class_entry *class_entry, zend_class_entry *class_entry_Error)
276+
{
277+
zend_class_entry ce;
278+
279+
INIT_CLASS_ENTRY(ce, "TypeError", class_TypeError_methods);
280+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
281281
}
282282

283-
#define register_class_ArgumentCountError(class_entry, class_entry_TypeError) \
284-
{ \
285-
zend_class_entry ce; \
286-
\
287-
INIT_CLASS_ENTRY(ce, "ArgumentCountError", class_ArgumentCountError_methods); \
288-
class_entry = zend_register_internal_class_ex(&ce, class_entry_TypeError); \
283+
void register_class_ArgumentCountError(zend_class_entry *class_entry, zend_class_entry *class_entry_TypeError)
284+
{
285+
zend_class_entry ce;
286+
287+
INIT_CLASS_ENTRY(ce, "ArgumentCountError", class_ArgumentCountError_methods);
288+
class_entry = zend_register_internal_class_ex(&ce, class_entry_TypeError);
289289
}
290290

291-
#define register_class_ValueError(class_entry, class_entry_Error) \
292-
{ \
293-
zend_class_entry ce; \
294-
\
295-
INIT_CLASS_ENTRY(ce, "ValueError", class_ValueError_methods); \
296-
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); \
291+
void register_class_ValueError(zend_class_entry *class_entry, zend_class_entry *class_entry_Error)
292+
{
293+
zend_class_entry ce;
294+
295+
INIT_CLASS_ENTRY(ce, "ValueError", class_ValueError_methods);
296+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
297297
}
298298

299-
#define register_class_ArithmeticError(class_entry, class_entry_Error) \
300-
{ \
301-
zend_class_entry ce; \
302-
\
303-
INIT_CLASS_ENTRY(ce, "ArithmeticError", class_ArithmeticError_methods); \
304-
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); \
299+
void register_class_ArithmeticError(zend_class_entry *class_entry, zend_class_entry *class_entry_Error)
300+
{
301+
zend_class_entry ce;
302+
303+
INIT_CLASS_ENTRY(ce, "ArithmeticError", class_ArithmeticError_methods);
304+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
305305
}
306306

307-
#define register_class_DivisionByZeroError(class_entry, class_entry_ArithmeticError) \
308-
{ \
309-
zend_class_entry ce; \
310-
\
311-
INIT_CLASS_ENTRY(ce, "DivisionByZeroError", class_DivisionByZeroError_methods); \
312-
class_entry = zend_register_internal_class_ex(&ce, class_entry_ArithmeticError); \
307+
void register_class_DivisionByZeroError(zend_class_entry *class_entry, zend_class_entry *class_entry_ArithmeticError)
308+
{
309+
zend_class_entry ce;
310+
311+
INIT_CLASS_ENTRY(ce, "DivisionByZeroError", class_DivisionByZeroError_methods);
312+
class_entry = zend_register_internal_class_ex(&ce, class_entry_ArithmeticError);
313313
}
314314

315-
#define register_class_UnhandledMatchError(class_entry, class_entry_Error) \
316-
{ \
317-
zend_class_entry ce; \
318-
\
319-
INIT_CLASS_ENTRY(ce, "UnhandledMatchError", class_UnhandledMatchError_methods); \
320-
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error); \
315+
void register_class_UnhandledMatchError(zend_class_entry *class_entry, zend_class_entry *class_entry_Error)
316+
{
317+
zend_class_entry ce;
318+
319+
INIT_CLASS_ENTRY(ce, "UnhandledMatchError", class_UnhandledMatchError_methods);
320+
class_entry = zend_register_internal_class_ex(&ce, class_entry_Error);
321321
}
322322

0 commit comments

Comments
 (0)