Clean up resolver API (AssemblyScript#703)

dcodeIO · web-flow · commit 72d0fe66a7fb · 2019-07-16T23:57:30.000+02:00
diff --git a/src/builtins.ts b/src/builtins.ts
@@ -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);
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -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. */
@@ -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(
@@ -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;
@@ -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,
diff --git a/src/resolver.ts b/src/resolver.ts
