From aa49b05e65ebff47fb89c100f2e4e48f080c48a9 Mon Sep 17 00:00:00 2001
From: Ben Smith <binjimin@gmail.com>
Date: Thu, 19 Jan 2017 17:01:36 -0800
Subject: Pass import_index to binary reader import callbacks (#283)

It was being passed before as "index", which is confusing because the
other callbacks have recently been changed to pass the
func/global/memory/table index instead.
---
 src/binary-reader-ast.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/binary-reader-ast.c')

diff --git a/src/binary-reader-ast.c b/src/binary-reader-ast.c
index 9a1a0a7d..ddf1a7aa 100644
--- a/src/binary-reader-ast.c
+++ b/src/binary-reader-ast.c
@@ -208,13 +208,14 @@ static WasmResult on_import(uint32_t index,
   return WASM_OK;
 }
 
-static WasmResult on_import_func(uint32_t index,
+static WasmResult on_import_func(uint32_t import_index,
+                                 uint32_t func_index,
                                  uint32_t sig_index,
                                  void* user_data) {
   Context* ctx = user_data;
-  assert(index == ctx->module->imports.size - 1);
+  assert(import_index == ctx->module->imports.size - 1);
   assert(sig_index < ctx->module->func_types.size);
-  WasmImport* import = ctx->module->imports.data[index];
+  WasmImport* import = ctx->module->imports.data[import_index];
 
   import->kind = WASM_EXTERNAL_KIND_FUNC;
   import->func.decl.flags = WASM_FUNC_DECLARATION_FLAG_HAS_FUNC_TYPE |
@@ -229,13 +230,14 @@ static WasmResult on_import_func(uint32_t index,
   return WASM_OK;
 }
 
-static WasmResult on_import_table(uint32_t index,
+static WasmResult on_import_table(uint32_t import_index,
+                                  uint32_t table_index,
                                   WasmType elem_type,
                                   const WasmLimits* elem_limits,
                                   void* user_data) {
   Context* ctx = user_data;
-  assert(index == ctx->module->imports.size - 1);
-  WasmImport* import = ctx->module->imports.data[index];
+  assert(import_index == ctx->module->imports.size - 1);
+  WasmImport* import = ctx->module->imports.data[import_index];
   import->kind = WASM_EXTERNAL_KIND_TABLE;
   import->table.elem_limits = *elem_limits;
 
@@ -245,12 +247,13 @@ static WasmResult on_import_table(uint32_t index,
   return WASM_OK;
 }
 
-static WasmResult on_import_memory(uint32_t index,
+static WasmResult on_import_memory(uint32_t import_index,
+                                   uint32_t memory_index,
                                    const WasmLimits* page_limits,
                                    void* user_data) {
   Context* ctx = user_data;
-  assert(index == ctx->module->imports.size - 1);
-  WasmImport* import = ctx->module->imports.data[index];
+  assert(import_index == ctx->module->imports.size - 1);
+  WasmImport* import = ctx->module->imports.data[import_index];
   import->kind = WASM_EXTERNAL_KIND_MEMORY;
   import->memory.page_limits = *page_limits;
 
@@ -261,13 +264,14 @@ static WasmResult on_import_memory(uint32_t index,
   return WASM_OK;
 }
 
-static WasmResult on_import_global(uint32_t index,
+static WasmResult on_import_global(uint32_t import_index,
+                                   uint32_t global_index,
                                    WasmType type,
                                    WasmBool mutable_,
                                    void* user_data) {
   Context* ctx = user_data;
-  assert(index == ctx->module->imports.size - 1);
-  WasmImport* import = ctx->module->imports.data[index];
+  assert(import_index == ctx->module->imports.size - 1);
+  WasmImport* import = ctx->module->imports.data[import_index];
   import->kind = WASM_EXTERNAL_KIND_GLOBAL;
   import->global.type = type;
   import->global.mutable_ = mutable_;
-- 
cgit v1.2.3