Merge pull request microsoft#2875 from Microsoft/incrementor

JsonFreeman · JsonFreeman · commit 60afbc133406 · 2015-04-22T15:07:09.000-07:00
Rename iterator property of ForStatement to incrementor
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -9349,7 +9349,7 @@ module ts {
             }
 
             if (node.condition) checkExpression(node.condition);
-            if (node.iterator) checkExpression(node.iterator);
+            if (node.incrementor) checkExpression(node.incrementor);
             checkSourceElement(node.statement);
         }
 
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -2138,7 +2138,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 write(";");
                 emitOptional(" ", node.condition);
                 write(";");
-                emitOptional(" ", node.iterator);
+                emitOptional(" ", node.incrementor);
                 write(")");
                 emitEmbeddedStatement(node.statement);
             }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -194,7 +194,7 @@ module ts {
             case SyntaxKind.ForStatement:
                 return visitNode(cbNode, (<ForStatement>node).initializer) ||
                     visitNode(cbNode, (<ForStatement>node).condition) ||
-                    visitNode(cbNode, (<ForStatement>node).iterator) ||
+                    visitNode(cbNode, (<ForStatement>node).incrementor) ||
                     visitNode(cbNode, (<ForStatement>node).statement);
             case SyntaxKind.ForInStatement:
                 return visitNode(cbNode, (<ForInStatement>node).initializer) ||
@@ -3497,7 +3497,7 @@ module ts {
                 }
                 parseExpected(SyntaxKind.SemicolonToken);
                 if (token !== SyntaxKind.CloseParenToken) {
-                    forStatement.iterator = allowInAnd(parseExpression);
+                    forStatement.incrementor = allowInAnd(parseExpression);
                 }
                 parseExpected(SyntaxKind.CloseParenToken);
                 forOrForInOrForOfStatement = forStatement;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -795,7 +795,7 @@ module ts {
     export interface ForStatement extends IterationStatement {
         initializer?: VariableDeclarationList | Expression;
         condition?: Expression;
-        iterator?: Expression;
+        incrementor?: Expression;
     }
 
     export interface ForInStatement extends IterationStatement {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -775,7 +775,7 @@ module ts {
                         let forStatement = <ForStatement>parent;
                         return (forStatement.initializer === node && forStatement.initializer.kind !== SyntaxKind.VariableDeclarationList) ||
                             forStatement.condition === node ||
-                            forStatement.iterator === node;
+                            forStatement.incrementor === node;
                     case SyntaxKind.ForInStatement:
                     case SyntaxKind.ForOfStatement:
                         let forInStatement = <ForInStatement | ForOfStatement>parent;
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
@@ -401,8 +401,8 @@ module ts.BreakpointResolver {
                 if (forStatement.condition) {
                     return textSpan(forStatement.condition);
                 }
-                if (forStatement.iterator) {
-                    return textSpan(forStatement.iterator);
+                if (forStatement.incrementor) {
+                    return textSpan(forStatement.incrementor);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -9349,7 +9349,7 @@ module ts {`
`9349`	`9349`	`}`
`9350`	`9350`
`9351`	`9351`	`if (node.condition) checkExpression(node.condition);`
`9352`		`- if (node.iterator) checkExpression(node.iterator);`
	`9352`	`+ if (node.incrementor) checkExpression(node.incrementor);`
`9353`	`9353`	`checkSourceElement(node.statement);`
`9354`	`9354`	`}`
`9355`	`9355`
Original file line number	Diff line number	Diff line change
`@@ -2138,7 +2138,7 @@ var __param = this.__param \|\| function(index, decorator) { return function (targ`
`2138`	`2138`	`write(";");`
`2139`	`2139`	`emitOptional(" ", node.condition);`
`2140`	`2140`	`write(";");`
`2141`		`- emitOptional(" ", node.iterator);`
	`2141`	`+ emitOptional(" ", node.incrementor);`
`2142`	`2142`	`write(")");`
`2143`	`2143`	`emitEmbeddedStatement(node.statement);`
`2144`	`2144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ module ts {`
`795`	`795`	`export interface ForStatement extends IterationStatement {`
`796`	`796`	`initializer?: VariableDeclarationList \| Expression;`
`797`	`797`	`condition?: Expression;`
`798`		`- iterator?: Expression;`
	`798`	`+ incrementor?: Expression;`
`799`	`799`	`}`
`800`	`800`
`801`	`801`	`export interface ForInStatement extends IterationStatement {`
Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,8 @@ module ts.BreakpointResolver {`
`401`	`401`	`if (forStatement.condition) {`
`402`	`402`	`return textSpan(forStatement.condition);`
`403`	`403`	`}`
`404`		`- if (forStatement.iterator) {`
`405`		`- return textSpan(forStatement.iterator);`
	`404`	`+ if (forStatement.incrementor) {`
	`405`	`+ return textSpan(forStatement.incrementor);`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`