Skip to content

Fix type and local confusion when resolving types #2075

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 14, 2021
Merged

Fix type and local confusion when resolving types #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7de55c0
Fix type and local confusion when resolving types
dcodeIO Sep 14, 2021
0187c62
use getMember in related places
dcodeIO Sep 14, 2021
1d4a334
lint
dcodeIO Sep 14, 2021
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
2 changes: 1 addition & 1 deletion src/builtins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9540,7 +9540,7 @@ function ensureVisitMembersOf(compiler: Compiler, instance: Class): void {
// for example to visit all members of a collection, e.g. arrays and maps.
var hasVisitImpl = false;
if (instance.isDeclaredInLibrary) {
let visitPrototype = instance.lookupInSelf("__visit");
let visitPrototype = instance.getMember("__visit");
if (visitPrototype) {
assert(visitPrototype.kind == ElementKind.FUNCTION_PROTOTYPE);
let visitInstance = program.resolver.resolveFunction(<FunctionPrototype>visitPrototype, null);
Expand Down
9 changes: 4 additions & 5 deletions src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ import {
PropertyPrototype,
IndexSignature,
File,
mangleInternalName,
DeclaredElement
mangleInternalName
} from "./program";

import {
Expand Down Expand Up @@ -8428,7 +8427,7 @@ export class Compiler extends DiagnosticEmitter {
)
);
// tempData = tempThis.dataStart
var dataStartMember = assert(arrayInstance.lookupInSelf("dataStart"));
var dataStartMember = assert(arrayInstance.getMember("dataStart"));
assert(dataStartMember.kind == ElementKind.FIELD);
stmts.push(
module.local_set(tempDataStart.index,
Expand Down Expand Up @@ -8677,8 +8676,8 @@ export class Compiler extends DiagnosticEmitter {
// Iterate through the members defined in our expression
for (let i = 0; i < numNames; ++i) {
let memberName = names[i].text;
let member: DeclaredElement;
if (!members || !members.has(memberName) || (member = assert(members.get(memberName))).kind != ElementKind.FIELD) {
let member = classReference.getMember(memberName);
if (!member || member.kind != ElementKind.FIELD) {
this.error(
DiagnosticCode.Property_0_does_not_exist_on_type_1,
names[i].range, memberName, classType.toString()
Expand Down
135 changes: 42 additions & 93 deletions src/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ export class Program extends DiagnosticEmitter {
);
}
} else { // i.e. export { foo [as bar] }
let element = file.lookupInSelf(localName);
let element = file.getMember(localName);
if (element) {
file.ensureExport(exportName, element);
} else {
Expand Down Expand Up @@ -1751,7 +1751,7 @@ export class Program extends DiagnosticEmitter {
}

// exported from this file
element = foreignFile.lookupInSelf(queuedExport.localIdentifier.text);
element = foreignFile.getMember(queuedExport.localIdentifier.text);
if (element) return element;
}
}
Expand Down Expand Up @@ -2200,7 +2200,7 @@ export class Program extends DiagnosticEmitter {
if (foreignPath === null) {

// resolve right away if the local element already exists
if (element = localFile.lookupInSelf(localName)) {
if (element = localFile.getMember(localName)) {
localFile.ensureExport(foreignName, element);

// otherwise queue it
Expand Down Expand Up @@ -2514,7 +2514,7 @@ export class Program extends DiagnosticEmitter {
this.checkDecorators(declaration.decorators, DecoratorFlags.GLOBAL)
);
if (!parent.add(name, original)) return null;
var element = assert(parent.lookupInSelf(name)); // possibly merged
var element = assert(parent.getMember(name)); // possibly merged
var members = declaration.members;
for (let i = 0, k = members.length; i < k; ++i) {
let member = members[i];
Expand Down Expand Up @@ -2775,15 +2775,17 @@ export abstract class Element {
/** Tests if this element has a specific decorator flag or flags. */
hasDecorator(flag: DecoratorFlags): bool { return (this.decoratorFlags & flag) == flag; }

/** Looks up the element with the specified name within this element. */
lookupInSelf(name: string): DeclaredElement | null {
/** Get the member with the specified name, if any. */
getMember(name: string): DeclaredElement | null {
var members = this.members;
if (members !== null && members.has(name)) return assert(members.get(name));
if (members && members.has(name)) return assert(members.get(name));
return null;
}

/** Looks up the element with the specified name relative to this element, like in JS. */
abstract lookup(name: string): Element | null;
/** Looks up the element with the specified name relative to this element. */
lookup(name: string, isType: bool = false): Element | null {
return this.parent.lookup(name, isType);
}

/** Adds an element as a member of this one. Reports and returns `false` if a duplicate. */
add(name: string, element: DeclaredElement, localIdentifierIfImport: IdentifierExpression | null = null): bool {
Expand Down Expand Up @@ -3038,7 +3040,7 @@ export class File extends Element {
element = this.program.ensureGlobal(name, element); // possibly merged globally
}
if (!super.add(name, element, localIdentifierIfImport)) return false;
element = assert(this.lookupInSelf(name)); // possibly merged locally
element = assert(this.getMember(name)); // possibly merged locally
if (element.is(CommonFlags.EXPORT) && !localIdentifierIfImport) {
this.ensureExport(
element.name,
Expand All @@ -3049,23 +3051,23 @@ export class File extends Element {
}

/* @override */
lookupInSelf(name: string): DeclaredElement | null {
var element = super.lookupInSelf(name);
getMember(name: string): DeclaredElement | null {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

var element = super.getMember(name);
if (element) return element;
var exportsStar = this.exportsStar;
if (exportsStar) {
for (let i = 0, k = exportsStar.length; i < k; ++i) {
if (element = exportsStar[i].lookupInSelf(name)) return element;
if (element = exportsStar[i].getMember(name)) return element;
}
}
return null;
}

/* @override */
lookup(name: string): Element | null {
var element = this.lookupInSelf(name);
lookup(name: string, isType: bool = false): Element | null {
var element = this.getMember(name);
if (element) return element;
return this.program.lookup(name);
return this.program.lookup(name); // has no meaningful parent
}

/** Ensures that an element is an export of this file. */
Expand Down Expand Up @@ -3176,11 +3178,6 @@ export class TypeDefinition extends TypedElement {
get typeNode(): TypeNode {
return (<TypeDeclaration>this.declaration).type;
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A namespace that differs from a file in being user-declared with a name. */
Expand Down Expand Up @@ -3209,10 +3206,10 @@ export class Namespace extends DeclaredElement {
}

/* @override */
lookup(name: string): Element | null {
var inSelf = this.lookupInSelf(name);
if (inSelf) return inSelf;
return this.parent.lookup(name);
lookup(name: string, isType: bool = false): Element | null {
var member = this.getMember(name);
if (member) return member;
return super.lookup(name, isType);
}
}

Expand Down Expand Up @@ -3243,10 +3240,10 @@ export class Enum extends TypedElement {
}

/* @override */
lookup(name: string): Element | null {
var inSelf = this.lookupInSelf(name);
if (inSelf) return inSelf;
return this.parent.lookup(name);
lookup(name: string, isType: bool = false): Element | null {
var member = this.getMember(name);
if (member) return member;
return super.lookup(name, isType);
}
}

Expand Down Expand Up @@ -3319,11 +3316,6 @@ export abstract class VariableLikeElement extends TypedElement {
this.constantFloatValue = value;
this.set(CommonFlags.CONST | CommonFlags.INLINED | CommonFlags.RESOLVED);
}

/** @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** An enum value. */
Expand Down Expand Up @@ -3357,11 +3349,6 @@ export class EnumValue extends VariableLikeElement {
get valueNode(): Expression | null {
return (<EnumValueDeclaration>this.declaration).initializer;
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A global variable. */
Expand Down Expand Up @@ -3546,11 +3533,6 @@ export class FunctionPrototype extends DeclaredElement {
else assert(!instances.has(instanceKey));
instances.set(instanceKey, instance);
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A resolved function. */
Expand Down Expand Up @@ -3709,10 +3691,12 @@ export class Function extends TypedElement {
}

/* @override */
lookup(name: string): Element | null {
var locals = this.localsByName;
if (locals.has(name)) return assert(locals.get(name));
return this.parent.lookup(name);
lookup(name: string, isType: bool = false): Element | null {
if (!isType) {
let locals = this.localsByName;
if (locals.has(name)) return assert(locals.get(name));
}
return super.lookup(name, isType);
}

// used by flows to keep track of temporary locals
Expand Down Expand Up @@ -3797,11 +3781,6 @@ export class FieldPrototype extends DeclaredElement {
get parameterIndex(): i32 {
return (<FieldDeclaration>this.declaration).parameterIndex;
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A resolved instance field. */
Expand Down Expand Up @@ -3912,11 +3891,6 @@ export class PropertyPrototype extends DeclaredElement {
this.flags &= ~(CommonFlags.GET | CommonFlags.SET);
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}

/** Tests if this prototype is bound to a class. */
get isBound(): bool {
switch (this.parent.kind) {
Expand Down Expand Up @@ -3992,11 +3966,6 @@ export class Property extends VariableLikeElement {
registerConcreteElement(this.program, this);
}
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A resolved index signature. */
Expand Down Expand Up @@ -4026,11 +3995,6 @@ export class IndexSignature extends TypedElement {
getSetterInstance(isUnchecked: bool): Function | null {
return (<Class>this.parent).lookupOverload(OperatorKind.INDEXED_SET, isUnchecked);
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A yet unresolved class prototype. */
Expand Down Expand Up @@ -4155,11 +4119,6 @@ export class ClassPrototype extends DeclaredElement {
else assert(!instances.has(instanceKey));
instances.set(instanceKey, instance);
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}
}

/** A resolved class. */
Expand Down Expand Up @@ -4211,7 +4170,7 @@ export class Class extends TypedElement {
/** Tests if this class is array-like. */
get isArrayLike(): bool {
if (this.isBuiltinArray) return true;
var lengthField = this.lookupInSelf("length");
var lengthField = this.getMember("length");
return lengthField !== null && (
lengthField.kind == ElementKind.FIELD ||
(
Expand Down Expand Up @@ -4361,30 +4320,20 @@ export class Class extends TypedElement {
return null;
}

/* @override */
lookup(name: string): Element | null {
return this.parent.lookup(name);
}

/** Gets the method of the specified name, resolved with the given type arguments. */
getMethod(name: string, typeArguments: Type[] | null = null): Function | null {
var members = this.members;
if (members !== null && members.has(name)) {
let bound = changetype<Element>(members.get(name));
if (bound.kind == ElementKind.FUNCTION_PROTOTYPE) {
return this.program.resolver.resolveFunction(<FunctionPrototype>bound, typeArguments);
}
var member = this.getMember(name);
if (member && member.kind == ElementKind.FUNCTION_PROTOTYPE) {
return this.program.resolver.resolveFunction(<FunctionPrototype>member, typeArguments);
}
return null;
}

/** Calculates the memory offset of the specified field. */
offsetof(fieldName: string): u32 {
var members = assert(this.members);
assert(members.has(fieldName));
var field = <Element>members.get(fieldName);
assert(field.kind == ElementKind.FIELD);
return (<Field>field).memoryOffset;
var member = assert(this.getMember(fieldName));
assert(member.kind == ElementKind.FIELD);
return (<Field>member).memoryOffset;
}

/** Creates a buffer suitable to hold a runtime instance of this class. */
Expand All @@ -4404,9 +4353,9 @@ export class Class extends TypedElement {

/** Writes a field value to a buffer and returns the number of bytes written. */
writeField<T>(name: string, value: T, buffer: Uint8Array, baseOffset: i32 = this.program.totalOverhead): i32 {
var element = this.lookupInSelf(name);
if (element !== null && element.kind == ElementKind.FIELD) {
let fieldInstance = <Field>element;
var member = this.getMember(name);
if (member !== null && member.kind == ElementKind.FIELD) {
let fieldInstance = <Field>member;
let offset = baseOffset + fieldInstance.memoryOffset;
let typeKind = fieldInstance.type.kind;
switch (typeKind) {
Expand Down
Loading