com php-langspec: Fixes #217: Incorrect rule for `trait-select-insteadof-clause`: spec/16-traits.md spec/19-grammar.md

[email protected] (Nikita Popov) Mon, 10 Sep 2018 11:43:42 +0000
Newsgroups php.standards.cvs
Message-ID <[email protected]>
Commit:    bbbcec63be0487cad32b42b823d3da3f6057226d=0AAuthor:    Tyson Andr=
e <[email protected]>         Sat, 12 May 2018 14:52:26 -0700=0ACom=
mitter: Nikita Popov <[email protected]>      Mon, 10 Sep 2018 13:43:42 =
+0200=0AParents:   8f78136eaae6a3fa7eef4789c8729bc38726b19d=0ABranches:  ma=
ster=0A=0ALink:       http://git.php.net/?p=3Dphp-langspec.git;a=3Dcommitdi=
ff;h=3Dbbbcec63be0487cad32b42b823d3da3f6057226d=0A=0ALog:=0AFixes #217: Inc=
orrect rule for `trait-select-insteadof-clause`=0A=0AAn example of the inst=
eadof clause (satisfies the fixed rule):=0A=0A`use T1,T2,T3{T1::foo instead=
of T2,T3;}`=0A=0ABugs:=0Ahttps://bugs.php.net/217=0A=0AChanged paths:=0A  M=
  spec/16-traits.md=0A  M  spec/19-grammar.md=0A=0A=0ADiff:=0Adiff --git a/=
spec/16-traits.md b/spec/16-traits.md=0Aindex 2eb52e4..abd4be1 100644=0A---=
 a/spec/16-traits.md=0A+++ b/spec/16-traits.md=0A@@ -139,7 +139,7 @@ trait-=
select-and-alias-clause:=0A   trait-alias-as-clause ';'=0A =0A trait-select=
-insteadof-clause:=0A-  name 'insteadof' name=0A+  qualified-name '::' name=
 'insteadof' trait-name-list=0A =0A trait-alias-as-clause:=0A   name 'as' v=
isibility-modifier? name=0A@@ -171,7 +171,7 @@ trait-alias-as-clause:=0A   =
 <i><a href=3D"#grammar-trait-alias-as-clause">trait-alias-as-clause</a></i=
>   ;=0A =0A <i id=3D"grammar-trait-select-insteadof-clause">trait-select-i=
nsteadof-clause:</i>=0A-   <i><a href=3D"09-lexical-structure.md#grammar-na=
me">name</a></i>   insteadof   <i><a href=3D"09-lexical-structure.md#gramma=
r-name">name</a></i>=0A+   <i><a href=3D"09-lexical-structure.md#grammar-qu=
alified-name">qualified-name</a></i>   ::   <i><a href=3D"09-lexical-struct=
ure.md#grammar-name">name</a></i>   insteadof   <i><a href=3D"#grammar-trai=
t-name-list">trait-name-list</a></i>=0A =0A <i id=3D"grammar-trait-alias-as=
-clause">trait-alias-as-clause:</i>=0A    <i><a href=3D"09-lexical-structur=
e.md#grammar-name">name</a></i>   as   <i><a href=3D"14-classes.md#grammar-=
visibility-modifier">visibility-modifier</a></i><sub>opt</sub>   <i><a href=
=3D"09-lexical-structure.md#grammar-name">name</a></i>=0Adiff --git a/spec/=
19-grammar.md b/spec/19-grammar.md=0Aindex 66573bf..7deab0b 100644=0A--- a/=
spec/19-grammar.md=0A+++ b/spec/19-grammar.md=0A@@ -1095,7 +1095,7 @@ The g=
rammar notation is described in [Grammars section](09-lexical-structure.md#=
=0A    <i><a href=3D"#grammar-trait-alias-as-clause">trait-alias-as-clause<=
/a></i>   ;=0A =0A <i id=3D"grammar-trait-select-insteadof-clause">trait-se=
lect-insteadof-clause:</i>=0A-   <i><a href=3D"#grammar-name">name</a></i> =
  insteadof   <i><a href=3D"#grammar-name">name</a></i>=0A+   <i><a href=3D=
"#grammar-qualified-name">qualified-name</a></i>   ::   <i><a href=3D"#gram=
mar-name">name</a></i>   insteadof   <i><a href=3D"#grammar-trait-name-list=
">trait-name-list</a></i>=0A =0A <i id=3D"grammar-trait-alias-as-clause">tr=
ait-alias-as-clause:</i>=0A    <i><a href=3D"#grammar-name">name</a></i>   =
as   <i><a href=3D"#grammar-visibility-modifier">visibility-modifier</a></i=
><sub>opt</sub>   <i><a href=3D"#grammar-name">name</a></i>=0A