zig

commit 6a7f3c8df72349ffbe207ff7f8d98b6993b0e8c4 (tree)
parent b68aee4f34dffe60c099cba0a4ca56580e7a9cf5
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Fri, 13 May 2016 11:11:55 -0700

std: make parsing an unsigned number generic

Diffstat:
M
example/guess_number/main.zig
 | 
2
+-
M
std/io.zig
 | 
10
+++++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/example/guess_number/main.zig b/example/guess_number/main.zig
@@ -23,7 +23,7 @@ pub fn main(args: [][]u8) -> %void {
             return err;
         };
 
-        const guess = io.parse_u64(line_buf[0...line_len - 1], 10) %% {
+        const guess = io.parse_unsigned(u8)(line_buf[0...line_len - 1], 10) %% {
             %%io.stdout.printf("Invalid number.\n");
             continue;
         };
diff --git a/std/io.zig b/std/io.zig
@@ -211,8 +211,8 @@ pub struct InStream {
 pub error InvalidChar;
 pub error Overflow;
 
-pub fn parse_u64(buf: []u8, radix: u8) -> %u64 {
-    var x : u64 = 0;
+pub fn parse_unsigned(T: type)(buf: []u8, radix: u8) -> %T {
+    var x: T = 0;
 
     for (buf) |c| {
         const digit = char_to_digit(c);
@@ -222,12 +222,12 @@ pub fn parse_u64(buf: []u8, radix: u8) -> %u64 {
         }
 
         // x *= radix
-        if (@mul_with_overflow(u64, x, radix, &x)) {
+        if (@mul_with_overflow(T, x, radix, &x)) {
             return error.Overflow;
         }
 
         // x += digit
-        if (@add_with_overflow(u64, x, digit, &x)) {
+        if (@add_with_overflow(T, x, digit, &x)) {
             return error.Overflow;
         }
     }
@@ -404,7 +404,7 @@ pub fn buf_print_f64(out_buf: []u8, x: f64, decimals: isize) -> isize {
 
 #attribute("test")
 fn parse_u64_digit_too_big() {
-    parse_u64("123a", 10) %% |err| {
+    parse_unsigned(u64)("123a", 10) %% |err| {
         if (err == error.InvalidChar) return;
         unreachable{};
     };