Merge lp:~rpadovani/ubuntu-calculator-app/1332567 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Updated bignumber.js, added a workaround for bug #1332567

Due bug #1332567 when device is connected to charger it does wrong divisions.
I'm pretty sure I have identified the origin of the bug: in bignumber.js there is function named "division", which has a do/while cycle inside.

Before the do/while cycle all vars are equal on desktop and on device, but after the cycle the array named qc is different.

So, I started to debug the do/while cycle, but everytime I add a console.log() in the do/while cycle, the bug disappears. I think is an Heisenbug[1].

I suppose the bug is in the QT 5.3 Javascript Interpreter, and I'm working to reproduce the bug with a simplier code.

Until the fix of the bug in the interpreter, I suggest to add a console.log() in the do/while cycle as a workaround.

Also, I updated the library to latest version

[1]https://en.wikipedia.org/wiki/Unusual_software_bug

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:284
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/220/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/735
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/735/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/15

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/220/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Looks ok. Great job!

review: Approve

[Mihir Soni (mihirsoni)]

Change looks good to me , it works great on desktop with new upgraded version of js file.
But still haven't tested on device.

review: Approve

[Bartosz Kosiorek (gang65)]

Could you please submit bug report for QT 5.3 Javascript Interpreter?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/133/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/13
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/11
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/282/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/191
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9140

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/ubuntu-calculator-app/1332567]

285. By Riccardo Padovani on 2014-07-02

Merged lp:~vthompson/ubuntu-calculator-app/test-fix-1332567

286. By Riccardo Padovani on 2014-07-02

Removed old workaround

[Riccardo Padovani (rpadovani)]

I merged Victor fix that is better. Seems that in specific occasions the QT interpreter is too slow. I'll talk with someone in the sdk team and I'll report the bug upstream

[Victor Thompson (vthompson)]

lgtm!

review: Approve

[Bartosz Kosiorek (gang65)]

Great work.
One more comment.

Could you please extend autopilot test case, to handle this divine problem in future?

You could change for example from:
    def test_divide_positive(self):
        self.main_view.calculate_operation("4/2")
        self._assert_result("2")

To:
    def test_divide_positive(self):
        self.main_view.calculate_operation("4/5")
        self._assert_result("0.8")

Maybe it will be good to submit this bignumber fix to upstream:
https://github.com/MikeMcl/bignumber.js/

review: Needs Information

[Bartosz Kosiorek (gang65)]

Or maybe better 4.5/2 = 2.25

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:286
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/222/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/768
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/17

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/222/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

> Could you please extend autopilot test case, to handle this divine problem in future?

We have a testcase about this, is 1/3. It's thanks to this test case we found
the bug

> Maybe it will be good to submit this bignumber fix to upstream:
> https://github.com/MikeMcl/bignumber.js/

I reported the bug upstream and linked Victor's patch. I know it's trivial
change, but I prefer to know author's opinion before do a MR :-)

[Renato Araujo Oliveira Filho (renatofilho)]

works for me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'bignumber.js'
--- bignumber.js	2014-04-26 17:59:39 +0000
+++ bignumber.js	2014-07-02 14:22:11 +0000
@@ -1,12 +1,19 @@
-/* bignumber.js v1.3.0 https://github.com/MikeMcl/bignumber.js/LICENCE */
+/*! bignumber.js v1.4.1 https://github.com/MikeMcl/bignumber.js/LICENCE */
 
 var BN;
 
+/* Due bug https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1332567
+ * there is a change after line 598, remember to add it when you update
+ * the file
+ * See
+ * https://code.launchpad.net/~vthompson/ubuntu-calculator-app/test-fix-1332567
+ */
+
 ;(function ( global ) {
     'use strict';
 
     /*
-      bignumber.js v1.3.0
+      bignumber.js v1.4.1
       A JavaScript library for arbitrary-precision arithmetic.
       https://github.com/MikeMcl/bignumber.js
       Copyright (c) 2012 Michael Mclaughlin <[e-mail]>
@@ -114,7 +121,7 @@
                 x['s'] = n['s'];
                 x['e'] = n['e'];
                 x['c'] = ( n = n['c'] ) ? n.slice() : n;
-                return
+                return;
             }
         }
 
@@ -122,7 +129,7 @@
         if ( typeof n != 'string' ) {
             n = ( isNum = typeof n == 'number' ||
                 Object.prototype.toString.call(n) == '[object Number]' ) &&
-                    n === 0 && 1 / n < 0 ? '-0' : n + ''
+                    n === 0 && 1 / n < 0 ? '-0' : n + '';
         }
 
         orig = n;
@@ -130,7 +137,7 @@
         if ( b === e && isValid.test(n) ) {
 
             // Determine sign.
-            x['s'] = n.charAt(0) == '-' ? ( n = n.slice(1), -1 ) : 1
+            x['s'] = n.charAt(0) == '-' ? ( n = n.slice(1), -1 ) : 1;
 
         // Either n is not a valid BigNumber or a base has been specified.
         } else {
@@ -139,7 +146,7 @@
             // Ensure return value is rounded to DECIMAL_PLACES as with other bases.
             if ( b == 10 ) {
 
-                return setMode( n, DECIMAL_PLACES, ROUNDING_MODE )
+                return setMode( n, DECIMAL_PLACES, ROUNDING_MODE );
             }
 
             n = trim.call(n).replace( /^\+(?!-)/, '' );
@@ -163,22 +170,22 @@
 
                         if ( isNum ) {
 
-                            if ( n.replace( /^0\.0*|\./, '' ).length > 11 ) {
+                            if ( n.replace( /^0\.0*|\./, '' ).length > 15 ) {
 
-                                // 'new BigNumber() number type has more than 11 significant digits: {n}'
-                                ifExceptionsThrow( orig, 0 )
+                                // 'new BigNumber() number type has more than 15 significant digits: {n}'
+                                ifExceptionsThrow( orig, 0 );
                             }
 
                             // Prevent later check for length on converted number.
-                            isNum = !isNum
+                            isNum = !isNum;
                         }
-                        n = convert( n, 10, b, x['s'] )
+                        n = convert( n, 10, b, x['s'] );
 
                     } else if ( n != 'Infinity' && n != 'NaN' ) {
 
                         // 'new BigNumber() not a base {b} number: {n}'
                         ifExceptionsThrow( orig, 1, b );
-                        n = 'NaN'
+                        n = 'NaN';
                     }
                 } else {
 
@@ -187,10 +194,10 @@
                     ifExceptionsThrow( b, 2 );
 
                     // Ignore base.
-                    valid = isValid.test(n)
+                    valid = isValid.test(n);
                 }
             } else {
-                valid = isValid.test(n)
+                valid = isValid.test(n);
             }
 
             if ( !valid ) {
@@ -205,19 +212,19 @@
                     if ( n != 'NaN' ) {
 
                         // 'new BigNumber() not a number: {n}'
-                        ifExceptionsThrow( orig, 3 )
+                        ifExceptionsThrow( orig, 3 );
                     }
-                    x['s'] = null
+                    x['s'] = null;
                 }
                 id = 0;
 
-                return
+                return;
             }
         }
 
         // Decimal point?
         if ( ( e = n.indexOf('.') ) > -1 ) {
-            n = n.replace( '.', '' )
+            n = n.replace( '.', '' );
         }
 
         // Exponential form?
@@ -225,15 +232,15 @@
 
             // Determine exponent.
             if ( e < 0 ) {
-                e = i
+                e = i;
             }
             e += +n.slice( i + 1 );
-            n = n.substring( 0, i )
+            n = n.substring( 0, i );
 
         } else if ( e < 0 ) {
 
             // Integer.
-            e = n.length
+            e = n.length;
         }
 
         // Determine leading zeros.
@@ -242,11 +249,11 @@
 
         b = n.length;
 
-        // Disallow numbers with over 11 significant digits if number type.
-        if ( isNum && b > 11 && n.slice(i).length > 11 ) {
+        // Disallow numbers with over 15 significant digits if number type.
+        if ( isNum && b > 15 && n.slice(i).length > 15 ) {
 
-            // 'new BigNumber() number type has more than 11 significant digits: {n}'
-            ifExceptionsThrow( orig, 0 )
+            // 'new BigNumber() number type has more than 15 significant digits: {n}'
+            ifExceptionsThrow( orig, 0 );
         }
         id = 0;
 
@@ -254,13 +261,13 @@
         if ( ( e -= i + 1 ) > MAX_EXP ) {
 
             // Infinity.
-            x['c'] = x['e'] = null
+            x['c'] = x['e'] = null;
 
         // Zero or underflow?
         } else if ( i == b || e < MIN_EXP ) {
 
             // Zero.
-            x['c'] = [ x['e'] = 0 ]
+            x['c'] = [ x['e'] = 0 ];
         } else {
 
             // Determine trailing zeros.
@@ -314,7 +321,7 @@
             c = 'config',
             inRange = function ( n, lo, hi ) {
               return !( ( outOfRange = n < lo || n > hi ) ||
-                parse(n) != n && n !== 0 )
+                parse(n) != n && n !== 0 );
             },
             has = o && typeof o == 'object'
               ? function () {if ( o.hasOwnProperty(p) ) return ( v = o[p] ) != null}
@@ -324,12 +331,12 @@
         if ( has( p = 'DECIMAL_PLACES' ) ) {
 
             if ( inRange( v, 0, MAX ) ) {
-                DECIMAL_PLACES = v | 0
+                DECIMAL_PLACES = v | 0;
             } else {
 
                 // 'config() DECIMAL_PLACES not an integer: {v}'
                 // 'config() DECIMAL_PLACES out of range: {v}'
-                ifExceptionsThrow( v, p, c )
+                ifExceptionsThrow( v, p, c );
             }
         }
         r[p] = DECIMAL_PLACES;
@@ -338,12 +345,12 @@
         if ( has( p = 'ROUNDING_MODE' ) ) {
 
             if ( inRange( v, 0, 8 ) ) {
-                ROUNDING_MODE = v | 0
+                ROUNDING_MODE = v | 0;
             } else {
 
                 // 'config() ROUNDING_MODE not an integer: {v}'
                 // 'config() ROUNDING_MODE out of range: {v}'
-                ifExceptionsThrow( v, p, c )
+                ifExceptionsThrow( v, p, c );
             }
         }
         r[p] = ROUNDING_MODE;
@@ -355,15 +362,16 @@
         if ( has( p = 'EXPONENTIAL_AT' ) ) {
 
             if ( inRange( v, -MAX, MAX ) ) {
-                TO_EXP_NEG = -( TO_EXP_POS = ~~( v < 0 ? -v : +v ) )
+                TO_EXP_NEG = -( TO_EXP_POS = ~~( v < 0 ? -v : +v ) );
             } else if ( !outOfRange && v && inRange( v[0], -MAX, 0 ) &&
               inRange( v[1], 0, MAX ) ) {
-                TO_EXP_NEG = ~~v[0], TO_EXP_POS = ~~v[1]
+                TO_EXP_NEG = ~~v[0];
+                TO_EXP_POS = ~~v[1];
             } else {
 
                 // 'config() EXPONENTIAL_AT not an integer or not [integer, integer]: {v}'
                 // 'config() EXPONENTIAL_AT out of range or not [negative, positive: {v}'
-                ifExceptionsThrow( v, p, c, 1 )
+                ifExceptionsThrow( v, p, c, 1 );
             }
         }
         r[p] = [ TO_EXP_NEG, TO_EXP_POS ];
@@ -375,15 +383,15 @@
         if ( has( p = 'RANGE' ) ) {
 
             if ( inRange( v, -MAX, MAX ) && ~~v ) {
-                MIN_EXP = -( MAX_EXP = ~~( v < 0 ? -v : +v ) )
+                MIN_EXP = -( MAX_EXP = ~~( v < 0 ? -v : +v ) );
             } else if ( !outOfRange && v && inRange( v[0], -MAX, -1 ) &&
               inRange( v[1], 1, MAX ) ) {
-                MIN_EXP = ~~v[0], MAX_EXP = ~~v[1]
+                MIN_EXP = ~~v[0], MAX_EXP = ~~v[1];
             } else {
 
                 // 'config() RANGE not a non-zero integer or not [integer, integer]: {v}'
                 // 'config() RANGE out of range or not [negative, positive: {v}'
-                ifExceptionsThrow( v, p, c, 1, 1 )
+                ifExceptionsThrow( v, p, c, 1, 1 );
             }
         }
         r[p] = [ MIN_EXP, MAX_EXP ];
@@ -394,16 +402,16 @@
             if ( v === !!v || v === 1 || v === 0 ) {
                 parse = ( outOfRange = id = 0, ERRORS = !!v )
                   ? parseInt
-                  : parseFloat
+                  : parseFloat;
             } else {
 
                 // 'config() ERRORS not a boolean or binary digit: {v}'
-                ifExceptionsThrow( v, p, c, 0, 0, 1 )
+                ifExceptionsThrow( v, p, c, 0, 0, 1 );
             }
         }
         r[p] = ERRORS;
 
-        return r
+        return r;
     };
 
 
@@ -422,7 +430,7 @@
                   ( isRange ? ' non-zero' : 'n' ) + ' integer';
 
             message = ( [
-                method + ' number type has more than 11 significant digits',
+                method + ' number type has more than 15 significant digits',
                 method + ' not a base ' + j + ' number',
                 method + ' base' + message,
                 method + ' not a number' ][i] ||
@@ -438,7 +446,7 @@
             error = new Error(message);
             error['name'] = 'BigNumber Error';
 
-            throw error
+            throw error;
         }
     }
 
@@ -471,15 +479,15 @@
                     if ( arr[j] > baseOut - 1 ) {
 
                         if ( arr[j + 1] == null ) {
-                            arr[j + 1] = 0
+                            arr[j + 1] = 0;
                         }
                         arr[j + 1] += arr[j] / baseOut ^ 0;
-                        arr[j] %= baseOut
+                        arr[j] %= baseOut;
                     }
                 }
             }
 
-            return arr.reverse()
+            return arr.reverse();
         }
 
         // Convert array to string.
@@ -492,11 +500,11 @@
             for ( ; i < arrL; str += DIGITS.charAt( arr[i++] ) ) {
             }
 
-            return str
+            return str;
         }
 
         if ( baseIn < 37 ) {
-            nStr = nStr.toLowerCase()
+            nStr = nStr.toLowerCase();
         }
 
         /*
@@ -539,7 +547,7 @@
                 }
 
                 // Append the fraction part to the converted integer part.
-                nStr = arrToStr(nArr) + '.' + arrToStr(fracArr)
+                nStr = arrToStr(nArr) + '.' + arrToStr(fracArr);
 
             // fracArr is [1].
             // Fraction digits rounded up, so increment last digit of integer part.
@@ -547,23 +555,23 @@
 
                 if ( nArr[ e = nArr.length - 1 ] < baseOut - 1 ) {
                     ++nArr[e];
-                    nStr = arrToStr(nArr)
+                    nStr = arrToStr(nArr);
                 } else {
                     nStr = new BigNumber( arrToStr(nArr),
-                      baseOut )['plus'](ONE)['toS'](baseOut)
+                      baseOut )['plus'](ONE)['toS'](baseOut);
                 }
 
             // fracArr is [0]. No fraction digits.
             } else {
-                nStr = arrToStr(nArr)
+                nStr = arrToStr(nArr);
             }
         } else {
 
             // Simple integer. Convert base.
-            nStr = arrToStr( strToArr(nStr) )
+            nStr = arrToStr( strToArr(nStr) );
         }
 
-        return nStr
+        return nStr;
     }
 
 
@@ -591,19 +599,18 @@
         dvsZ.unshift(0);
 
         do {
-
             // 'next' is how many times the divisor goes into the current remainder.
             for ( next = 0; next < base; next++ ) {
 
                 // Compare divisor and remainder.
                 if ( dvsL != ( remL = rem.length ) ) {
-                    cmp = dvsL > remL ? 1 : -1
+                    cmp = dvsL > remL ? 1 : -1;
                 } else {
                     for ( remI = -1, cmp = 0; ++remI < dvsL; ) {
 
                         if ( dvs[remI] != rem[remI] ) {
                             cmp = dvs[remI] > rem[remI] ? 1 : -1;
-                            break
+                            break;
                         }
                     }
                 }
@@ -622,24 +629,24 @@
                                 rem[remI] = base - 1 ) {
                             }
                             --rem[remI];
-                            rem[remL] += base
+                            rem[remL] += base;
                         }
-                        rem[remL] -= dvsT[remL]
+                        rem[remL] -= dvsT[remL];
                     }
                     for ( ; !rem[0]; rem.shift() ) {
                     }
                 } else {
-                    break
+                    break;
                 }
             }
 
-            // Add the 'next' digit to the result array.
-            qc[qi++] = cmp ? next : ++next;
-
             // Update the remainder.
             rem[0] && cmp
               ? ( rem[remL] = dvd[dvdI] || 0 )
-              : ( rem = [ dvd[dvdI] ] )
+              : ( rem = [ dvd[dvdI] ] );
+
+            // Add the 'next' digit to the result array.
+            qc[qi++] = cmp ? next : ++next;
 
         } while ( ( dvdI++ < dvdL || rem[0] != null ) && s-- );
 
@@ -648,28 +655,28 @@
 
             // There can't be more than one zero.
             --quo['e'];
-            qc.shift()
+            qc.shift();
         }
 
         // Round?
         if ( qi > dig ) {
-            rnd( quo, DECIMAL_PLACES, base, isOdd, rem[0] != null )
+            rnd( quo, DECIMAL_PLACES, base, isOdd, rem[0] != null );
         }
 
         // Overflow?
         if ( quo['e'] > MAX_EXP ) {
 
             // Infinity.
-            quo['c'] = quo['e'] = null
+            quo['c'] = quo['e'] = null;
 
         // Underflow?
         } else if ( quo['e'] < MIN_EXP ) {
 
             // Zero.
-            quo['c'] = [quo['e'] = 0]
+            quo['c'] = [quo['e'] = 0];
         }
 
-        return quo
+        return quo;
     }
 
 
@@ -689,12 +696,12 @@
 
         // +-Infinity or NaN?
         if ( !c ) {
-            return n['toS']()
+            return n['toS']();
         }
 
         // Round?
         if ( c.length > ++d ) {
-            rnd( n, i, 10 )
+            rnd( n, i, 10 );
         }
 
         // Recalculate d if toFixed as n['e'] may have changed if value rounded up.
@@ -718,7 +725,7 @@
             : c[0] ) + ( i < 0 ? 'e' : 'e+' ) + i
 
           // Normal notation.
-          : n['toS']()
+          : n['toS']();
     }
 
 
@@ -768,14 +775,14 @@
 
                 // 1, 0.1, 0.01, 0.001, 0.0001 etc.
                 xc[0] = 1;
-                x['e'] = -dp
+                x['e'] = -dp;
             } else {
 
                 // Zero.
-                x['e'] = 0
+                x['e'] = 0;
             }
 
-            return x
+            return x;
         }
 
         // Remove any digits after the required decimal places.
@@ -790,7 +797,7 @@
 
                 if ( !i-- ) {
                     ++x['e'];
-                    xc.unshift(1)
+                    xc.unshift(1);
                 }
             }
         }
@@ -799,7 +806,7 @@
         for ( i = xc.length; !xc[--i]; xc.pop() ) {
         }
 
-        return x
+        return x;
     }
 
 
@@ -813,7 +820,7 @@
         x['c'] && rnd( x, dp, 10 );
         ROUNDING_MODE = r;
 
-        return x
+        return x;
     }
 
 
@@ -827,10 +834,10 @@
         var x = new BigNumber(this);
 
         if ( x['s'] < 0 ) {
-            x['s'] = 1
+            x['s'] = 1;
         }
 
-        return x
+        return x;
     };
 
 
@@ -839,7 +846,7 @@
      * rounded to a whole number in the direction of Infinity.
      */
     P['ceil'] = function () {
-        return setMode( this, 0, 2 )
+        return setMode( this, 0, 2 );
     };
 
 
@@ -862,29 +869,29 @@
 
         // Either NaN?
         if ( !i || !j ) {
-            return null
+            return null;
         }
 
         a = xc && !xc[0], b = yc && !yc[0];
 
         // Either zero?
         if ( a || b ) {
-            return a ? b ? 0 : -j : i
+            return a ? b ? 0 : -j : i;
         }
 
         // Signs differ?
         if ( i != j ) {
-            return i
+            return i;
         }
 
         // Either Infinity?
         if ( a = i < 0, b = k == l, !xc || !yc ) {
-            return b ? 0 : !xc ^ a ? 1 : -1
+            return b ? 0 : !xc ^ a ? 1 : -1;
         }
 
         // Compare exponents.
         if ( !b ) {
-            return k > l ^ a ? 1 : -1
+            return k > l ^ a ? 1 : -1;
         }
 
         // Compare digit by digit.
@@ -893,11 +900,11 @@
               ++i < j; ) {
 
             if ( xc[i] != yc[i] ) {
-                return xc[i] > yc[i] ^ a ? 1 : -1
+                return xc[i] > yc[i] ^ a ? 1 : -1;
             }
         }
         // Compare lengths.
-        return k == l ? 0 : k > l ^ a ? 1 : -1
+        return k == l ? 0 : k > l ^ a ? 1 : -1;
     };
 
 
@@ -952,7 +959,7 @@
                 // y is 0. Return +-Infinity.
                 : s / 0 )
 
-          : divide( xc, yc, xe - ye, s, 10 )
+          : divide( xc, yc, xe - ye, s, 10 );
     };
 
 
@@ -962,7 +969,7 @@
      */
     P['equals'] = P['eq'] = function ( n, b ) {
         id = 3;
-        return this['cmp']( n, b ) === 0
+        return this['cmp']( n, b ) === 0;
     };
 
 
@@ -971,7 +978,7 @@
      * rounded to a whole number in the direction of -Infinity.
      */
     P['floor'] = function () {
-        return setMode( this, 0, 3 )
+        return setMode( this, 0, 3 );
     };
 
 
@@ -981,7 +988,7 @@
      */
     P['greaterThan'] = P['gt'] = function ( n, b ) {
         id = 4;
-        return this['cmp']( n, b ) > 0
+        return this['cmp']( n, b ) > 0;
     };
 
 
@@ -991,7 +998,7 @@
      */
     P['greaterThanOrEqualTo'] = P['gte'] = function ( n, b ) {
         id = 5;
-        return ( b = this['cmp']( n, b ) ) == 1 || b === 0
+        return ( b = this['cmp']( n, b ) ) == 1 || b === 0;
     };
 
 
@@ -1000,7 +1007,7 @@
      * returns false.
      */
     P['isFinite'] = P['isF'] = function () {
-        return !!this['c']
+        return !!this['c'];
     };
 
 
@@ -1009,7 +1016,7 @@
      * false.
      */
     P['isNaN'] = function () {
-        return !this['s']
+        return !this['s'];
     };
 
 
@@ -1018,7 +1025,7 @@
      * returns false.
      */
     P['isNegative'] = P['isNeg'] = function () {
-        return this['s'] < 0
+        return this['s'] < 0;
     };
 
 
@@ -1027,7 +1034,7 @@
      * false.
      */
     P['isZero'] = P['isZ'] = function () {
-        return !!this['c'] && this['c'][0] == 0
+        return !!this['c'] && this['c'][0] == 0;
     };
 
 
@@ -1037,7 +1044,7 @@
      */
     P['lessThan'] = P['lt'] = function ( n, b ) {
         id = 6;
-        return this['cmp']( n, b ) < 0
+        return this['cmp']( n, b ) < 0;
     };
 
 
@@ -1047,7 +1054,7 @@
      */
     P['lessThanOrEqualTo'] = P['lte'] = function ( n, b ) {
         id = 7;
-        return ( b = this['cmp']( n, b ) ) == -1 || b === 0
+        return ( b = this['cmp']( n, b ) ) == -1 || b === 0;
     };
 
 
@@ -1080,12 +1087,12 @@
 
         // Either NaN?
         if ( !a || !b ) {
-            return new BigNumber(NaN)
+            return new BigNumber(NaN);
         }
 
         // Signs differ?
         if ( a != b ) {
-            return y['s'] = -b, x['plus'](y)
+            return y['s'] = -b, x['plus'](y);
         }
 
         var xc = x['c'],
@@ -1097,7 +1104,7 @@
 
             // Either Infinity?
             if ( !xc || !yc ) {
-                return xc ? ( y['s'] = -b, y ) : new BigNumber( yc ? x : NaN )
+                return xc ? ( y['s'] = -b, y ) : new BigNumber( yc ? x : NaN );
             }
 
             // Either zero?
@@ -1113,7 +1120,7 @@
 
                     // Both are zero.
                     // IEEE 754 (2008) 6.3: n - n = -0 when rounding to -Infinity
-                    : ROUNDING_MODE == 3 ? -0 : 0 )
+                    : ROUNDING_MODE == 3 ? -0 : 0 );
             }
         }
 
@@ -1124,7 +1131,7 @@
 
             for ( d.reverse(), b = a; b--; d.push(0) ) {
             }
-            d.reverse()
+            d.reverse();
         } else {
 
             // Exponents equal. Check digit by digit.
@@ -1134,7 +1141,7 @@
 
                 if ( xc[b] != yc[b] ) {
                     xLTy = xc[b] < yc[b];
-                    break
+                    break;
                 }
             }
         }
@@ -1142,7 +1149,7 @@
         // x < y? Point xc to the array of the bigger number.
         if ( xLTy ) {
             d = xc, xc = yc, yc = d;
-            y['s'] = -y['s']
+            y['s'] = -y['s'];
         }
 
         /*
@@ -1163,9 +1170,9 @@
                 for ( i = b; i && !xc[--i]; xc[i] = 9 ) {
                 }
                 --xc[i];
-                xc[b] += 10
+                xc[b] += 10;
             }
-            xc[b] -= yc[b]
+            xc[b] -= yc[b];
         }
 
         // Remove trailing zeros.
@@ -1189,14 +1196,14 @@
              * n - n = +0  but  n - n = -0 when rounding towards -Infinity.
              */
             if ( !xc[0] ) {
-                y['s'] = ROUNDING_MODE == 3 ? -1 : 1
+                y['s'] = ROUNDING_MODE == 3 ? -1 : 1;
             }
 
             // Result is zero.
-            xc = [ye = 0]
+            xc = [ye = 0];
         }
 
-        return y['c'] = xc, y['e'] = ye, y
+        return y['c'] = xc, y['e'] = ye, y;
     };
 
 
@@ -1225,7 +1232,7 @@
         b = !i || !j || yc && !yc[0];
 
         if ( b || xc && !xc[0] ) {
-            return new BigNumber( b ? NaN : x )
+            return new BigNumber( b ? NaN : x );
         }
 
         x['s'] = y['s'] = 1;
@@ -1238,7 +1245,7 @@
             DECIMAL_PLACES = 0, ROUNDING_MODE = 1,
               x = x['div'](y),
                 DECIMAL_PLACES = i, ROUNDING_MODE = j,
-                  this['minus']( x['times'](y) ) )
+                  this['minus']( x['times'](y) ) );
     };
 
 
@@ -1249,7 +1256,7 @@
     P['negated'] = P['neg'] = function () {
         var x = new BigNumber(this);
 
-        return x['s'] = -x['s'] || null, x
+        return x['s'] = -x['s'] || null, x;
     };
 
 
@@ -1282,12 +1289,12 @@
 
         // Either NaN?
         if ( !a || !b ) {
-            return new BigNumber(NaN)
+            return new BigNumber(NaN);
         }
 
         // Signs differ?
         if ( a != b ) {
-            return y['s'] = -b, x['minus'](y)
+            return y['s'] = -b, x['minus'](y);
         }
 
         var xe = x['e'],
@@ -1301,7 +1308,7 @@
             if ( !xc || !yc ) {
 
                 // Return +-Infinity.
-                return new BigNumber( a / 0 )
+                return new BigNumber( a / 0 );
             }
 
             // Either zero?
@@ -1316,7 +1323,7 @@
                     ? x
 
                     // Both are zero. Return zero.
-                    : a * 0 )
+                    : a * 0 );
             }
         }
 
@@ -1327,12 +1334,12 @@
 
             for ( d.reverse(); a--; d.push(0) ) {
             }
-            d.reverse()
+            d.reverse();
         }
 
         // Point xc to the longer array.
         if ( xc.length - yc.length < 0 ) {
-            d = yc, yc = xc, xc = d
+            d = yc, yc = xc, xc = d;
         }
 
         /*
@@ -1352,7 +1359,7 @@
             if ( ++ye > MAX_EXP ) {
 
                 // Infinity.
-                xc = ye = null
+                xc = ye = null;
             }
         }
 
@@ -1360,7 +1367,7 @@
         for ( a = xc.length; xc[--a] == 0; xc.pop() ) {
         }
 
-        return y['c'] = xc, y['e'] = ye, y
+        return y['c'] = xc, y['e'] = ye, y;
     };
 
 
@@ -1399,23 +1406,23 @@
                 !i ) {
 
             // i is +-Infinity, NaN or 0.
-            return new BigNumber( Math.pow( x['toS'](), i ) )
+            return new BigNumber( Math.pow( x['toS'](), i ) );
         }
 
         for ( i = i < 0 ? -i : i; ; ) {
 
             if ( i & 1 ) {
-                y = y['times'](x)
+                y = y['times'](x);
             }
             i >>= 1;
 
             if ( !i ) {
-                break
+                break;
             }
-            x = x['times'](x)
+            x = x['times'](x);
         }
 
-        return e < 0 ? ONE['div'](y) : y
+        return e < 0 ? ONE['div'](y) : y;
     };
 
 
@@ -1449,7 +1456,7 @@
               ? ROUNDING_MODE
               : rm | 0;
 
-        return setMode( this, dp, rm )
+        return setMode( this, dp, rm );
     };
 
 
@@ -1465,7 +1472,7 @@
      * this BigNumber, rounded according to DECIMAL_PLACES and ROUNDING_MODE.
      */
     P['squareRoot'] = P['sqrt'] = function () {
-        var i, n, r, re, t,
+        var n, r, re, t,
             x = this,
             c = x['c'],
             s = x['s'],
@@ -1479,7 +1486,7 @@
 
             return new BigNumber( !s || s < 0 && ( !c || c[0] )
               ? NaN
-              : c ? x : 1 / 0 )
+              : c ? x : 1 / 0 );
         }
 
         // Initial estimate.
@@ -1494,23 +1501,23 @@
             n = c.join('');
 
             if ( !( n.length + e & 1 ) ) {
-                n += '0'
+                n += '0';
             }
             r = new BigNumber( Math.sqrt(n) + '' );
 
             // r may still not be finite.
             if ( !r['c'] ) {
-                r['c'] = [1]
+                r['c'] = [1];
             }
-            r['e'] = ( ( ( e + 1 ) / 2 ) | 0 ) - ( e < 0 || e & 1 )
+            r['e'] = ( ( ( e + 1 ) / 2 ) | 0 ) - ( e < 0 || e & 1 );
         } else {
-            r = new BigNumber( n = s.toString() )
+            r = new BigNumber( n = s.toString() );
         }
         re = r['e'];
         s = re + ( DECIMAL_PLACES += 4 );
 
         if ( s < 3 ) {
-            s = 0
+            s = 0;
         }
         e = s;
 
@@ -1548,12 +1555,12 @@
                             ROUNDING_MODE = rm;
                             DECIMAL_PLACES = dp;
 
-                            return t
+                            return t;
                         }
                     }
                     DECIMAL_PLACES += 4;
                     s += 4;
-                    n = ''
+                    n = '';
                 } else {
 
                     /*
@@ -1566,21 +1573,21 @@
 
                         // Truncate to the first rounding digit.
                         if ( c.length > e - 2 ) {
-                            c.length = e - 2
+                            c.length = e - 2;
                         }
 
                         if ( !r['times'](r)['eq'](x) ) {
 
                             while ( c.length < e - 3 ) {
-                                c.push(0)
+                                c.push(0);
                             }
-                            c[e - 3]++
+                            c[e - 3]++;
                         }
                     }
                     ROUNDING_MODE = rm;
                     rnd( r, DECIMAL_PLACES = dp, 10 );
 
-                    return r
+                    return r;
                 }
             }
         }
@@ -1637,12 +1644,12 @@
                   ? y['s'] / 0
 
                   // x or y is 0. Return +-0.
-                  : y['s'] * 0 )
+                  : y['s'] * 0 );
         }
         y['e'] = i + j;
 
         if ( ( a = xc.length ) < ( b = yc.length ) ) {
-            c = xc, xc = yc, yc = c, j = a, a = b, b = j
+            c = xc, xc = yc, yc = c, j = a, a = b, b = j;
         }
 
         for ( j = a + b, c = []; j--; c.push(0) ) {
@@ -1659,7 +1666,7 @@
             }
 
             if ( b ) {
-                c[j] = ( c[j] + b ) % 10
+                c[j] = ( c[j] + b ) % 10;
             }
         }
 
@@ -1689,7 +1696,7 @@
             // Neither.
             : c;
 
-        return y
+        return y;
     };
 
 
@@ -1715,7 +1722,7 @@
               // 'toE() decimal places out of range: {dp}'
               !ifExceptionsThrow( dp, 'decimal places', 'toE' ) ) && this['c']
                 ? this['c'].length - 1
-                : dp | 0, 1 )
+                : dp | 0, 1 );
     };
 
 
@@ -1739,7 +1746,7 @@
             // 'toF() decimal places not an integer: {dp}'
             // 'toF() decimal places out of range: {dp}'
             !ifExceptionsThrow( dp, 'decimal places', 'toF' ) ) ) {
-              d = x['e'] + ( dp | 0 )
+              d = x['e'] + ( dp | 0 );
         }
 
         n = TO_EXP_NEG, dp = TO_EXP_POS;
@@ -1747,7 +1754,7 @@
 
         // Note: str is initially undefined.
         if ( d == str ) {
-            str = x['toS']()
+            str = x['toS']();
         } else {
             str = format( x, d );
 
@@ -1757,17 +1764,17 @@
 
                 // As e.g. -0 toFixed(3), will wrongly be returned as -0.000 from toString.
                 if ( !x['c'][0] ) {
-                    str = str.replace(/^-/, '')
+                    str = str.replace(/^-/, '');
 
                 // As e.g. -0.5 if rounded to -0 will cause toString to omit the minus sign.
                 } else if ( str.indexOf('-') < 0 ) {
-                    str = '-' + str
+                    str = '-' + str;
                 }
             }
         }
         TO_EXP_NEG = n, TO_EXP_POS = dp;
 
-        return str
+        return str;
     };
 
 
@@ -1794,7 +1801,7 @@
 
         // NaN, Infinity.
         if ( !xc ) {
-            return x['toS']()
+            return x['toS']();
         }
 
         e = d['e'] = xc.length - x['e'] - 1;
@@ -1819,7 +1826,7 @@
                      ( maxD = n )['cmp'](d) > 0 ) {
 
             // d is e.g. 10, 100, 1000, 10000... , n1 is 1.
-            maxD = e > 0 ? d : n1
+            maxD = e > 0 ? d : n1;
         }
 
         MAX_EXP = 1 / 0;
@@ -1830,7 +1837,7 @@
             d2 = d0['plus']( q['times'](d1) );
 
             if ( d2['cmp'](maxD) == 1 ) {
-                break
+                break;
             }
 
             d0 = d1, d1 = d2;
@@ -1839,7 +1846,7 @@
             n0 = d2;
 
             d = n['minus']( q['times']( d2 = d ) );
-            n = d2
+            n = d2;
         }
 
         d2 = maxD['minus'](d0)['div'](d1);
@@ -1857,7 +1864,7 @@
           ? [ n1['toS'](), d1['toS']() ]
           : [ n0['toS'](), d0['toS']() ];
 
-        return MAX_EXP = exp, DECIMAL_PLACES = dp, frac
+        return MAX_EXP = exp, DECIMAL_PLACES = dp, frac;
     };
 
 
@@ -1883,7 +1890,7 @@
             // 'toP() precision out of range: {sd}'
             !ifExceptionsThrow( sd, 'precision', 'toP' ) )
               ? this['toS']()
-              : format( this, --sd | 0, 2 )
+              : format( this, --sd | 0, 2 );
     };
 
 
@@ -1904,11 +1911,11 @@
 
         // Infinity or NaN?
         if ( xe === null ) {
-            str = x['s'] ? 'Infinity' : 'NaN'
+            str = x['s'] ? 'Infinity' : 'NaN';
 
         // Exponential format?
         } else if ( b === u && ( xe <= TO_EXP_NEG || xe >= TO_EXP_POS ) ) {
-            return format( x, x['c'].length - 1, 1 )
+            return format( x, x['c'].length - 1, 1 );
         } else {
             str = x['c'].join('');
 
@@ -1918,7 +1925,7 @@
                 // Prepend zeros.
                 for ( ; ++xe; str = '0' + str ) {
                 }
-                str = '0.' + str
+                str = '0.' + str;
 
             // Positive exponent?
             } else if ( strL = str.length, xe > 0 ) {
@@ -1929,17 +1936,17 @@
                     for ( xe -= strL; xe-- ; str += '0' ) {
                     }
                 } else if ( xe < strL ) {
-                    str = str.slice( 0, xe ) + '.' + str.slice(xe)
+                    str = str.slice( 0, xe ) + '.' + str.slice(xe);
                 }
 
             // Exponent zero.
             } else {
                 if ( u = str.charAt(0), strL > 1 ) {
-                    str = u + '.' + str.slice(1)
+                    str = u + '.' + str.slice(1);
 
                 // Avoid '-0'
                 } else if ( u == '0' ) {
-                    return u
+                    return u;
                 }
             }
 
@@ -1951,19 +1958,31 @@
 
                     // Avoid '-0'
                     if ( str == '0' ) {
-                        return str
+                        return str;
                     }
                 } else {
 
                     // 'toS() base not an integer: {b}'
                     // 'toS() base out of range: {b}'
-                    ifExceptionsThrow( b, 'base', 'toS' )
+                    ifExceptionsThrow( b, 'base', 'toS' );
                 }
             }
 
         }
 
-        return x['s'] < 0 ? '-' + str : str
+        return x['s'] < 0 ? '-' + str : str;
+    };
+
+
+    /*
+     * Return the value of this BigNumber converted to a number primitive.
+     *
+     */
+    P['toNumber'] = P['toN'] = function () {
+        var x = this;
+
+        // Ensure zero has correct sign.
+        return +x || ( x['s'] ? 0 * x['s'] : NaN );
     };
 
 
@@ -1971,7 +1990,7 @@
      * Return as toString, but do not accept a base argument.
      */
     P['valueOf'] = function () {
-        return this['toS']()
+        return this['toS']();
     };
 
 
@@ -1990,13 +2009,13 @@
 
     // Node and other CommonJS-like environments that support module.exports.
     if ( typeof module !== 'undefined' && module.exports ) {
-        module.exports = BigNumber
+        module.exports = BigNumber;
 
     //AMD.
     } else if ( typeof define == 'function' && define.amd ) {
         define( function () {
-            return BigNumber
-        })
+            return BigNumber;
+        });
 
     //Browser.
     } else {
@@ -2004,4 +2023,3 @@
     }
 
 })( this );
-