authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-02-05 18:09:13-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-02-05 18:09:13-05:00
logf99b8b006fe458ee717acc6c8de6170fc453acb7
tree672b663987df03e6b70e384b39b565272c9efbf1
parent6940212ecbef349e449441e1fd813116865d3a5f

error sets - fix most std lib compile errors

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

src/ir.cpp+19-1
......@@ -9361,6 +9361,24 @@ static TypeTableEntry *ir_analyze_bin_op_cmp(IrAnalyze *ira, IrInstructionBinOp
93619361 ir_add_error_node(ira, source_node, buf_sprintf("operator not allowed for errors"));
93629362 return ira->codegen->builtin_types.entry_invalid;
93639363 }
9364 // exception if one of the operators has the type of the empty error set, we allow the comparison
9365 // (and make it comptime known)
9366 // this is a function which is evaluated at comptime and returns an inferred error set will have an empty
9367 // error set.
9368 if (op1->value.type->data.error_set.err_count == 0 || op2->value.type->data.error_set.err_count == 0) {
9369 bool are_equal = false;
9370 bool answer;
9371 if (op_id == IrBinOpCmpEq) {
9372 answer = are_equal;
9373 } else if (op_id == IrBinOpCmpNotEq) {
9374 answer = !are_equal;
9375 } else {
9376 zig_unreachable();
9377 }
9378 ConstExprValue *out_val = ir_build_const_from(ira, &bin_op_instruction->base);
9379 out_val->data.x_bool = answer;
9380 return ira->codegen->builtin_types.entry_bool;
9381 }
93649382 TypeTableEntry *intersect_type = get_error_set_intersection(ira, op1->value.type, op2->value.type, source_node);
93659383 if (type_is_invalid(intersect_type)) {
93669384 return ira->codegen->builtin_types.entry_invalid;
......@@ -15352,7 +15370,7 @@ static TypeTableEntry *ir_analyze_instruction_unwrap_err_payload(IrAnalyze *ira,
1535215370 ErrorTableEntry *err = err_union_val->data.x_err_union.err;
1535315371 if (err != nullptr) {
1535415372 ir_add_error(ira, &instruction->base,
15355 buf_sprintf("unable to unwrap error '%s'", buf_ptr(&err->name)));
15373 buf_sprintf("caught unexpected error '%s'", buf_ptr(&err->name)));
1535615374 return ira->codegen->builtin_types.entry_invalid;
1535715375 }
1535815376
std/fmt/index.zig+4-4
......@@ -439,9 +439,9 @@ pub fn parseInt(comptime T: type, buf: []const u8, radix: u8) !T {
439439test "fmt.parseInt" {
440440 assert((parseInt(i32, "-10", 10) catch unreachable) == -10);
441441 assert((parseInt(i32, "+10", 10) catch unreachable) == 10);
442 assert(if (parseInt(i32, " 10", 10)) |_| false else |err| err == error.InvalidChar);
443 assert(if (parseInt(i32, "10 ", 10)) |_| false else |err| err == error.InvalidChar);
444 assert(if (parseInt(u32, "-10", 10)) |_| false else |err| err == error.InvalidChar);
442 assert(if (parseInt(i32, " 10", 10)) |_| false else |err| err == error.InvalidCharacter);
443 assert(if (parseInt(i32, "10 ", 10)) |_| false else |err| err == error.InvalidCharacter);
444 assert(if (parseInt(u32, "-10", 10)) |_| false else |err| err == error.InvalidCharacter);
445445 assert((parseInt(u8, "255", 10) catch unreachable) == 255);
446446 assert(if (parseInt(u8, "256", 10)) |_| false else |err| err == error.Overflow);
447447}
......@@ -538,7 +538,7 @@ fn bufPrintIntToSlice(buf: []u8, value: var, base: u8, uppercase: bool, width: u
538538
539539test "parse u64 digit too big" {
540540 _ = parseUnsigned(u64, "123a", 10) catch |err| {
541 if (err == error.InvalidChar) return;
541 if (err == error.InvalidCharacter) return;
542542 unreachable;
543543 };
544544 unreachable;
std/io.zig+24-15
......@@ -550,21 +550,24 @@ pub fn readFileAllocExtra(path: []const u8, allocator: &mem.Allocator, extra_len
550550 return buf;
551551}
552552
553pub const BufferedInStream = BufferedInStreamCustom(os.page_size);
553pub fn BufferedInStream(comptime Error: type) type {
554 return BufferedInStreamCustom(os.page_size, Error);
555}
554556
555pub fn BufferedInStreamCustom(comptime buffer_size: usize) type {
557pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type) type {
556558 return struct {
557559 const Self = this;
560 const Stream = InStream(Error);
558561
559 pub stream: InStream,
562 pub stream: Stream,
560563
561 unbuffered_in_stream: &InStream,
564 unbuffered_in_stream: &Stream,
562565
563566 buffer: [buffer_size]u8,
564567 start_index: usize,
565568 end_index: usize,
566569
567 pub fn init(unbuffered_in_stream: &InStream) Self {
570 pub fn init(unbuffered_in_stream: &Stream) Self {
568571 return Self {
569572 .unbuffered_in_stream = unbuffered_in_stream,
570573 .buffer = undefined,
......@@ -576,13 +579,13 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize) type {
576579 .start_index = buffer_size,
577580 .end_index = buffer_size,
578581
579 .stream = InStream {
582 .stream = Stream {
580583 .readFn = readFn,
581584 },
582585 };
583586 }
584587
585 fn readFn(in_stream: &InStream, dest: []u8) !usize {
588 fn readFn(in_stream: &Stream, dest: []u8) !usize {
586589 const self = @fieldParentPtr(Self, "stream", in_stream);
587590
588591 var dest_index: usize = 0;
......@@ -621,25 +624,28 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize) type {
621624 };
622625}
623626
624pub const BufferedOutStream = BufferedOutStreamCustom(os.page_size);
627pub fn BufferedOutStream(comptime Error: type) type {
628 return BufferedOutStreamCustom(os.page_size, Error);
629}
625630
626pub fn BufferedOutStreamCustom(comptime buffer_size: usize) type {
631pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime Error: type) type {
627632 return struct {
628633 const Self = this;
634 const Stream = OutStream(Error);
629635
630 pub stream: OutStream,
636 pub stream: Stream,
631637
632 unbuffered_out_stream: &OutStream,
638 unbuffered_out_stream: &Stream,
633639
634640 buffer: [buffer_size]u8,
635641 index: usize,
636642
637 pub fn init(unbuffered_out_stream: &OutStream) Self {
643 pub fn init(unbuffered_out_stream: &Stream) Self {
638644 return Self {
639645 .unbuffered_out_stream = unbuffered_out_stream,
640646 .buffer = undefined,
641647 .index = 0,
642 .stream = OutStream {
648 .stream = Stream {
643649 .writeFn = writeFn,
644650 },
645651 };
......@@ -653,7 +659,7 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize) type {
653659 self.index = 0;
654660 }
655661
656 fn writeFn(out_stream: &OutStream, bytes: []const u8) !void {
662 fn writeFn(out_stream: &Stream, bytes: []const u8) !void {
657663 const self = @fieldParentPtr(Self, "stream", out_stream);
658664
659665 if (bytes.len >= self.buffer.len) {
......@@ -680,7 +686,10 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize) type {
680686/// Implementation of OutStream trait for Buffer
681687pub const BufferOutStream = struct {
682688 buffer: &Buffer,
683 stream: OutStream,
689 stream: Stream,
690
691 pub const Error = error{OutOfMemory};
692 pub const Stream = OutStream(Error);
684693
685694 pub fn init(buffer: &Buffer) BufferOutStream {
686695 return BufferOutStream {
std/io_test.zig+2-2
......@@ -17,7 +17,7 @@ test "write a file, read it, then delete it" {
1717 defer file.close();
1818
1919 var file_out_stream = io.FileOutStream.init(&file);
20 var buf_stream = io.BufferedOutStream.init(&file_out_stream.stream);
20 var buf_stream = io.BufferedOutStream(io.FileOutStream.Error).init(&file_out_stream.stream);
2121 const st = &buf_stream.stream;
2222 try st.print("begin");
2323 try st.write(data[0..]);
......@@ -33,7 +33,7 @@ test "write a file, read it, then delete it" {
3333 assert(file_size == expected_file_size);
3434
3535 var file_in_stream = io.FileInStream.init(&file);
36 var buf_stream = io.BufferedInStream.init(&file_in_stream.stream);
36 var buf_stream = io.BufferedInStream(io.FileInStream.Error).init(&file_in_stream.stream);
3737 const st = &buf_stream.stream;
3838 const contents = try st.readAllAlloc(allocator, 2 * 1024);
3939 defer allocator.free(contents);