From c744a6c1704f695249c8506e3f982271f11c7d1f Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 6 Dec 2017 14:52:40 +0200 Subject: [PATCH] empty heredoc node --- parser/parser.go | 2 +- parser/parser.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/parser.go b/parser/parser.go index 2e5a363..0cf2de7 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -4510,7 +4510,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.y:1011 { - yyVAL.node = node.NewSimpleNode("Scalar").Append(node.TokenNode("Heredoc", yyDollar[1].token)).Append(node.TokenNode("HeredocEnd", yyDollar[2].token)) + yyVAL.node = scalar.NewEncapsed(yyDollar[1].token, nil, yyDollar[2].token) } case 407: yyDollar = yyS[yypt-3 : yypt+1] diff --git a/parser/parser.y b/parser/parser.y index ba883bf..68face2 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -1008,7 +1008,7 @@ scalar: | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$ = scalar.NewString($2) /* TODO: mark as Heredoc*/ } | T_START_HEREDOC T_END_HEREDOC - { $$ = node.NewSimpleNode("Scalar").Append(node.TokenNode("Heredoc", $1)).Append(node.TokenNode("HeredocEnd", $2)) } + { $$ = scalar.NewEncapsed($1, nil, $2) } | '"' encaps_list '"' { $$ = scalar.NewEncapsed($1, $2, $3) } | T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = scalar.NewEncapsed($1, $2, $3) } | dereferencable_scalar { $$ = $1; }