Skip to content

Commit 3656140

Browse files
committed
Remove ASSIGN_* flags
As well as old flag versioning information.
1 parent 15ac063 commit 3656140

File tree

3 files changed

+16
-58
lines changed

3 files changed

+16
-58
lines changed

README.md

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,6 @@ combined using bitwise or and should be checked by using `$ast->flags & ast\flag
222222
"exclusive" flags are used standalone and should be checked using `$ast->flags === ast\flags\BAR`.
223223

224224
```
225-
// Used by ast\AST_ARRAY_ELEM and ast\AST_CLOSURE_VAR (exclusive)
226-
1 = by-reference
227-
228225
// Used by ast\AST_NAME (exclusive)
229226
ast\flags\NAME_FQ (= 0) // example: \Foo\Bar
230227
ast\flags\NAME_NOT_FQ // example: Foo\Bar
@@ -263,13 +260,13 @@ ast\flags\PARAM_VARIADIC
263260
// Used by ast\AST_TYPE (exclusive)
264261
ast\flags\TYPE_ARRAY
265262
ast\flags\TYPE_CALLABLE
266-
ast\flags\TYPE_VOID // since version 40
267-
ast\flags\TYPE_BOOL // since version 40
268-
ast\flags\TYPE_LONG // since version 40
269-
ast\flags\TYPE_DOUBLE // since version 40
270-
ast\flags\TYPE_STRING // since version 40
271-
ast\flags\TYPE_ITERABLE // since version 40
272-
ast\flags\TYPE_OBJECT // since version 45
263+
ast\flags\TYPE_VOID
264+
ast\flags\TYPE_BOOL
265+
ast\flags\TYPE_LONG
266+
ast\flags\TYPE_DOUBLE
267+
ast\flags\TYPE_STRING
268+
ast\flags\TYPE_ITERABLE
269+
ast\flags\TYPE_OBJECT
273270
274271
// Used by ast\AST_CAST (exclusive)
275272
ast\flags\TYPE_NULL
@@ -283,11 +280,11 @@ ast\flags\TYPE_OBJECT
283280
// Used by ast\AST_UNARY_OP (exclusive)
284281
ast\flags\UNARY_BOOL_NOT
285282
ast\flags\UNARY_BITWISE_NOT
286-
ast\flags\UNARY_MINUS // since version 20
287-
ast\flags\UNARY_PLUS // since version 20
288-
ast\flags\UNARY_SILENCE // since version 20
283+
ast\flags\UNARY_MINUS
284+
ast\flags\UNARY_PLUS
285+
ast\flags\UNARY_SILENCE
289286
290-
// Used by ast\AST_BINARY_OP and ast\AST_ASSIGN_OP in version >= 20 (exclusive)
287+
// Used by ast\AST_BINARY_OP and ast\AST_ASSIGN_OP (exclusive)
291288
ast\flags\BINARY_BITWISE_OR
292289
ast\flags\BINARY_BITWISE_AND
293290
ast\flags\BINARY_BITWISE_XOR
@@ -302,33 +299,19 @@ ast\flags\BINARY_SHIFT_LEFT
302299
ast\flags\BINARY_SHIFT_RIGHT
303300
304301
// Used by ast\AST_BINARY_OP (exclusive)
305-
ast\flags\BINARY_BOOL_AND // since version 20
306-
ast\flags\BINARY_BOOL_OR // since version 20
302+
ast\flags\BINARY_BOOL_AND
303+
ast\flags\BINARY_BOOL_OR
307304
ast\flags\BINARY_BOOL_XOR
308305
ast\flags\BINARY_IS_IDENTICAL
309306
ast\flags\BINARY_IS_NOT_IDENTICAL
310307
ast\flags\BINARY_IS_EQUAL
311308
ast\flags\BINARY_IS_NOT_EQUAL
312309
ast\flags\BINARY_IS_SMALLER
313310
ast\flags\BINARY_IS_SMALLER_OR_EQUAL
314-
ast\flags\BINARY_IS_GREATER // since version 20
315-
ast\flags\BINARY_IS_GREATER_OR_EQUAL // since version 20
311+
ast\flags\BINARY_IS_GREATER
312+
ast\flags\BINARY_IS_GREATER_OR_EQUAL
316313
ast\flags\BINARY_SPACESHIP
317-
ast\flags\BINARY_COALESCE // since version 40
318-
319-
// Used by ast\AST_ASSIGN_OP in versions before 20 (exclusive)
320-
ast\flags\ASSIGN_BITWISE_OR
321-
ast\flags\ASSIGN_BITWISE_AND
322-
ast\flags\ASSIGN_BITWISE_XOR
323-
ast\flags\ASSIGN_CONCAT
324-
ast\flags\ASSIGN_ADD
325-
ast\flags\ASSIGN_SUB
326-
ast\flags\ASSIGN_MUL
327-
ast\flags\ASSIGN_DIV
328-
ast\flags\ASSIGN_MOD
329-
ast\flags\ASSIGN_POW
330-
ast\flags\ASSIGN_SHIFT_LEFT
331-
ast\flags\ASSIGN_SHIFT_RIGHT
314+
ast\flags\BINARY_COALESCE
332315
333316
// Used by ast\AST_MAGIC_CONST (exclusive)
334317
ast\flags\MAGIC_LINE

ast.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,19 +1184,6 @@ PHP_MINIT_FUNCTION(ast) {
11841184
ast_register_flag_constant("BINARY_SPACESHIP", ZEND_SPACESHIP);
11851185
ast_register_flag_constant("BINARY_COALESCE", AST_BINARY_COALESCE);
11861186

1187-
ast_register_flag_constant("ASSIGN_BITWISE_OR", ZEND_ASSIGN_BW_OR);
1188-
ast_register_flag_constant("ASSIGN_BITWISE_AND", ZEND_ASSIGN_BW_AND);
1189-
ast_register_flag_constant("ASSIGN_BITWISE_XOR", ZEND_ASSIGN_BW_XOR);
1190-
ast_register_flag_constant("ASSIGN_CONCAT", ZEND_ASSIGN_CONCAT);
1191-
ast_register_flag_constant("ASSIGN_ADD", ZEND_ASSIGN_ADD);
1192-
ast_register_flag_constant("ASSIGN_SUB", ZEND_ASSIGN_SUB);
1193-
ast_register_flag_constant("ASSIGN_MUL", ZEND_ASSIGN_MUL);
1194-
ast_register_flag_constant("ASSIGN_DIV", ZEND_ASSIGN_DIV);
1195-
ast_register_flag_constant("ASSIGN_MOD", ZEND_ASSIGN_MOD);
1196-
ast_register_flag_constant("ASSIGN_POW", ZEND_ASSIGN_POW);
1197-
ast_register_flag_constant("ASSIGN_SHIFT_LEFT", ZEND_ASSIGN_SL);
1198-
ast_register_flag_constant("ASSIGN_SHIFT_RIGHT", ZEND_ASSIGN_SR);
1199-
12001187
ast_register_flag_constant("EXEC_EVAL", ZEND_EVAL);
12011188
ast_register_flag_constant("EXEC_INCLUDE", ZEND_INCLUDE);
12021189
ast_register_flag_constant("EXEC_INCLUDE_ONCE", ZEND_INCLUDE_ONCE);

ast_stub.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,6 @@
163163
const BINARY_IS_GREATER_OR_EQUAL = 257;
164164
const BINARY_SPACESHIP = 170;
165165
const BINARY_COALESCE = 260;
166-
const ASSIGN_BITWISE_OR = 31;
167-
const ASSIGN_BITWISE_AND = 32;
168-
const ASSIGN_BITWISE_XOR = 33;
169-
const ASSIGN_CONCAT = 30;
170-
const ASSIGN_ADD = 23;
171-
const ASSIGN_SUB = 24;
172-
const ASSIGN_MUL = 25;
173-
const ASSIGN_DIV = 26;
174-
const ASSIGN_MOD = 27;
175-
const ASSIGN_POW = 167;
176-
const ASSIGN_SHIFT_LEFT = 28;
177-
const ASSIGN_SHIFT_RIGHT = 29;
178166
const EXEC_EVAL = 1;
179167
const EXEC_INCLUDE = 2;
180168
const EXEC_INCLUDE_ONCE = 4;

0 commit comments

Comments
 (0)