fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-19 01:41:30 +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
7 changed files with 100 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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) {
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;