Update baselines after merging from master

This commit is contained in:
Nathan Shively-Sanders 2016-03-28 10:37:39 -07:00
parent 9e5f26048b
commit f64110aa0f
2 changed files with 34 additions and 34 deletions

View file

@ -4,39 +4,39 @@ class B {
>B : Symbol(B, Decl(thisTypeInFunctions.ts, 0, 0))
n: number;
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 1, 9))
>n : Symbol(B.n, Decl(thisTypeInFunctions.ts, 1, 9))
}
class C {
>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
n: number;
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
explicitThis(this: this, m: number): number {
>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 6, 17))
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 6, 28))
return this.n + m;
>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 6, 28))
}
explicitC(this: C, m: number): number {
>explicitC : Symbol(explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 9, 14))
>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 9, 22))
return this.n + m;
>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 9, 22))
}
explicitProperty(this: {n: number}, m: number): number {
>explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 12, 21))
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 12, 39))
@ -48,7 +48,7 @@ class C {
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 12, 39))
}
explicitVoid(this: void, m: number): number {
>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
>explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 15, 17))
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 15, 28))
@ -64,28 +64,28 @@ interface I {
>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
a: number;
>a : Symbol(a, Decl(thisTypeInFunctions.ts, 20, 13))
>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
explicitVoid1(this: void): number;
>explicitVoid1 : Symbol(explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
>explicitVoid1 : Symbol(I.explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 22, 18))
explicitVoid2(this: void): number;
>explicitVoid2 : Symbol(explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
>explicitVoid2 : Symbol(I.explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 23, 18))
explicitStructural(this: {a: number}): number;
>explicitStructural : Symbol(explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
>explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 24, 23))
>a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
explicitInterface(this: I): number;
>explicitInterface : Symbol(explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
>explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 25, 22))
>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
explicitThis(this: this): number;
>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
>explicitThis : Symbol(I.explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 26, 17))
}
function explicitStructural(this: { y: number }, x: number): number {
@ -585,22 +585,22 @@ class Base1 {
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
x: number;
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
public polymorphic(this: this): number { return this.x; }
>polymorphic : Symbol(polymorphic, Decl(thisTypeInFunctions.ts, 137, 14))
>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 137, 14))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 138, 23))
>this.x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
explicit(this: Base1): number { return this.x; }
>explicit : Symbol(explicit, Decl(thisTypeInFunctions.ts, 138, 61))
>explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 138, 61))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 139, 13))
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
>this.x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
static explicitStatic(this: typeof Base1): number { return this.y; }
>explicitStatic : Symbol(Base1.explicitStatic, Decl(thisTypeInFunctions.ts, 139, 52))
@ -618,23 +618,23 @@ class Derived1 extends Base1 {
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
y: number
>y : Symbol(y, Decl(thisTypeInFunctions.ts, 143, 30))
>y : Symbol(Derived1.y, Decl(thisTypeInFunctions.ts, 143, 30))
}
class Base2 {
>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 145, 1))
y: number
>y : Symbol(y, Decl(thisTypeInFunctions.ts, 146, 13))
>y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 146, 13))
polymorphic(this: this): number { return this.y; }
>polymorphic : Symbol(polymorphic, Decl(thisTypeInFunctions.ts, 147, 13))
>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 147, 13))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 148, 16))
>this.y : Symbol(y, Decl(thisTypeInFunctions.ts, 146, 13))
>this.y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 146, 13))
>this : Symbol(Base2, Decl(thisTypeInFunctions.ts, 145, 1))
>y : Symbol(y, Decl(thisTypeInFunctions.ts, 146, 13))
>y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 146, 13))
explicit(this: Base1): number { return this.x; }
>explicit : Symbol(explicit, Decl(thisTypeInFunctions.ts, 148, 54))
>explicit : Symbol(Base2.explicit, Decl(thisTypeInFunctions.ts, 148, 54))
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 149, 13))
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
@ -646,7 +646,7 @@ class Derived2 extends Base2 {
>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 145, 1))
x: number
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 151, 30))
>x : Symbol(Derived2.x, Decl(thisTypeInFunctions.ts, 151, 30))
}
let b1 = new Base1();
>b1 : Symbol(b1, Decl(thisTypeInFunctions.ts, 154, 3))

View file

@ -3,23 +3,23 @@ interface Real {
>Real : Symbol(Real, Decl(unionThisTypeInFunctions.ts, 0, 0))
method(this: this, n: number): void;
>method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 0, 16))
>method : Symbol(Real.method, Decl(unionThisTypeInFunctions.ts, 0, 16))
>this : Symbol(this, Decl(unionThisTypeInFunctions.ts, 1, 11))
>n : Symbol(n, Decl(unionThisTypeInFunctions.ts, 1, 22))
data: string;
>data : Symbol(data, Decl(unionThisTypeInFunctions.ts, 1, 40))
>data : Symbol(Real.data, Decl(unionThisTypeInFunctions.ts, 1, 40))
}
interface Fake {
>Fake : Symbol(Fake, Decl(unionThisTypeInFunctions.ts, 3, 1))
method(this: this, n: number): void;
>method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 4, 16))
>method : Symbol(Fake.method, Decl(unionThisTypeInFunctions.ts, 4, 16))
>this : Symbol(this, Decl(unionThisTypeInFunctions.ts, 5, 11))
>n : Symbol(n, Decl(unionThisTypeInFunctions.ts, 5, 22))
data: number;
>data : Symbol(data, Decl(unionThisTypeInFunctions.ts, 5, 40))
>data : Symbol(Fake.data, Decl(unionThisTypeInFunctions.ts, 5, 40))
}
function test(r: Real | Fake) {
>test : Symbol(test, Decl(unionThisTypeInFunctions.ts, 7, 1))