Align binaryen.js with the npm package (#2551)

Binaryen.js now uses binaryen (was Binaryen) as its global
name to align with the npm package. Also fixes issues with
emitting and testing both the JS and Wasm builds.

1 files changed, 27 insertions, 36 deletions

diff --git a/test/binaryen.js/push-pop.js b/test/binaryen.js/push-pop.js
index 2b50b2dca..042ed17d6 100644
--- a/test/binaryen.js/push-pop.js
+++ b/test/binaryen.js/push-pop.js
@@ -1,7 +1,3 @@
-function assert(x) {
-  if (!x) throw 'error!';
-}
-
 function cleanInfo(info) {
   var ret = {};
   for (var x in info) {
@@ -13,40 +9,35 @@ function cleanInfo(info) {
 }
 
 function stringify(expr) {
-  return JSON.stringify(cleanInfo(Binaryen.getExpressionInfo(expr)));
+  return JSON.stringify(cleanInfo(binaryen.getExpressionInfo(expr)));
 }
 
-function test() {
-  var module = new Binaryen.Module();
+var module = new binaryen.Module();
 
-  var func = module.addFunction("func", Binaryen.none, Binaryen.none, [],
-    module.block(null, [
-      module.push(module.i32.pop()),
-      module.push(module.i64.pop()),
-      module.push(module.f32.pop()),
-      module.push(module.f64.pop()),
-      module.push(module.v128.pop()),
-      module.push(module.funcref.pop()),
-      module.push(module.anyref.pop()),
-      module.push(module.nullref.pop()),
-      module.push(module.exnref.pop())
-    ]
-  )
-  )
+var func = module.addFunction("func", binaryen.none, binaryen.none, [],
+  module.block(null, [
+    module.push(module.i32.pop()),
+    module.push(module.i64.pop()),
+    module.push(module.f32.pop()),
+    module.push(module.f64.pop()),
+    module.push(module.v128.pop()),
+    module.push(module.funcref.pop()),
+    module.push(module.anyref.pop()),
+    module.push(module.nullref.pop()),
+    module.push(module.exnref.pop())
+  ])
+)
 
-  assert(module.validate());
-  console.log(module.emitText());
-
-  console.log("getExpressionInfo(i32.pop) = " + stringify(module.i32.pop()));
-  console.log("getExpressionInfo(i64.pop) = " + stringify(module.i64.pop()));
-  console.log("getExpressionInfo(f32.pop) = " + stringify(module.f32.pop()));
-  console.log("getExpressionInfo(f64.pop) = " + stringify(module.f64.pop()));
-  console.log("getExpressionInfo(v128.pop) = " + stringify(module.v128.pop()));
-  console.log("getExpressionInfo(funcref.pop) = " + stringify(module.funcref.pop()));
-  console.log("getExpressionInfo(anyref.pop) = " + stringify(module.anyref.pop()));
-  console.log("getExpressionInfo(nullref.pop) = " + stringify(module.nullref.pop()));
-  console.log("getExpressionInfo(exnref.pop) = " + stringify(module.exnref.pop()));
-  console.log("getExpressionInfo(push) = " + stringify(module.push(module.i32.const(0))));
-}
+assert(module.validate());
+console.log(module.emitText());
 
-Binaryen.ready.then(test);
+console.log("getExpressionInfo(i32.pop) = " + stringify(module.i32.pop()));
+console.log("getExpressionInfo(i64.pop) = " + stringify(module.i64.pop()));
+console.log("getExpressionInfo(f32.pop) = " + stringify(module.f32.pop()));
+console.log("getExpressionInfo(f64.pop) = " + stringify(module.f64.pop()));
+console.log("getExpressionInfo(v128.pop) = " + stringify(module.v128.pop()));
+console.log("getExpressionInfo(funcref.pop) = " + stringify(module.funcref.pop()));
+console.log("getExpressionInfo(anyref.pop) = " + stringify(module.anyref.pop()));
+console.log("getExpressionInfo(nullref.pop) = " + stringify(module.nullref.pop()));
+console.log("getExpressionInfo(exnref.pop) = " + stringify(module.exnref.pop()));
+console.log("getExpressionInfo(push) = " + stringify(module.push(module.i32.const(0))));