Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conformance for spec update section 9.4, 12.1.4 const enum #2792

Merged
merged 6 commits into from
May 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions tests/baselines/reference/ambientEnumDeclaration1.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(5,5): error TS1066: Ambient enum elements can only have integer literal initializers.
tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(6,5): error TS1066: Ambient enum elements can only have integer literal initializers.
tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(7,5): error TS1066: Ambient enum elements can only have integer literal initializers.
tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(8,5): error TS1066: Ambient enum elements can only have integer literal initializers.


==== tests/cases/conformance/ambient/ambientEnumDeclaration1.ts (4 errors) ====
// In ambient enum declarations, all values specified in enum member declarations must be classified as constant enum expressions.

declare enum E {
a = 10,
b = 10 + 1,
~
!!! error TS1066: Ambient enum elements can only have integer literal initializers.
c = b,
~
!!! error TS1066: Ambient enum elements can only have integer literal initializers.
d = (c) + 1,
~
!!! error TS1066: Ambient enum elements can only have integer literal initializers.
e = 10 << 2 * 8,
~
!!! error TS1066: Ambient enum elements can only have integer literal initializers.
}
13 changes: 13 additions & 0 deletions tests/baselines/reference/ambientEnumDeclaration1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//// [ambientEnumDeclaration1.ts]
// In ambient enum declarations, all values specified in enum member declarations must be classified as constant enum expressions.

declare enum E {
a = 10,
b = 10 + 1,
c = b,
d = (c) + 1,
e = 10 << 2 * 8,
}

//// [ambientEnumDeclaration1.js]
// In ambient enum declarations, all values specified in enum member declarations must be classified as constant enum expressions.
17 changes: 17 additions & 0 deletions tests/baselines/reference/ambientEnumDeclaration2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//// [ambientEnumDeclaration2.ts]
// In ambient enum declarations that specify no const modifier, enum member declarations
// that omit a value are considered computed members (as opposed to having auto- incremented values assigned).

declare enum E {
a, // E.a
b, // E.b
}

declare const enum E1 {
a, // E.a = 0
b, // E.b = 1
}

//// [ambientEnumDeclaration2.js]
// In ambient enum declarations that specify no const modifier, enum member declarations
// that omit a value are considered computed members (as opposed to having auto- incremented values assigned).
23 changes: 23 additions & 0 deletions tests/baselines/reference/ambientEnumDeclaration2.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
=== tests/cases/conformance/ambient/ambientEnumDeclaration2.ts ===
// In ambient enum declarations that specify no const modifier, enum member declarations
// that omit a value are considered computed members (as opposed to having auto- incremented values assigned).

declare enum E {
>E : Symbol(E, Decl(ambientEnumDeclaration2.ts, 0, 0))

a, // E.a
>a : Symbol(E.a, Decl(ambientEnumDeclaration2.ts, 3, 16))

b, // E.b
>b : Symbol(E.b, Decl(ambientEnumDeclaration2.ts, 4, 6))
}

declare const enum E1 {
>E1 : Symbol(E1, Decl(ambientEnumDeclaration2.ts, 6, 1))

a, // E.a = 0
>a : Symbol(E1.a, Decl(ambientEnumDeclaration2.ts, 8, 23))

b, // E.b = 1
>b : Symbol(E1.b, Decl(ambientEnumDeclaration2.ts, 9, 6))
}
23 changes: 23 additions & 0 deletions tests/baselines/reference/ambientEnumDeclaration2.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
=== tests/cases/conformance/ambient/ambientEnumDeclaration2.ts ===
// In ambient enum declarations that specify no const modifier, enum member declarations
// that omit a value are considered computed members (as opposed to having auto- incremented values assigned).

declare enum E {
>E : E

a, // E.a
>a : E

b, // E.b
>b : E
}

declare const enum E1 {
>E1 : E1

a, // E.a = 0
>a : E1

b, // E.b = 1
>b : E1
}
34 changes: 34 additions & 0 deletions tests/baselines/reference/constEnum1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//// [constEnum1.ts]

// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.

const enum E {
a = 10,
b = a,
c = (a+1),
e,
d = ~e,
f = a << 2 >> 1,
g = a << 2 >>> 1,
h = a | b
}

//// [constEnum1.js]
// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.


//// [constEnum1.d.ts]
declare const enum E {
a = 10,
b = 10,
c = 11,
e = 12,
d = -13,
f = 20,
g = 20,
h = 10,
}
40 changes: 40 additions & 0 deletions tests/baselines/reference/constEnum1.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
=== tests/cases/conformance/constEnums/constEnum1.ts ===

// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.

const enum E {
>E : Symbol(E, Decl(constEnum1.ts, 0, 0))

a = 10,
>a : Symbol(E.a, Decl(constEnum1.ts, 5, 14))

b = a,
>b : Symbol(E.b, Decl(constEnum1.ts, 6, 11))
>a : Symbol(E.a, Decl(constEnum1.ts, 5, 14))

c = (a+1),
>c : Symbol(E.c, Decl(constEnum1.ts, 7, 10))
>a : Symbol(E.a, Decl(constEnum1.ts, 5, 14))

e,
>e : Symbol(E.e, Decl(constEnum1.ts, 8, 14))

d = ~e,
>d : Symbol(E.d, Decl(constEnum1.ts, 9, 6))
>e : Symbol(E.e, Decl(constEnum1.ts, 8, 14))

f = a << 2 >> 1,
>f : Symbol(E.f, Decl(constEnum1.ts, 10, 11))
>a : Symbol(E.a, Decl(constEnum1.ts, 5, 14))

g = a << 2 >>> 1,
>g : Symbol(E.g, Decl(constEnum1.ts, 11, 20))
>a : Symbol(E.a, Decl(constEnum1.ts, 5, 14))

h = a | b
>h : Symbol(E.h, Decl(constEnum1.ts, 12, 21))
>a : Symbol(E.a, Decl(constEnum1.ts, 5, 14))
>b : Symbol(E.b, Decl(constEnum1.ts, 6, 11))
}
54 changes: 54 additions & 0 deletions tests/baselines/reference/constEnum1.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
=== tests/cases/conformance/constEnums/constEnum1.ts ===

// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.

const enum E {
>E : E

a = 10,
>a : E
>10 : number

b = a,
>b : E
>a : E

c = (a+1),
>c : E
>(a+1) : number
>a+1 : number
>a : E
>1 : number

e,
>e : E

d = ~e,
>d : E
>~e : number
>e : E

f = a << 2 >> 1,
>f : E
>a << 2 >> 1 : number
>a << 2 : number
>a : E
>2 : number
>1 : number

g = a << 2 >>> 1,
>g : E
>a << 2 >>> 1 : number
>a << 2 : number
>a : E
>2 : number
>1 : number

h = a | b
>h : E
>a | b : number
>a : E
>b : E
}
29 changes: 29 additions & 0 deletions tests/baselines/reference/constEnum2.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
tests/cases/conformance/constEnums/constEnum2.ts(11,9): error TS2474: In 'const' enum declarations member initializer must be constant expression.
tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: In 'const' enum declarations member initializer must be constant expression.
tests/cases/conformance/constEnums/constEnum2.ts(13,5): error TS1005: ',' expected.
tests/cases/conformance/constEnums/constEnum2.ts(13,9): error TS2474: In 'const' enum declarations member initializer must be constant expression.


==== tests/cases/conformance/constEnums/constEnum2.ts (4 errors) ====

// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.

// Error : not a constant enum expression

const CONST = 9000 % 2;
const enum D {
d = 10,
e = 199 * Math.floor(Math.random() * 1000),
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2474: In 'const' enum declarations member initializer must be constant expression.
f = d - (100 * Math.floor(Math.random() % 8))
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2474: In 'const' enum declarations member initializer must be constant expression.
g = CONST,
~
!!! error TS1005: ',' expected.
~~~~~
!!! error TS2474: In 'const' enum declarations member initializer must be constant expression.
}
32 changes: 32 additions & 0 deletions tests/baselines/reference/constEnum2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//// [constEnum2.ts]

// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.

// Error : not a constant enum expression

const CONST = 9000 % 2;
const enum D {
d = 10,
e = 199 * Math.floor(Math.random() * 1000),
f = d - (100 * Math.floor(Math.random() % 8))
g = CONST,
}

//// [constEnum2.js]
// An enum declaration that specifies a const modifier is a constant enum declaration.
// In a constant enum declaration, all members must have constant values and
// it is an error for a member declaration to specify an expression that isn't classified as a constant enum expression.
// Error : not a constant enum expression
var CONST = 9000 % 2;


//// [constEnum2.d.ts]
declare const CONST: number;
declare const enum D {
d = 10,
e,
f,
g,
}
67 changes: 67 additions & 0 deletions tests/baselines/reference/constEnumPropertyAccess1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
//// [constEnumPropertyAccess1.ts]

// constant enum declarations are completely erased in the emitted JavaScript code.
// it is an error to reference a constant enum object in any other context
// than a property access that selects one of the enum's members

const enum G {
A = 1,
B = 2,
C = A + B,
D = A * 2
}

var o: {
[idx: number]: boolean
} = {
1: true
};

var a = G.A;
var a1 = G["A"];
var g = o[G.A];

class C {
[G.A]() { }
get [G.B]() {
return true;
}
set [G.B](x: number) { }
}



//// [constEnumPropertyAccess1.js]
// constant enum declarations are completely erased in the emitted JavaScript code.
// it is an error to reference a constant enum object in any other context
// than a property access that selects one of the enum's members
var o = {
1: true
};
var a = 1 /* A */;
var a1 = 1 /* "A" */;
var g = o[1 /* A */];
class C {
[1 /* A */]() { }
get [2 /* B */]() {
return true;
}
set [2 /* B */](x) { }
}


//// [constEnumPropertyAccess1.d.ts]
declare const enum G {
A = 1,
B = 2,
C = 3,
D = 2,
}
declare var o: {
[idx: number]: boolean;
};
declare var a: G;
declare var a1: G;
declare var g: boolean;
declare class C {
}
Loading