Skip to content

[NFC] Minor refactorings for resolver #2457

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 2 commits into from
Aug 21, 2022
Merged

[NFC] Minor refactorings for resolver #2457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
699213c
init
MaxGraey Aug 21, 2022
849e879
more
MaxGraey Aug 21, 2022
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
120 changes: 83 additions & 37 deletions src/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ export class Resolver extends DiagnosticEmitter {
// Handle special built-in types
if (isSimpleType) {
let text = nameNode.identifier.text;
if (text == CommonNames.native) return this.resolveBuiltinNativeType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.indexof) return this.resolveBuiltinIndexofType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.valueof) return this.resolveBuiltinValueofType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.native) return this.resolveBuiltinNativeType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.indexof) return this.resolveBuiltinIndexofType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.valueof) return this.resolveBuiltinValueofType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.returnof) return this.resolveBuiltinReturnTypeType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.nonnull) return this.resolveBuiltinNotNullableType(node, ctxElement, ctxTypes, reportMode);
if (text == CommonNames.nonnull) return this.resolveBuiltinNotNullableType(node, ctxElement, ctxTypes, reportMode);
}

// Resolve normally
Expand Down Expand Up @@ -447,17 +447,17 @@ export class Resolver extends DiagnosticEmitter {
switch (typeArgument.kind) {
case TypeKind.I8:
case TypeKind.I16:
case TypeKind.I32: return Type.i32;
case TypeKind.I32: return Type.i32;
case TypeKind.ISIZE: if (!this.program.options.isWasm64) return Type.i32;
case TypeKind.I64: return Type.i64;
case TypeKind.I64: return Type.i64;
case TypeKind.U8:
case TypeKind.U16:
case TypeKind.U32:
case TypeKind.BOOL: return Type.u32;
case TypeKind.USIZE: if (!this.program.options.isWasm64) return Type.u32;
case TypeKind.U64: return Type.u64;
case TypeKind.F32: return Type.f32;
case TypeKind.F64: return Type.f64;
case TypeKind.U64: return Type.u64;
case TypeKind.F32: return Type.f32;
case TypeKind.F64: return Type.f64;
case TypeKind.V128: return Type.v128;
case TypeKind.VOID: return Type.void;
default: assert(false);
Expand Down Expand Up @@ -491,12 +491,13 @@ export class Resolver extends DiagnosticEmitter {
}
var overload = classReference.lookupOverload(OperatorKind.INDEXED_GET);
if (overload) {
let parameterTypes = overload.signature.parameterTypes;
if (overload.is(CommonFlags.STATIC)) {
assert(overload.signature.parameterTypes.length == 2);
return overload.signature.parameterTypes[1];
assert(parameterTypes.length == 2);
return parameterTypes[1];
} else {
assert(overload.signature.parameterTypes.length == 1);
return overload.signature.parameterTypes[0];
assert(parameterTypes.length == 1);
return parameterTypes[0];
}
}
if (reportMode == ReportMode.REPORT) {
Expand Down Expand Up @@ -631,8 +632,9 @@ export class Resolver extends DiagnosticEmitter {
/** How to proceed with eventual diagnostics. */
reportMode: ReportMode = ReportMode.REPORT
): Type[] | null {
var minParameterCount = 0;
var maxParameterCount = 0;
var
minParameterCount = 0,
maxParameterCount = 0;
for (let i = 0, k = typeParameters.length; i < k; ++i) {
if (!typeParameters[i].defaultType) ++minParameterCount;
++maxParameterCount;
Expand Down Expand Up @@ -730,7 +732,9 @@ export class Resolver extends DiagnosticEmitter {

// infer types with generic components while updating contextual types
for (let i = 0; i < numParameters; ++i) {
let argumentExpression = i < numArguments ? argumentNodes[i] : parameterNodes[i].initializer;
let argumentExpression = i < numArguments
? argumentNodes[i]
: parameterNodes[i].initializer;
if (!argumentExpression) {
// optional but not have initializer should be handled in the other place
if (parameterNodes[i].parameterKind == ParameterKind.OPTIONAL) {
Expand All @@ -748,7 +752,15 @@ export class Resolver extends DiagnosticEmitter {
let typeNode = parameterNodes[i].type;
if (typeNode.hasGenericComponent(typeParameterNodes)) {
let type = this.resolveExpression(argumentExpression, ctxFlow, Type.auto, ReportMode.SWALLOW);
if (type) this.propagateInferredGenericTypes(typeNode, type, prototype, contextualTypeArguments, typeParameterNames);
if (type) {
this.propagateInferredGenericTypes(
typeNode,
type,
prototype,
contextualTypeArguments,
typeParameterNames
);
}
}
}

Expand All @@ -766,13 +778,19 @@ export class Resolver extends DiagnosticEmitter {
let defaultType = typeParameterNode.defaultType;
if (defaultType) {
// Default parameters are resolved in context of the called function, not the calling function
let parent = prototype.parent;
let defaultTypeContextualTypeArguments: Map<string, Type> | null = null;
if (prototype.parent.kind == ElementKind.CLASS) {
defaultTypeContextualTypeArguments = (<Class>prototype.parent).contextualTypeArguments;
} else if (prototype.parent.kind == ElementKind.FUNCTION) {
defaultTypeContextualTypeArguments = (<Function>prototype.parent).contextualTypeArguments;
if (parent.kind == ElementKind.CLASS) {
defaultTypeContextualTypeArguments = (<Class>parent).contextualTypeArguments;
} else if (parent.kind == ElementKind.FUNCTION) {
defaultTypeContextualTypeArguments = (<Function>parent).contextualTypeArguments;
}
let resolvedDefaultType = this.resolveType(defaultType, prototype, defaultTypeContextualTypeArguments, reportMode);
let resolvedDefaultType = this.resolveType(
defaultType,
prototype,
defaultTypeContextualTypeArguments,
reportMode
);
if (!resolvedDefaultType) return null;
resolvedTypeArguments[i] = resolvedDefaultType;
continue;
Expand Down Expand Up @@ -825,7 +843,13 @@ export class Resolver extends DiagnosticEmitter {
let typeArguments = classReference.typeArguments;
if (typeArguments && typeArguments.length == typeArgumentNodes.length) {
for (let i = 0, k = typeArguments.length; i < k; ++i) {
this.propagateInferredGenericTypes(typeArgumentNodes[i], typeArguments[i], ctxElement, ctxTypes, typeParameterNames);
this.propagateInferredGenericTypes(
typeArgumentNodes[i],
typeArguments[i],
ctxElement,
ctxTypes,
typeParameterNames
);
}
return;
}
Expand All @@ -835,9 +859,10 @@ export class Resolver extends DiagnosticEmitter {
let name = namedTypeNode.name.identifier.text;
if (ctxTypes.has(name)) {
let currentType = assert(ctxTypes.get(name));
if (currentType == Type.auto || (typeParameterNames.has(name) && currentType.isAssignableTo(type))) {
ctxTypes.set(name, type);
}
if (
currentType == Type.auto ||
(typeParameterNames.has(name) && currentType.isAssignableTo(type))
) ctxTypes.set(name, type);
}
}
} else if (node.kind == NodeKind.FUNCTIONTYPE) { // foo<T>(bar: (baz: T) => i32))
Expand All @@ -847,15 +872,34 @@ export class Resolver extends DiagnosticEmitter {
if (signatureReference) {
let parameterTypes = signatureReference.parameterTypes;
for (let i = 0, k = min(parameterTypes.length, parameterNodes.length) ; i < k; ++i) {
this.propagateInferredGenericTypes(parameterNodes[i].type, parameterTypes[i], ctxElement, ctxTypes, typeParameterNames);
this.propagateInferredGenericTypes(
parameterNodes[i].type,
parameterTypes[i],
ctxElement,
ctxTypes,
typeParameterNames
);
}
if (signatureReference.returnType != Type.void) {
this.propagateInferredGenericTypes(functionTypeNode.returnType, signatureReference.returnType, ctxElement, ctxTypes, typeParameterNames);
let returnType = signatureReference.returnType;
if (returnType != Type.void) {
this.propagateInferredGenericTypes(
functionTypeNode.returnType,
returnType,
ctxElement,
ctxTypes,
typeParameterNames
);
}
let thisType = signatureReference.thisType;
let explicitThisType = functionTypeNode.explicitThisType;
if (thisType && explicitThisType) {
this.propagateInferredGenericTypes(explicitThisType, thisType, ctxElement, ctxTypes, typeParameterNames);
this.propagateInferredGenericTypes(
explicitThisType,
thisType,
ctxElement,
ctxTypes,
typeParameterNames
);
}
return;
}
Expand Down Expand Up @@ -1251,13 +1295,15 @@ export class Resolver extends DiagnosticEmitter {
/** Resolves a lazily compiled global, i.e. a static class field or annotated `@lazy`. */
private ensureResolvedLazyGlobal(global: Global, reportMode: ReportMode = ReportMode.REPORT): bool {
if (global.is(CommonFlags.RESOLVED)) return true;
var type: Type | null;
var typeNode = global.typeNode;
if (typeNode) {
type = this.resolveType(typeNode, global.parent, null, reportMode);
} else {
type = this.resolveExpression(assert(global.initializerNode), global.file.startFunction.flow, Type.auto, reportMode);
}
var type = typeNode
? this.resolveType(typeNode, global.parent, null, reportMode)
: this.resolveExpression(
assert(global.initializerNode),
global.file.startFunction.flow,
Type.auto,
reportMode
);
if (!type) return false;
global.setType(type); // also sets resolved
return true;
Expand Down Expand Up @@ -2632,7 +2678,7 @@ export class Resolver extends DiagnosticEmitter {
if (
functionType &&
declaration.arrowKind != ArrowKind.NONE &&
body && body.kind == NodeKind.EXPRESSION &&
body && body.kind == NodeKind.EXPRESSION &&
isTypeOmitted(signature.returnType)
) {
// (x) => ret, infer return type accordingt to `ret`
Expand Down