Skip to content

Commit 359aec6

Browse files
kocsismatekocsismate
committed
Get rid of macro
1 parent f79f5d2 commit 359aec6

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
@@ -186,138 +186,138 @@ static const zend_function_entry class_UnhandledMatchError_methods[] = {
186186
ZEND_FE_END
187187
};
188188

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

198-
#define register_class_Exception(class_entry, class_entry_Throwable) \
199-
{ \
200-
zend_class_entry ce; \
201-
\
202-
INIT_CLASS_ENTRY(ce, "Exception", class_Exception_methods); \
203-
class_entry = zend_register_internal_class_ex(&ce, NULL); \
204-
zend_class_implements(class_entry, 1, class_entry_Throwable); \
205-
\
206-
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED); \
207-
\
208-
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE); \
209-
\
210-
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED); \
211-
\
212-
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED); \
213-
\
214-
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED); \
215-
\
216-
zval property_trace_default_value; \
217-
ZVAL_EMPTY_ARRAY(&property_trace_default_value); \
218-
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)); \
219-
\
220-
zval property_previous_default_value; \
221-
ZVAL_NULL(&property_previous_default_value); \
222-
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)); \
198+
void register_class_Exception(zend_class_entry *class_entry, zend_class_entry *class_entry_Throwable)
199+
{
200+
zend_class_entry ce;
201+
202+
INIT_CLASS_ENTRY(ce, "Exception", class_Exception_methods);
203+
class_entry = zend_register_internal_class_ex(&ce, NULL);
204+
zend_class_implements(class_entry, 1, class_entry_Throwable);
205+
206+
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED);
207+
208+
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE);
209+
210+
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED);
211+
212+
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED);
213+
214+
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED);
215+
216+
zval property_trace_default_value;
217+
ZVAL_EMPTY_ARRAY(&property_trace_default_value);
218+
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));
219+
220+
zval property_previous_default_value;
221+
ZVAL_NULL(&property_previous_default_value);
222+
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));
223223
}
224224

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

233-
#define register_class_Error(class_entry, class_entry_Throwable) \
234-
{ \
235-
zend_class_entry ce; \
236-
\
237-
INIT_CLASS_ENTRY(ce, "Error", class_Error_methods); \
238-
class_entry = zend_register_internal_class_ex(&ce, NULL); \
239-
zend_class_implements(class_entry, 1, class_entry_Throwable); \
240-
\
241-
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED); \
242-
\
243-
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE); \
244-
\
245-
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED); \
246-
\
247-
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED); \
248-
\
249-
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED); \
250-
\
251-
zval property_trace_default_value; \
252-
ZVAL_EMPTY_ARRAY(&property_trace_default_value); \
253-
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)); \
254-
\
255-
zval property_previous_default_value; \
256-
ZVAL_NULL(&property_previous_default_value); \
257-
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)); \
233+
void register_class_Error(zend_class_entry *class_entry, zend_class_entry *class_entry_Throwable)
234+
{
235+
zend_class_entry ce;
236+
237+
INIT_CLASS_ENTRY(ce, "Error", class_Error_methods);
238+
class_entry = zend_register_internal_class_ex(&ce, NULL);
239+
zend_class_implements(class_entry, 1, class_entry_Throwable);
240+
241+
zend_declare_property_string(class_entry, "message", sizeof("message") - 1, "", ZEND_ACC_PROTECTED);
242+
243+
zend_declare_property_string(class_entry, "string", sizeof("string") - 1, "", ZEND_ACC_PRIVATE);
244+
245+
zend_declare_property_long(class_entry, "code", sizeof("code") - 1, 0, ZEND_ACC_PROTECTED);
246+
247+
zend_declare_property_null(class_entry, "file", sizeof("file") - 1, ZEND_ACC_PROTECTED);
248+
249+
zend_declare_property_null(class_entry, "line", sizeof("line") - 1, ZEND_ACC_PROTECTED);
250+
251+
zval property_trace_default_value;
252+
ZVAL_EMPTY_ARRAY(&property_trace_default_value);
253+
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));
254+
255+
zval property_previous_default_value;
256+
ZVAL_NULL(&property_previous_default_value);
257+
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));
258258
}
259259

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)