authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-08-16 22:59:32-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-08-16 22:59:32-07:00
loga2ac06dcd506fd5e119e4eb8e1de201fefa05bbc
tree65fdd42a0a6f19b729dd44d2ed95abd4a6905f06
parent37d167f6e0e26e8dc57950cb0fa1bfa630036521

std: replace print_u64/i64 with printInt

4 files changed, 16 insertions(+), 22 deletions(-)

std/debug.zig+1-1
......@@ -10,7 +10,7 @@ pub fn printStackTrace() {
1010 while (true) {
1111 const fp = maybe_fp ?? break;
1212 const return_address = *(&const usize)(usize(fp) + @sizeOf(usize));
13 %%io.stderr.print_u64(return_address);
13 %%io.stderr.printInt(usize, return_address);
1414 %%io.stderr.printf("\n");
1515 maybe_fp = *(&const ?&const u8)(fp);
1616 }
std/io.zig+9-15
......@@ -94,23 +94,13 @@ pub struct OutStream {
9494 return byte_count;
9595 }
9696
97 pub fn print_u64(os: &OutStream, x: u64) -> %usize {
97 pub fn printInt(os: &OutStream, inline T: type, x: T) -> %usize {
98 // TODO replace max_u64_base10_digits with math.log10(math.pow(2, @sizeOf(T)))
9899 if (os.index + max_u64_base10_digits >= os.buffer.len) {
99100 %return os.flush();
100101 }
101 const amt_printed = bufPrintUnsigned(u64, os.buffer[os.index...], x);
102 const amt_printed = bufPrintInt(T, os.buffer[os.index...], x);
102103 os.index += amt_printed;
103
104 return amt_printed;
105 }
106
107 pub fn print_i64(os: &OutStream, x: i64) -> %usize {
108 if (os.index + max_u64_base10_digits >= os.buffer.len) {
109 %return os.flush();
110 }
111 const amt_printed = bufPrintSigned(i64, os.buffer[os.index...], x);
112 os.index += amt_printed;
113
114104 return amt_printed;
115105 }
116106
......@@ -234,7 +224,11 @@ fn charToDigit(c: u8, radix: u8) -> %u8 {
234224 return if (value >= radix) error.InvalidChar else value;
235225}
236226
237pub fn bufPrintSigned(inline T: type, out_buf: []u8, x: T) -> usize {
227pub fn bufPrintInt(inline T: type, out_buf: []u8, x: T) -> usize {
228 if (T.is_signed) bufPrintSigned(T, out_buf, x) else bufPrintUnsigned(T, out_buf, x)
229}
230
231fn bufPrintSigned(inline T: type, out_buf: []u8, x: T) -> usize {
238232 const uint = @intType(false, T.bit_count);
239233 if (x < 0) {
240234 out_buf[0] = '-';
......@@ -244,7 +238,7 @@ pub fn bufPrintSigned(inline T: type, out_buf: []u8, x: T) -> usize {
244238 }
245239}
246240
247pub fn bufPrintUnsigned(inline T: type, out_buf: []u8, x: T) -> usize {
241fn bufPrintUnsigned(inline T: type, out_buf: []u8, x: T) -> usize {
248242 var buf: [max_u64_base10_digits]u8 = undefined;
249243 var a = x;
250244 var index: usize = buf.len;
std/test_runner.zig+2-2
......@@ -11,9 +11,9 @@ pub fn runTests() -> %void {
1111 for (zig_test_fn_list) |testFn, i| {
1212 // TODO: print var args
1313 %%io.stderr.write("Test ");
14 %%io.stderr.print_u64(i + 1);
14 %%io.stderr.printInt(@typeOf(i), i + 1);
1515 %%io.stderr.write("/");
16 %%io.stderr.print_u64(zig_test_fn_list.len);
16 %%io.stderr.printInt(@typeOf(zig_test_fn_list.len), zig_test_fn_list.len);
1717 %%io.stderr.write(" ");
1818 %%io.stderr.write(testFn.name);
1919 %%io.stderr.write("...");
test/run_tests.cpp+4-4
......@@ -462,20 +462,20 @@ const io = @import("std").io;
462462pub fn main(args: [][]u8) -> %void {
463463 const array = []u8 {9, 8, 7, 6};
464464 for (array) |item| {
465 %%io.stdout.print_u64(item);
465 %%io.stdout.printInt(@typeOf(item), item);
466466 %%io.stdout.printf("\n");
467467 }
468468 for (array) |item, index| {
469 %%io.stdout.print_u64(index);
469 %%io.stdout.printInt(@typeOf(index), index);
470470 %%io.stdout.printf("\n");
471471 }
472472 const unknown_size: []u8 = array;
473473 for (unknown_size) |item| {
474 %%io.stdout.print_u64(item);
474 %%io.stdout.printInt(@typeOf(item), item);
475475 %%io.stdout.printf("\n");
476476 }
477477 for (unknown_size) |item, index| {
478 %%io.stdout.print_u64(index);
478 %%io.stdout.printInt(@typeOf(index), index);
479479 %%io.stdout.printf("\n");
480480 }
481481}