Skip to content

Commit f817838

Browse files
kocsismatekocsismate
committed
Simplify constant handling
1 parent 832d5a3 commit f817838

13 files changed

+474
-428
lines changed

‎Zend/zend_constants.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,6 @@ void zend_register_standard_constants(void)
111111
{
112112
register_zend_constants_consts(0);
113113

114-
REGISTER_MAIN_LONG_CONSTANT("E_RECOVERABLE_ERROR", E_RECOVERABLE_ERROR, CONST_PERSISTENT | CONST_CS);
115-
REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS);
116-
REGISTER_MAIN_LONG_CONSTANT("E_STRICT", E_STRICT, CONST_PERSISTENT | CONST_CS);
117-
REGISTER_MAIN_LONG_CONSTANT("E_DEPRECATED", E_DEPRECATED, CONST_PERSISTENT | CONST_CS);
118-
REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_PERSISTENT | CONST_CS);
119-
REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_PERSISTENT | CONST_CS);
120-
REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_PERSISTENT | CONST_CS);
121-
REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_WARNING", E_COMPILE_WARNING, CONST_PERSISTENT | CONST_CS);
122-
REGISTER_MAIN_LONG_CONSTANT("E_USER_ERROR", E_USER_ERROR, CONST_PERSISTENT | CONST_CS);
123-
REGISTER_MAIN_LONG_CONSTANT("E_USER_WARNING", E_USER_WARNING, CONST_PERSISTENT | CONST_CS);
124-
REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
125-
REGISTER_MAIN_LONG_CONSTANT("E_USER_DEPRECATED", E_USER_DEPRECATED, CONST_PERSISTENT | CONST_CS);
126-
127-
REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
128-
129114
REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_PROVIDE_OBJECT", DEBUG_BACKTRACE_PROVIDE_OBJECT, CONST_PERSISTENT | CONST_CS);
130115
REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_IGNORE_ARGS", DEBUG_BACKTRACE_IGNORE_ARGS, CONST_PERSISTENT | CONST_CS);
131116
REGISTER_MAIN_BOOL_CONSTANT("ZEND_THREAD_SAFE", ZTS_V, CONST_PERSISTENT | CONST_CS);

‎Zend/zend_constants.stub.php

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,83 @@
22

33
/** @generate-class-entries */
44

5-
/** @cname E_ERROR */
6-
const E_ERROR = 1;
7-
/** @cname E_WARNING */
8-
const E_WARNING = 2;
9-
/** @cname E_PARSE */
10-
const E_PARSE = 4;
5+
/**
6+
* @var int
7+
* @cname E_ERROR
8+
*/
9+
const E_ERROR = UNKNOWN;
10+
/**
11+
* @var int
12+
* @cname E_WARNING
13+
*/
14+
const E_WARNING = UNKNOWN;
15+
/**
16+
* @var int
17+
* @cname E_PARSE
18+
*/
19+
const E_PARSE = UNKNOWN;
20+
/**
21+
* @var int
22+
* @cname E_NOTICE
23+
*/
1124
const E_NOTICE = UNKNOWN;
25+
/**
26+
* @var int
27+
* @cname E_CORE_ERROR
28+
*/
1229
const E_CORE_ERROR = UNKNOWN;
30+
/**
31+
* @var int
32+
* @cname E_CORE_WARNING
33+
*/
1334
const E_CORE_WARNING = UNKNOWN;
35+
/**
36+
* @var int
37+
* @cname E_COMPILE_ERROR
38+
*/
1439
const E_COMPILE_ERROR = UNKNOWN;
40+
/**
41+
* @var int
42+
* @cname E_COMPILE_WARNING
43+
*/
1544
const E_COMPILE_WARNING = UNKNOWN;
45+
/**
46+
* @var int
47+
* @cname E_USER_ERROR
48+
*/
1649
const E_USER_ERROR = UNKNOWN;
50+
/**
51+
* @var int
52+
* @cname E_USER_WARNING
53+
*/
1754
const E_USER_WARNING = UNKNOWN;
55+
/**
56+
* @var int
57+
* @cname E_USER_NOTICE
58+
*/
1859
const E_USER_NOTICE = UNKNOWN;
60+
/**
61+
* @var int
62+
* @cname E_STRICT
63+
*/
1964
const E_STRICT = UNKNOWN;
65+
/**
66+
* @var int
67+
* @cname E_RECOVERABLE_ERROR
68+
*/
2069
const E_RECOVERABLE_ERROR = UNKNOWN;
70+
/**
71+
* @var int
72+
* @cname E_DEPRECATED
73+
*/
2174
const E_DEPRECATED = UNKNOWN;
75+
/**
76+
* @var int
77+
* @cname E_USER_DEPRECATED
78+
*/
2279
const E_USER_DEPRECATED = UNKNOWN;
80+
/**
81+
* @var int
82+
* @cname E_ALL
83+
*/
84+
const E_ALL = UNKNOWN;

‎Zend/zend_constants_arginfo.h

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 87186b2c9fa37d09b1c0b4bbc1ffeaebd0dae2f7 */
3-
4-
#include "zend_constants_consts.h"
2+
* Stub hash: f7d158c81a29e7afdf299a34e9c6b3ed6408e582 */
53

64

75

@@ -10,4 +8,17 @@ static void register_zend_constants_consts(int module_number)
108
REGISTER_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_CS | CONST_PERSISTENT);
119
REGISTER_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_CS | CONST_PERSISTENT);
1210
REGISTER_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_CS | CONST_PERSISTENT);
11+
REGISTER_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_CS | CONST_PERSISTENT);
12+
REGISTER_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_CS | CONST_PERSISTENT);
13+
REGISTER_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_CS | CONST_PERSISTENT);
14+
REGISTER_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_CS | CONST_PERSISTENT);
15+
REGISTER_LONG_CONSTANT("E_COMPILE_WARNING", E_COMPILE_WARNING, CONST_CS | CONST_PERSISTENT);
16+
REGISTER_LONG_CONSTANT("E_USER_ERROR", E_USER_ERROR, CONST_CS | CONST_PERSISTENT);
17+
REGISTER_LONG_CONSTANT("E_USER_WARNING", E_USER_WARNING, CONST_CS | CONST_PERSISTENT);
18+
REGISTER_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_CS | CONST_PERSISTENT);
19+
REGISTER_LONG_CONSTANT("E_STRICT", E_STRICT, CONST_CS | CONST_PERSISTENT);
20+
REGISTER_LONG_CONSTANT("E_RECOVERABLE_ERROR", E_RECOVERABLE_ERROR, CONST_CS | CONST_PERSISTENT);
21+
REGISTER_LONG_CONSTANT("E_DEPRECATED", E_DEPRECATED, CONST_CS | CONST_PERSISTENT);
22+
REGISTER_LONG_CONSTANT("E_USER_DEPRECATED", E_USER_DEPRECATED, CONST_CS | CONST_PERSISTENT);
23+
REGISTER_LONG_CONSTANT("E_ALL", E_ALL, CONST_CS | CONST_PERSISTENT);
1324
}

‎Zend/zend_constants_consts.h

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Zend/zend_errors.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
#ifndef ZEND_ERRORS_H
2121
#define ZEND_ERRORS_H
2222

23-
#include "zend_constants_consts.h"
24-
23+
#define E_ERROR (1<<0L)
24+
#define E_WARNING (1<<1L)
25+
#define E_PARSE (1<<2L)
2526
#define E_NOTICE (1<<3L)
2627
#define E_CORE_ERROR (1<<4L)
2728
#define E_CORE_WARNING (1<<5L)

0 commit comments

Comments
 (0)