fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-25 07:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix enum initialization (#545)

Browse Source
This commit is contained in:
Daniel Wirtz 2019-03-18 04:54:44 +01:00 committed by GitHub
parent 6de4847356
commit fd99589527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 100 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler.ts
View File

@ -503,7 +503,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case ElementKind.ENUMVALUE: {
if (!assert(element.parent).is(CommonFlags.CONST) && !this.options.hasFeature(Feature.MUTABLE_GLOBAL)) {
if (!(<EnumValue>element).isImmutable && !this.options.hasFeature(Feature.MUTABLE_GLOBAL)) {
this.error(
DiagnosticCode.Cannot_export_a_mutable_global,
(<EnumValue>element).identifierNode.range
@ -946,16 +946,14 @@ export class Compiler extends DiagnosticEmitter {
WrapMode.NONE
);
if (getExpressionId(initExpr) != ExpressionId.Const) {
if (element.is(CommonFlags.CONST)) {
initExpr = module.precomputeExpression(initExpr);
if (getExpressionId(initExpr) != ExpressionId.Const) {
if (element.is(CommonFlags.CONST)) {
this.error(
DiagnosticCode.In_const_enum_declarations_member_initializer_must_be_constant_expression,
valueNode.range
);
initInStart = true;
}
} else {
initInStart = true;
}
}
@ -997,8 +995,9 @@ export class Compiler extends DiagnosticEmitter {
module.addGlobal(val.internalName, NativeType.I32, false, initExpr);
}
} else {
module.addGlobal(val.internalName, NativeType.I32, true, initExpr);
module.addGlobal(val.internalName, NativeType.I32, false, initExpr);
}
val.isImmutable = true;
previousValueIsMut = false;
}
previousValue = <EnumValue>val;

3
src/program.ts
View File

@ -2266,6 +2266,9 @@ export class EnumValue extends VariableLikeElement {
this.setType(Type.i32);
}
/** Whether this enum value is immutable. */
isImmutable: bool = false;
/** Gets the associated value node. */
get valueNode(): Expression | null {
return (<EnumValueDeclaration>this.declaration).value;

28
tests/compiler/enum.optimized.wat
View File

@ -7,34 +7,62 @@
(global $enum/Implicit.ONE i32 (i32.const 1))
(global $enum/Implicit.TWO i32 (i32.const 2))
(global $enum/Implicit.THREE i32 (i32.const 3))
(global $enum/ImplicitConst.ZERO i32 (i32.const 0))
(global $enum/ImplicitConst.ONE i32 (i32.const 1))
(global $enum/ImplicitConst.TWO i32 (i32.const 2))
(global $enum/ImplicitConst.THREE i32 (i32.const 3))
(global $enum/Explicit.ZERO i32 (i32.const 0))
(global $enum/Explicit.ONE i32 (i32.const 1))
(global $enum/Explicit.TWO i32 (i32.const 2))
(global $enum/Explicit.THREE i32 (i32.const 3))
(global $enum/ExplicitConst.ZERO i32 (i32.const 0))
(global $enum/ExplicitConst.ONE i32 (i32.const 1))
(global $enum/ExplicitConst.TWO i32 (i32.const 2))
(global $enum/ExplicitConst.THREE i32 (i32.const 3))
(global $enum/Mixed.ZERO i32 (i32.const 0))
(global $enum/Mixed.ONE i32 (i32.const 1))
(global $enum/Mixed.THREE i32 (i32.const 3))
(global $enum/Mixed.FOUR i32 (i32.const 4))
(global $enum/MixedConst.ZERO i32 (i32.const 0))
(global $enum/MixedConst.ONE i32 (i32.const 1))
(global $enum/MixedConst.THREE i32 (i32.const 3))
(global $enum/MixedConst.FOUR i32 (i32.const 4))
(global $enum/NonConstant.ZERO (mut i32) (i32.const 0))
(global $enum/NonConstant.ONE (mut i32) (i32.const 0))
(global $enum/SelfReference.ZERO i32 (i32.const 0))
(global $enum/SelfReference.ONE i32 (i32.const 1))
(global $enum/SelfReferenceConst.ZERO i32 (i32.const 0))
(global $enum/SelfReferenceConst.ONE i32 (i32.const 1))
(export "memory" (memory $0))
(export "table" (table $0))
(export "Implicit.ZERO" (global $enum/Implicit.ZERO))
(export "Implicit.ONE" (global $enum/Implicit.ONE))
(export "Implicit.TWO" (global $enum/Implicit.TWO))
(export "Implicit.THREE" (global $enum/Implicit.THREE))
(export "ImplicitConst.ZERO" (global $enum/ImplicitConst.ZERO))
(export "ImplicitConst.ONE" (global $enum/ImplicitConst.ONE))
(export "ImplicitConst.TWO" (global $enum/ImplicitConst.TWO))
(export "ImplicitConst.THREE" (global $enum/ImplicitConst.THREE))
(export "Explicit.ZERO" (global $enum/Explicit.ZERO))
(export "Explicit.ONE" (global $enum/Explicit.ONE))
(export "Explicit.TWO" (global $enum/Explicit.TWO))
(export "Explicit.THREE" (global $enum/Explicit.THREE))
(export "ExplicitConst.ZERO" (global $enum/ExplicitConst.ZERO))
(export "ExplicitConst.ONE" (global $enum/ExplicitConst.ONE))
(export "ExplicitConst.TWO" (global $enum/ExplicitConst.TWO))
(export "ExplicitConst.THREE" (global $enum/ExplicitConst.THREE))
(export "Mixed.ZERO" (global $enum/Mixed.ZERO))
(export "Mixed.ONE" (global $enum/Mixed.ONE))
(export "Mixed.THREE" (global $enum/Mixed.THREE))
(export "Mixed.FOUR" (global $enum/Mixed.FOUR))
(export "MixedConst.ZERO" (global $enum/MixedConst.ZERO))
(export "MixedConst.ONE" (global $enum/MixedConst.ONE))
(export "MixedConst.THREE" (global $enum/MixedConst.THREE))
(export "MixedConst.FOUR" (global $enum/MixedConst.FOUR))
(export "SelfReference.ZERO" (global $enum/SelfReference.ZERO))
(export "SelfReference.ONE" (global $enum/SelfReference.ONE))
(export "SelfReferenceConst.ZERO" (global $enum/SelfReferenceConst.ZERO))
(export "SelfReferenceConst.ONE" (global $enum/SelfReferenceConst.ONE))
(start $start)
(func $start (; 0 ;) (type $FUNCSIG$v)
i32.const 0

36
tests/compiler/enum.ts
View File

@ -1,18 +1,39 @@
export const enum Implicit {
export enum Implicit {
ZERO,
ONE,
TWO,
THREE
}
export const enum Explicit {
export const enum ImplicitConst {
ZERO,
ONE,
TWO,
THREE
}
export enum Explicit {
ZERO = 0,
ONE = 0 + 1,
TWO = 1 + 1,
THREE = 3
}
export const enum Mixed {
export const enum ExplicitConst {
ZERO = 0,
ONE = 0 + 1,
TWO = 1 + 1,
THREE = 3
}
export enum Mixed {
ZERO,
ONE,
THREE = 3,
FOUR
}
export const enum MixedConst {
ZERO,
ONE,
THREE = 3,
@ -31,9 +52,14 @@ enum NonConstant {
NonConstant.ZERO;
NonConstant.ONE;
export const enum SelfReference {
export enum SelfReference {
ZERO,
ONE = ZERO + 1
}
var enumType: SelfReference;
export const enum SelfReferenceConst {
ZERO,
ONE = ZERO + 1
}
var enumType: SelfReferenceConst;

28
tests/compiler/enum.untouched.wat
View File

@ -8,18 +8,32 @@
(global $enum/Implicit.ONE i32 (i32.const 1))
(global $enum/Implicit.TWO i32 (i32.const 2))
(global $enum/Implicit.THREE i32 (i32.const 3))
(global $enum/ImplicitConst.ZERO i32 (i32.const 0))
(global $enum/ImplicitConst.ONE i32 (i32.const 1))
(global $enum/ImplicitConst.TWO i32 (i32.const 2))
(global $enum/ImplicitConst.THREE i32 (i32.const 3))
(global $enum/Explicit.ZERO i32 (i32.const 0))
(global $enum/Explicit.ONE i32 (i32.const 1))
(global $enum/Explicit.TWO i32 (i32.const 2))
(global $enum/Explicit.THREE i32 (i32.const 3))
(global $enum/ExplicitConst.ZERO i32 (i32.const 0))
(global $enum/ExplicitConst.ONE i32 (i32.const 1))
(global $enum/ExplicitConst.TWO i32 (i32.const 2))
(global $enum/ExplicitConst.THREE i32 (i32.const 3))
(global $enum/Mixed.ZERO i32 (i32.const 0))
(global $enum/Mixed.ONE i32 (i32.const 1))
(global $enum/Mixed.THREE i32 (i32.const 3))
(global $enum/Mixed.FOUR i32 (i32.const 4))
(global $enum/MixedConst.ZERO i32 (i32.const 0))
(global $enum/MixedConst.ONE i32 (i32.const 1))
(global $enum/MixedConst.THREE i32 (i32.const 3))
(global $enum/MixedConst.FOUR i32 (i32.const 4))
(global $enum/NonConstant.ZERO (mut i32) (i32.const 0))
(global $enum/NonConstant.ONE (mut i32) (i32.const 0))
(global $enum/SelfReference.ZERO i32 (i32.const 0))
(global $enum/SelfReference.ONE i32 (i32.const 1))
(global $enum/SelfReferenceConst.ZERO i32 (i32.const 0))
(global $enum/SelfReferenceConst.ONE i32 (i32.const 1))
(global $enum/enumType (mut i32) (i32.const 0))
(global $~lib/memory/HEAP_BASE i32 (i32.const 8))
(export "memory" (memory $0))
@ -28,16 +42,30 @@
(export "Implicit.ONE" (global $enum/Implicit.ONE))
(export "Implicit.TWO" (global $enum/Implicit.TWO))
(export "Implicit.THREE" (global $enum/Implicit.THREE))
(export "ImplicitConst.ZERO" (global $enum/ImplicitConst.ZERO))
(export "ImplicitConst.ONE" (global $enum/ImplicitConst.ONE))
(export "ImplicitConst.TWO" (global $enum/ImplicitConst.TWO))
(export "ImplicitConst.THREE" (global $enum/ImplicitConst.THREE))
(export "Explicit.ZERO" (global $enum/Explicit.ZERO))
(export "Explicit.ONE" (global $enum/Explicit.ONE))
(export "Explicit.TWO" (global $enum/Explicit.TWO))
(export "Explicit.THREE" (global $enum/Explicit.THREE))
(export "ExplicitConst.ZERO" (global $enum/ExplicitConst.ZERO))
(export "ExplicitConst.ONE" (global $enum/ExplicitConst.ONE))
(export "ExplicitConst.TWO" (global $enum/ExplicitConst.TWO))
(export "ExplicitConst.THREE" (global $enum/ExplicitConst.THREE))
(export "Mixed.ZERO" (global $enum/Mixed.ZERO))
(export "Mixed.ONE" (global $enum/Mixed.ONE))
(export "Mixed.THREE" (global $enum/Mixed.THREE))
(export "Mixed.FOUR" (global $enum/Mixed.FOUR))
(export "MixedConst.ZERO" (global $enum/MixedConst.ZERO))
(export "MixedConst.ONE" (global $enum/MixedConst.ONE))
(export "MixedConst.THREE" (global $enum/MixedConst.THREE))
(export "MixedConst.FOUR" (global $enum/MixedConst.FOUR))
(export "SelfReference.ZERO" (global $enum/SelfReference.ZERO))
(export "SelfReference.ONE" (global $enum/SelfReference.ONE))
(export "SelfReferenceConst.ZERO" (global $enum/SelfReferenceConst.ZERO))
(export "SelfReferenceConst.ONE" (global $enum/SelfReferenceConst.ONE))
(start $start)
(func $enum/getZero (; 0 ;) (type $FUNCSIG$i) (result i32)
i32.const 0

4
tests/compiler/merge.untouched.wat
View File

@ -11,8 +11,8 @@
(global $merge/typeNamespace_test (mut i32) (i32.const 0))
(global $merge/functionType_test (mut i32) (i32.const 0))
(global $merge/typeFunction_test (mut i32) (i32.const 0))
(global $merge/enumNamespace.val (mut i32) (i32.const 1))
(global $merge/namespaceEnum.val (mut i32) (i32.const 2))
(global $merge/enumNamespace.val i32 (i32.const 1))
(global $merge/namespaceEnum.val i32 (i32.const 2))
(global $~lib/memory/HEAP_BASE i32 (i32.const 8))
(export "memory" (memory $0))
(export "table" (table $0))

4
tests/compiler/namespace.untouched.wat
View File

@ -5,8 +5,8 @@
(table $0 1 funcref)
(elem (i32.const 0) $null)
(global $namespace/Outer.Inner.aVar (mut i32) (i32.const 0))
(global $namespace/Outer.Inner.anEnum.ONE (mut i32) (i32.const 1))
(global $namespace/Outer.Inner.anEnum.TWO (mut i32) (i32.const 2))
(global $namespace/Outer.Inner.anEnum.ONE i32 (i32.const 1))
(global $namespace/Outer.Inner.anEnum.TWO i32 (i32.const 2))
(global $~lib/memory/HEAP_BASE i32 (i32.const 8))
(export "memory" (memory $0))
(export "table" (table $0))