maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename const_list and class_const_list

Browse Source
This commit is contained in:
vadim 2017-12-27 16:44:19 +02:00
parent 06a15be7a2
commit b9d686eca1
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/stmt/class_const.go → node/stmt/class_const_list.go
View File

@ -8,23 +8,23 @@ import (
"github.com/z7zmey/php-parser/token" "github.com/z7zmey/php-parser/token"
) )
type ClassConst struct { type ClassConstList struct {
node.SimpleNode node.SimpleNode
token token.Token token token.Token
modifiers []node.Node modifiers []node.Node
consts []node.Node consts []node.Node
} }
func NewClassConst(token token.Token, modifiers []node.Node, consts []node.Node) node.Node { func NewClassConstList(token token.Token, modifiers []node.Node, consts []node.Node) node.Node {
return ClassConst{ return ClassConstList{
node.SimpleNode{Name: "ClassConst", Attributes: make(map[string]string)}, node.SimpleNode{Name: "ClassConstList", Attributes: make(map[string]string)},
token, token,
modifiers, modifiers,
consts, consts,
} }
} }
func (n ClassConst) Print(out io.Writer, indent string) { func (n ClassConstList) Print(out io.Writer, indent string) {
fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value) fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value)
if n.modifiers != nil { if n.modifiers != nil {

10
node/stmt/stmt_const.go → node/stmt/const_list.go
View File

@ -8,21 +8,21 @@ import (
"github.com/z7zmey/php-parser/token" "github.com/z7zmey/php-parser/token"
) )
type StmtConst struct { type ConstList struct {
node.SimpleNode node.SimpleNode
token token.Token token token.Token
consts []node.Node consts []node.Node
} }
func NewStmtConst(token token.Token, consts []node.Node) node.Node { func NewConstList(token token.Token, consts []node.Node) node.Node {
return StmtConst{ return ConstList{
node.SimpleNode{Name: "StmtConst", Attributes: make(map[string]string)}, node.SimpleNode{Name: "ConstList", Attributes: make(map[string]string)},
token, token,
consts, consts,
} }
} }
func (n StmtConst) Print(out io.Writer, indent string) { func (n ConstList) Print(out io.Writer, indent string) {
fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value) fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value)
if n.consts != nil { if n.consts != nil {

4
parser/parser.go
View File

@ -2639,7 +2639,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1] yyDollar = yyS[yypt-3 : yypt+1]
//line parser/parser.y:299 //line parser/parser.y:299
{ {
yyVAL.node = stmt.NewStmtConst(yyDollar[1].token, yyDollar[2].list) yyVAL.node = stmt.NewConstList(yyDollar[1].token, yyDollar[2].list)
} }
case 99: case 99:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]
@ -3479,7 +3479,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
//line parser/parser.y:675 //line parser/parser.y:675
{ {
yyVAL.node = stmt.NewClassConst(yyDollar[2].token, yyDollar[1].list, yyDollar[3].list) yyVAL.node = stmt.NewClassConstList(yyDollar[2].token, yyDollar[1].list, yyDollar[3].list)
} }
case 242: case 242:
yyDollar = yyS[yypt-3 : yypt+1] yyDollar = yyS[yypt-3 : yypt+1]

4
parser/parser.y
View File

@ -296,7 +296,7 @@ top_statement:
| T_USE use_type group_use_declaration ';' { $$ = $3.(stmt.GroupUse).SetToken($1).(stmt.GroupUse).SetUseType($2) } | T_USE use_type group_use_declaration ';' { $$ = $3.(stmt.GroupUse).SetToken($1).(stmt.GroupUse).SetUseType($2) }
| T_USE use_declarations ';' { $$ = stmt.NewUseList($1, nil, $2) } | T_USE use_declarations ';' { $$ = stmt.NewUseList($1, nil, $2) }
| T_USE use_type use_declarations ';' { $$ = stmt.NewUseList($1, $2, $3) } | T_USE use_type use_declarations ';' { $$ = stmt.NewUseList($1, $2, $3) }
| T_CONST const_list ';' { $$ = stmt.NewStmtConst($1, $2) } | T_CONST const_list ';' { $$ = stmt.NewConstList($1, $2) }
; ;
use_type: use_type:
@ -672,7 +672,7 @@ class_statement_list:
class_statement: class_statement:
variable_modifiers property_list ';' { $$ = stmt.NewPropertyList($1, $2) } variable_modifiers property_list ';' { $$ = stmt.NewPropertyList($1, $2) }
| method_modifiers T_CONST class_const_list ';' { $$ = stmt.NewClassConst($2, $1, $3); } | method_modifiers T_CONST class_const_list ';' { $$ = stmt.NewClassConstList($2, $1, $3); }
| T_USE name_list trait_adaptations { $$ = stmt.NewTraitUse($1, $2, $3) } | T_USE name_list trait_adaptations { $$ = stmt.NewTraitUse($1, $2, $3) }
| method_modifiers T_FUNCTION returns_ref identifier '(' parameter_list ')' return_type method_body | method_modifiers T_FUNCTION returns_ref identifier '(' parameter_list ')' return_type method_body
{ {