A few more toDecimal() fixes
This commit is contained in:
parent
656f7e6796
commit
3a33ffdd50
2 changed files with 44 additions and 28 deletions
|
|
@ -140,6 +140,9 @@ for (let i = 0; i <= 12; i++) {
|
||||||
test("set 100");
|
test("set 100");
|
||||||
test("div 3");
|
test("div 3");
|
||||||
|
|
||||||
|
test("set 4001");
|
||||||
|
test("div -5");
|
||||||
|
|
||||||
repl.start({
|
repl.start({
|
||||||
prompt: "int36> ",
|
prompt: "int36> ",
|
||||||
input: process.stdin,
|
input: process.stdin,
|
||||||
|
|
|
||||||
|
|
@ -34,15 +34,17 @@ var DEBUG = true;
|
||||||
* @class Int36
|
* @class Int36
|
||||||
* @property {number} value
|
* @property {number} value
|
||||||
* @property {number|null} extended
|
* @property {number|null} extended
|
||||||
* @property {number} remainder
|
* @property {number|null} remainder
|
||||||
* @property {number} error
|
* @property {number} error
|
||||||
*
|
*
|
||||||
* The 'value' property stores the 36-bit value as a two's complement integer.
|
* The 'value' property stores the 36-bit value as a two's complement integer.
|
||||||
*
|
*
|
||||||
* The 'extended' property stores an additional 36 bits of data from a multiplication;
|
* The 'extended' property stores an additional 36 bits of data from a multiplication;
|
||||||
* it must also be set prior to a division.
|
* it must also be set prior to a division. Internally, it will be set to null whenever
|
||||||
|
* the current value is not extended.
|
||||||
*
|
*
|
||||||
* The 'remainder' property stores the remainder from a division.
|
* The 'remainder' property stores the remainder from the last division. You should
|
||||||
|
* assume that it will be set to null by any other operation.
|
||||||
*
|
*
|
||||||
* The 'error' property records any error(s) from the last operation.
|
* The 'error' property records any error(s) from the last operation.
|
||||||
*/
|
*/
|
||||||
|
|
@ -54,7 +56,7 @@ class Int36 {
|
||||||
* The constructor, which simply calls set(), creates an Int36 from either:
|
* The constructor, which simply calls set(), creates an Int36 from either:
|
||||||
*
|
*
|
||||||
* 1) another Int36
|
* 1) another Int36
|
||||||
* 2) a single (signed) 36-bit value, with an optional 36-bit extended value
|
* 2) a single (signed) 36-bit value, with an optional 36-bit extension
|
||||||
* 3) nothing (initial value will be zero)
|
* 3) nothing (initial value will be zero)
|
||||||
*
|
*
|
||||||
* We guarantee that an Int36 value will be (and will always remain) a signed value within this range:
|
* We guarantee that an Int36 value will be (and will always remain) a signed value within this range:
|
||||||
|
|
@ -90,7 +92,7 @@ class Int36 {
|
||||||
*
|
*
|
||||||
* @this {Int36}
|
* @this {Int36}
|
||||||
* @param {Int36|number} [obj] (if omitted, the default is zero)
|
* @param {Int36|number} [obj] (if omitted, the default is zero)
|
||||||
* @param {number} [extended]
|
* @param {number|null} [extended]
|
||||||
*/
|
*/
|
||||||
constructor(obj, extended)
|
constructor(obj, extended)
|
||||||
{
|
{
|
||||||
|
|
@ -104,7 +106,7 @@ class Int36 {
|
||||||
*
|
*
|
||||||
* @this {Int36}
|
* @this {Int36}
|
||||||
* @param {Int36|number} [obj] (if omitted, the default is zero)
|
* @param {Int36|number} [obj] (if omitted, the default is zero)
|
||||||
* @param {number} [extended]
|
* @param {number|null} [extended]
|
||||||
*/
|
*/
|
||||||
set(obj = 0, extended)
|
set(obj = 0, extended)
|
||||||
{
|
{
|
||||||
|
|
@ -116,10 +118,13 @@ class Int36 {
|
||||||
else {
|
else {
|
||||||
this.value = Int36.validate(obj || 0);
|
this.value = Int36.validate(obj || 0);
|
||||||
this.extended = null;
|
this.extended = null;
|
||||||
|
/*
|
||||||
|
* NOTE: Surprisingly, isNaN(null) is false, whereas isNaN(undefined) is true. Go figure.
|
||||||
|
*/
|
||||||
if (extended != null && !isNaN(extended)) {
|
if (extended != null && !isNaN(extended)) {
|
||||||
this.extended = Int36.validate(extended);
|
this.extended = Int36.validate(extended);
|
||||||
}
|
}
|
||||||
this.remainder = 0;
|
this.remainder = null;
|
||||||
}
|
}
|
||||||
this.error = Int36.ERROR.NONE;
|
this.error = Int36.ERROR.NONE;
|
||||||
}
|
}
|
||||||
|
|
@ -135,23 +140,19 @@ class Int36 {
|
||||||
var s = "", fNeg = false;
|
var s = "", fNeg = false;
|
||||||
var i36Div = new Int36(10000000000);
|
var i36Div = new Int36(10000000000);
|
||||||
var i36Tmp = new Int36(this.value, this.extended);
|
var i36Tmp = new Int36(this.value, this.extended);
|
||||||
if (i36Tmp.extended < 0 || i36Tmp.extended == null && i36Tmp.value < 0) {
|
if (i36Tmp.isNegative()) {
|
||||||
i36Tmp.negExtended();
|
i36Tmp.negate();
|
||||||
fNeg = true;
|
fNeg = true;
|
||||||
}
|
}
|
||||||
var quotient = i36Tmp.div(i36Div);
|
do {
|
||||||
i36Tmp.value = i36Tmp.remainder;
|
var quotient = i36Tmp.div(i36Div);
|
||||||
if (quotient) {
|
var nMinDigits = (quotient? 10 : 1);
|
||||||
var nDigits = 10;
|
i36Tmp.value = i36Tmp.remainder;
|
||||||
do {
|
do {
|
||||||
i36Tmp.divNum(10);
|
i36Tmp.divNum(10);
|
||||||
s = String.fromCharCode(0x30 + i36Tmp.remainder) + s;
|
s = String.fromCharCode(0x30 + i36Tmp.remainder) + s;
|
||||||
} while (--nDigits);
|
} while (--nMinDigits > 0 || i36Tmp.value);
|
||||||
i36Tmp.value = quotient;
|
i36Tmp.value = quotient;
|
||||||
}
|
|
||||||
do {
|
|
||||||
i36Tmp.divNum(10);
|
|
||||||
s = String.fromCharCode(0x30 + i36Tmp.remainder) + s;
|
|
||||||
} while (i36Tmp.value);
|
} while (i36Tmp.value);
|
||||||
if (fNeg) s = '-' + s;
|
if (fNeg) s = '-' + s;
|
||||||
return s;
|
return s;
|
||||||
|
|
@ -190,7 +191,7 @@ class Int36 {
|
||||||
|
|
||||||
if (fUnsigned || extended) {
|
if (fUnsigned || extended) {
|
||||||
if (value < 0) value += Int36.BIT36;
|
if (value < 0) value += Int36.BIT36;
|
||||||
if (extended) {
|
if (extended != null) {
|
||||||
if (fUnsigned) extended += Int36.BIT36;
|
if (fUnsigned) extended += Int36.BIT36;
|
||||||
/*
|
/*
|
||||||
* TODO: Need a radix-independent solution for these extended (up to 72-bit) values,
|
* TODO: Need a radix-independent solution for these extended (up to 72-bit) values,
|
||||||
|
|
@ -219,6 +220,8 @@ class Int36 {
|
||||||
if (DEBUG && result !== Math.trunc(result)) {
|
if (DEBUG && result !== Math.trunc(result)) {
|
||||||
console.log("Int36.truncate(" + result + " is not an integer)");
|
console.log("Int36.truncate(" + result + " is not an integer)");
|
||||||
}
|
}
|
||||||
|
this.extended = null;
|
||||||
|
this.remainder = null;
|
||||||
this.error = Int36.ERROR.NONE;
|
this.error = Int36.ERROR.NONE;
|
||||||
if (result > Int36.MAXVAL) {
|
if (result > Int36.MAXVAL) {
|
||||||
result %= Int36.BIT36;
|
result %= Int36.BIT36;
|
||||||
|
|
@ -345,7 +348,7 @@ class Int36 {
|
||||||
this.value = this.truncate(value);
|
this.value = this.truncate(value);
|
||||||
this.extended = this.truncate(extended);
|
this.extended = this.truncate(extended);
|
||||||
|
|
||||||
if (fNeg) this.negExtended();
|
if (fNeg) this.negate();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -396,8 +399,8 @@ class Int36 {
|
||||||
bNegLo = 1 - bNegLo;
|
bNegLo = 1 - bNegLo;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.extended < 0 || this.extended == null && this.value < 0) {
|
if (this.isNegative()) {
|
||||||
this.negExtended();
|
this.negate();
|
||||||
bNegHi = 1; bNegLo = 1 - bNegLo;
|
bNegHi = 1; bNegLo = 1 - bNegLo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -438,7 +441,7 @@ class Int36 {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.value = result;
|
this.value = result;
|
||||||
this.extended = 0;
|
this.extended = null;
|
||||||
this.remainder = bitsRem[0];
|
this.remainder = bitsRem[0];
|
||||||
|
|
||||||
if (bNegLo && this.value && this.value > Int36.MINVAL) {
|
if (bNegLo && this.value && this.value > Int36.MINVAL) {
|
||||||
|
|
@ -452,7 +455,17 @@ class Int36 {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* negExtended()
|
* isNegative()
|
||||||
|
*
|
||||||
|
* @return {boolean}
|
||||||
|
*/
|
||||||
|
isNegative()
|
||||||
|
{
|
||||||
|
return (this.extended < 0 || this.extended == null && this.value < 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* negate()
|
||||||
*
|
*
|
||||||
* Converts the current value to its two's complement. If we were dealing with 8-bit values:
|
* Converts the current value to its two's complement. If we were dealing with 8-bit values:
|
||||||
*
|
*
|
||||||
|
|
@ -468,12 +481,12 @@ class Int36 {
|
||||||
* 126 -126 -127
|
* 126 -126 -127
|
||||||
* 127 -127 -128
|
* 127 -127 -128
|
||||||
*
|
*
|
||||||
* So the one wrinkle is that, when performing two's complement, MINVAL and ZERO are not modified.
|
* so you can see that, when performing two's complement, MINVAL and ZERO are not modified.
|
||||||
*
|
*
|
||||||
* However, in our world, since JavaScript numbers CAN represent both positive and negative MINVAL
|
* However, in our happy little world, since JavaScript numbers CAN represent both positive and negative
|
||||||
* values, we don't need to exclude MINVAL from the process.
|
* MINVAL values, we don't need to exclude MINVAL from the conversion.
|
||||||
*/
|
*/
|
||||||
negExtended()
|
negate()
|
||||||
{
|
{
|
||||||
this.error = Int36.ERROR.NONE;
|
this.error = Int36.ERROR.NONE;
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue