Commit ed962d9d21c451ed2e0ff125d6817f3c71827154 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-12-22 08:48:08-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-12-22 08:48:08-05:00
log	ed962d9d21c451ed2e0ff125d6817f3c71827154
tree	4353b780bd2ad97d1a46fbe4483d469af973cfbd
parent	3e25ff65c37739fbe095f9cdd3458d5f7c42739d

2 files changed, 14 insertions(+), 19 deletions(-)

test/cases3/error.zig+14

...	@@ -83,6 +83,20 @@ fn unwrapSimpleValueFromError() {	...	@@ -83,6 +83,20 @@ fn unwrapSimpleValueFromError() {
83	fn unwrapSimpleValueFromErrorDo() -> %isize { 13 }	83	fn unwrapSimpleValueFromErrorDo() -> %isize { 13 }
84		84
85		85
		86	fn errReturnInAssignment() {
		87	@setFnTest(this);
		88
		89	%%doErrReturnInAssignment();
		90	}
		91
		92	fn doErrReturnInAssignment() -> %void {
		93	var x : i32 = undefined;
		94	x = %return makeANonErr();
		95	}
		96
		97	fn makeANonErr() -> %i32 {
		98	return 1;
		99	}
86		100
87		101
88		102

test/self_hosted.zig-19

...	@@ -13,25 +13,6 @@ const test_enum_with_members = @import("cases/enum_with_members.zig");	...	@@ -13,25 +13,6 @@ const test_enum_with_members = @import("cases/enum_with_members.zig");
13	const test_struct_contains_slice_of_itself = @import("cases/struct_contains_slice_of_itself.zig");	13	const test_struct_contains_slice_of_itself = @import("cases/struct_contains_slice_of_itself.zig");
14		14
15		15
16	fn errReturnInAssignment() {
17	@setFnTest(this, true);
18
19	%%doErrReturnInAssignment();
20	}
21
22	fn doErrReturnInAssignment() -> %void {
23	@setFnStaticEval(this, false);
24
25	var x : i32 = undefined;
26	x = %return makeANonErr();
27	}
28
29	fn makeANonErr() -> %i32 {
30	return 1;
31	}
32
33
34
35	fn rhsMaybeUnwrapReturn() {	16	fn rhsMaybeUnwrapReturn() {
36	@setFnTest(this, true);	17	@setFnTest(this, true);
37		18