mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-08 11:34:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix decimal.odin assignment bug

Browse Source
This commit is contained in:
Ginger Bill
2017-09-20 22:59:46 +01:00
parent 14d0cbf6d7
commit 3bfaac0844
4 changed files with 117 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/decimal.odin
View File

@@ -29,13 +29,13 @@ decimal_to_string :: proc(buf: []u8, a: ^Decimal) -> string {
w := 0;
if a.decimal_point <= 0 {
buf[w] = '0'; w+=1;
buf[w] = '.'; w+=1;
buf[w] = '0'; w += 1;
buf[w] = '.'; w += 1;
w += digit_zero(buf[w .. w-a.decimal_point]);
w += copy(buf[w..], a.digits[0..a.count]);
} else if a.decimal_point < a.count {
w += copy(buf[w..], a.digits[0..a.decimal_point]);
buf[w] = '.'; w+=1;
buf[w] = '.'; w += 1;
w += copy(buf[w..], a.digits[a.decimal_point .. a.count]);
} else {
w += copy(buf[w..], a.digits[0..a.count]);
@@ -63,14 +63,15 @@ assign :: proc(a: ^Decimal, i: u64) {
j := i/10;
i -= 10*j;
buf[n] = u8('0'+i);
n+=1;
n += 1;
i = j;
}
a.count = 0;
for n -= 1; n >= 0; n -= 1 {
for n >= 0 {
a.digits[a.count] = buf[n];
a.count+=1;
a.count += 1;
n -= 1;
}
a.decimal_point = a.count;
trim(a);
@@ -83,7 +84,7 @@ shift_right :: proc(a: ^Decimal, k: uint) {
w := 0; // write index
n: uint;
for ; n>>k == 0; r+=1 {
for ; n>>k == 0; r += 1 {
if r >= a.count {
if n == 0 {
// Just in case
@@ -92,7 +93,7 @@ shift_right :: proc(a: ^Decimal, k: uint) {
}
for n>>k == 0 {
n = n * 10;
r+=1;
r += 1;
}
break;
}
@@ -103,12 +104,12 @@ shift_right :: proc(a: ^Decimal, k: uint) {
mask: uint = (1<<k) - 1;
for ; r < a.count; r+=1 {
for ; r < a.count; r += 1 {
c := uint(a.digits[r]);
dig := n>>k;
n &= mask;
a.digits[w] = u8('0' + dig);
w+=1;
w += 1;
n = n*10 + c - '0';
}
@@ -117,7 +118,7 @@ shift_right :: proc(a: ^Decimal, k: uint) {
n &= mask;
if w < len(a.digits) {
a.digits[w] = u8('0' + dig);
w+=1;
w += 1;
} else if dig > 0 {
a.trunc = true;
}
@@ -215,7 +216,7 @@ round_up :: proc(a: ^Decimal, nd: int) {
for i := nd-1; i >= 0; i -= 1 {
if c := a.digits[i]; c < '9' {
a.digits[i]+=1;
a.digits[i] += 1;
a.count = i+1;
return;
}
@@ -224,7 +225,7 @@ round_up :: proc(a: ^Decimal, nd: int) {
// Number is just 9s
a.digits[0] = '1';
a.count = 1;
a.decimal_point+=1;
a.decimal_point += 1;
}
round_down :: proc(a: ^Decimal, nd: int) {
@@ -249,7 +250,7 @@ rounded_integer :: proc(a: ^Decimal) -> u64 {
n *= 10;
}
if can_round_up(a, a.decimal_point) {
n+=1;
n += 1;
}
return n;
}

3
core/strconv.odin
View File

@@ -300,7 +300,7 @@ format_digits :: proc(buf: []u8, shortest: bool, neg: bool, digs: DecimalSlice,
// integer, padded with zeros when needed
if digs.decimal_point > 0 {
m := min(digs.count, digs.decimal_point);
append(&buf, ...digs.digits[..m]);
append(&buf, ...digs.digits[0..m]);
for ; m < digs.decimal_point; m += 1 {
append(&buf, '0');
}
@@ -320,7 +320,6 @@ format_digits :: proc(buf: []u8, shortest: bool, neg: bool, digs: DecimalSlice,
append(&buf, c);
}
}
return buf;
case 'e', 'E':