Commit b9f07b7ac227134001258e5933e3ef61aae80303 | zig

ci/azure/linux_script+3

...	...	@@ -59,6 +59,9 @@ unset CXX
59	59
60	60	make $JOBS install
61	61
	62	# look for formatting errors
	63	release/bin/zig fmt --check .. \|\| (echo "Please run 'zig fmt' to fix the non-conforming files listed above." && false)
	64
62	65	# Here we rebuild zig but this time using the Zig binary we just now produced to
63	66	# build zig1.o rather than relying on the one built with stage0. See
64	67	# https://github.com/ziglang/zig/issues/6830 for more details.

lib/std/Thread/Futex.zig+8-8

...	...	@@ -84,7 +84,7 @@ else
84	84
85	85	const WindowsFutex = struct {
86	86	const windows = std.os.windows;
87
	87
88	88	fn wait(ptr: *const Atomic(u32), expect: u32, timeout: ?u64) error{TimedOut}!void {
89	89	var timeout_value: windows.LARGE_INTEGER = undefined;
90	90	var timeout_ptr: ?*const windows.LARGE_INTEGER = null;
...	...	@@ -299,7 +299,7 @@ const PosixFutex = struct {
299	299	state: State = .empty,
300	300	cond: std.c.pthread_cond_t = .{},
301	301	mutex: std.c.pthread_mutex_t = .{},
302
	302
303	303	const Self = @This();
304	304	const State = enum {
305	305	empty,
...	...	@@ -381,7 +381,7 @@ test "Futex - wait/wake" {
381	381
382	382	const wait_noop_result = Futex.wait(&value, 0, 0);
383	383	try testing.expectError(error.TimedOut, wait_noop_result);
384
	384
385	385	const wait_longer_result = Futex.wait(&value, 0, std.time.ns_per_ms);
386	386	try testing.expectError(error.TimedOut, wait_longer_result);
387	387
...	...	@@ -416,7 +416,7 @@ test "Futex - Signal" {
416	416	const Thread = struct {
417	417	tx: *Self,
418	418	rx: *Self,
419
	419
420	420	const start_value = 1;
421	421
422	422	fn run(self: Thread) void {
...	...	@@ -472,7 +472,7 @@ test "Futex - Broadcast" {
472	472	self.broadcast.store(BROADCAST_RECEIVED, .Release);
473	473	Futex.wake(&self.broadcast, 1);
474	474	}
475		}
	475	}
476	476
477	477	fn run() !void {
478	478	var self = Self{};
...	...	@@ -542,7 +542,7 @@ test "Futex - Chain" {
542	542	if (chain.index + 1 < chain.self.threads.len) {
543	543	next_signal = &chain.self.threads[chain.index + 1].signal;
544	544	}
545
	545
546	546	this_signal.wait();
547	547	next_signal.notify();
548	548	}
...	...	@@ -554,7 +554,7 @@ test "Futex - Chain" {
554	554	for (self.threads) \|*entry, index\| {
555	555	entry.signal = .{};
556	556	entry.thread = try std.Thread.spawn(Chain.run, .{
557		.self = &self,
	557	.self = &self,
558	558	.index = index,
559	559	});
560	560	}
...	...	@@ -567,4 +567,4 @@ test "Futex - Chain" {
567	567	}
568	568	}
569	569	}).run();
570		}
		\ No newline at end of file
	570	}

lib/std/c/darwin.zig+2-2

...	...	@@ -246,7 +246,7 @@ pub const ULF_WAIT_ADAPTIVE_SPIN = 0x40000;
246	246
247	247	pub extern "c" fn __ulock_wait2(op: u32, addr: ?*const c_void, val: u64, timeout_us: u32, val2: u64) c_int;
248	248	pub extern "c" fn __ulock_wait(op: u32, addr: ?*const c_void, val: u64, timeout_us: u32) c_int;
249		pub extern "c" fn __ulock_wake(op: u32, addr: ?*const c_void, val: u64) c_int;
	249	pub extern "c" fn __ulock_wake(op: u32, addr: ?*const c_void, val: u64) c_int;
250	250
251	251	pub const OS_UNFAIR_LOCK_INIT = os_unfair_lock{};
252	252	pub const os_unfair_lock_t = *os_unfair_lock;
...	...	@@ -258,4 +258,4 @@ pub extern "c" fn os_unfair_lock_lock(o: os_unfair_lock_t) void;
258	258	pub extern "c" fn os_unfair_lock_unlock(o: os_unfair_lock_t) void;
259	259	pub extern "c" fn os_unfair_lock_trylock(o: os_unfair_lock_t) bool;
260	260	pub extern "c" fn os_unfair_lock_assert_owner(o: os_unfair_lock_t) void;
261		pub extern "c" fn os_unfair_lock_assert_not_owner(o: os_unfair_lock_t) void;
		\ No newline at end of file
	261	pub extern "c" fn os_unfair_lock_assert_not_owner(o: os_unfair_lock_t) void;

lib/std/zig/parse.zig+42-15

...	...	@@ -2005,9 +2005,12 @@ const Parser = struct {
2005	2005	if (field_init != 0) {
2006	2006	try p.scratch.append(p.gpa, field_init);
2007	2007	while (true) {
2008		switch (p.token_tags[p.tok_i]) {
	2008	switch (p.token_tags[p.tok_i]) {
2009	2009	.comma => p.tok_i += 1,
2010		.r_brace => { p.tok_i += 1; break; },
	2010	.r_brace => {
	2011	p.tok_i += 1;
	2012	break;
	2013	},
2011	2014	.colon, .r_paren, .r_bracket => return p.failExpected(.r_brace),
2012	2015	// Likely just a missing comma; give error but continue parsing.
2013	2016	else => try p.warnExpected(.comma),
...	...	@@ -2045,7 +2048,10 @@ const Parser = struct {
2045	2048	try p.scratch.append(p.gpa, elem_init);
2046	2049	switch (p.token_tags[p.tok_i]) {
2047	2050	.comma => p.tok_i += 1,
2048		.r_brace => { p.tok_i += 1; break; },
	2051	.r_brace => {
	2052	p.tok_i += 1;
	2053	break;
	2054	},
2049	2055	.colon, .r_paren, .r_bracket => return p.failExpected(.r_brace),
2050	2056	// Likely just a missing comma; give error but continue parsing.
2051	2057	else => try p.warnExpected(.comma),
...	...	@@ -2121,7 +2127,10 @@ const Parser = struct {
2121	2127	try p.scratch.append(p.gpa, param);
2122	2128	switch (p.token_tags[p.tok_i]) {
2123	2129	.comma => p.tok_i += 1,
2124		.r_paren => { p.tok_i += 1; break; },
	2130	.r_paren => {
	2131	p.tok_i += 1;
	2132	break;
	2133	},
2125	2134	.colon, .r_brace, .r_bracket => return p.failExpected(.r_paren),
2126	2135	// Likely just a missing comma; give error but continue parsing.
2127	2136	else => try p.warnExpected(.comma),
...	...	@@ -2129,7 +2138,7 @@ const Parser = struct {
2129	2138	}
2130	2139	const comma = (p.token_tags[p.tok_i - 2] == .comma);
2131	2140	const params = p.scratch.items[scratch_top..];
2132		switch(params.len) {
	2141	switch (params.len) {
2133	2142	0 => return p.addNode(.{
2134	2143	.tag = if (comma) .async_call_one_comma else .async_call_one,
2135	2144	.main_token = lparen,
...	...	@@ -2174,7 +2183,10 @@ const Parser = struct {
2174	2183	try p.scratch.append(p.gpa, param);
2175	2184	switch (p.token_tags[p.tok_i]) {
2176	2185	.comma => p.tok_i += 1,
2177		.r_paren => { p.tok_i += 1; break; },
	2186	.r_paren => {
	2187	p.tok_i += 1;
	2188	break;
	2189	},
2178	2190	.colon, .r_brace, .r_bracket => return p.failExpected(.r_paren),
2179	2191	// Likely just a missing comma; give error but continue parsing.
2180	2192	else => try p.warnExpected(.comma),
...	...	@@ -2182,7 +2194,7 @@ const Parser = struct {
2182	2194	}
2183	2195	const comma = (p.token_tags[p.tok_i - 2] == .comma);
2184	2196	const params = p.scratch.items[scratch_top..];
2185		res = switch(params.len) {
	2197	res = switch (params.len) {
2186	2198	0 => try p.addNode(.{
2187	2199	.tag = if (comma) .call_one_comma else .call_one,
2188	2200	.main_token = lparen,
...	...	@@ -2448,7 +2460,10 @@ const Parser = struct {
2448	2460	while (true) {
2449	2461	switch (p.token_tags[p.tok_i]) {
2450	2462	.comma => p.tok_i += 1,
2451		.r_brace => { p.tok_i += 1; break; },
	2463	.r_brace => {
	2464	p.tok_i += 1;
	2465	break;
	2466	},
2452	2467	.colon, .r_paren, .r_bracket => return p.failExpected(.r_brace),
2453	2468	// Likely just a missing comma; give error but continue parsing.
2454	2469	else => try p.warnExpected(.comma),
...	...	@@ -2497,7 +2512,10 @@ const Parser = struct {
2497	2512	try p.scratch.append(p.gpa, elem_init);
2498	2513	switch (p.token_tags[p.tok_i]) {
2499	2514	.comma => p.tok_i += 1,
2500		.r_brace => { p.tok_i += 1; break; },
	2515	.r_brace => {
	2516	p.tok_i += 1;
	2517	break;
	2518	},
2501	2519	.colon, .r_paren, .r_bracket => return p.failExpected(.r_brace),
2502	2520	// Likely just a missing comma; give error but continue parsing.
2503	2521	else => try p.warnExpected(.comma),
...	...	@@ -2555,7 +2573,10 @@ const Parser = struct {
2555	2573	const identifier = try p.expectToken(.identifier);
2556	2574	switch (p.token_tags[p.tok_i]) {
2557	2575	.comma => p.tok_i += 1,
2558		.r_brace => { p.tok_i += 1; break; },
	2576	.r_brace => {
	2577	p.tok_i += 1;
	2578	break;
	2579	},
2559	2580	.colon, .r_paren, .r_bracket => return p.failExpected(.r_brace),
2560	2581	// Likely just a missing comma; give error but continue parsing.
2561	2582	else => try p.warnExpected(.comma),
...	...	@@ -2992,14 +3013,14 @@ const Parser = struct {
2992	3013	_ = try p.parsePtrPayload();
2993	3014
2994	3015	const items = p.scratch.items[scratch_top..];
2995		switch(items.len) {
	3016	switch (items.len) {
2996	3017	0 => return p.addNode(.{
2997	3018	.tag = .switch_case_one,
2998	3019	.main_token = arrow_token,
2999	3020	.data = .{
3000	3021	.lhs = 0,
3001	3022	.rhs = try p.expectAssignExpr(),
3002		}
	3023	},
3003	3024	}),
3004	3025	1 => return p.addNode(.{
3005	3026	.tag = .switch_case_one,
...	...	@@ -3007,7 +3028,7 @@ const Parser = struct {
3007	3028	.data = .{
3008	3029	.lhs = items[0],
3009	3030	.rhs = try p.expectAssignExpr(),
3010		}
	3031	},
3011	3032	}),
3012	3033	else => return p.addNode(.{
3013	3034	.tag = .switch_case,
...	...	@@ -3375,7 +3396,10 @@ const Parser = struct {
3375	3396	}
3376	3397	switch (p.token_tags[p.tok_i]) {
3377	3398	.comma => p.tok_i += 1,
3378		.r_paren => { p.tok_i += 1; break; },
	3399	.r_paren => {
	3400	p.tok_i += 1;
	3401	break;
	3402	},
3379	3403	.colon, .r_brace, .r_bracket => return p.failExpected(.r_paren),
3380	3404	// Likely just a missing comma; give error but continue parsing.
3381	3405	else => try p.warnExpected(.comma),
...	...	@@ -3444,7 +3468,10 @@ const Parser = struct {
3444	3468	try p.scratch.append(p.gpa, param);
3445	3469	switch (p.token_tags[p.tok_i]) {
3446	3470	.comma => p.tok_i += 1,
3447		.r_paren => { p.tok_i += 1; break; },
	3471	.r_paren => {
	3472	p.tok_i += 1;
	3473	break;
	3474	},
3448	3475	// Likely just a missing comma; give error but continue parsing.
3449	3476	else => try p.warnExpected(.comma),
3450	3477	}

test/tests.zig+2-5

...	...	@@ -107,7 +107,6 @@ const test_targets = blk: {
107	107	.link_libc = true,
108	108	},
109	109
110
111	110	TestTarget{
112	111	.target = .{
113	112	.cpu_arch = .aarch64,
...	...	@@ -228,7 +227,6 @@ const test_targets = blk: {
228	227	.link_libc = true,
229	228	},
230	229
231
232	230	TestTarget{
233	231	.target = .{
234	232	.cpu_arch = .riscv64,
...	...	@@ -656,7 +654,7 @@ pub const StackTracesContext = struct {
656	654	const b = self.b;
657	655	const src_basename = "source.zig";
658	656	const write_src = b.addWriteFile(src_basename, source);
659		const exe = b.addExecutableSource("test", write_src.getFileSource(src_basename).?);
	657	const exe = b.addExecutableSource("test", write_src.getFileSource(src_basename).?);
660	658	exe.setBuildMode(mode);
661	659
662	660	const run_and_compare = RunAndCompareStep.create(
...	...	@@ -670,7 +668,6 @@ pub const StackTracesContext = struct {
670	668	self.step.dependOn(&run_and_compare.step);
671	669	}
672	670
673
674	671	const RunAndCompareStep = struct {
675	672	pub const base_id = .custom;
676	673
...	...	@@ -1376,4 +1373,4 @@ fn printInvocation(args: []const []const u8) void {
1376	1373	warn("{s} ", .{arg});
1377	1374	}
1378	1375	warn("\n", .{});
1379		}
		\ No newline at end of file
	1376	}

author	Jacob G-W <jacoblevgw@gmail.com> 2021-03-11 22:53:39-05:00
committer	Veikka Tuominen <git@vexu.eu> 2021-06-13 22:33:39+03:00
log	b9f07b7ac227134001258e5933e3ef61aae80303
tree	ad56b175414566e6ed1ea030d69399ba91d2a922
parent	ff79b87fa062d602722a6ec17f74550cda42a624

format zig files and add formatting check to ci