From 4d3b49c1659d978a7879b5d4bfec14b16a0f1faa Mon Sep 17 00:00:00 2001 From: Kevin Millikin Date: Thu, 28 May 2015 16:08:29 +0200 Subject: [PATCH 1/2] Some minor formatting cleanups. --- proposal.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/proposal.md b/proposal.md index 6c4c5c3..a1535b5 100644 --- a/proposal.md +++ b/proposal.md @@ -79,19 +79,18 @@ A compound assignment of the form *v op= e* is equivalent to *v=v op e*. A compo ``` compoundAssignmentOperator: - -‘*=’ | -‘/=’ | -‘ ̃/=’ | -‘%=’ | -‘+=’ | -‘-=’ | -‘<<=’ | -‘>>=’ | -‘&=’ | -‘ˆ=’ | -‘|=’ -‘??=’ + ‘*=’ | + ‘/=’ | + ‘ ̃/=’ | + ‘%=’ | + ‘+=’ | + ‘-=’ | + ‘<<=’ | + ‘>>=’ | + ‘&=’ | + ‘ˆ=’ | + ‘|=’ + ‘??=’ ; ``` @@ -100,10 +99,10 @@ compoundAssignmentOperator: #### 16.20 Conditional A conditional expression evaluates one of two expressions based on a boolean condition. -conditionalExpression: ``` -ifNullExpression (‘ ?’ expressionWithoutCascade ‘:’ expressionWithoutCascade)? +conditionalExpression: + ifNullExpression (‘ ?’ expressionWithoutCascade ‘:’ expressionWithoutCascade)? ; ``` **Rest of section 16.20 is unchanged** From cc48fc111526b196f52791c0db94d954b74684a3 Mon Sep 17 00:00:00 2001 From: Kevin Millikin Date: Thu, 28 May 2015 16:20:04 +0200 Subject: [PATCH 2/2] A couple more formatting fixes. --- proposal.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/proposal.md b/proposal.md index a1535b5..e6ac63c 100644 --- a/proposal.md +++ b/proposal.md @@ -74,7 +74,6 @@ See above. The proposal is strictly limited to the above syntactic transforms. #### 16.19.1 Compound Assignment A compound assignment of the form *v op= e* is equivalent to *v=v op e*. A compound assignment of the form *C.v op= e* is equivalent to *C.v = C.v op e*. A compound assignment of the form *e1.v op = e2* is equivalent to `((x) => x.v = x.v op e2)(e1)` where *x* is a variable that is not used in *e2*. A compound assignment of the form *e1[e2] op= e3* is equivalent to `((a, i) => a[i] = a[i] op e3)(e1, e2)` where *a* and *i* are variables that are not used in *e3*. -; ``` @@ -127,15 +126,15 @@ Assignable expressions are expressions that can appear on the left hand side of ``` assignableExpression: -primary (arguments* assignableSelector)+ | -super assignableSelector | -identifier + primary (arguments* assignableSelector)+ | + super assignableSelector | + identifier ; assignableSelector: -‘[’ expression ‘]’ | - ‘.’ identifier | - ‘?.’ identifier + ‘[’ expression ‘]’ | + ‘.’ identifier | + ‘?.’ identifier ; ``` An assignable expression can be conditional or unconditional.