diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/jsifier.js | 3 | ||||
| -rw-r--r-- | src/parseTools.js | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index a503e90d..726a5eda 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -215,6 +215,9 @@ function JSify(data, functionsOnly) { function parseConst(value, type, ident) { var constant = makeConst(value, type); + // Sadly, we've thrown away type information in makeConst, so we're not + // passing correct type info to parseNumerical which works around this + // lack. constant = flatten(constant).map(function(x) { return parseNumerical(x) }) return constant; } diff --git a/src/parseTools.js b/src/parseTools.js index 4d6d7bd3..b7f97a40 100644 --- a/src/parseTools.js +++ b/src/parseTools.js @@ -962,8 +962,13 @@ function parseNumerical(value, type) { } if (isNumber(value)) { var ret = parseFloat(value); // will change e.g. 5.000000e+01 to 50 + // type may be undefined here, like when this is called from makeConst with a single argument. + // but if it is a number, then we can safely assume that this should handle negative zeros + // correctly. + if (type === undefined || type === 'double' || type === 'float') { + if (value[0] === '-' && ret === 0) { return '-.0'; } // fix negative 0, toString makes it 0 + } if (type === 'double' || type === 'float') { - if (value[0] === '-' && ret === 0) return '-.0'; // fix negative 0, toString makes it 0 if (!RUNNING_JS_OPTS) ret = asmEnsureFloat(ret, type); } return ret.toString(); |