make WasmRaw subtype of WasmInstruction subtypes

Author: jonas.ong

src/wasm-compiler/builderGenerator.ts

@@ -104,10 +104,15 @@ type Binding = { name: string; tag: "local" | "nonlocal" };
 // all expressions compile to a call to a function like makeX, get/setLexAddress, arithOp, etc.
 // so expressions return WasmCalls. (every expression results in i32 i64)
 // WasmRaw is for function calls
+
+interface BuilderVisitor<S, E> extends StmtNS.Visitor<S>, ExprNS.Visitor<E> {
+  visit(stmt: StmtNS.Stmt): S;
+  visit(stmt: ExprNS.Expr): E;
+  visit(stmt: StmtNS.Stmt | ExprNS.Expr): S | E;
+}
+
 export class BuilderGenerator
-  implements
-    StmtNS.Visitor<WasmInstruction>,
-    ExprNS.Visitor<WasmCall | WasmRaw>
+  implements BuilderVisitor<WasmInstruction, WasmCall | WasmRaw>
 {
   private strings: [string, number][] = [];
   private heapPointer = 0;
@@ -181,8 +186,8 @@ export class BuilderGenerator
   }
 
   visit(stmt: StmtNS.Stmt): WasmInstruction;
-  visit(stmt: ExprNS.Expr): WasmCall;
-  visit(stmt: StmtNS.Stmt | ExprNS.Expr): WasmInstruction | WasmCall {
+  visit(stmt: ExprNS.Expr): WasmCall | WasmRaw;
+  visit(stmt: StmtNS.Stmt | ExprNS.Expr): WasmInstruction | WasmCall | WasmRaw {
     return stmt.accept(this);
   }
 
@@ -281,7 +286,7 @@ export class BuilderGenerator
     return wasm.drop(wasm.drop(expr));
   }
 
-  visitGroupingExpr(expr: ExprNS.Grouping): WasmCall {
+  visitGroupingExpr(expr: ExprNS.Grouping): WasmCall | WasmRaw {
     return this.visit(expr.expression);
   }
 

src/wasm-compiler/wasm-util/types.ts

@@ -216,7 +216,8 @@ export type WasmNumeric =
   | WasmNumericFor<"i32">
   | WasmNumericFor<"i64">
   | WasmNumericFor<"f32">
-  | WasmNumericFor<"f64">;
+  | WasmNumericFor<"f64">
+  | WasmRaw;
 
 // ------------------------ WASM Variable Instructions ----------------------------
 
@@ -243,7 +244,8 @@ type WasmVariable =
   | WasmLocalGet
   | WasmLocalTee
   | WasmGlobalSet
-  | WasmGlobalGet;
+  | WasmGlobalGet
+  | WasmRaw;
 
 // ------------------------ WASM Memory Instructions ----------------------------
 // Technically WasmStoreOp and WasmLoadOp are memory instructions, but they are defined
@@ -263,7 +265,7 @@ export type WasmMemoryFill = {
   numOfBytes: WasmNumericFor<"i32">;
 };
 
-type WasmMemory = WasmMemoryCopy | WasmMemoryFill;
+type WasmMemory = WasmMemoryCopy | WasmMemoryFill | WasmRaw;
 
 // ------------------------ WASM Control Instructions ----------------------------
 
@@ -322,7 +324,8 @@ type WasmControl =
   | WasmBrTable
   | WasmCall
   | WasmReturn
-  | WasmSelect;
+  | WasmSelect
+  | WasmRaw;
 
 // ------------------------ WASM Module Instructions ----------------------------
 
@@ -394,7 +397,8 @@ export type WasmModuleInstruction =
   | WasmFunction
   | WasmExport
   | WasmStart
-  | WasmModule;
+  | WasmModule
+  | WasmRaw;
 
 // meant to be used with wasm.raw (tagged template)
 export type WasmRaw = {
@@ -408,5 +412,4 @@ export type WasmInstruction =
   | WasmMemory
   | WasmControl
   | WasmVariable
-  | WasmModuleInstruction
-  | WasmRaw;
+  | WasmModuleInstruction;