Merge branch 'transforms-flags' into transforms-transformer

rbuckton · rbuckton · commit 6fa400254d83 · 2016-02-09T11:43:46.000-08:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -96,7 +96,7 @@ namespace ts {
      * returns a falsey value, then returns false.
      * If no such value is found, the callback is applied to each element of array and `true` is returned.
      */
-    export function trueForAll<T>(array: T[], callback: (element: T, index: number) => boolean): boolean {
+    export function every<T>(array: T[], callback: (element: T, index: number) => boolean): boolean {
         if (array) {
             for (let i = 0, len = array.length; i < len; i++) {
                 if (!callback(array[i], i)) {
@@ -252,14 +252,14 @@ namespace ts {
         return ~low;
     }
 
-    export function reduceLeft<T>(array: T[], f: (a: T, x: T) => T): T;
-    export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
-    export function reduceLeft<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
+    export function reduceLeft<T, U>(array: T[], f: (memo: U, value: T) => U, initial: U): U;
+    export function reduceLeft<T>(array: T[], f: (memo: T, value: T) => T): T;
+    export function reduceLeft<T>(array: T[], f: (memo: T, value: T) => T, initial?: T): T {
         if (array) {
             const count = array.length;
             if (count > 0) {
                 let pos = 0;
-                let result: T | U;
+                let result: T;
                 if (arguments.length <= 2) {
                     result = array[pos];
                     pos++;
@@ -268,22 +268,22 @@ namespace ts {
                     result = initial;
                 }
                 while (pos < count) {
-                    result = f(<U>result, array[pos]);
+                    result = f(result, array[pos]);
                     pos++;
                 }
-                return <U>result;
+                return result;
             }
         }
         return initial;
     }
 
-    export function reduceRight<T>(array: T[], f: (a: T, x: T) => T): T;
-    export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial: U): U;
-    export function reduceRight<T, U>(array: T[], f: (a: U, x: T) => U, initial?: U): U {
+    export function reduceRight<T, U>(array: T[], f: (memo: U, value: T) => U, initial: U): U;
+    export function reduceRight<T>(array: T[], f: (memo: T, value: T) => T): T;
+    export function reduceRight<T>(array: T[], f: (memo: T, value: T) => T, initial?: T): T {
         if (array) {
             let pos = array.length - 1;
             if (pos >= 0) {
-                let result: T | U;
+                let result: T;
                 if (arguments.length <= 2) {
                     result = array[pos];
                     pos--;
@@ -292,10 +292,10 @@ namespace ts {
                     result = initial;
                 }
                 while (pos >= 0) {
-                    result = f(<U>result, array[pos]);
+                    result = f(result, array[pos]);
                     pos--;
                 }
-                return <U>result;
+                return result;
             }
         }
         return initial;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2755,13 +2755,6 @@ namespace ts {
         ES6 = 1 << 6,
         ContainsES6 = 1 << 7,
 
-        // Assertions
-        // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
-        AssertTypeScript = TypeScript | ContainsTypeScript,
-        AssertJsx = Jsx | ContainsJsx,
-        AssertES7 = ES7 | ContainsES7,
-        AssertES6 = ES6 | ContainsES6,
-
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
         ContainsDecorators = 1 << 8,
@@ -2773,6 +2766,13 @@ namespace ts {
         ContainsSpreadElementExpression = 1 << 14,
         ContainsComputedPropertyName = 1 << 15,
 
+        // Assertions
+        // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
+        AssertTypeScript = TypeScript | ContainsTypeScript,
+        AssertJsx = Jsx | ContainsJsx,
+        AssertES7 = ES7 | ContainsES7,
+        AssertES6 = ES6 | ContainsES6,
+
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
@@ -755,7 +755,7 @@ namespace ts {
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes: NodeArray<Node>) {
-        Debug.assert(trueForAll(nodes, isStatement), "Cannot lift nodes to a Block.");
+        Debug.assert(every(nodes, isStatement), "Cannot lift nodes to a Block.");
         return createBlock(<NodeArray<Statement>>nodes);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ namespace ts {`
`755`	`755`	`* @param nodes The NodeArray.`
`756`	`756`	`*/`
`757`	`757`	`function liftToBlock(nodes: NodeArray<Node>) {`
`758`		`- Debug.assert(trueForAll(nodes, isStatement), "Cannot lift nodes to a Block.");`
	`758`	`+ Debug.assert(every(nodes, isStatement), "Cannot lift nodes to a Block.");`
`759`	`759`	`return createBlock(<NodeArray<Statement>>nodes);`
`760`	`760`	`}`
`761`	`761`