Provide AddImport/AddExport for each element in the C-API (#1292)

* Provide AddImport/AddExport for each element in the C-API

5 files changed, 11 insertions, 11 deletions

diff --git a/test/binaryen.js/call_import_error.js b/test/binaryen.js/call_import_error.js
index 4434584b5..22d1c38dd 100644
--- a/test/binaryen.js/call_import_error.js
+++ b/test/binaryen.js/call_import_error.js
@@ -1,12 +1,12 @@
 var module = new Binaryen.Module();
 
 var signature = module.addFunctionType("v", Binaryen.none, []);
-module.addImport("fn", "env", "fn", signature);
+module.addFunctionImport("fn", "env", "fn", signature);
 
 module.addFunction("main", signature, [], module.block("", [
   module.call("fn", [], Binaryen.none) // should be callImport
 ]));
-module.addExport("main", "main");
+module.addFunctionExport("main", "main");
 
 console.log(module.emitText());
 
diff --git a/test/binaryen.js/emit_asmjs.js b/test/binaryen.js/emit_asmjs.js
index 6848f5f01..c7cd5c717 100644
--- a/test/binaryen.js/emit_asmjs.js
+++ b/test/binaryen.js/emit_asmjs.js
@@ -4,7 +4,7 @@ var signature = module.addFunctionType("ii", Binaryen.i32, [ Binaryen.i32 ]);
 
 module.addFunction("main", signature, [], module.getLocal(0, Binaryen.i32));
 
-module.addExport("main", "main");
+module.addFunctionExport("main", "main");
 
 module.validate(); // should validate before calling emitAsmjs
 
diff --git a/test/binaryen.js/hello-world.js b/test/binaryen.js/hello-world.js
index c08e67342..1cc5b89b7 100644
--- a/test/binaryen.js/hello-world.js
+++ b/test/binaryen.js/hello-world.js
@@ -22,7 +22,7 @@ module.addFunction('adder', iii, [], ret);
 
 // Export the function, so we can call it later (for simplicity we
 // export it as the same name as it has internally)
-module.addExport('adder', 'adder');
+module.addFunctionExport('adder', 'adder');
 
 // Print out the text
 console.log(module.emitText());
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index 3205de702..2aa76eeab 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -230,11 +230,11 @@ function test_core() {
   // Imports
 
   var fiF = module.addFunctionType("fiF", Binaryen.f32, [ Binaryen.i32, Binaryen.f64 ]);
-  module.addImport("an-imported", "module", "base", fiF);
+  module.addFunctionImport("an-imported", "module", "base", fiF);
 
   // Exports
 
-  module.addExport("kitchen()sinker", "kitchen_sinker");
+  module.addFunctionExport("kitchen()sinker", "kitchen_sinker");
 
   // Function table. One per module
 
@@ -281,7 +281,7 @@ function test_relooper() {
 
   {
     var vi = module.addFunctionType("vi", Binaryen.None, [ Binaryen.i32 ]);
-    module.addImport("check", "module", "check", vi);
+    module.addFunctionImport("check", "module", "check", vi);
   }
 
   { // trivial: just one block
@@ -501,7 +501,7 @@ function test_interpret() {
   module = new Binaryen.Module();
 
   var vi = module.addFunctionType("vi", Binaryen.None, [ Binaryen.i32 ]);
-  module.addImport("print-i32", "spectest", "print", vi);
+  module.addFunctionImport("print-i32", "spectest", "print", vi);
 
   var v = module.addFunctionType("v", Binaryen.None, []);
   call = module.callImport("print-i32", [ makeInt32(1234) ], Binaryen.None);
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index f585d28d8..ed411bb87 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -1432,8 +1432,8 @@ getExpressionType=3
     BinaryenType paramTypes[] = { 1, 4 };
     functionTypes[1] = BinaryenAddFunctionType(the_module, "fiF", 3, paramTypes, 2);
   }
-  BinaryenAddImport(the_module, "an-imported", "module", "base", functionTypes[1]);
-  BinaryenAddExport(the_module, "kitchen()sinker", "kitchen_sinker");
+  BinaryenAddFunctionImport(the_module, "an-imported", "module", "base", functionTypes[1]);
+  BinaryenAddFunctionExport(the_module, "kitchen()sinker", "kitchen_sinker");
   {
     BinaryenFunctionRef funcs[] = { functions[0] };
     BinaryenSetFunctionTable(the_module, funcs, 1);
@@ -2009,7 +2009,7 @@ getExpressionType=3
     BinaryenType paramTypes[] = { 1 };
     functionTypes[1] = BinaryenAddFunctionType(the_module, "vi", 0, paramTypes, 1);
   }
-  BinaryenAddImport(the_module, "check", "module", "check", functionTypes[1]);
+  BinaryenAddFunctionImport(the_module, "check", "module", "check", functionTypes[1]);
   the_relooper = RelooperCreate();
   expressions[1] = BinaryenConst(the_module, BinaryenLiteralInt32(1337));
   {