From 47573b3463559f4978b417717b5b5ce2f3bed3c1 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Sun, 1 Nov 2015 12:54:01 -0800
Subject: fix imports from global.Math

---
 src/wasm-js.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/wasm-js.cpp')

diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index 93a1036ac..c966e07cf 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -95,7 +95,19 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm(char *input) {
         var base = Pointer_stringify($1);
         var tempArguments = Module['tempArguments'];
         Module['tempArguments'] = null;
-        return Module['info'][mod][base].apply(null, tempArguments);
+        var lookup = Module['info'];
+        if (mod.indexOf('.') < 0) {
+          lookup = (lookup || {})[mod];
+        } else {
+          var parts = mod.split('.');
+          lookup = (lookup || {})[parts[0]];
+          lookup = (lookup || {})[parts[1]];
+        }
+        lookup = (lookup || {})[base];
+        if (!lookup) {
+          abort('bad CallImport to (' + mod + ').' + base);
+        }
+        return lookup.apply(null, tempArguments);
       }, import->module.str, import->base.str));
     }
 
-- 
cgit v1.2.3