From edb6543354fdb5efeb45d4e9e6ebc148fc121490 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 2 Nov 2014 15:21:10 -0800
Subject: [PATCH] Accepting new baselines

---
 .../baselines/reference/unionTypeInference.js | 42 +++++++++++
 .../reference/unionTypeInference.types        | 72 +++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 tests/baselines/reference/unionTypeInference.js
 create mode 100644 tests/baselines/reference/unionTypeInference.types

diff --git a/tests/baselines/reference/unionTypeInference.js b/tests/baselines/reference/unionTypeInference.js
new file mode 100644
index 00000000000..ec59f2c7593
--- /dev/null
+++ b/tests/baselines/reference/unionTypeInference.js
@@ -0,0 +1,42 @@
+//// [unionTypeInference.ts]
+// Verify that inferences made *to* a type parameter in a union type are secondary
+// to inferences made directly to that type parameter
+
+function f<T>(x: T, y: string|T): T {
+    return x;
+}
+function g<T>(value: [string, T]): T {
+    return value[1];
+}
+
+var a: number;
+var a = f(1, 2);
+var b: number;
+var b = f(1, "hello");
+var c: number;
+var c = f(1, a || "hello");
+var d: any;
+var d = f(undefined, "abc");
+var e: boolean;
+var e = g(["string", true]);
+
+
+//// [unionTypeInference.js]
+// Verify that inferences made *to* a type parameter in a union type are secondary
+// to inferences made directly to that type parameter
+function f(x, y) {
+    return x;
+}
+function g(value) {
+    return value[1];
+}
+var a;
+var a = f(1, 2);
+var b;
+var b = f(1, "hello");
+var c;
+var c = f(1, a || "hello");
+var d;
+var d = f(undefined, "abc");
+var e;
+var e = g(["string", true]);
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
new file mode 100644
index 00000000000..dc7fed2aced
--- /dev/null
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -0,0 +1,72 @@
+=== tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts ===
+// Verify that inferences made *to* a type parameter in a union type are secondary
+// to inferences made directly to that type parameter
+
+function f<T>(x: T, y: string|T): T {
+>f : <T>(x: T, y: string | T) => T
+>T : T
+>x : T
+>T : T
+>y : string | T
+>T : T
+>T : T
+
+    return x;
+>x : T
+}
+function g<T>(value: [string, T]): T {
+>g : <T>(value: [string, T]) => T
+>T : T
+>value : [string, T]
+>T : T
+>T : T
+
+    return value[1];
+>value[1] : T
+>value : [string, T]
+}
+
+var a: number;
+>a : number
+
+var a = f(1, 2);
+>a : number
+>f(1, 2) : number
+>f : <T>(x: T, y: string | T) => T
+
+var b: number;
+>b : number
+
+var b = f(1, "hello");
+>b : number
+>f(1, "hello") : number
+>f : <T>(x: T, y: string | T) => T
+
+var c: number;
+>c : number
+
+var c = f(1, a || "hello");
+>c : number
+>f(1, a || "hello") : number
+>f : <T>(x: T, y: string | T) => T
+>a || "hello" : string | number
+>a : number
+
+var d: any;
+>d : any
+
+var d = f(undefined, "abc");
+>d : any
+>f(undefined, "abc") : any
+>f : <T>(x: T, y: string | T) => T
+>undefined : undefined
+
+var e: boolean;
+>e : boolean
+
+var e = g(["string", true]);
+>e : boolean
+>g(["string", true]) : boolean
+>g : <T>(value: [string, T]) => T
+>["string", true] : [string, boolean]
+