aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-11-09 09:16:12 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-11-09 09:16:12 -0800
commit7a3b033e450b94f5b8c32509fd9ec8b3ca539dfb (patch)
tree6c6fd5942d3e4126f7795810b541074338390d16
parent11418ef9f027c503e371da0bf82aff9387826594 (diff)
fix ensureDot logic
-rw-r--r--src/parseTools.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/parseTools.js b/src/parseTools.js
index 088fea16..adb3f6e4 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -1165,7 +1165,9 @@ function makeVarDef(js) {
function ensureDot(value) {
value = value.toString();
- if (value.indexOf('.') >= 0 || /[IN]/.test(value)) return value; // if already dotted, or Infinity or NaN, nothing to do here
+ // if already dotted, or Infinity or NaN, nothing to do here
+ // if smaller than 1 and running js opts, we always need to force a coercion (0.001 will turn into 1e-3, which has no .)
+ if ((value.indexOf('.') >= 0 || /[IN]/.test(value)) && (!RUNNING_JS_OPTS || Math.abs(value) >= 1)) return value;
if (RUNNING_JS_OPTS) return '(+' + value + ')'; // JS optimizer will run, we must do +x, and it will be corrected later
var e = value.indexOf('e');
if (e < 0) return value + '.0';
@@ -1181,8 +1183,7 @@ function asmEnsureFloat(value, type) { // ensures that a float type has either 5
value = ensureDot(value);
return 'Math_fround(' + value + ')';
}
- // coerce if missing a '.', or if smaller than 1, so could be 1e-5 which has no .
- if (type in Runtime.FLOAT_TYPES && (value.toString().indexOf('.') < 0 || Math.abs(value) < 1)) {
+ if (type in Runtime.FLOAT_TYPES) {
return ensureDot(value);
} else {
return value;