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

Properly resolve enum value siblings

Browse Source
This commit is contained in:
dcodeIO
2018-01-24 03:08:09 +01:00
parent 29935948f2
commit b548b5c81f
7 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/program.ts
View File

@ -992,18 +992,24 @@ export class Program extends DiagnosticEmitter {
}
/** Resolves an identifier to the element it refers to. */
resolveIdentifier(identifier: IdentifierExpression, contextualFunction: Function | null): ResolvedElement | null {
resolveIdentifier(identifier: IdentifierExpression, contextualFunction: Function | null, contextualEnum: Enum | null = null): ResolvedElement | null {
var name = identifier.name;
var element: Element | null;
var namespace: Element | null;
var reference: Element | null;
if (contextualFunction) {
// check siblings
if (contextualEnum) {
if (contextualEnum.members && (element = contextualEnum.members.get(name)) && element.kind == ElementKind.ENUMVALUE)
return (resolvedElement || (resolvedElement = new ResolvedElement())).set(element);
} else if (contextualFunction) {
// check locals
var local = contextualFunction.flow.getScopedLocal(name);
if (local)
return (resolvedElement || (resolvedElement = new ResolvedElement())).set(local);
if (element = contextualFunction.flow.getScopedLocal(name))
return (resolvedElement || (resolvedElement = new ResolvedElement())).set(element);
// search contextual parent namespaces if applicable
if (namespace = contextualFunction.prototype.namespace) {
@ -1259,7 +1265,9 @@ export enum ElementFlags {
/** Has already inherited base class static members. */
HAS_STATIC_BASE_MEMBERS = 1 << 18,
/** Is scoped. */
SCOPED = 1 << 19
SCOPED = 1 << 19,
/** Is the start function. */
START = 1 << 20
}
/** Base class of all program elements. */