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

From: Date: Mon, 10 Sep 2018 11:43:42 +0000
Subject: com php-langspec: Fixes #217: Incorrect rule for `trait-select-insteadof-clause`: spec/16-traits.md spec/19-grammar.md
Groups: php.standards.cvs 
Request: Send a blank email to standards--cvs+get-415@lists.php.net to get a copy of this message
Commit: bbbcec63be0487cad32b42b823d3da3f6057226d Author: Tyson Andre <tysonandre775@hotmail.com> Sat, 12 May 2018 14:52:26 -0700 Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 10 Sep 2018 13:43:42 +0200 Parents: 8f78136eaae6a3fa7eef4789c8729bc38726b19d Branches: master Link: http://git.php.net/?p=php-langspec.git;a=commitdiff;h=bbbcec63be0487cad32b42b823d3da3f6057226d Log: Fixes #217: Incorrect rule for trait-select-insteadof-clause An example of the insteadof clause (satisfies the fixed rule): use T1,T2,T3{T1::foo insteadof T2,T3;} Bugs: https://bugs.php.net/217 Changed paths: M spec/16-traits.md M spec/19-grammar.md Diff: diff --git a/spec/16-traits.md b/spec/16-traits.md index 2eb52e4..abd4be1 100644 --- a/spec/16-traits.md +++ b/spec/16-traits.md @@ -139,7 +139,7 @@ trait-select-and-alias-clause: trait-alias-as-clause ';' trait-select-insteadof-clause: - name 'insteadof' name + qualified-name '::' name 'insteadof' trait-name-list trait-alias-as-clause: name 'as' visibility-modifier? name @@ -171,7 +171,7 @@ trait-alias-as-clause: <i><a href="#grammar-trait-alias-as-clause">trait-alias-as-clause</a></i> ; <i id="grammar-trait-select-insteadof-clause">trait-select-insteadof-clause:</i> - <i><a href="09-lexical-structure.md#grammar-name">name</a></i> insteadof <i><a href="09-lexical-structure.md#grammar-name">name</a></i> + <i><a href="09-lexical-structure.md#grammar-qualified-name">qualified-name</a></i> :: <i><a href="09-lexical-structure.md#grammar-name">name</a></i> insteadof <i><a href="#grammar-trait-name-list">trait-name-list</a></i> <i id="grammar-trait-alias-as-clause">trait-alias-as-clause:</i> <i><a href="09-lexical-structure.md#grammar-name">name</a></i> as <i><a href="14-classes.md#grammar-visibility-modifier">visibility-modifier</a></i><sub>opt</sub> <i><a href="09-lexical-structure.md#grammar-name">name</a></i> diff --git a/spec/19-grammar.md b/spec/19-grammar.md index 66573bf..7deab0b 100644 --- a/spec/19-grammar.md +++ b/spec/19-grammar.md @@ -1095,7 +1095,7 @@ The grammar notation is described in [Grammars section](09-lexical-structure.md# <i><a href="#grammar-trait-alias-as-clause">trait-alias-as-clause</a></i> ; <i id="grammar-trait-select-insteadof-clause">trait-select-insteadof-clause:</i> - <i><a href="#grammar-name">name</a></i> insteadof <i><a href="#grammar-name">name</a></i> + <i><a href="#grammar-qualified-name">qualified-name</a></i> :: <i><a href="#grammar-name">name</a></i> insteadof <i><a href="#grammar-trait-name-list">trait-name-list</a></i> <i id="grammar-trait-alias-as-clause">trait-alias-as-clause:</i> <i><a href="#grammar-name">name</a></i> as <i><a href="#grammar-visibility-modifier">visibility-modifier</a></i><sub>opt</sub> <i><a href="#grammar-name">name</a></i>

« previous php.standards.cvs (#415) next »