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

fix declare do if else else_if nodes

Browse Source
This commit is contained in:
vadim
2017-12-07 11:35:45 +02:00
parent 9608147c51
commit bb188f0637
8 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
parser/parser.go
View File

@@ -2757,7 +2757,7 @@ yydefault:
yyDollar = yyS[yypt-0 : yypt+1]
//line parser/parser.y:342
{
yyVAL.node = node.NewSimpleNode("stmt")
yyVAL.node = node.NewSimpleNode("StmtList")
}
case 123:
yyDollar = yyS[yypt-1 : yypt+1]
@@ -2825,7 +2825,7 @@ yydefault:
yyDollar = yyS[yypt-7 : yypt+1]
//line parser/parser.y:363
{
yyVAL.node = stmt.NewDo(yyDollar[1].token, yyDollar[2].node.(node.SimpleNode).Children, yyDollar[5].node)
yyVAL.node = stmt.NewDo(yyDollar[1].token, yyDollar[2].node, yyDollar[5].node)
}
case 134:
yyDollar = yyS[yypt-9 : yypt+1]
@@ -2920,7 +2920,7 @@ yydefault:
yyDollar = yyS[yypt-5 : yypt+1]
//line parser/parser.y:398
{
yyVAL.node = stmt.NewDeclare(yyDollar[1].token, yyDollar[3].list, yyDollar[5].node.(node.SimpleNode).Children)
yyVAL.node = stmt.NewDeclare(yyDollar[1].token, yyDollar[3].list, yyDollar[5].node)
}
case 148:
yyDollar = yyS[yypt-1 : yypt+1]
@@ -3246,13 +3246,13 @@ yydefault:
yyDollar = yyS[yypt-5 : yypt+1]
//line parser/parser.y:552
{
yyVAL.node = stmt.NewIf(yyDollar[1].token, yyDollar[3].node, yyDollar[5].node.(node.SimpleNode).Children)
yyVAL.node = stmt.NewIf(yyDollar[1].token, yyDollar[3].node, yyDollar[5].node)
}
case 203:
yyDollar = yyS[yypt-6 : yypt+1]
//line parser/parser.y:554
{
_elseIf := stmt.NewElseIf(yyDollar[2].token, yyDollar[4].node, yyDollar[6].node.(node.SimpleNode).Children)
_elseIf := stmt.NewElseIf(yyDollar[2].token, yyDollar[4].node, yyDollar[6].node)
yyVAL.node = yyDollar[1].node.(stmt.If).AddElseIf(_elseIf)
}
case 204:
@@ -3265,7 +3265,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line parser/parser.y:563
{
_else := stmt.NewElse(yyDollar[2].token, yyDollar[3].node.(node.SimpleNode).Children)
_else := stmt.NewElse(yyDollar[2].token, yyDollar[3].node)
yyVAL.node = yyDollar[1].node.(stmt.If).SetElse(_else)
}
case 206:

12
parser/parser.y
View File

@@ -339,7 +339,7 @@ const_list:
inner_statement_list:
inner_statement_list inner_statement { $$ = $1.Append($2); }
| /* empty */ { $$ = node.NewSimpleNode("stmt") }
| /* empty */ { $$ = node.NewSimpleNode("StmtList") }
;
inner_statement:
@@ -360,7 +360,7 @@ statement:
Append(node.NewSimpleNode("expr").Append($3)).
Append(node.NewSimpleNode("stmt").Append($5));
}
| T_DO statement T_WHILE '(' expr ')' ';' { $$ = stmt.NewDo($1, $2.(node.SimpleNode).Children, $5) }
| T_DO statement T_WHILE '(' expr ')' ';' { $$ = stmt.NewDo($1, $2, $5) }
| T_FOR '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement
{
$$ = node.NewSimpleNode("For").
@@ -395,7 +395,7 @@ statement:
Append(node.NewSimpleNode("ForeachVariable").Append($7)).
Append($9);
}
| T_DECLARE '(' const_list ')' declare_statement { $$ = stmt.NewDeclare($1, $3, $5.(node.SimpleNode).Children) }
| T_DECLARE '(' const_list ')' declare_statement { $$ = stmt.NewDeclare($1, $3, $5) }
| ';' /* empty statement */ { $$ = node.NewSimpleNode(""); }
| T_TRY '{' inner_statement_list '}' catch_list finally_statement
{
@@ -549,10 +549,10 @@ while_statement:
;
if_stmt_without_else:
T_IF '(' expr ')' statement { $$ = stmt.NewIf($1, $3, $5.(node.SimpleNode).Children) }
T_IF '(' expr ')' statement { $$ = stmt.NewIf($1, $3, $5) }
| if_stmt_without_else T_ELSEIF '(' expr ')' statement
{
_elseIf := stmt.NewElseIf($2, $4, $6.(node.SimpleNode).Children)
_elseIf := stmt.NewElseIf($2, $4, $6)
$$ = $1.(stmt.If).AddElseIf(_elseIf)
}
;
@@ -561,7 +561,7 @@ if_stmt:
if_stmt_without_else %prec T_NOELSE { $$ = $1; }
| if_stmt_without_else T_ELSE statement
{
_else := stmt.NewElse($2, $3.(node.SimpleNode).Children)
_else := stmt.NewElse($2, $3)
$$ = $1.(stmt.If).SetElse(_else)
}
;