Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2091 from ziglang/bigint-print-fix 

Fix bigint_append_buf
master
Andrew Kelley 2019-03-22 10:23:18 -04:00 committed by GitHub
parent 3560f61c16 a3f42a5fe1
commit 127bb124a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bigint.cpp
View File

@ -40,7 +40,7 @@ static uint8_t digit_to_char(uint8_t digit, bool uppercase) {
if (digit <= 9) {
return digit + '0';
} else if (digit <= 35) {
return digit + (uppercase ? 'A' : 'a');
return (digit - 10) + (uppercase ? 'A' : 'a');
} else {
zig_unreachable();
}
@ -1545,6 +1545,10 @@ void bigint_append_buf(Buf *buf, const BigInt *op, uint64_t base) {
buf_appendf(buf, "%" ZIG_PRI_u64, op->data.digit);
return;
}
if (op->digit_count == 1 && base == 16) {
buf_appendf(buf, "%" ZIG_PRI_x64, op->data.digit);
return;
}
size_t first_digit_index = buf_len(buf);
BigInt digit_bi = {0};
@ -1556,7 +1560,7 @@ void bigint_append_buf(Buf *buf, const BigInt *op, uint64_t base) {
bigint_init_bigint(a, op);
BigInt base_bi = {0};
bigint_init_unsigned(&base_bi, 10);
bigint_init_unsigned(&base_bi, base);
for (;;) {
bigint_rem(&digit_bi, a, &base_bi);
@ -1574,7 +1578,7 @@ void bigint_append_buf(Buf *buf, const BigInt *op, uint64_t base) {
}
// reverse
for (size_t i = first_digit_index; i < buf_len(buf); i += 1) {
for (size_t i = first_digit_index; i < buf_len(buf) / 2; i += 1) {
size_t other_i = buf_len(buf) + first_digit_index - i - 1;
uint8_t tmp = buf_ptr(buf)[i];
buf_ptr(buf)[i] = buf_ptr(buf)[other_i];

2
test/compile_errors.zig
View File

@ -441,7 +441,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ var ptr: [*c]u8 = x;
\\}
,
"tmp.zig:2:33: error: integer value 71615590737044764481 cannot be implicitly casted to type 'usize'",
"tmp.zig:2:33: error: integer value 18446744073709551617 cannot be implicitly casted to type 'usize'",
"tmp.zig:6:23: error: integer type 'u65' too big for implicit @intToPtr to type '[*c]u8'",
);