feat: use function matcher

xtuc · xtuc · commit 6e85ac5468c0 · 2018-06-06T10:39:06.000+02:00
diff --git a/declarations.d.ts b/declarations.d.ts
@@ -139,6 +139,12 @@ declare module "@webassemblyjs/ast" {
 		args: string[];
 		result: string[];
 	}
+
+	// Node matcher
+	export function isGlobalType(n: Node): boolean;
+	export function isTable(n: Node): boolean;
+	export function isMemory(n: Node): boolean;
+	export function isFuncImportDescr(n: Node): boolean;
 }
 
 /**
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
@@ -45,20 +45,6 @@ function compose(...fns) {
 	}, value => value);
 }
 
-// Utility functions
-
-/**
- * @param {t.ModuleImport} n the import
- * @returns {boolean} true, if a global was imported
- */
-const isGlobalImport = n => n.descr.type === "GlobalType";
-
-/**
- * @param {t.ModuleImport} n the import
- * @returns {boolean} true, if a func was imported
- */
-const isFuncImport = n => n.descr.type === "FuncImportDescr";
-
 // TODO replace with @callback
 
 /**
@@ -104,7 +90,7 @@ function getImportedGlobals(ast) {
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (isGlobalImport(node) === true) {
+			if (t.isGlobalType(node.descr) === true) {
 				importedGlobals.push(node);
 			}
 		}
@@ -118,7 +104,7 @@ function getCountImportedFunc(ast) {
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (isFuncImport(node) === true) {
+			if (t.isFuncImportDescr(node.descr) === true) {
 				count++;
 			}
 		}
@@ -206,7 +192,7 @@ const rewriteImportedGlobals = state => bin => {
 
 	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
-			if (isGlobalImport(path.node) === true) {
+			if (t.isGlobalType(path.node.descr) === true) {
 				const globalType = path.node.descr;
 
 				globalType.mutability = "var";
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
@@ -16,30 +16,6 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 
 /** @typedef {import("../Module")} Module */
 
-/**
- * @param {t.ModuleImport} n the import
- * @returns {boolean} true, if a memory was imported
- */
-const isMemoryImport = n => n.descr.type === "Memory";
-
-/**
- * @param {t.ModuleImport} n the import
- * @returns {boolean} true, if a table was imported
- */
-const isTableImport = n => n.descr.type === "Table";
-
-/**
- * @param {t.ModuleImport} n the import
- * @returns {boolean} true, if a func was imported
- */
-const isFuncImport = n => n.descr.type === "FuncImportDescr";
-
-/**
- * @param {t.ModuleImport} n the import
- * @returns {boolean} true, if a global was imported
- */
-const isGlobalImport = n => n.descr.type === "GlobalType";
-
 const JS_COMPAT_TYPES = new Set(["i32", "f32", "f64"]);
 
 /**
@@ -160,16 +136,16 @@ class WebAssemblyParser extends Tapable {
 				/** @type {false | string} */
 				let onlyDirectImport = false;
 
-				if (isMemoryImport(node) === true) {
+				if (t.isMemory(node.descr) === true) {
 					onlyDirectImport = "Memory";
-				} else if (isTableImport(node) === true) {
+				} else if (t.isTable(node.descr) === true) {
 					onlyDirectImport = "Table";
-				} else if (isFuncImport(node) === true) {
+				} else if (t.isFuncImportDescr(node.descr) === true) {
 					const incompatibleType = getJsIncompatibleType(node.descr.signature);
 					if (incompatibleType) {
 						onlyDirectImport = `Non-JS-compatible Func Sigurature (${incompatibleType})`;
 					}
-				} else if (isGlobalImport(node) === true) {
+				} else if (t.isGlobalType(node.descr) === true) {
 					const type = node.descr.valtype;
 					if (!JS_COMPAT_TYPES.has(type)) {
 						onlyDirectImport = `Non-JS-compatible Global Type (${type})`;
@@ -185,7 +161,7 @@ class WebAssemblyParser extends Tapable {
 
 				state.module.addDependency(dep);
 
-				if (isGlobalImport(node)) {
+				if (t.isGlobalType(node.descr)) {
 					importedGlobals.push(node);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,12 @@ declare module "@webassemblyjs/ast" {`
`139`	`139`	`args: string[];`
`140`	`140`	`result: string[];`
`141`	`141`	`}`
	`142`	`+`
	`143`	`+ // Node matcher`
	`144`	`+ export function isGlobalType(n: Node): boolean;`
	`145`	`+ export function isTable(n: Node): boolean;`
	`146`	`+ export function isMemory(n: Node): boolean;`
	`147`	`+ export function isFuncImportDescr(n: Node): boolean;`
`142`	`148`	`}`
`143`	`149`
`144`	`150`	`/**`