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

#70: [php7] inherit meta.Data at node.Argument, stmt.PropertyList, stmt.ClassConstList, stmt.ClassMethod, stmt.TraitUsePrecedence, stmt.TraitUseAlias, stmt.TraitMethodRef

Browse Source
This commit is contained in:
z7zmey
2018-12-26 12:09:54 +02:00
parent 1654b63fd1
commit 254f7a2167
7 changed files with 328 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

545
php7/php7.go
View File

File diff suppressed because it is too large Load Diff

27
php7/php7.y
View File

@@ -2352,6 +2352,9 @@ argument:
// save position
$$.SetPosition(yylex.(*Parser).positionBuilder.NewNodePosition($1))
// save comments
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| T_ELLIPSIS expr
@@ -2362,7 +2365,7 @@ argument:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenNodePosition($1, $2))
// save comments
$1.Meta.SetTokenName(meta.EllipsisToken).AppendTo($$.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
@@ -2478,6 +2481,8 @@ class_statement:
$3.Meta.SetTokenName(meta.SemiColonToken).AppendTo($$.GetMeta())
yylex.(*Parser).appendMetaToken($$, $3, meta.SemiColonToken)
$1[0].GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| method_modifiers T_CONST class_const_list ';'
@@ -2492,6 +2497,8 @@ class_statement:
$4.Meta.SetTokenName(meta.SemiColonToken).AppendTo($$.GetMeta())
yylex.(*Parser).appendMetaToken($$, $4, meta.SemiColonToken)
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| T_USE name_list trait_adaptations
@@ -2528,6 +2535,10 @@ class_statement:
$6.Meta.SetTokenName(meta.OpenParenthesisToken).AppendTo($$.GetMeta())
$8.Meta.SetTokenName(meta.CloseParenthesisToken).AppendTo($$.GetMeta())
if len($1) > 0 {
$1[0].GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
}
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
;
@@ -2639,6 +2650,8 @@ trait_precedence:
// save comments
$2.Meta.SetTokenName(meta.InsteadofToken).AppendTo($$.GetMeta())
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
;
@@ -2657,6 +2670,8 @@ trait_alias:
$2.Meta.SetTokenName(meta.AsToken).AppendTo($$.GetMeta())
$3.Meta.SetTokenName(meta.NodeStart).AppendTo(alias.GetMeta())
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| trait_method_reference T_AS reserved_non_modifiers
@@ -2672,6 +2687,8 @@ trait_alias:
$2.Meta.SetTokenName(meta.AsToken).AppendTo($$.GetMeta())
$3.Meta.SetTokenName(meta.NodeStart).AppendTo(alias.GetMeta())
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| trait_method_reference T_AS member_modifier identifier
@@ -2687,6 +2704,8 @@ trait_alias:
$2.Meta.SetTokenName(meta.AsToken).AppendTo($$.GetMeta())
$4.Meta.SetTokenName(meta.NodeStart).AppendTo(alias.GetMeta())
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
| trait_method_reference T_AS member_modifier
@@ -2699,6 +2718,8 @@ trait_alias:
// save comments
$2.Meta.SetTokenName(meta.AsToken).AppendTo($$.GetMeta())
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
;
@@ -2714,7 +2735,7 @@ trait_method_reference:
$$.SetPosition(yylex.(*Parser).positionBuilder.NewTokenPosition($1))
// save comments
$1.Meta.SetTokenName(meta.NodeStart).AppendTo(name.GetMeta())
$1.Meta.SetTokenName(meta.NodeStart).AppendTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
@@ -2740,6 +2761,8 @@ absolute_trait_method_reference:
$2.Meta.SetTokenName(meta.PaamayimNekudotayimToken).AppendTo($$.GetMeta())
$3.Meta.SetTokenName(meta.NodeStart).AppendTo(target.GetMeta())
$1.GetMeta().Cut(inheritMetaFilter).PrependTo($$.GetMeta())
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
;