Merge and rename to member_name

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 20e41d3ba6f20709fb3e0c09b3aa6a765834f746..6eb2c4287e22dfd2897bb70c8cee1008bd4e9f99 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -862,9 +862,9 @@ function_call:
                function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); }
        |       T_NS_SEPARATOR namespace_name { $$.u.op.opline_num = zend_do_begin_function_call(&$2, 0 TSRMLS_CC); }
                function_call_parameter_list { zend_do_end_function_call(&$2, &$$, 0, $3.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); }
-       |       class_name T_PAAMAYIM_NEKUDOTAYIM member_name_or_variable { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); }
+       |       class_name T_PAAMAYIM_NEKUDOTAYIM member_name { $$.u.op.opline_num = zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); }
                function_call_parameter_list { zend_do_end_function_call($4.u.op.opline_num?NULL:&$3, &$$, $4.u.op.opline_num, $4.u.op.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
-       |       variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name_or_variable { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); }
+       |       variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); }
                function_call_parameter_list { zend_do_end_function_call(NULL, &$$, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
        |       callable_expr { zend_do_begin_dynamic_function_call(&$1, 0 TSRMLS_CC); }
                function_call_parameter_list { zend_do_end_function_call(&$1, &$$, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
@@ -1079,7 +1079,7 @@ callable_variable:
                        { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; }
        |       dereferencable '{' expr '}'
                        { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_VARIABLE; }
-       |       dereferencable T_OBJECT_OPERATOR member_name_or_variable
+       |       dereferencable T_OBJECT_OPERATOR member_name
                        { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC);
                          zend_do_begin_method_call(&$$ TSRMLS_CC); }
                function_call_parameter_list
@@ -1094,7 +1094,7 @@ callable_variable:
 variable:
                callable_variable { $$ = $1; }
        |       static_member { $$ = $1; $$.EA = ZEND_PARSED_STATIC_MEMBER; }
-       |       dereferencable T_OBJECT_OPERATOR member_name_or_variable
+       |       dereferencable T_OBJECT_OPERATOR member_name
                        { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); $$.EA = ZEND_PARSED_MEMBER; }
 ;
 
@@ -1116,7 +1116,7 @@ new_variable:
                          fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); }
        |       new_variable '[' dim_offset ']' { fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
        |       new_variable '{' expr '}' { fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); }
-       |       new_variable T_OBJECT_OPERATOR member_name_or_variable
+       |       new_variable T_OBJECT_OPERATOR member_name
                        { zend_do_fetch_property(&$$, &$1, &$3 TSRMLS_CC); }
 ;
 
@@ -1125,14 +1125,10 @@ dim_offset:
        |       expr                    { $$ = $1; }
 ;
 
-member_name_or_variable:
-               member_name             { $$ = $1; }
-       |       simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); }
-;
-
 member_name:
                T_STRING                { $$ = $1; }
        |       '{' expr '}'    { $$ = $2; }
+       |       simple_variable { fetch_simple_variable_ex(&$$, &$1, 0, ZEND_FETCH_R TSRMLS_CC); }
 ;
 
 assignment_list: