i64 fixes and tests

2 files changed, 5 insertions, 2 deletions

diff --git a/src/parseTools.js b/src/parseTools.js
index 40f845a3..c8b4b918 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -359,6 +359,9 @@ function finalizeParam(param) {
   } else if (param.intertype === 'jsvalue') {
     return param.ident;
   } else {
+    if (param.type == 'i64' && I64_MODE == 1) {
+      return parseI64Constant(param.ident);
+    }
     return toNiceIdent(param.ident);
   }
 }
@@ -526,7 +529,7 @@ function IEEEUnHex(stringy) {
   return (absolute * (neg ? -1 : 1)).toString();
 }
 
-// Makes a proper runtime value for a 64-bit value. Used in library.
+// Makes a proper runtime value for a 64-bit value from low and high i32s.
 function makeI64(low, high) {
   if (I64_MODE == 1) {
     return '[' + low + ',' + (high || '0') + ']';
diff --git a/src/utility.js b/src/utility.js
index 42c6ca69..5ae4480f 100644
--- a/src/utility.js
+++ b/src/utility.js
@@ -185,7 +185,7 @@ function mergeInto(obj, other) {
 }
 
 function isNumber(x) {
-  return x == parseFloat(x); // XXX add:            || x.match(/^-?\d+(\.\d+)?/);
+  return x == parseFloat(x) || (typeof x == 'string' && x.match(/^-?\d+/));
 }
 
 function isArray(x) {