com php-langspec: Merge branch 'pull-request/149': spec/10-expressions.md spec/14-classes.md
[email protected] (Stanislav Malyshev) Sat, 02 Jan 2016 02:36:39 +0000
| Newsgroups | php.standards.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: cfdcbd2025d2a225dd9ce9cd838dc515d60ebb47 Author: Stanislav Malyshev <[email protected]> Fri, 1 Jan 2016 18:33:46 -0800 Parents: f7fb58d2cebdee290a5d6a4b64828e40d70edf7d 5a4f3305ec3725b6e8e523d35edb631de1792326 Branches: master Link: http://git.php.net/?p=php-langspec.git;a=commitdiff;h=cfdcbd2025d2a225dd9ce9cd838dc515d60ebb47 Log: Merge branch 'pull-request/149' Changed paths: MM spec/10-expressions.md MM spec/14-classes.md Diff: diff --cc spec/10-expressions.md index 65305a3,c7d3c70..55863ba --- a/spec/10-expressions.md +++ b/spec/10-expressions.md @@@ -764,11 -764,6 +764,11 @@@ $obj2 = clone $obj1; // creates a new <i>object-creation-expression:</i> new <i>class-type-designator</i> ( <i>argument-expression-list<sub>opt</sub></i> ) new <i>class-type-designator</i> + new class ( <i>argument-expression-list<sub>opt</sub></i> ) + <i>class-base-clause<sub>opt</sub></i> <i>class-interface-clause<sub>opt</sub></i> - { <i>class-members<sub>opt</sub></i> } ++ { <iclass-member-declarations<sub>opt</sub></i> } + new class <i>class-base-clause<sub>opt</sub></i> <i>class-interface-clause<sub>opt</sub></i> - { <i>class-members<sub>opt</sub></i> } ++ { <i>class-member-declarations<sub>opt</sub></i> } <i>class-type-designator:</i> <i>qualified-name</i> @@@ -778,12 -773,9 +778,12 @@@ **Defined elsewhere** * [*argument-expression-list*](#function-call-operator) -* [*qualified-name*](09-lexical-structure.md#names) +* [*class-base-clause*](14-classes.md#class-declarations) +* [*class-interface-clause*](14-classes.md#class-declarations) - * [*class-members*](14-classes.md#class-declarations) ++* [*class-member-declarations*](14-classes.md#class-members) * [*expression*](#general-6) - +* [*qualified-name*](09-lexical-structure.md#names) + **Constraints** *qualified-name* must name a class. diff --cc spec/14-classes.md index 7db2c0c,4b1ebcc..a686dc5 --- a/spec/14-classes.md +++ b/spec/14-classes.md @@@ -220,6 -218,7 +218,7 @@@ class MyList implements MyCollectio * [*method-declaration*](#methods) * [*constructor-declaration*](#constructors) * [*destructor-declaration*](#destructors) -* [*trait-use-clauses*](16-traits.md#trait-uses) ++* [*trait-use-clause*](16-traits.md#trait-uses) **Semantics**