com php-langspec: Cleanup echo/isset/unset grammar: spec/10-expressions.md spec/19-grammar.md
[email protected] (Nikita Popov) Tue, 15 Nov 2016 22:15:45 +0000
| Newsgroups | php.standards.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 256534b60943c0610ccb0f8cde160323bcbd4f7c=0AAuthor: Nikita Pop= ov <[email protected]> Tue, 15 Nov 2016 23:15:45 +0100=0AParents: 0fd= 1786650afcdd580d02a8cca535fdf4d33a27e=0ABranches: master=0A=0ALink: = http://git.php.net/?p=3Dphp-langspec.git;a=3Dcommitdiff;h=3D256534b60943c06= 10ccb0f8cde160323bcbd4f7c=0A=0ALog:=0ACleanup echo/isset/unset grammar=0A= =0Aisset and unset accept only variables.=0AFor echo, merge the single and = multiple expression cases.=0A=0AChanged paths:=0A M spec/10-expressions.m= d=0A M spec/19-grammar.md=0A=0A=0ADiff:=0Adiff --git a/spec/10-expression= s.md b/spec/10-expressions.md=0Aindex f45286c..39c88cf 100644=0A--- a/spec/= 10-expressions.md=0A+++ b/spec/10-expressions.md=0A@@ -333,12 +333,11 @@ ot= her values or expressions could be used.=0A =0A <pre>=0A <i>echo-intrinsi= c:</i>=0A- echo <i>expression</i>=0A- echo <i>expression-list-two-o= r-more</i>=0A+ echo <i>expression-list</i>=0A =0A <i>expression-list-= two-or-more:</i>=0A- <i>expression</i> , <i>expression</i>=0A- <i>e= xpression-list-two-or-more</i> , <i>expression</i>=0A+ <i>expression</= i>=0A+ <i>expression-list</i> , <i>expression</i>=0A </pre>=0A =0A **D= efined elsewhere**=0A@@ -508,25 +507,21 @@ exit;=0A =0A <pre>=0A <i>isset= -intrinsic:</i>=0A- isset ( <i>expression-list-one-or-more</i> )=0A+ = isset ( <i>variable-list</i> )=0A =0A- <i>expression-list-one-or-mor= e</i>:=0A- <i>expression</i>=0A- <i>expression-list-one-or-more</i> = , <i>expression</i>=0A+ <i>variable-list</i>:=0A+ <i>variable</i>=0A+ = <i>variable-list</i> , <i>variable</i>=0A </pre>=0A =0A **Defined else= where**=0A =0A-* [*expression*](#general-6)=0A-=0A-**Constraints**=0A-=0A-E= ach *expression* must designate a variable.=0A+* [*variable*](#variables)= =0A =0A **Semantics**=0A =0A This intrinsic returns `TRUE` if all the varia= bles designated by=0A-*expression*s are set and their values are not `NULL`= . Otherwise, it=0A+*variables*s are set and their values are not `NULL`. Ot= herwise, it=0A returns `FALSE`.=0A =0A If this intrinsic is used with an ex= pression that designate a [dynamic=0A@@ -708,21 +703,17 @@ $a > $b ? print = "..." : print "...";=0A =0A <pre>=0A <i>unset-intrinsic:</i>=0A- unset= ( <i>expression-list-one-or-more</i> )=0A+ unset ( <i>variable-lis= t</i> )=0A </pre>=0A =0A **Defined elsewhere**=0A =0A-* [*expression-list-= one-or-more*](#isset)=0A-=0A-**Constraints**=0A-=0A-Each *expression* must = designate a variable.=0A+* [*variable-list*](#isset)=0A =0A **Semantics**= =0A =0A This intrinsic [unsets](07-variables.md#general) the variables desi= gnated by each=0A-*expression* in *expression-list-one-or-more*. No value i= s returned. An=0A+*variable* in *variable-list*. No value is returned. An= =0A attempt to unset a non-existent variable (such as a non-existent elemen= t=0A in an array) is ignored.=0A =0Adiff --git a/spec/19-grammar.md b/spec/= 19-grammar.md=0Aindex beb6cf5..ce47a26 100644=0A--- a/spec/19-grammar.md=0A= +++ b/spec/19-grammar.md=0A@@ -393,12 +393,11 @@ The grammar notation is de= scribed in [Grammars section](09-lexical-structure.md#=0A <i>print-intr= insic</i>=0A =0A <i>echo-intrinsic:</i>=0A- echo <i>expression</i>=0A= - echo <i>expression-list-two-or-more</i>=0A+ echo <i>expression-li= st</i>=0A =0A <i>expression-list-two-or-more:</i>=0A- <i>expression</i= > , <i>expression</i>=0A- <i>expression-list-two-or-more</i> , <i>ex= pression</i>=0A+ <i>expression</i>=0A+ <i>expression-list</i> , <i>= expression</i>=0A =0A <i>empty-intrinsic:</i>=0A empty ( <i>expressio= n</i> )=0A@@ -413,11 +412,11 @@ The grammar notation is described in [Gram= mars section](09-lexical-structure.md#=0A die ( <i>expression<sub>o= pt</sub></i> )=0A =0A <i>isset-intrinsic:</i>=0A- isset ( <i>expre= ssion-list-one-or-more</i> )=0A+ isset ( <i>variable-list</i> )=0A = =0A- <i>expression-list-one-or-more</i>:=0A- <i>expression</i>=0A- <= i>expression-list-one-or-more</i> , <i>expression</i>=0A+ <i>variable-li= st</i>:=0A+ <i>variable</i>=0A+ <i>variable-list</i> , <i>variable<= /i>=0A =0A <i>list-intrinsic:</i>=0A list ( <i>list-expression-list= <sub>opt</sub></i> )=0A@@ -443,7 +442,7 @@ The grammar notation is describ= ed in [Grammars section](09-lexical-structure.md#=0A print <i>expressi= on</i>=0A =0A <i>unset-intrinsic:</i>=0A- unset ( <i>expression-list= -one-or-more</i> )=0A+ unset ( <i>variable-list</i> )=0A =0A <i>an= onymous-function-creation-expression:</i>=0A static<sub>opt</sub> functio= n &<sub>opt</sub> ( <i>parameter-declaration-list<sub>opt<sub></i> ) <i>= return-type<sub>opt</sub></i> <i>anonymous-function-use-clause<sub>opt</sub= ></i>=0A