You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

167 lines
8.3 KiB

13 years ago
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
16 years ago
  1. /*
  2. +----------------------------------------------------------------------+
  3. | Zend Engine |
  4. +----------------------------------------------------------------------+
  5. | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
  6. +----------------------------------------------------------------------+
  7. | This source file is subject to version 2.00 of the Zend license, |
  8. | that is bundled with this package in the file LICENSE, and is |
  9. | available through the world-wide-web at the following url: |
  10. | http://www.zend.com/license/2_00.txt. |
  11. | If you did not receive a copy of the Zend license and are unable to |
  12. | obtain it through the world-wide-web, please send a note to |
  13. | license@zend.com so we can mail you a copy immediately. |
  14. +----------------------------------------------------------------------+
  15. | Authors: Andi Gutmans <andi@zend.com> |
  16. | Zeev Suraski <zeev@zend.com> |
  17. | Dmitry Stogov <dmitry@zend.com> |
  18. +----------------------------------------------------------------------+
  19. */
  20. #define ZEND_NOP 0
  21. #define ZEND_ADD 1
  22. #define ZEND_SUB 2
  23. #define ZEND_MUL 3
  24. #define ZEND_DIV 4
  25. #define ZEND_MOD 5
  26. #define ZEND_SL 6
  27. #define ZEND_SR 7
  28. #define ZEND_CONCAT 8
  29. #define ZEND_BW_OR 9
  30. #define ZEND_BW_AND 10
  31. #define ZEND_BW_XOR 11
  32. #define ZEND_BW_NOT 12
  33. #define ZEND_BOOL_NOT 13
  34. #define ZEND_BOOL_XOR 14
  35. #define ZEND_IS_IDENTICAL 15
  36. #define ZEND_IS_NOT_IDENTICAL 16
  37. #define ZEND_IS_EQUAL 17
  38. #define ZEND_IS_NOT_EQUAL 18
  39. #define ZEND_IS_SMALLER 19
  40. #define ZEND_IS_SMALLER_OR_EQUAL 20
  41. #define ZEND_CAST 21
  42. #define ZEND_QM_ASSIGN 22
  43. #define ZEND_ASSIGN_ADD 23
  44. #define ZEND_ASSIGN_SUB 24
  45. #define ZEND_ASSIGN_MUL 25
  46. #define ZEND_ASSIGN_DIV 26
  47. #define ZEND_ASSIGN_MOD 27
  48. #define ZEND_ASSIGN_SL 28
  49. #define ZEND_ASSIGN_SR 29
  50. #define ZEND_ASSIGN_CONCAT 30
  51. #define ZEND_ASSIGN_BW_OR 31
  52. #define ZEND_ASSIGN_BW_AND 32
  53. #define ZEND_ASSIGN_BW_XOR 33
  54. #define ZEND_PRE_INC 34
  55. #define ZEND_PRE_DEC 35
  56. #define ZEND_POST_INC 36
  57. #define ZEND_POST_DEC 37
  58. #define ZEND_ASSIGN 38
  59. #define ZEND_ASSIGN_REF 39
  60. #define ZEND_ECHO 40
  61. #define ZEND_PRINT 41
  62. #define ZEND_JMP 42
  63. #define ZEND_JMPZ 43
  64. #define ZEND_JMPNZ 44
  65. #define ZEND_JMPZNZ 45
  66. #define ZEND_JMPZ_EX 46
  67. #define ZEND_JMPNZ_EX 47
  68. #define ZEND_CASE 48
  69. #define ZEND_SWITCH_FREE 49
  70. #define ZEND_BRK 50
  71. #define ZEND_CONT 51
  72. #define ZEND_BOOL 52
  73. #define ZEND_INIT_STRING 53
  74. #define ZEND_ADD_CHAR 54
  75. #define ZEND_ADD_STRING 55
  76. #define ZEND_ADD_VAR 56
  77. #define ZEND_BEGIN_SILENCE 57
  78. #define ZEND_END_SILENCE 58
  79. #define ZEND_INIT_FCALL_BY_NAME 59
  80. #define ZEND_DO_FCALL 60
  81. #define ZEND_DO_FCALL_BY_NAME 61
  82. #define ZEND_RETURN 62
  83. #define ZEND_RECV 63
  84. #define ZEND_RECV_INIT 64
  85. #define ZEND_SEND_VAL 65
  86. #define ZEND_SEND_VAR 66
  87. #define ZEND_SEND_REF 67
  88. #define ZEND_NEW 68
  89. #define ZEND_INIT_NS_FCALL_BY_NAME 69
  90. #define ZEND_FREE 70
  91. #define ZEND_INIT_ARRAY 71
  92. #define ZEND_ADD_ARRAY_ELEMENT 72
  93. #define ZEND_INCLUDE_OR_EVAL 73
  94. #define ZEND_UNSET_VAR 74
  95. #define ZEND_UNSET_DIM 75
  96. #define ZEND_UNSET_OBJ 76
  97. #define ZEND_FE_RESET 77
  98. #define ZEND_FE_FETCH 78
  99. #define ZEND_EXIT 79
  100. #define ZEND_FETCH_R 80
  101. #define ZEND_FETCH_DIM_R 81
  102. #define ZEND_FETCH_OBJ_R 82
  103. #define ZEND_FETCH_W 83
  104. #define ZEND_FETCH_DIM_W 84
  105. #define ZEND_FETCH_OBJ_W 85
  106. #define ZEND_FETCH_RW 86
  107. #define ZEND_FETCH_DIM_RW 87
  108. #define ZEND_FETCH_OBJ_RW 88
  109. #define ZEND_FETCH_IS 89
  110. #define ZEND_FETCH_DIM_IS 90
  111. #define ZEND_FETCH_OBJ_IS 91
  112. #define ZEND_FETCH_FUNC_ARG 92
  113. #define ZEND_FETCH_DIM_FUNC_ARG 93
  114. #define ZEND_FETCH_OBJ_FUNC_ARG 94
  115. #define ZEND_FETCH_UNSET 95
  116. #define ZEND_FETCH_DIM_UNSET 96
  117. #define ZEND_FETCH_OBJ_UNSET 97
  118. #define ZEND_FETCH_DIM_TMP_VAR 98
  119. #define ZEND_FETCH_CONSTANT 99
  120. #define ZEND_GOTO 100
  121. #define ZEND_EXT_STMT 101
  122. #define ZEND_EXT_FCALL_BEGIN 102
  123. #define ZEND_EXT_FCALL_END 103
  124. #define ZEND_EXT_NOP 104
  125. #define ZEND_TICKS 105
  126. #define ZEND_SEND_VAR_NO_REF 106
  127. #define ZEND_CATCH 107
  128. #define ZEND_THROW 108
  129. #define ZEND_FETCH_CLASS 109
  130. #define ZEND_CLONE 110
  131. #define ZEND_RETURN_BY_REF 111
  132. #define ZEND_INIT_METHOD_CALL 112
  133. #define ZEND_INIT_STATIC_METHOD_CALL 113
  134. #define ZEND_ISSET_ISEMPTY_VAR 114
  135. #define ZEND_ISSET_ISEMPTY_DIM_OBJ 115
  136. #define ZEND_PRE_INC_OBJ 132
  137. #define ZEND_PRE_DEC_OBJ 133
  138. #define ZEND_POST_INC_OBJ 134
  139. #define ZEND_POST_DEC_OBJ 135
  140. #define ZEND_ASSIGN_OBJ 136
  141. #define ZEND_INSTANCEOF 138
  142. #define ZEND_DECLARE_CLASS 139
  143. #define ZEND_DECLARE_INHERITED_CLASS 140
  144. #define ZEND_DECLARE_FUNCTION 141
  145. #define ZEND_RAISE_ABSTRACT_ERROR 142
  146. #define ZEND_DECLARE_CONST 143
  147. #define ZEND_ADD_INTERFACE 144
  148. #define ZEND_DECLARE_INHERITED_CLASS_DELAYED 145
  149. #define ZEND_VERIFY_ABSTRACT_CLASS 146
  150. #define ZEND_ASSIGN_DIM 147
  151. #define ZEND_ISSET_ISEMPTY_PROP_OBJ 148
  152. #define ZEND_HANDLE_EXCEPTION 149
  153. #define ZEND_USER_OPCODE 150
  154. #define ZEND_JMP_SET 152
  155. #define ZEND_DECLARE_LAMBDA_FUNCTION 153
  156. #define ZEND_ADD_TRAIT 154
  157. #define ZEND_BIND_TRAITS 155
  158. #define ZEND_SEPARATE 156
  159. #define ZEND_QM_ASSIGN_VAR 157
  160. #define ZEND_JMP_SET_VAR 158
  161. #define ZEND_DISCARD_EXCEPTION 159
  162. #define ZEND_YIELD 160
  163. #define ZEND_GENERATOR_RETURN 161
  164. #define ZEND_FAST_CALL 162
  165. #define ZEND_FAST_RET 163
  166. #define ZEND_RECV_VARIADIC 164