Address PR

Yui T · Yui T · commit df18dfcaaed9 · 2015-09-25T14:38:08.000-07:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3015,11 +3015,31 @@ namespace ts {
                 let newPrecedence = getBinaryOperatorPrecedence();
 
                 // Check the precedence to see if we should "take" this operator
-                if (token === SyntaxKind.AsteriskAsteriskToken && newPrecedence < precedence) {
-                    // ** operator is right-assocative
-                    break;
-                }
-                else if (token !== SyntaxKind.AsteriskAsteriskToken && newPrecedence <= precedence) {
+                // - For left associative operator (all operator but **), only consume the operator
+                //   , recursively call the function below and parse binaryExpression as a rightOperand
+                //   of the caller if the new precendence of the operator is greater then or equal to the current precendence.
+                //   For example:
+                //      a - b - c;
+                //            ^token; leftOperand = b. Return b to the caller as a rightOperand
+                //      a * b - c
+                //            ^token; leftOperand = b. Return b to the caller as a rightOperand
+                //      a - b * c;
+                //            ^token; leftOperand = b. Return b * c to the caller as a rightOperand
+                // - For right associative operator (**), only consume the operator, recursively call the function
+                //   and parse binaryExpression as a rightOperand of the caller if the new precendence of
+                //   the operator is strictly grater than the current precendence
+                //   For example:
+                //      a ** b ** c;
+                //             ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
+                //      a - b ** c;
+                //            ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
+                //      a ** b - c
+                //             ^token; leftOperand = b. Return b to the caller as a rightOperand
+                const consumeCurrentOperator = token === SyntaxKind.AsteriskAsteriskToken ?
+                    newPrecedence >= precedence :
+                    newPrecedence > precedence;
+
+                if (!consumeCurrentOperator) {
                     break;
                 }
 
@@ -3226,6 +3246,7 @@ namespace ts {
          *      3) LeftHandSideExpression[?yield] [[no LineTerminator here]]--
          *      4) ++LeftHandSideExpression[?yield]
          *      5) --LeftHandSideExpression[?yield]
+         * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression
          */
         function parseIncrementExpression(): IncrementExpression {
             if (token === SyntaxKind.PlusPlusToken || token === SyntaxKind.MinusMinusToken) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -707,15 +707,18 @@ namespace ts {
     export interface UnaryExpression extends Expression {
         _unaryExpressionBrand: any;
     }
+ 
+    export interface IncrementExpression extends UnaryExpression {
+        _incrementExpressionBrand: any;
+    }
+    //export type IncrementExpression = PrefixUnaryExpression | PostfixUnaryExpression | LeftHandSideExpression;
 
-    export interface IncrementExpression extends UnaryExpression { }
-
-    export interface PrefixUnaryExpression extends UnaryExpression {
+    export interface PrefixUnaryExpression extends IncrementExpression {
         operator: SyntaxKind;
         operand: UnaryExpression | BinaryExpression;
     }
 
-    export interface PostfixUnaryExpression extends PostfixExpression {
+    export interface PostfixUnaryExpression extends IncrementExpression {
         operand: LeftHandSideExpression;
         operator: SyntaxKind;
     }
@@ -724,7 +727,7 @@ namespace ts {
         _postfixExpressionBrand: any;
     }
 
-    export interface LeftHandSideExpression extends PostfixExpression {
+    export interface LeftHandSideExpression extends IncrementExpression {
         _leftHandSideExpressionBrand: any;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -707,15 +707,18 @@ namespace ts {`
`707`	`707`	`export interface UnaryExpression extends Expression {`
`708`	`708`	`_unaryExpressionBrand: any;`
`709`	`709`	`}`
	`710`	`+`
	`711`	`+ export interface IncrementExpression extends UnaryExpression {`
	`712`	`+ _incrementExpressionBrand: any;`
	`713`	`+ }`
	`714`	`+ //export type IncrementExpression = PrefixUnaryExpression \| PostfixUnaryExpression \| LeftHandSideExpression;`
`710`	`715`
`711`		`- export interface IncrementExpression extends UnaryExpression { }`
`712`		`-`
`713`		`- export interface PrefixUnaryExpression extends UnaryExpression {`
	`716`	`+ export interface PrefixUnaryExpression extends IncrementExpression {`
`714`	`717`	`operator: SyntaxKind;`
`715`	`718`	`operand: UnaryExpression \| BinaryExpression;`
`716`	`719`	`}`
`717`	`720`
`718`		`- export interface PostfixUnaryExpression extends PostfixExpression {`
	`721`	`+ export interface PostfixUnaryExpression extends IncrementExpression {`
`719`	`722`	`operand: LeftHandSideExpression;`
`720`	`723`	`operator: SyntaxKind;`
`721`	`724`	`}`
`@@ -724,7 +727,7 @@ namespace ts {`
`724`	`727`	`_postfixExpressionBrand: any;`
`725`	`728`	`}`
`726`	`729`
`727`		`- export interface LeftHandSideExpression extends PostfixExpression {`
	`730`	`+ export interface LeftHandSideExpression extends IncrementExpression {`
`728`	`731`	`_leftHandSideExpressionBrand: any;`
`729`	`732`	`}`
`730`	`733`