case and default nodes

This commit is contained in:
vadim 2017-12-06 14:15:32 +02:00
parent 88fb95a784
commit de066981b7
4 changed files with 67 additions and 4 deletions

34
node/stmt/case.go Normal file
View File

@ -0,0 +1,34 @@
package stmt
import (
"fmt"
"io"
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/token"
)
type Case struct {
node.SimpleNode
token token.Token
cond node.Node
stmts node.Node
}
//TODO: stmts myst be []node.Node
func NewCase(token token.Token, cond node.Node, stmts node.Node) node.Node {
return Case{
node.SimpleNode{Name: "Case", Attributes: make(map[string]string)},
token,
cond,
stmts,
}
}
func (n Case) 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%vcond:", indent+" ")
n.cond.Print(out, indent+" ")
fmt.Fprintf(out, "\n%vstmts:", indent+" ")
n.stmts.Print(out, indent+" ")
}

29
node/stmt/default.go Normal file
View File

@ -0,0 +1,29 @@
package stmt
import (
"fmt"
"io"
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/token"
)
type Default struct {
node.SimpleNode
token token.Token
stmts node.Node
}
func NewDefault(token token.Token, stmts node.Node) node.Node {
return Default{
node.SimpleNode{Name: "Default", Attributes: make(map[string]string)},
token,
stmts,
}
}
func (n Default) 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%vstmts:", indent+" ")
n.stmts.Print(out, indent+" ")
}

View File

@ -3234,13 +3234,13 @@ yydefault:
yyDollar = yyS[yypt-5 : yypt+1] yyDollar = yyS[yypt-5 : yypt+1]
//line parser/parser.y:549 //line parser/parser.y:549
{ {
yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("Case").Append(node.NewSimpleNode("expr").Append(yyDollar[3].node)).Append(yyDollar[5].node)) yyVAL.node = yyDollar[1].node.Append(stmt.NewCase(yyDollar[2].token, yyDollar[3].node, yyDollar[5].node))
} }
case 197: case 197:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
//line parser/parser.y:553 //line parser/parser.y:553
{ {
yyVAL.node = yyDollar[1].node.Append(node.NewSimpleNode("Default").Append(yyDollar[4].node)) yyVAL.node = yyDollar[1].node.Append(stmt.NewDefault(yyDollar[2].token, yyDollar[4].node))
} }
case 200: case 200:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]

View File

@ -547,11 +547,11 @@ case_list:
/* empty */ { $$ = node.NewSimpleNode("CaseList") } /* empty */ { $$ = node.NewSimpleNode("CaseList") }
| case_list T_CASE expr case_separator inner_statement_list | case_list T_CASE expr case_separator inner_statement_list
{ {
$$ = $1.Append(node.NewSimpleNode("Case").Append(node.NewSimpleNode("expr").Append($3)).Append($5)) $$ = $1.Append(stmt.NewCase($2, $3, $5))
} }
| case_list T_DEFAULT case_separator inner_statement_list | case_list T_DEFAULT case_separator inner_statement_list
{ {
$$ = $1.Append(node.NewSimpleNode("Default").Append($4)) $$ = $1.Append(stmt.NewDefault($2, $4))
} }
; ;