From dbd0f995146e0c99aa280f366f2fe23cbfe1591c Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Mon, 21 Jan 2019 15:21:51 -0800
Subject: [PATCH] Fix argument type conversion

---
 lib/runtime/examples/simple/main.rs |  2 +-
 lib/runtime/src/macros.rs           | 33 ++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/lib/runtime/examples/simple/main.rs b/lib/runtime/examples/simple/main.rs
index b134f60f9..be178740a 100644
--- a/lib/runtime/examples/simple/main.rs
+++ b/lib/runtime/examples/simple/main.rs
@@ -13,7 +13,7 @@ fn main() -> Result<()> {
         "print_i32",
         export_func!(
             print_num,
-            [I32] -> [I32]
+            [i32] -> [i32]
         ),
     );
 
diff --git a/lib/runtime/src/macros.rs b/lib/runtime/src/macros.rs
index 80a8f1de1..d90cb1454 100644
--- a/lib/runtime/src/macros.rs
+++ b/lib/runtime/src/macros.rs
@@ -12,14 +12,14 @@ macro_rules! export_func {
             vm,
         };
 
-        let func: extern fn( $( $crate::__export_func_convert_type!($params), )* &mut vm::Ctx) -> ($( $crate::__export_func_convert_type!($returns) )*) = $func;
+        let func: extern fn( $( $params, )* &mut vm::Ctx) -> ($( $returns )*) = $func;
 
         Export::Function {
             func: unsafe { FuncPointer::new(func as _) },
             ctx: Context::Internal,
             signature: FuncSig {
-                params: vec![$(Type::$params,)*],
-                returns: vec![$(Type::$params,)*],
+                params: vec![$($crate::__export_func_convert_type!($params),)*],
+                returns: vec![$($crate::__export_func_convert_type!($params),)*],
             },
         }
     }};
@@ -28,16 +28,25 @@ macro_rules! export_func {
 #[macro_export]
 #[doc(hidden)]
 macro_rules! __export_func_convert_type {
-    (I32) => {
-        i32
+    (i32) => {
+        Type::I32
     };
-    (I64) => {
-        i64
+    (u32) => {
+        Type::I32
     };
-    (F32) => {
-        f32
+    (i64) => {
+        Type::I64
     };
-    (F64) => {
-        f64
+    (u64) => {
+        Type::I32
     };
-}
+    (f32) => {
+        Type::F32
+    };
+    (f64) => {
+        Type::F64
+    };
+    ($x:ty) => {
+        compile_error!("Only `i32`, `u32`, `i64`, `u64`, `f32`, and `f64` are supported for argument and return types")
+    };
+}
\ No newline at end of file