[refactoring] fix typo

2020-12-11 17:29:22 +02:00
parent 45ded326d0
commit 5291529a37
8 changed files with 231 additions and 231 deletions
--- a/internal/php7/php7.go
+++ b/internal/php7/php7.go
@@ -2730,9 +2730,9 @@ yydefault:
 					Parts:         yyDollar[2].node.(*ast.ParserSeparatedList).Items,
 					SeparatorTkns: yyDollar[2].node.(*ast.ParserSeparatedList).SeparatorTkns,
 				},
-				OpenCurlyBracket:  yyDollar[3].token,
-				Stmts:             yyDollar[4].list,
-				CloseCurlyBracket: yyDollar[5].token,
+				OpenCurlyBracketTkn:  yyDollar[3].token,
+				Stmts:                yyDollar[4].list,
+				CloseCurlyBracketTkn: yyDollar[5].token,
 			}
 		}
 	case 95:
@@ -2740,11 +2740,11 @@ yydefault:
 		// line internal/php7/php7.y:459
 		{
 			yyVAL.node = &ast.StmtNamespace{
-				Position:          yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
-				NsTkn:             yyDollar[1].token,
-				OpenCurlyBracket:  yyDollar[2].token,
-				Stmts:             yyDollar[3].list,
-				CloseCurlyBracket: yyDollar[4].token,
+				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[4].token),
+				NsTkn:                yyDollar[1].token,
+				OpenCurlyBracketTkn:  yyDollar[2].token,
+				Stmts:                yyDollar[3].list,
+				CloseCurlyBracketTkn: yyDollar[4].token,
 			}
 		}
 	case 96:
@@ -3127,10 +3127,10 @@ yydefault:
 		// line internal/php7/php7.y:813
 		{
 			yyVAL.node = &ast.StmtStmtList{
-				Position:          yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
-				OpenCurlyBracket:  yyDollar[1].token,
-				Stmts:             yyDollar[2].list,
-				CloseCurlyBracket: yyDollar[3].token,
+				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
+				OpenCurlyBracketTkn:  yyDollar[1].token,
+				Stmts:                yyDollar[2].list,
+				CloseCurlyBracketTkn: yyDollar[3].token,
 			}
 		}
 	case 133:
@@ -3363,13 +3363,13 @@ yydefault:
 			}

 			yyVAL.node = &ast.StmtTry{
-				Position:          pos,
-				TryTkn:            yyDollar[1].token,
-				OpenCurlyBracket:  yyDollar[2].token,
-				Stmts:             yyDollar[3].list,
-				CloseCurlyBracket: yyDollar[4].token,
-				Catches:           yyDollar[5].list,
-				Finally:           yyDollar[6].node,
+				Position:             pos,
+				TryTkn:               yyDollar[1].token,
+				OpenCurlyBracketTkn:  yyDollar[2].token,
+				Stmts:                yyDollar[3].list,
+				CloseCurlyBracketTkn: yyDollar[4].token,
+				Catches:              yyDollar[5].list,
+				Finally:              yyDollar[6].node,
 			}
 		}
 	case 153:
@@ -3560,11 +3560,11 @@ yydefault:
 					IdentifierTkn: yyDollar[3].token,
 					Value:         yyDollar[3].token.Value,
 				},
-				Extends:           yyDollar[4].node,
-				Implements:        yyDollar[5].node,
-				OpenCurlyBracket:  yyDollar[7].token,
-				Stmts:             yyDollar[8].list,
-				CloseCurlyBracket: yyDollar[9].token,
+				Extends:              yyDollar[4].node,
+				Implements:           yyDollar[5].node,
+				OpenCurlyBracketTkn:  yyDollar[7].token,
+				Stmts:                yyDollar[8].list,
+				CloseCurlyBracketTkn: yyDollar[9].token,
 			}
 		}
 	case 171:
@@ -3579,11 +3579,11 @@ yydefault:
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
 				},
-				Extends:           yyDollar[3].node,
-				Implements:        yyDollar[4].node,
-				OpenCurlyBracket:  yyDollar[6].token,
-				Stmts:             yyDollar[7].list,
-				CloseCurlyBracket: yyDollar[8].token,
+				Extends:              yyDollar[3].node,
+				Implements:           yyDollar[4].node,
+				OpenCurlyBracketTkn:  yyDollar[6].token,
+				Stmts:                yyDollar[7].list,
+				CloseCurlyBracketTkn: yyDollar[8].token,
 			}
 		}
 	case 172:
@@ -3630,9 +3630,9 @@ yydefault:
 					IdentifierTkn: yyDollar[2].token,
 					Value:         yyDollar[2].token.Value,
 				},
-				OpenCurlyBracket:  yyDollar[4].token,
-				Stmts:             yyDollar[5].list,
-				CloseCurlyBracket: yyDollar[6].token,
+				OpenCurlyBracketTkn:  yyDollar[4].token,
+				Stmts:                yyDollar[5].list,
+				CloseCurlyBracketTkn: yyDollar[6].token,
 			}
 		}
 	case 177:
@@ -4614,10 +4614,10 @@ yydefault:
 		// line internal/php7/php7.y:2191
 		{
 			yyVAL.node = &ast.StmtStmtList{
-				Position:          yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
-				OpenCurlyBracket:  yyDollar[1].token,
-				Stmts:             yyDollar[2].list,
-				CloseCurlyBracket: yyDollar[3].token,
+				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
+				OpenCurlyBracketTkn:  yyDollar[1].token,
+				Stmts:                yyDollar[2].list,
+				CloseCurlyBracketTkn: yyDollar[3].token,
 			}
 		}
 	case 266:
@@ -4878,17 +4878,17 @@ yydefault:
 		// line internal/php7/php7.y:2441
 		{
 			yyVAL.node = &ast.StmtClass{
-				Position:            yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token),
-				ClassTkn:            yyDollar[1].token,
-				OpenParenthesisTkn:  yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn,
-				Arguments:           yyDollar[2].node.(*ast.ArgumentList).Arguments,
-				SeparatorTkns:       yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns,
-				CloseParenthesisTkn: yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn,
-				Extends:             yyDollar[3].node,
-				Implements:          yyDollar[4].node,
-				OpenCurlyBracket:    yyDollar[6].token,
-				Stmts:               yyDollar[7].list,
-				CloseCurlyBracket:   yyDollar[8].token,
+				Position:             yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[8].token),
+				ClassTkn:             yyDollar[1].token,
+				OpenParenthesisTkn:   yyDollar[2].node.(*ast.ArgumentList).OpenParenthesisTkn,
+				Arguments:            yyDollar[2].node.(*ast.ArgumentList).Arguments,
+				SeparatorTkns:        yyDollar[2].node.(*ast.ArgumentList).SeparatorTkns,
+				CloseParenthesisTkn:  yyDollar[2].node.(*ast.ArgumentList).CloseParenthesisTkn,
+				Extends:              yyDollar[3].node,
+				Implements:           yyDollar[4].node,
+				OpenCurlyBracketTkn:  yyDollar[6].token,
+				Stmts:                yyDollar[7].list,
+				CloseCurlyBracketTkn: yyDollar[8].token,
 			}
 		}
 	case 294:
@@ -6178,10 +6178,10 @@ yydefault:
 		// line internal/php7/php7.y:3550
 		{
 			yyVAL.node = &ast.ScalarEncapsed{
-				Position:     yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
-				OpenQoteTkn:  yyDollar[1].token,
-				Parts:        yyDollar[2].list,
-				CloseQoteTkn: yyDollar[3].token,
+				Position:      yylex.(*Parser).builder.NewTokensPosition(yyDollar[1].token, yyDollar[3].token),
+				OpenQuoteTkn:  yyDollar[1].token,
+				Parts:         yyDollar[2].list,
+				CloseQuoteTkn: yyDollar[3].token,
 			}
 		}
 	case 415:
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -450,19 +450,19 @@ top_statement:
                        Parts:         $2.(*ast.ParserSeparatedList).Items,
                        SeparatorTkns: $2.(*ast.ParserSeparatedList).SeparatorTkns,
                    },
-                    OpenCurlyBracket:  $3,
-                    Stmts:             $4,
-                    CloseCurlyBracket: $5,
+                    OpenCurlyBracketTkn:  $3,
+                    Stmts:                $4,
+                    CloseCurlyBracketTkn: $5,
                }
            }
    |   T_NAMESPACE '{' top_statement_list '}'
            {
                $$ = &ast.StmtNamespace{
                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $4),
-                    NsTkn:             $1,
-                    OpenCurlyBracket:  $2,
-                    Stmts:             $3,
-                    CloseCurlyBracket: $4,
+                    NsTkn:               $1,
+                    OpenCurlyBracketTkn: $2,
+                    Stmts:               $3,
+                    CloseCurlyBracket:   $4,
                }
            }
    |   T_USE mixed_group_use_declaration ';'
@@ -813,9 +813,9 @@ statement:
            {
                $$ = &ast.StmtStmtList{
                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
-                    OpenCurlyBracket:  $1,
-                    Stmts:             $2,
-                    CloseCurlyBracket: $3,
+                    OpenCurlyBracketTkn:  $1,
+                    Stmts:                $2,
+                    CloseCurlyBracketTkn: $3,
                }
            }
    |   if_stmt
@@ -1009,12 +1009,12 @@ statement:

                $$ = &ast.StmtTry{
                    Position: pos,
-                    TryTkn:            $1,
-                    OpenCurlyBracket:  $2,
-                    Stmts:             $3,
-                    CloseCurlyBracket: $4,
-                    Catches:           $5,
-                    Finally:           $6,
+                    TryTkn:               $1,
+                    OpenCurlyBracketTkn:  $2,
+                    Stmts:                $3,
+                    CloseCurlyBracketTkn: $4,
+                    Catches:              $5,
+                    Finally:              $6,
                }
            }
    |   T_THROW expr ';'
@@ -1194,11 +1194,11 @@ class_declaration_statement:
                        IdentifierTkn: $3,
                        Value:         $3.Value,
                    },
-                    Extends:           $4,
-                    Implements:        $5,
-                    OpenCurlyBracket:  $7,
-                    Stmts:             $8,
-                    CloseCurlyBracket: $9,
+                    Extends:              $4,
+                    Implements:           $5,
+                    OpenCurlyBracketTkn:  $7,
+                    Stmts:                $8,
+                    CloseCurlyBracketTkn: $9,
                }
            }
    |   T_CLASS T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
@@ -1211,11 +1211,11 @@ class_declaration_statement:
                        IdentifierTkn: $2,
                        Value:         $2.Value,
                    },
-                    Extends:           $3,
-                    Implements:        $4,
-                    OpenCurlyBracket:  $6,
-                    Stmts:             $7,
-                    CloseCurlyBracket: $8,
+                    Extends:              $3,
+                    Implements:           $4,
+                    OpenCurlyBracketTkn:  $6,
+                    Stmts:                $7,
+                    CloseCurlyBracketTkn: $8,
                }
            }
 ;
@@ -1261,9 +1261,9 @@ trait_declaration_statement:
                        IdentifierTkn: $2,
                        Value:         $2.Value,
                    },
-                    OpenCurlyBracket:  $4,
-                    Stmts:             $5,
-                    CloseCurlyBracket: $6,
+                    OpenCurlyBracketTkn:  $4,
+                    Stmts:                $5,
+                    CloseCurlyBracketTkn: $6,
                }
            }
 ;
@@ -2191,9 +2191,9 @@ method_body:
            {
                $$ = &ast.StmtStmtList{
                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
-                    OpenCurlyBracket:  $1,
-                    Stmts:             $2,
-                    CloseCurlyBracket: $3,
+                    OpenCurlyBracketTkn:  $1,
+                    Stmts:                $2,
+                    CloseCurlyBracketTkn: $3,
                }
            }
 ;
@@ -2441,16 +2441,16 @@ anonymous_class:
            {
                $$ = &ast.StmtClass{
                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $8),
-                    ClassTkn:            $1,
-                    OpenParenthesisTkn:  $2.(*ast.ArgumentList).OpenParenthesisTkn,
-                    Arguments:           $2.(*ast.ArgumentList).Arguments,
-                    SeparatorTkns:       $2.(*ast.ArgumentList).SeparatorTkns,
-                    CloseParenthesisTkn: $2.(*ast.ArgumentList).CloseParenthesisTkn,
-                    Extends:             $3,
-                    Implements:          $4,
-                    OpenCurlyBracket:    $6,
-                    Stmts:               $7,
-                    CloseCurlyBracket:   $8,
+                    ClassTkn:             $1,
+                    OpenParenthesisTkn:   $2.(*ast.ArgumentList).OpenParenthesisTkn,
+                    Arguments:            $2.(*ast.ArgumentList).Arguments,
+                    SeparatorTkns:        $2.(*ast.ArgumentList).SeparatorTkns,
+                    CloseParenthesisTkn:  $2.(*ast.ArgumentList).CloseParenthesisTkn,
+                    Extends:              $3,
+                    Implements:           $4,
+                    OpenCurlyBracketTkn:  $6,
+                    Stmts:                $7,
+                    CloseCurlyBracketTkn: $8,
                }
            }
 ;
@@ -3550,9 +3550,9 @@ scalar:
            {
                $$ = &ast.ScalarEncapsed{
                    Position: yylex.(*Parser).builder.NewTokensPosition($1, $3),
-                    OpenQoteTkn:  $1,
-                    Parts:        $2,
-                    CloseQoteTkn: $3,
+                    OpenQuoteTkn:  $1,
+                    Parts:         $2,
+                    CloseQuoteTkn: $3,
                }
            }
    |   T_START_HEREDOC encaps_list T_END_HEREDOC