Skip to content

Cleanup resolver API #703

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
Jul 16, 2019
Merged

Cleanup resolver API #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb5dc71
Clean up resolver API
dcodeIO Jul 2, 2019
9ee6375
Merge branch 'master' into cleanup-resolver
dcodeIO Jul 2, 2019
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 @@ -637,7 +637,7 @@ export function compileCall(
let element = compiler.resolver.resolveExpression(
operands[0],
compiler.currentFlow,
Type.void,
Type.auto,
ReportMode.SWALLOW
);
return module.i32(element ? 1 : 0);
Expand Down
7 changes: 4 additions & 3 deletions src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export class Compiler extends DiagnosticEmitter {
/** Program reference. */
program: Program;
/** Resolver reference. */
resolver: Resolver;
get resolver(): Resolver { return this.program.resolver; }
/** Provided options. */
options: Options;
/** Module instance being compiled. */
Expand Down Expand Up @@ -312,7 +312,6 @@ export class Compiler extends DiagnosticEmitter {
constructor(program: Program, options: Options | null = null) {
super(program.diagnostics);
this.program = program;
this.resolver = program.resolver;
if (!options) options = new Options();
this.options = options;
this.memoryOffset = i64_new(
Expand Down Expand Up @@ -456,6 +455,8 @@ export class Compiler extends DiagnosticEmitter {
return module;
}

// === Exports ==================================================================================

/** Applies the respective module exports for the specified file. */
private ensureModuleExports(file: File): void {
var members = file.exports;
Expand Down Expand Up @@ -5079,7 +5080,7 @@ export class Compiler extends DiagnosticEmitter {
}
if (!compound) return expr;
var resolver = this.resolver;
var target = this.resolver.resolveExpression(left, this.currentFlow);
var target = resolver.resolveExpression(left, this.currentFlow);
if (!target) return module.unreachable();
return this.makeAssignment(
target,
Expand Down
Loading