Notes on NaN

dcodeIO · Dec 9, 2013 · ec813a5 · ec813a5
1 parent 7a3148e
commit ec813a5
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 24 deletions.
diff --git a/Long.js b/Long.js
@@ -53,9 +53,10 @@
      * case would often result in infinite recursion.
      * 
      * @exports Long
+     * @class A Long class for representing a 64-bit two's-complement integer value.
      * @param {number} low The low (signed) 32 bits of the long.
      * @param {number} high The high (signed) 32 bits of the long.
-     * @param {boolean=} unsigned Whether unsigned or not. Defaults to false (signed).
+     * @param {boolean=} unsigned Whether unsigned or not. Defaults to `false` (signed).
      * @constructor
      */
     var Long = function(low, high, unsigned) {
@@ -107,24 +108,25 @@
      * @expose
      */
     Long.fromInt = function(value, unsigned) {
+        var obj, cachedObj;
         if (!unsigned) {
             value = value | 0;
             if (-128 <= value && value < 128) {
-                var cachedObj = INT_CACHE[value];
+                cachedObj = INT_CACHE[value];
                 if (cachedObj) return cachedObj;
             }
-            var obj = new Long(value, value < 0 ? -1 : 0, false);
+            obj = new Long(value, value < 0 ? -1 : 0, false);
             if (-128 <= value && value < 128) {
                 INT_CACHE[value] = obj;
             }
             return obj;
         } else {
             value = value >>> 0;
             if (0 <= value && value < 256) {
-                var cachedObj = UINT_CACHE[value];
+                cachedObj = UINT_CACHE[value];
                 if (cachedObj) return cachedObj;
             }
-            var obj = new Long(value, (value | 0) < 0 ? -1 : 0, true);
+            obj = new Long(value, (value | 0) < 0 ? -1 : 0, true);
             if (0 <= value && value < 256) {
                 UINT_CACHE[value] = obj;
             }
@@ -201,7 +203,10 @@
         if (str.length == 0) {
             throw(new Error('number format error: empty string'));
         }
-        if (typeof unsigned == 'number') { // For goog.math.Long compatibility
+        if (str === "NaN" || str === "Infinity" || str === "+Infinity" || str === "-Infinity") {
+            return Long.ZERO;
+        }
+        if (typeof unsigned === 'number') { // For goog.math.Long compatibility
             radix = unsigned;
             unsigned = false;
         }
@@ -370,13 +375,14 @@
         if (this.isZero()) {
             return '0';
         }
+        var rem;
         if (this.isNegative()) { // Unsigned Longs are never negative
             if (this.equals(Long.MIN_SIGNED_VALUE)) {
                 // We need to change the Long value before it can be negated, so we remove
                 // the bottom-most digit in this base and then recurse to do the rest.
                 var radixLong = Long.fromNumber(radix);
                 var div = this.div(radixLong);
-                var rem = div.multiply(radixLong).subtract(this);
+                rem = div.multiply(radixLong).subtract(this);
                 return div.toString(radix) + rem.toInt().toString(radix);
             } else {
                 return '-' + this.negate().toString(radix);
@@ -386,7 +392,7 @@
         // Do several (6) digits each time through the loop, so as to
         // minimize the calls to the very expensive emulated div.
         var radixToPower = Long.fromNumber(Math.pow(radix, 6));
-        var rem = this;
+        rem = this;
         var result = '';
         while (true) {
             var remDiv = rem.div(radixToPower);

diff --git a/Long.min.js b/Long.min.js
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ Features
 * Shim compatible (include the script, then use var Long = dcodeIO.Long;)
 * [node.js](http://nodejs.org) compatible, also available via [npm](https://npmjs.org/package/long)
 * Fully documented using [jsdoc3](https://github.com/jsdoc3/jsdoc)
+* API-compatible to the Closure Library implementation
 * Zero production dependencies
 * Small footprint
 

diff --git a/docs/Long.html b/docs/Long.html
@@ -30,6 +30,8 @@ <h2>
     Long
     </h2>
 
+        <div class="class-description">A Long class for representing a 64-bit two's-complement integer value.</div>
+
 </header>  
 
 <article>
@@ -181,7 +183,7 @@ <h5>Parameters:</h5>
 
 
 
-            <td class="description last">Whether unsigned or not. Defaults to false (signed).</td>
+            <td class="description last">Whether unsigned or not. Defaults to `false` (signed).</td>
         </tr>
 
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "long",
     "version": "1.1.2",
     "author": "Daniel Wirtz <dcode@dcode.io>",
-    "description": "Long.js: A Long class for representing a 64-bit two's-complement integer value derived from the Closure Library extended with unsigned support.",
+    "description": "A Long class for representing a 64-bit two's-complement integer value.",
     "main": "Long.js",
     "repository": {
         "type": "git",