com php-langspec: Grammar syntax/typo fixes: spec/09-lexical-structure.md spec/10-expressions.md spec/11-statements.md spec/19-grammar.md
[email protected] (Nikita Popov) Sun, 20 Nov 2016 22:15:46 +0000
| Newsgroups | php.standards.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: bb8f2d45961447e4deb4e730c8a2c0fb3d525bcd=0AAuthor: Nikita Pop= ov <[email protected]> Sun, 20 Nov 2016 23:15:46 +0100=0AParents: 344= 7bf5d4df23527c623c58da67b43df665c7ba0=0ABranches: master=0A=0ALink: = http://git.php.net/?p=3Dphp-langspec.git;a=3Dcommitdiff;h=3Dbb8f2d45961447e= 4deb4e730c8a2c0fb3d525bcd=0A=0ALog:=0AGrammar syntax/typo fixes=0A=0AChange= d paths:=0A M spec/09-lexical-structure.md=0A M spec/10-expressions.md= =0A M spec/11-statements.md=0A M spec/19-grammar.md=0A=0A=0ADiff:=0Adif= f --git a/spec/09-lexical-structure.md b/spec/09-lexical-structure.md=0Aind= ex 5ea95f2..cc82917 100644=0A--- a/spec/09-lexical-structure.md=0A+++ b/spe= c/09-lexical-structure.md=0A@@ -731,7 +731,7 @@ echo "\$myC->p1 =3D >$myC->= p1<\n"; // =E2=86=92 $myC->p1 =3D >2<=0A =0A <pre>=0A <i>heredoc-string-= literal::</i>=0A- <i>b-prefix<sub>opt</sub></i> <<< <i>hd-s= tart-identifier new-line hd-body<sub>opt</i> hd-end-identifier</i> = ;<i><sub>opt</sub> new-line</i>=0A+ <i>b-prefix<sub>opt</sub></i> &l= t;<< <i>hd-start-identifier new-line hd-body<sub>opt</sub></i> = hd-end-identifier</i> ;<i><sub>opt</sub> new-line</i>=0A =0A <i>hd-= start-identifier::</i>=0A <i>name</i>=0Adiff --git a/spec/10-expression= s.md b/spec/10-expressions.md=0Aindex 0ced0f2..255a7dd 100644=0A--- a/spec/= 10-expressions.md=0A+++ b/spec/10-expressions.md=0A@@ -335,7 +335,7 @@ othe= r values or expressions could be used.=0A <i>echo-intrinsic:</i>=0A e= cho <i>expression-list</i>=0A =0A- <i>expression-list-two-or-more:</i>=0A= + <i>expression-list:</i>=0A <i>expression</i>=0A <i>expression-li= st</i> , <i>expression</i>=0A </pre>=0A@@ -509,7 +509,7 @@ exit;=0A <i>= isset-intrinsic:</i>=0A isset ( <i>variable-list</i> )=0A =0A- <i>v= ariable-list</i>:=0A+ <i>variable-list:</i>=0A <i>variable</i>=0A = <i>variable-list</i> , <i>variable</i>=0A </pre>=0A@@ -754,7 +754,7 @@ un= set($x->m); // if m is a dynamic property, $x->__unset("m") is called=0A = =0A <pre>=0A <i>anonymous-function-creation-expression:</i>=0A- static<s= ub>opt</sub> function &<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+ static<sub>opt</sub> function &<sub>opt</su= b> ( <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 = <i>compound-statement</i>=0A =0A <i>anonymous-function-use-clause:</i>=0A= @@ -1029,7 +1029,7 @@ $v2 =3D new class (100) extends C1 implements I1, I2 = {=0A <i>element-key:</i>=0A <i>expression</i>=0A =0A- <i>element-val= ue</i>=0A+ <i>element-value:</i>=0A <i>expression</i>=0A </pre>=0A =0A= @@ -1562,7 +1562,7 @@ $a =3D array(100, 200); $v =3D $a[1]++; // old value = of $ia[1] (200) is assigned=0A <i>qualified-name</i>=0A <i>derefere= ncable-expression</i>=0A =0A- <i>relative-scope</i>:=0A+ <i>relative-scop= e:</i>=0A self=0A parent=0A static=0A@@ -2552,7 +2552,7 @@ TRUE= !=3D=3D 100 // result has value TRUE=0A <pre>=0A <i>bitwise-AND-express= ion:</i>=0A <i>equality-expression</i>=0A- <i>bit-wise-AND-expressio= n</i> & <i>equality-expression</i>=0A+ <i>bitwise-AND-expression</i> = & <i>equality-expression</i>=0A </pre>=0A =0A **Defined elsewhere**=0A@@ -= 2688,7 +2688,7 @@ $lLetter =3D $upCaseLetter | 0x20; // set the 6th bit to= make letter 'a'=0A =0A <pre>=0A <i>logical-AND-expression-1:</i>=0A- = <i>bitwise-incl-OR-expression</i>=0A+ <i>bitwise-inc-OR-expression</i>= =0A <i>logical-AND-expression-1</i> && <i>bitwise-inc-OR-expression</= i>=0A </pre>=0A =0A@@ -2789,7 +2789,7 @@ function factorial($int)=0A =0A <p= re>=0A <i>coalesce-expression:</i>=0A- <i>logical-inc-OR-expression</i= > ?? <i>expression</i>=0A+ <i>logical-inc-OR-expression-1</i> ?? <i>= expression</i>=0A </pre>=0A =0A **Defined elsewhere**=0Adiff --git a/spec/1= 1-statements.md b/spec/11-statements.md=0Aindex 423c972..a8ba5f0 100644=0A-= -- a/spec/11-statements.md=0A+++ b/spec/11-statements.md=0A@@ -605,7 +605,7= @@ for ($a =3D 100, $i =3D 1; ++$i, $i <=3D 10; ++$i, $a -=3D 10)=0A f= oreach ( <i>foreach-collection-name</i> as <i>foreach-key<sub>opt</sub>= foreach-value</i> ) statement=0A foreach ( <i>foreach-collection= -name</i> as <i>foreach-key<sub>opt</sub> foreach-value</i> ) : <i>st= atement-list</i> endforeach ;=0A =0A- <i>foreach-collection-name</i>:=0A= + <i>foreach-collection-name:</i>=0A <i>expression</i>=0A =0A <i>for= each-key:</i>=0Adiff --git a/spec/19-grammar.md b/spec/19-grammar.md=0Ainde= x 4042df4..6e3e936 100644=0A--- a/spec/19-grammar.md=0A+++ b/spec/19-gramma= r.md=0A@@ -239,7 +239,7 @@ The grammar notation is described in [Grammars s= ection](09-lexical-structure.md#=0A -> <i>name</i>=0A =0A <i>heredo= c-string-literal::</i>=0A- <i>b-prefix<sub>opt</sub></i> <<< = <i>hd-start-identifier new-line hd-body<sub>opt</i> hd-end-identifi= er</i> ;<i><sub>opt</sub> new-line</i>=0A+ <i>b-prefix<sub>opt</sub>= </i> <<< <i>hd-start-identifier new-line hd-body<sub>opt</= sub></i> hd-end-identifier</i> ;<i><sub>opt</sub> new-line</i>=0A =0A= <i>hd-start-identifier::</i>=0A <i>name</i>=0A@@ -395,7 +395,7 @@ Th= e grammar notation is described in [Grammars section](09-lexical-structure.= md#=0A <i>echo-intrinsic:</i>=0A echo <i>expression-list</i>=0A =0A-= <i>expression-list-two-or-more:</i>=0A+ <i>expression-list:</i>=0A <= i>expression</i>=0A <i>expression-list</i> , <i>expression</i>=0A =0A= @@ -414,7 +414,7 @@ The grammar notation is described in [Grammars section]= (09-lexical-structure.md#=0A <i>isset-intrinsic:</i>=0A isset ( <i>= variable-list</i> )=0A =0A- <i>variable-list</i>:=0A+ <i>variable-list:<= /i>=0A <i>variable</i>=0A <i>variable-list</i> , <i>variable</i>= =0A =0A@@ -445,7 +445,7 @@ The grammar notation is described in [Grammars s= ection](09-lexical-structure.md#=0A unset ( <i>variable-list</i> )= =0A =0A <i>anonymous-function-creation-expression:</i>=0A- static<sub>op= t</sub> function &<sub>opt</sub> ( <i>parameter-declaration-list<sub>opt<= sub></i> ) <i>return-type<sub>opt</sub></i> <i>anonymous-function-use-clau= se<sub>opt</sub></i>=0A+ static<sub>opt</sub> function &<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 <i>co= mpound-statement</i>=0A =0A <i>anonymous-function-use-clause:</i>=0A@@ -4= 97,7 +497,7 @@ The grammar notation is described in [Grammars section](09-l= exical-structure.md#=0A <i>element-key:</i>=0A <i>expression</i>=0A = =0A- <i>element-value</i>=0A+ <i>element-value:</i>=0A <i>expression<= /i>=0A =0A <i>subscript-expression:</i>=0A@@ -550,7 +550,7 @@ The grammar= notation is described in [Grammars section](09-lexical-structure.md#=0A = <i>qualified-name</i>=0A <i>dereferencable-expression</i>=0A =0A- <i= >relative-scope</i>:=0A+ <i>relative-scope:</i>=0A self=0A parent= =0A static=0A@@ -639,7 +639,7 @@ The grammar notation is described in [= Grammars section](09-lexical-structure.md#=0A =0A <i>bitwise-AND-expressi= on:</i>=0A <i>equality-expression</i>=0A- <i>bit-wise-AND-expression= </i> & <i>equality-expression</i>=0A+ <i>bitwise-AND-expression</i> &= <i>equality-expression</i>=0A =0A <i>bitwise-exc-OR-expression:</i>=0A = <i>bitwise-AND-expression</i>=0A@@ -650,7 +650,7 @@ The grammar notatio= n is described in [Grammars section](09-lexical-structure.md#=0A <i>bit= wise-inc-OR-expression</i> | <i>bitwise-exc-OR-expression</i>=0A =0A <i= >logical-AND-expression-1:</i>=0A- <i>bitwise-incl-OR-expression</i>=0A+= <i>bitwise-inc-OR-expression</i>=0A <i>logical-AND-expression-1</i>= && <i>bitwise-inc-OR-expression</i>=0A =0A <i>logical-inc-OR-expressio= n-1:</i>=0A@@ -662,7 +662,7 @@ The grammar notation is described in [Gramma= rs section](09-lexical-structure.md#=0A <i>logical-inc-OR-expression-1<= /i> ? <i>expression<sub>opt</sub></i> : <i>conditional-expression</i>= =0A =0A <i>coalesce-expression:</i>=0A- <i>logical-inc-OR-expression</= i> ?? <i>expression</i>=0A+ <i>logical-inc-OR-expression-1</i> ?? <i= >expression</i>=0A =0A <i>assignment-expression:</i>=0A <i>conditiona= l-expression</i>=0A@@ -839,7 +839,7 @@ The grammar notation is described in= [Grammars section](09-lexical-structure.md#=0A foreach ( <i>foreach-= collection-name</i> as <i>foreach-key<sub>opt</sub> foreach-value</i> )= statement=0A foreach ( <i>foreach-collection-name</i> as <i>fore= ach-key<sub>opt</sub> foreach-value</i> ) : <i>statement-list</i> endf= oreach ;=0A =0A- <i>foreach-collection-name</i>:=0A+ <i>foreach-collecti= on-name:</i>=0A <i>expression</i>=0A =0A <i>foreach-key:</i>=0A