Merge pull request #1017 from Microsoft/fixTypeRelationCaching

Fix type relation caching

Author: ahejlsberg

src/compiler/checker.ts

@@ -1,6 +1,20 @@
 /// <reference path="types.ts"/>
 
 module ts {
+
+    // Ternary values are defined such that
+    // x & y is False if either x or y is False.
+    // x & y is Maybe if either x or y is Maybe, but neither x or y is False.
+    // x & y is True if both x and y are True.
+    // x | y is False if both x and y are False.
+    // x | y is Maybe if either x or y is Maybe, but neither x or y is True.
+    // x | y is True if either x or y is True.
+    export enum Ternary {
+        False = 0,
+        Maybe = 1,
+        True  = -1
+    }
+
     export interface Map<T> {
         [index: string]: T;
     }

src/compiler/core.ts

@@ -26,13 +26,10 @@ tests/cases/compiler/arrayAssignmentTest1.ts(70,1): error TS2323: Type 'C3[]' is
     Property 'C2M1' is missing in type 'C3'.
 tests/cases/compiler/arrayAssignmentTest1.ts(75,1): error TS2323: Type 'C2[]' is not assignable to type 'C3[]'.
   Type 'C2' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C2'.
 tests/cases/compiler/arrayAssignmentTest1.ts(76,1): error TS2323: Type 'C1[]' is not assignable to type 'C3[]'.
   Type 'C1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(77,1): error TS2323: Type 'I1[]' is not assignable to type 'C3[]'.
   Type 'I1' is not assignable to type 'C3'.
-    Property 'CM3M1' is missing in type 'I1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(79,1): error TS2323: Type '() => C1' is not assignable to type 'any[]'.
   Property 'push' is missing in type '() => C1'.
 tests/cases/compiler/arrayAssignmentTest1.ts(80,1): error TS2323: Type '{ one: number; }' is not assignable to type 'any[]'.
@@ -162,17 +159,14 @@ tests/cases/compiler/arrayAssignmentTest1.ts(85,1): error TS2323: Type 'I1' is n
     ~~~~~~
 !!! error TS2323: Type 'C2[]' is not assignable to type 'C3[]'.
 !!! error TS2323:   Type 'C2' is not assignable to type 'C3'.
-!!! error TS2323:     Property 'CM3M1' is missing in type 'C2'.
     arr_c3 = arr_c1_2; // should be an error - is
     ~~~~~~
 !!! error TS2323: Type 'C1[]' is not assignable to type 'C3[]'.
 !!! error TS2323:   Type 'C1' is not assignable to type 'C3'.
-!!! error TS2323:     Property 'CM3M1' is missing in type 'C1'.
     arr_c3 = arr_i1_2; // should be an error - is
     ~~~~~~
 !!! error TS2323: Type 'I1[]' is not assignable to type 'C3[]'.
 !!! error TS2323:   Type 'I1' is not assignable to type 'C3'.
-!!! error TS2323:     Property 'CM3M1' is missing in type 'I1'.
 
     arr_any = f1; // should be an error - is
     ~~~~~~~

tests/baselines/reference/arrayAssignmentTest1.errors.txt

@@ -1,6 +1,5 @@
 tests/cases/compiler/arrayCast.ts(3,1): error TS2352: Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other.
   Type '{ foo: string; }' is not assignable to type '{ id: number; }'.
-    Property 'id' is missing in type '{ foo: string; }'.
 
 
 ==== tests/cases/compiler/arrayCast.ts (1 errors) ====
@@ -10,7 +9,6 @@ tests/cases/compiler/arrayCast.ts(3,1): error TS2352: Neither type '{ foo: strin
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2352: Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other.
 !!! error TS2352:   Type '{ foo: string; }' is not assignable to type '{ id: number; }'.
-!!! error TS2352:     Property 'id' is missing in type '{ foo: string; }'.
 
     // Should succeed, as the {} element causes the type of the array to be {}[]
     <{ id: number; }[]>[{ foo: "s" }, {}]; 

tests/baselines/reference/arrayCast.errors.txt

@@ -8,10 +8,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts(53,9): error TS2323: Type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
   Types of parameters 'y' and 'y' are incompatible.
     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
-      Types of parameters 'arg2' and 'arg2' are incompatible.
-        Type 'Base' is not assignable to type '{ foo: number; }'.
-          Types of property 'foo' are incompatible.
-            Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts (2 errors) ====
@@ -80,10 +76,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2323: Type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
 !!! error TS2323:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2323:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
-!!! error TS2323:       Types of parameters 'arg2' and 'arg2' are incompatible.
-!!! error TS2323:         Type 'Base' is not assignable to type '{ foo: number; }'.
-!!! error TS2323:           Types of property 'foo' are incompatible.
-!!! error TS2323:             Type 'string' is not assignable to type 'number'.
 
 
             var b10: <T extends Derived>(...x: T[]) => T; 

tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt

@@ -8,10 +8,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(53,9): error TS2323: Type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
   Types of parameters 'y' and 'y' are incompatible.
     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
-      Types of parameters 'arg2' and 'arg2' are incompatible.
-        Type 'Base' is not assignable to type '{ foo: number; }'.
-          Types of property 'foo' are incompatible.
-            Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(77,9): error TS2323: Type 'new <T>(x: (a: T) => T) => T[]' is not assignable to type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
@@ -92,10 +88,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2323: Type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
 !!! error TS2323:   Types of parameters 'y' and 'y' are incompatible.
 !!! error TS2323:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
-!!! error TS2323:       Types of parameters 'arg2' and 'arg2' are incompatible.
-!!! error TS2323:         Type 'Base' is not assignable to type '{ foo: number; }'.
-!!! error TS2323:           Types of property 'foo' are incompatible.
-!!! error TS2323:             Type 'string' is not assignable to type 'number'.
 
 
             var b10: new <T extends Derived>(...x: T[]) => T; 

tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt

@@ -12,14 +12,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(33,9): error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
     Type 'T' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(36,9): error TS2323: Type '{ [x: number]: Derived2; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived2' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts(37,9): error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'T' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts (6 errors) ====
@@ -74,7 +72,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2323:   Index signatures are incompatible.
 !!! error TS2323:     Type 'T' is not assignable to type 'Derived'.
-!!! error TS2323:       Property 'bar' is missing in type 'Base'.
 
             var b2: { [x: number]: Derived2; }
             a = b2; // error
@@ -87,7 +84,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2323:   Index signatures are incompatible.
 !!! error TS2323:     Type 'T' is not assignable to type 'Derived2'.
-!!! error TS2323:       Property 'baz' is missing in type 'Base'.
 
             var b3: { [x: number]: T; }
             a = b3; // ok

tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt

@@ -12,14 +12,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(33,9): error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived; }'.
   Index signatures are incompatible.
     Type 'T' is not assignable to type 'Derived'.
-      Property 'bar' is missing in type 'Base'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(36,9): error TS2323: Type '{ [x: number]: Derived2; }' is not assignable to type 'A<T>'.
   Index signatures are incompatible.
     Type 'Derived2' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts(37,9): error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived2; }'.
   Index signatures are incompatible.
     Type 'T' is not assignable to type 'Derived2'.
-      Property 'baz' is missing in type 'Base'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts (6 errors) ====
@@ -74,7 +72,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived; }'.
 !!! error TS2323:   Index signatures are incompatible.
 !!! error TS2323:     Type 'T' is not assignable to type 'Derived'.
-!!! error TS2323:       Property 'bar' is missing in type 'Base'.
 
             var b2: { [x: number]: Derived2; }
             a = b2; // error
@@ -87,7 +84,6 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2323: Type 'A<T>' is not assignable to type '{ [x: number]: Derived2; }'.
 !!! error TS2323:   Index signatures are incompatible.
 !!! error TS2323:     Type 'T' is not assignable to type 'Derived2'.
-!!! error TS2323:       Property 'baz' is missing in type 'Base'.
 
             var b3: { [x: number]: T; }
             a = b3; // ok