work

src/binaryen-embind.cpp

@@ -62,7 +62,6 @@ EMSCRIPTEN_BINDINGS(Binaryen) {
     .function("isDefaultable", &Type::isDefaultable)
     .function("getHeapType", &Type::getHeapType)
   ;
-
   register_vector<Type>("TypeVec");
 
   value_object<Signature>("Signature")
@@ -81,7 +80,7 @@ EMSCRIPTEN_BINDINGS(Binaryen) {
     .property("type", &Expression::type);
 
   // All Expression classes...
-  class_<Nop>("Nop");
+  class_<Nop, base<Expression>>("Nop");
 
   // Module-level constructs.
 
@@ -101,12 +100,11 @@ EMSCRIPTEN_BINDINGS(Binaryen) {
     .property("name", &NameType::name)
     .property("type", &NameType::type)
   ;
-
   register_vector<NameType>("NameTypeVec");
 
   class_<Builder>("Builder")
     .constructor<Module&>()
-    .function("makeFunction",
+    .class_function("makeFunction",
               select_overload<std::unique_ptr<Function> (Name,
                                                          HeapType,
                                                          std::vector<Type>&& vars,

test/binaryen-embind.js/basics.js

@@ -36,12 +36,25 @@ binaryenFactory().then((binaryen) => {
   };
   const func_ii = new binaryen.HeapType(sig);
   const vars = new binaryen.TypeVec();
-  const func = builder.makeFunction(
-    "foo",
+  const func = binaryen.Builder.makeFunction(
+    new binaryen.Name("foo"),
     func_ii,
     vars,
     builder.makeNop()
   );
+  module.addFunction(func);
+
+  // Check the function prints out ok.
+  normEqual(binaryen.stringify(module),
+            `
+             (module
+              (type $0 (func (param i32) (result i32)))
+              (func $foo (param $0 i32) (result i32)
+               (nop)
+              )
+             )
+            `);
+
   console.log('success.');
 });