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

#70: [php7] inherit meta.Data at stmt.Class and node.Parameter

Browse Source
This commit is contained in:
z7zmey
2018-12-25 22:16:19 +02:00
parent f406a441a9
commit 1654b63fd1
6 changed files with 363 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

666
php7/php7.go
View File

File diff suppressed because it is too large Load Diff

22
php7/php7.y
View File

@@ -1508,6 +1508,8 @@ class_declaration_statement:
$7.Meta.SetTokenName(meta.OpenCurlyBracesToken).AppendTo($$.GetMeta())
$9.Meta.SetTokenName(meta.CloseCurlyBracesToken).AppendTo($$.GetMeta())
$1[0].GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| T_CLASS T_STRING extends_from implements_list backup_doc_comment '{' class_statement_list '}'
@@ -1520,7 +1522,7 @@ class_declaration_statement:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokensPosition($1, $8))
// save comments
$1.Meta.SetTokenName(meta.ClassToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
$2.Meta.SetTokenName(meta.NodeStart).AppendTo(name.GetMeta())
$6.Meta.SetTokenName(meta.OpenCurlyBracesToken).AppendTo($$.GetMeta())
$8.Meta.SetTokenName(meta.CloseCurlyBracesToken).AppendTo($$.GetMeta())
@@ -2145,13 +2147,20 @@ parameter:
}
// save comments
if $1 != nil {
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
}
if $2 != nil {
$2.Meta.SetTokenName(meta.AmpersandToken).AppendTo($$.GetMeta())
}
if $3 != nil {
$3.Meta.SetTokenName(meta.EllipsisToken).AppendTo($$.GetMeta())
}
$4.Meta.SetTokenName(meta.NodeStart).AppendTo(variable.GetMeta())
if $1 == nil && $2 == nil && $3 == nil {
$4.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
} else {
$4.Meta.SetTokenName(meta.NodeStart).AppendTo(variable.GetMeta())
}
yylex.(*Parser).appendMeta(variable, &meta.Data{"$", meta.TokenType, nil, meta.NodeStart}, meta.NodeStart)
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
@@ -2176,13 +2185,20 @@ parameter:
}
// save comments
if $1 != nil {
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
}
if $2 != nil {
$2.Meta.SetTokenName(meta.AmpersandToken).AppendTo($$.GetMeta())
}
if $3 != nil {
$3.Meta.SetTokenName(meta.EllipsisToken).AppendTo($$.GetMeta())
}
$4.Meta.SetTokenName(meta.NodeStart).AppendTo(variable.GetMeta())
if $1 == nil && $2 == nil && $3 == nil {
$4.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
} else {
$4.Meta.SetTokenName(meta.NodeStart).AppendTo(variable.GetMeta())
}
yylex.(*Parser).appendMeta(variable, &meta.Data{"$", meta.TokenType, nil, meta.NodeStart}, meta.NodeStart)
$5.Meta.SetTokenName(meta.EqualToken).AppendTo($$.GetMeta())