diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-04-22 15:42:57 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-04-22 15:47:53 +0200 |
| commit | 6ae40ca0e2e719cc6b904dd38d5802750b5c27b6 (patch) | |
| tree | 17283883962de11299b7b79fb7d86a8513c2da2c /Zend/zend_compile.h | |
| parent | 06eb61591ad1fdd28c8e68aa05ffaeb40e11187d (diff) | |
| download | php-git-6ae40ca0e2e719cc6b904dd38d5802750b5c27b6.tar.gz | |
Document which function flags are still free
Also clearly separate method and class flags.
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index e718085343..742a102391 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -199,23 +199,21 @@ typedef struct _zend_oparray_context { HashTable *labels; } zend_oparray_context; +/* + * Function and method flags + * + * Free flags: + * 0x10 + * 0x20 + * 0x2000000 + */ + /* method flags (types) */ #define ZEND_ACC_STATIC 0x01 #define ZEND_ACC_ABSTRACT 0x02 #define ZEND_ACC_FINAL 0x04 #define ZEND_ACC_IMPLEMENTED_ABSTRACT 0x08 -/* class flags (types) */ -/* ZEND_ACC_IMPLICIT_ABSTRACT_CLASS is used for abstract classes (since it is set by any abstract method even interfaces MAY have it set, too). */ -/* ZEND_ACC_EXPLICIT_ABSTRACT_CLASS denotes that a class was explicitly defined as abstract by using the keyword. */ -#define ZEND_ACC_IMPLICIT_ABSTRACT_CLASS 0x10 -#define ZEND_ACC_EXPLICIT_ABSTRACT_CLASS 0x20 -#define ZEND_ACC_INTERFACE 0x40 -#define ZEND_ACC_TRAIT 0x80 -#define ZEND_ACC_ANON_CLASS 0x100 -#define ZEND_ACC_ANON_BOUND 0x200 -#define ZEND_ACC_INHERITED 0x400 - /* method flags (visibility) */ /* The order of those must be kept - public < protected < private */ #define ZEND_ACC_PUBLIC 0x100 @@ -243,17 +241,6 @@ typedef struct _zend_oparray_context { /* deprecation flag */ #define ZEND_ACC_DEPRECATED 0x40000 -/* class implement interface(s) flag */ -#define ZEND_ACC_IMPLEMENT_INTERFACES 0x80000 -#define ZEND_ACC_IMPLEMENT_TRAITS 0x400000 - -/* class constants updated */ -#define ZEND_ACC_CONSTANTS_UPDATED 0x100000 - -/* user class has methods with static variables */ -#define ZEND_HAS_STATIC_IN_METHODS 0x800000 - - #define ZEND_ACC_CLOSURE 0x100000 #define ZEND_ACC_FAKE_CLOSURE 0x40 #define ZEND_ACC_GENERATOR 0x800000 @@ -292,6 +279,33 @@ typedef struct _zend_oparray_context { /* op_array uses strict mode types */ #define ZEND_ACC_STRICT_TYPES 0x80000000 +/* + * Class flags + * + * Classes also use the ZEND_ACC_FINAL (0x04) flag, otherwise there is no overlap. + */ + +/* class flags (types) */ +/* ZEND_ACC_IMPLICIT_ABSTRACT_CLASS is used for abstract classes (since it is set by any abstract method even interfaces MAY have it set, too). */ +/* ZEND_ACC_EXPLICIT_ABSTRACT_CLASS denotes that a class was explicitly defined as abstract by using the keyword. */ +#define ZEND_ACC_IMPLICIT_ABSTRACT_CLASS 0x10 +#define ZEND_ACC_EXPLICIT_ABSTRACT_CLASS 0x20 +#define ZEND_ACC_INTERFACE 0x40 +#define ZEND_ACC_TRAIT 0x80 +#define ZEND_ACC_ANON_CLASS 0x100 +#define ZEND_ACC_ANON_BOUND 0x200 +#define ZEND_ACC_INHERITED 0x400 + +/* class implement interface(s) flag */ +#define ZEND_ACC_IMPLEMENT_INTERFACES 0x80000 +#define ZEND_ACC_IMPLEMENT_TRAITS 0x400000 + +/* class constants updated */ +#define ZEND_ACC_CONSTANTS_UPDATED 0x100000 + +/* user class has methods with static variables */ +#define ZEND_HAS_STATIC_IN_METHODS 0x800000 + char *zend_visibility_string(uint32_t fn_flags); typedef struct _zend_property_info { |