]> granicus.if.org Git - php/commitdiff
- Beautify parser a bit. It still could do with some more at some point
authorAndi Gutmans <andi@php.net>
Sun, 2 Jul 2000 16:00:00 +0000 (16:00 +0000)
committerAndi Gutmans <andi@php.net>
Sun, 2 Jul 2000 16:00:00 +0000 (16:00 +0000)
Zend/zend-parser.y

index 8a688c0a4401df9217281d5adc30038d3080a282..b399560936ee5862c6f43d587de21d2743c92c17 100644 (file)
@@ -185,20 +185,20 @@ unticked_statement:
                        ')' { do_free(&$9 CLS_CC); do_for_before_statement(&$4, &$7 CLS_CC); }
                        for_statement { do_for_end(&$7 CLS_CC); }
        |       T_SWITCH '(' expr ')' { do_switch_cond(&$3 CLS_CC); } switch_case_list { do_switch_end(&$6 CLS_CC); }
-       |       T_BREAK ';'                     { do_brk_cont(ZEND_BRK, NULL CLS_CC); }
-       |       T_BREAK expr ';'                { do_brk_cont(ZEND_BRK, &$2 CLS_CC); }
+       |       T_BREAK ';'             { do_brk_cont(ZEND_BRK, NULL CLS_CC); }
+       |       T_BREAK expr ';'        { do_brk_cont(ZEND_BRK, &$2 CLS_CC); }
        |       T_CONTINUE ';'          { do_brk_cont(ZEND_CONT, NULL CLS_CC); }
        |       T_CONTINUE expr ';'     { do_brk_cont(ZEND_CONT, &$2 CLS_CC); }
-       |       T_RETURN ';'                    { do_return(NULL, 0 CLS_CC); }
-       |       T_RETURN expr_without_variable ';'              { do_return(&$2, 0 CLS_CC); }
-       |       T_RETURN cvar ';'               { do_return(&$2, 1 CLS_CC); }
+       |       T_RETURN ';'                            { do_return(NULL, 0 CLS_CC); }
+       |       T_RETURN expr_without_variable ';'      { do_return(&$2, 0 CLS_CC); }
+       |       T_RETURN cvar ';'                       { do_return(&$2, 1 CLS_CC); }
        |       T_GLOBAL global_var_list ';'
        |       T_STATIC static_var_list ';'
        |       T_ECHO echo_expr_list ';'
        |       T_INLINE_HTML                   { do_echo(&$1 CLS_CC); }
        |       expr ';'                        { do_free(&$1 CLS_CC); }
-       |       T_REQUIRE expr ';'                      { do_require(&$2, 0 CLS_CC); }
-       |       T_REQUIRE_ONCE use_filename ';'                 { do_require(&$2, 1 CLS_CC); }
+       |       T_REQUIRE expr ';'              { do_require(&$2, 0 CLS_CC); }
+       |       T_REQUIRE_ONCE use_filename ';' { do_require(&$2, 1 CLS_CC); }
        |       T_USE use_filename ';'          { use_filename($2.u.constant.value.str.val, $2.u.constant.value.str.len CLS_CC); zval_dtor(&$2.u.constant); }
        |       T_UNSET '(' unset_variables ')' ';'
        |       T_FOREACH '(' expr T_AS { do_foreach_begin(&$1, &$3, &$2, &$4 CLS_CC); } w_cvar foreach_optional_arg ')' { do_foreach_cont(&$6, &$7, &$4 CLS_CC); } foreach_statement { do_foreach_end(&$1, &$2 CLS_CC); }
@@ -216,7 +216,7 @@ unset_variable:
 ;
 
 use_filename:
-               T_CONSTANT_ENCAPSED_STRING                      { $$ = $1; }
+               T_CONSTANT_ENCAPSED_STRING              { $$ = $1; }
        |       '(' T_CONSTANT_ENCAPSED_STRING ')'      { $$ = $2; }
 ;
 
@@ -238,7 +238,7 @@ unticked_declaration_statement:
 
 foreach_optional_arg:
                /* empty */             { $$.op_type = IS_UNUSED; }
-       |       T_DOUBLE_ARROW w_cvar           { $$ = $2; }
+       |       T_DOUBLE_ARROW w_cvar   { $$ = $2; }
 ;
 
 
@@ -261,16 +261,16 @@ declare_statement:
 
 
 declare_list:
-               T_STRING '=' static_scalar                                              { do_declare_stmt(&$1, &$3 CLS_CC); }
-       |       declare_list ',' T_STRING '=' static_scalar             { do_declare_stmt(&$3, &$5 CLS_CC); }
+               T_STRING '=' static_scalar                      { do_declare_stmt(&$1, &$3 CLS_CC); }
+       |       declare_list ',' T_STRING '=' static_scalar     { do_declare_stmt(&$3, &$5 CLS_CC); }
 ;
 
 
 switch_case_list:
-               '{' case_list '}'                                       { $$ = $2; }
-       |       '{' ';' case_list '}'                           { $$ = $3; }
-       |       ':' case_list T_ENDSWITCH ';'                   { $$ = $2; }
-       |       ':' ';' case_list T_ENDSWITCH ';'               { $$ = $3; }
+               '{' case_list '}'                       { $$ = $2; }
+       |       '{' ';' case_list '}'                   { $$ = $3; }
+       |       ':' case_list T_ENDSWITCH ';'           { $$ = $2; }
+       |       ':' ';' case_list T_ENDSWITCH ';'       { $$ = $3; }
 ;
 
 
@@ -318,8 +318,6 @@ new_else_single:
 ;
 
 
-
-
 parameter_list: 
                non_empty_parameter_list
        |       /* empty */
@@ -327,41 +325,41 @@ parameter_list:
 
 
 non_empty_parameter_list:
-               T_VARIABLE                                              { znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
-       |       '&' T_VARIABLE                                  { znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
-       |       T_CONST T_VARIABLE                      { znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
-       |       T_VARIABLE '=' static_scalar            { znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$3, BYREF_NONE CLS_CC); }
-       |       non_empty_parameter_list ',' T_VARIABLE                                                 { znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
-       |       non_empty_parameter_list ',' '&' T_VARIABLE                                     { znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
+               T_VARIABLE                      { znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+       |       '&' T_VARIABLE                  { znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
+       |       T_CONST T_VARIABLE              { znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+       |       T_VARIABLE '=' static_scalar    { znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$3, BYREF_NONE CLS_CC); }
+       |       non_empty_parameter_list ',' T_VARIABLE         { znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+       |       non_empty_parameter_list ',' '&' T_VARIABLE     { znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
        |       non_empty_parameter_list ',' T_CONST T_VARIABLE                 { znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
        |       non_empty_parameter_list ',' T_VARIABLE '=' static_scalar       { znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$5, BYREF_NONE CLS_CC); }
 ;
 
 
 function_call_parameter_list:
-               non_empty_function_call_parameter_list          { $$ = $1; }
-       |       /* empty */                                                                     { $$.u.constant.value.lval = 0; }
+               non_empty_function_call_parameter_list  { $$ = $1; }
+       |       /* empty */                             { $$.u.constant.value.lval = 0; }
 ;
 
 
 non_empty_function_call_parameter_list:
-               expr_without_variable   {       $$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
-       |       cvar                                    {       $$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
-       |       '&' w_cvar                              {       $$.u.constant.value.lval = 1;  do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
-       |       non_empty_function_call_parameter_list ',' expr_without_variable        {       $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
-       |       non_empty_function_call_parameter_list ',' cvar                                         {       $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
-       |       non_empty_function_call_parameter_list ',' '&' w_cvar                           {       $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
+               expr_without_variable   { $$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
+       |       cvar                    { $$.u.constant.value.lval = 1;  do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
+       |       '&' w_cvar              { $$.u.constant.value.lval = 1;  do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
+       |       non_empty_function_call_parameter_list ',' expr_without_variable        { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
+       |       non_empty_function_call_parameter_list ',' cvar                         { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
+       |       non_empty_function_call_parameter_list ',' '&' w_cvar                   { $$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
 ;
 
 global_var_list:
-               global_var_list ',' global_var { do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
-       |       global_var { do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
+               global_var_list ',' global_var  { do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
+       |       global_var                      { do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
 ;
 
 
 global_var:
-               T_VARIABLE                      { $$ = $1; }
-       |       '$' r_cvar                      { $$ = $2; }
+               T_VARIABLE              { $$ = $1; }
+       |       '$' r_cvar              { $$ = $2; }
        |       '$' '{' expr '}'        { $$ = $3; }
 ;
 
@@ -391,31 +389,31 @@ class_statement:
 ;
 
 is_reference:
-               /* empty */ { $$.op_type = ZEND_RETURN_VAL; }
-       |       '&'                     { $$.op_type = ZEND_RETURN_REF; }
+               /* empty */     { $$.op_type = ZEND_RETURN_VAL; }
+       |       '&'             { $$.op_type = ZEND_RETURN_REF; }
 
 class_variable_decleration:
-               class_variable_decleration ',' T_VARIABLE { do_declare_property(&$3, NULL CLS_CC); }
-       |       class_variable_decleration ',' T_VARIABLE '=' static_scalar  { do_declare_property(&$3, &$5 CLS_CC); }
-       |       T_VARIABLE      { do_declare_property(&$1, NULL CLS_CC); }
-       |       T_VARIABLE '=' static_scalar { do_declare_property(&$1, &$3 CLS_CC); }
+               class_variable_decleration ',' T_VARIABLE                       { do_declare_property(&$3, NULL CLS_CC); }
+       |       class_variable_decleration ',' T_VARIABLE '=' static_scalar     { do_declare_property(&$3, &$5 CLS_CC); }
+       |       T_VARIABLE                      { do_declare_property(&$1, NULL CLS_CC); }
+       |       T_VARIABLE '=' static_scalar    { do_declare_property(&$1, &$3 CLS_CC); }
 ;
 
 
 echo_expr_list:        
        |       echo_expr_list ',' expr { do_echo(&$3 CLS_CC); }
-       |       expr                                    { do_echo(&$1 CLS_CC); }
+       |       expr                    { do_echo(&$1 CLS_CC); }
 ;
 
 
 for_expr:
-               /* empty */                     { $$.op_type = IS_CONST;  $$.u.constant.type = IS_BOOL;  $$.u.constant.value.lval = 1; }
-       |       non_empty_for_expr { $$ = $1; }
+               /* empty */ { $$.op_type = IS_CONST;  $$.u.constant.type = IS_BOOL;  $$.u.constant.value.lval = 1; }
+       |       non_empty_for_expr      { $$ = $1; }
 ;
 
 non_empty_for_expr:
-               non_empty_for_expr ',' { do_free(&$1 CLS_CC); } expr    { $$ = $4; }
-       |       expr                            { $$ = $1; }
+               non_empty_for_expr ','  { do_free(&$1 CLS_CC); } expr { $$ = $4; }
+       |       expr                    { $$ = $1; }
 ;
 
 
@@ -454,19 +452,19 @@ expr_without_variable:
        |       expr '*' expr   { do_binary_op(ZEND_MUL,&$$,&$1,&$3 CLS_CC); }
        |       expr '/' expr   { do_binary_op(ZEND_DIV,&$$,&$1,&$3 CLS_CC); }
        |       expr '%' expr   { do_binary_op(ZEND_MOD,&$$,&$1,&$3 CLS_CC); }
-       |       expr T_SL expr { do_binary_op(ZEND_SL, &$$, &$1, &$3 CLS_CC); }
-       |       expr T_SR expr { do_binary_op(ZEND_SR, &$$, &$1, &$3 CLS_CC); }
+       |       expr T_SL expr  { do_binary_op(ZEND_SL, &$$, &$1, &$3 CLS_CC); }
+       |       expr T_SR expr  { do_binary_op(ZEND_SR, &$$, &$1, &$3 CLS_CC); }
        |       '+' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); do_binary_op(ZEND_ADD, &$$, &$1, &$2 CLS_CC); }
        |       '-' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); do_binary_op(ZEND_SUB, &$$, &$1, &$2 CLS_CC); }
        |       '!' expr { do_unary_op(ZEND_BOOL_NOT, &$$, &$2 CLS_CC); }
        |       '~' expr { do_unary_op(ZEND_BW_NOT, &$$, &$2 CLS_CC); }
        |       expr T_IS_IDENTICAL expr                                { do_binary_op(ZEND_IS_IDENTICAL, &$$, &$1, &$3 CLS_CC); }
        |       expr T_IS_NOT_IDENTICAL expr            { do_binary_op(ZEND_IS_NOT_IDENTICAL, &$$, &$1, &$3 CLS_CC); }
-       |       expr T_IS_EQUAL expr                            { do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 CLS_CC); }
-       |       expr T_IS_NOT_EQUAL expr                        { do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 CLS_CC); }
-       |       expr '<' expr                                   { do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 CLS_CC); }
+       |       expr T_IS_EQUAL expr                    { do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 CLS_CC); }
+       |       expr T_IS_NOT_EQUAL expr                { do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 CLS_CC); }
+       |       expr '<' expr                           { do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 CLS_CC); }
        |       expr T_IS_SMALLER_OR_EQUAL expr         { do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 CLS_CC); }
-       |       expr '>' expr                                   { do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 CLS_CC); }
+       |       expr '>' expr                           { do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 CLS_CC); }
        |       expr T_IS_GREATER_OR_EQUAL expr         { do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 CLS_CC); }
        |       '(' expr ')'    { $$ = $2; }
        |       expr '?' { do_begin_qm_op(&$1, &$2 CLS_CC); }
@@ -474,7 +472,7 @@ expr_without_variable:
                expr     { do_qm_false(&$$, &$7, &$2, &$5 CLS_CC); }
        |       function_call { $$ = $1; }
        |       internal_functions_in_yacc { $$ = $1; }
-       |       T_INT_CAST expr                 { do_cast(&$$, &$2, IS_LONG CLS_CC); }
+       |       T_INT_CAST expr         { do_cast(&$$, &$2, IS_LONG CLS_CC); }
        |       T_DOUBLE_CAST expr      { do_cast(&$$, &$2, IS_DOUBLE CLS_CC); }
        |       T_STRING_CAST expr      { do_cast(&$$, &$2, IS_STRING CLS_CC); } 
        |       T_ARRAY_CAST expr       { do_cast(&$$, &$2, IS_ARRAY CLS_CC); }
@@ -504,37 +502,37 @@ function_call:
 
 
 exit_expr:
-               /* empty */             { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }      
-       |       '(' ')'                 { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }      
+               /* empty */     { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }      
+       |       '(' ')'         { memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }      
        |       '(' expr ')'    { $$ = $2; }
 ;
 
 
 ctor_arguments:
-               /* empty */                                                                     { $$.u.constant.value.lval=0; }
+               /* empty */     { $$.u.constant.value.lval=0; }
        |       '(' function_call_parameter_list ')'            { $$ = $2; }
 ;
 
 
 class_name:
                T_STRING        { $$ = $1; }
-       |       r_cvar  { $$ = $1; }
+       |       r_cvar          { $$ = $1; }
 ;
 
 
 
 common_scalar:
-               T_LNUMBER                                       { $$=$1; }
-       |       T_DNUMBER                                       { $$=$1; }
+               T_LNUMBER                       { $$ = $1; }
+       |       T_DNUMBER                       { $$ = $1; }
        |       T_CONSTANT_ENCAPSED_STRING      { $$ = $1; }
-       |       T_LINE                                  { $$ = $1; }
-       |       T_FILE                                  { $$ = $1; }
+       |       T_LINE                          { $$ = $1; }
+       |       T_FILE                          { $$ = $1; }
 ;
 
 
 static_scalar: /* compile-time evaluated scalars */
                common_scalar           { $$ = $1; }
-       |       T_STRING                                { do_fetch_constant(&$$, &$1, ZEND_CT CLS_CC); }
+       |       T_STRING                { do_fetch_constant(&$$, &$1, ZEND_CT CLS_CC); }
        |       '+' static_scalar       { $$ = $1; }
        |       '-' static_scalar       { zval minus_one;  minus_one.type = IS_LONG; minus_one.value.lval = -1;  mul_function(&$2.u.constant, &$2.u.constant, &minus_one);  $$ = $2; }
        |       T_ARRAY '(' static_array_pair_list ')' { $$ = $3; $$.u.constant.type = IS_CONSTANT_ARRAY; }
@@ -542,9 +540,9 @@ static_scalar: /* compile-time evaluated scalars */
 
 
 scalar:
-               T_STRING                                        { do_fetch_constant(&$$, &$1, ZEND_RT CLS_CC); }
-       |       T_STRING_VARNAME                        { $$ = $1; }
-       |       common_scalar                   { $$ = $1; }
+               T_STRING                { do_fetch_constant(&$$, &$1, ZEND_RT CLS_CC); }
+       |       T_STRING_VARNAME        { $$ = $1; }
+       |       common_scalar           { $$ = $1; }
        |       '"' encaps_list '"'     { $$ = $2; }
        |       '\'' encaps_list '\''   { $$ = $2; }
        |       T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; do_end_heredoc(CLS_C); }
@@ -552,7 +550,7 @@ scalar:
 
 
 static_array_pair_list:
-               /* empty */                                             { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); }
+               /* empty */ { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); }
        |       non_empty_static_array_pair_list possible_comma { $$ = $1; }
 ;
 
@@ -563,19 +561,19 @@ possible_comma:
 
 non_empty_static_array_pair_list:
                non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW static_scalar { do_add_static_array_element(&$$, &$3, &$5); }
-       |       non_empty_static_array_pair_list ',' static_scalar              { do_add_static_array_element(&$$, NULL, &$3); }
-       |       static_scalar T_DOUBLE_ARROW static_scalar      { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, &$1, &$3); }
-       |       static_scalar                                                                   { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, NULL, &$1); }
+       |       non_empty_static_array_pair_list ',' static_scalar { do_add_static_array_element(&$$, NULL, &$3); }
+       |       static_scalar T_DOUBLE_ARROW static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, &$1, &$3); }
+       |       static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); do_add_static_array_element(&$$, NULL, &$1); }
 ;
 
 expr:
-               r_cvar                                  { $$ = $1; }
+               r_cvar                  { $$ = $1; }
        |       expr_without_variable   { $$ = $1; }
 ;
 
 /*
 w_expr:
-               w_cvar                                  { $$ = $1; }
+               w_cvar                  { $$ = $1; }
        |       expr_without_variable   { $$ = $1; }
 ;
 */
@@ -610,13 +608,13 @@ cvar_without_objects:
 
 reference_variable:
                reference_variable '[' dim_offset ']'   { fetch_array_dim(&$$, &$1, &$3 CLS_CC); }
-       |       reference_variable '{' expr '}'                 { fetch_string_offset(&$$, &$1, &$3 CLS_CC); }
-       |       compound_variable                                               { do_fetch_globals(&$1 CLS_CC); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+       |       reference_variable '{' expr '}'         { fetch_string_offset(&$$, &$1, &$3 CLS_CC); }
+       |       compound_variable                       { do_fetch_globals(&$1 CLS_CC); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
 ;
        
 
 compound_variable:
-               T_VARIABLE                      { $$ = $1; }
+               T_VARIABLE              { $$ = $1; }
        |       '$' '{' expr '}'        { $$ = $3; }
 ;
 
@@ -642,7 +640,7 @@ object_dim_list:
 ;
 
 variable_name:
-               T_STRING                { $$ = $1; }
+               T_STRING        { $$ = $1; }
        |       '{' expr '}'    { $$ = $2; }
 ;
 
@@ -666,28 +664,28 @@ assignment_list_element:
 
 
 array_pair_list:
-               /* empty */                             { do_init_array(&$$, NULL, NULL, 0 CLS_CC); }
+               /* empty */ { do_init_array(&$$, NULL, NULL, 0 CLS_CC); }
        |       non_empty_array_pair_list possible_comma        { $$ = $1; }
 ;
 
 non_empty_array_pair_list:
                non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr  { do_add_array_element(&$$, &$5, &$3, 0 CLS_CC); }
-       |       non_empty_array_pair_list ',' expr              { do_add_array_element(&$$, &$3, NULL, 0 CLS_CC); }
+       |       non_empty_array_pair_list ',' expr                      { do_add_array_element(&$$, &$3, NULL, 0 CLS_CC); }
        |       expr T_DOUBLE_ARROW expr        { do_init_array(&$$, &$3, &$1, 0 CLS_CC); }
-       |       expr                                            { do_init_array(&$$, &$1, NULL, 0 CLS_CC); }
+       |       expr                            { do_init_array(&$$, &$1, NULL, 0 CLS_CC); }
        |       non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_cvar { do_add_array_element(&$$, &$6, &$3, 1 CLS_CC); }
        |       non_empty_array_pair_list ',' '&' w_cvar { do_add_array_element(&$$, &$4, NULL, 1 CLS_CC); }
        |       expr T_DOUBLE_ARROW '&' w_cvar  { do_init_array(&$$, &$4, &$1, 1 CLS_CC); }
-       |       '&' w_cvar                                              { do_init_array(&$$, &$2, NULL, 1 CLS_CC); }
+       |       '&' w_cvar                      { do_init_array(&$$, &$2, NULL, 1 CLS_CC); }
 ;
 
 encaps_list:
                encaps_list encaps_var { do_end_variable_parse(BP_VAR_R, 0 CLS_CC);  do_add_variable(&$$, &$1, &$2 CLS_CC); }
-       |       encaps_list T_STRING                                            { do_add_string(&$$, &$1, &$2 CLS_CC); }
-       |       encaps_list T_NUM_STRING                                        { do_add_string(&$$, &$1, &$2 CLS_CC); }
-       |       encaps_list T_ENCAPSED_AND_WHITESPACE           { do_add_string(&$$, &$1, &$2 CLS_CC); }
-       |       encaps_list T_CHARACTER                                         { do_add_char(&$$, &$1, &$2 CLS_CC); }
-       |       encaps_list T_BAD_CHARACTER                             { do_add_string(&$$, &$1, &$2 CLS_CC); }
+       |       encaps_list T_STRING                    { do_add_string(&$$, &$1, &$2 CLS_CC); }
+       |       encaps_list T_NUM_STRING                { do_add_string(&$$, &$1, &$2 CLS_CC); }
+       |       encaps_list T_ENCAPSED_AND_WHITESPACE   { do_add_string(&$$, &$1, &$2 CLS_CC); }
+       |       encaps_list T_CHARACTER                 { do_add_char(&$$, &$1, &$2 CLS_CC); }
+       |       encaps_list T_BAD_CHARACTER             { do_add_string(&$$, &$1, &$2 CLS_CC); }
        |       encaps_list '['         { $2.u.constant.value.lval = (long) '['; do_add_char(&$$, &$1, &$2 CLS_CC); }
        |       encaps_list ']'         { $2.u.constant.value.lval = (long) ']'; do_add_char(&$$, &$1, &$2 CLS_CC); }
        |       encaps_list '{'         { $2.u.constant.value.lval = (long) '{'; do_add_char(&$$, &$1, &$2 CLS_CC); }