new baselines got mergeClassInterfaceAndModule

This commit is contained in:
Arthur Ozga 2015-06-03 14:28:18 -07:00
parent 143890b117
commit 323ce24287
3 changed files with 95 additions and 0 deletions

View file

@ -0,0 +1,19 @@
//// [mergeClassInterfaceAndModule.ts]
interface C1 {}
declare class C1 {}
module C1 {}
declare class C2 {}
interface C2 {}
module C2 {}
declare class C3 {}
module C3 {}
interface C3 {}
module C4 {}
declare class C4 {} // error -- class declaration must preceed module declaration
interface C4 {}
//// [mergeClassInterfaceAndModule.js]

View file

@ -0,0 +1,38 @@
=== tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
interface C1 {}
>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
declare class C1 {}
>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
module C1 {}
>C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 1, 15), Decl(mergeClassInterfaceAndModule.ts, 2, 19))
declare class C2 {}
>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
interface C2 {}
>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
module C2 {}
>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 3, 12), Decl(mergeClassInterfaceAndModule.ts, 5, 19), Decl(mergeClassInterfaceAndModule.ts, 6, 15))
declare class C3 {}
>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
module C3 {}
>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
interface C3 {}
>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 7, 12), Decl(mergeClassInterfaceAndModule.ts, 9, 19), Decl(mergeClassInterfaceAndModule.ts, 10, 12))
module C4 {}
>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
declare class C4 {} // error -- class declaration must preceed module declaration
>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))
interface C4 {}
>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 11, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 12), Decl(mergeClassInterfaceAndModule.ts, 14, 19))

View file

@ -0,0 +1,38 @@
=== tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts ===
interface C1 {}
>C1 : C1
declare class C1 {}
>C1 : C1
module C1 {}
>C1 : typeof C1
declare class C2 {}
>C2 : C2
interface C2 {}
>C2 : C2
module C2 {}
>C2 : typeof C2
declare class C3 {}
>C3 : C3
module C3 {}
>C3 : typeof C3
interface C3 {}
>C3 : C3
module C4 {}
>C4 : typeof C4
declare class C4 {} // error -- class declaration must preceed module declaration
>C4 : C4
interface C4 {}
>C4 : C4