Commit 5aca3baea62326dee301ec29c567dc224baa4a08 | zig

lib/std/io.zig+2-2

...	...	@@ -191,10 +191,10 @@ pub const BufferedAtomicFile = @import("io/buffered_atomic_file.zig").BufferedAt
191	191	pub const StreamSource = @import("io/stream_source.zig").StreamSource;
192	192
193	193	/// A Writer that doesn't write to anything.
194		pub var null_writer = @as(NullWriter, .{ .context = {} });
	194	pub const null_writer = @as(NullWriter, .{ .context = {} });
195	195
196	196	/// Deprecated: use `null_writer`
197		pub var null_out_stream = null_writer;
	197	pub const null_out_stream = null_writer;
198	198
199	199	const NullWriter = Writer(void, error{}, dummyWrite);
200	200	/// Deprecated: use NullWriter

lib/std/io/auto_indenting_stream.zig+22-36

...	...	@@ -1,37 +1,31 @@
1	1	const std = @import("../std.zig");
2	2	const io = std.io;
3	3	const mem = std.mem;
4		const Allocator = mem.Allocator;
5		const ArrayList = std.ArrayList;
6	4	const assert = std.debug.assert;
7	5
8	6	/// Automatically inserts indentation of written data by keeping
9	7	/// track of the current indentation level
10		pub fn AutoIndentingStream(comptime indent_delta: usize, comptime WriterType: type) type {
	8	pub fn AutoIndentingStream(comptime WriterType: type) type {
11	9	return struct {
12	10	const Self = @This();
13	11	pub const Error = WriterType.Error;
14		pub const PushError = Allocator.Error;
15	12	pub const Writer = io.Writer(*Self, Error, write);
16		const Stack = ArrayList(usize);
17	13
18	14	writer_pointer: *WriterType,
19		indent_stack: Stack,
20	15
	16	indent_stack: usize = 0,
	17	indent_delta: usize,
21	18	current_line_empty: bool = true,
22	19	indent_one_shot_count: usize = 0, // automatically popped when applied
23	20	applied_indent: usize = 0, // the most recently applied indent
24	21	indent_next_line: usize = 0, // not used until the next line
25	22
26		pub fn init(writer_pointer: WriterType, allocator: Allocator) Self {
27		var indent_stack = Stack.init(allocator);
28		return Self{ .writer_pointer = writer_pointer, .indent_stack = indent_stack };
	23	pub fn init(indent_delta: usize, writer_pointer: *WriterType) Self {
	24	return Self{ .writer_pointer = writer_pointer, .indent_delta = indent_delta };
29	25	}
30	26
31	27	/// Release all allocated memory.
32		pub fn deinit(self: Self) void {
33		self.indent_stack.deinit();
34		}
	28	pub fn deinit(self: Self) void {}
35	29
36	30	pub fn writer(self: *Self) Writer {
37	31	return .{ .context = self };
...	...	@@ -71,21 +65,16 @@ pub fn AutoIndentingStream(comptime indent_delta: usize, comptime WriterType: ty
71	65	}
72	66
73	67	/// Push default indentation
74		pub fn pushIndent(self: *Self) PushError!void {
	68	pub fn pushIndent(self: *Self) void {
75	69	// Doesn't actually write any indentation.
76	70	// Just primes the stream to be able to write the correct indentation if it needs to.
77		try self.pushIndentN(indent_delta);
78		}
79
80		/// Push an indent of arbitrary width
81		pub fn pushIndentN(self: *Self, n: usize) PushError!void {
82		try self.indent_stack.append(n);
	71	self.indent_stack += 1;
83	72	}
84	73
85	74	/// Push an indent that is automatically popped after being applied
86		pub fn pushIndentOneShot(self: *Self) PushError!void {
	75	pub fn pushIndentOneShot(self: *Self) void {
87	76	self.indent_one_shot_count += 1;
88		try self.pushIndent();
	77	self.pushIndent();
89	78	}
90	79
91	80	/// Turns all one-shot indents into regular indents
...	...	@@ -97,15 +86,15 @@ pub fn AutoIndentingStream(comptime indent_delta: usize, comptime WriterType: ty
97	86	}
98	87
99	88	/// Push an indent that should not take effect until the next line
100		pub fn pushIndentNextLine(self: *Self) PushError!void {
	89	pub fn pushIndentNextLine(self: *Self) void {
101	90	self.indent_next_line += 1;
102		try self.pushIndent();
	91	self.pushIndent();
103	92	}
104	93
105	94	pub fn popIndent(self: *Self) void {
106		assert(self.indent_stack.items.len != 0);
107		self.indent_stack.items.len -= 1;
108		self.indent_next_line = std.math.min(self.indent_stack.items.len, self.indent_next_line); // Tentative indent may have been popped before there was a newline
	95	assert(self.indent_stack != 0);
	96	self.indent_stack -= 1;
	97	self.indent_next_line = std.math.min(self.indent_stack, self.indent_next_line); // Tentative indent may have been popped before there was a newline
109	98	}
110	99
111	100	/// Writes ' ' bytes if the current line is empty
...	...	@@ -116,7 +105,7 @@ pub fn AutoIndentingStream(comptime indent_delta: usize, comptime WriterType: ty
116	105	self.applied_indent = current_indent;
117	106	}
118	107
119		self.indent_stack.items.len -= self.indent_one_shot_count;
	108	self.indent_stack -= self.indent_one_shot_count;
120	109	self.indent_one_shot_count = 0;
121	110	self.current_line_empty = false;
122	111	}
...	...	@@ -129,11 +118,9 @@ pub fn AutoIndentingStream(comptime indent_delta: usize, comptime WriterType: ty
129	118
130	119	fn currentIndent(self: *Self) usize {
131	120	var indent_current: usize = 0;
132		if (self.indent_stack.items.len > 0) {
133		const stack_top = self.indent_stack.items.len - self.indent_next_line;
134		for (self.indent_stack.items[0..stack_top]) \|indent\| {
135		indent_current += indent;
136		}
	121	if (self.indent_stack > 0) {
	122	const stack_top = self.indent_stack - self.indent_next_line;
	123	indent_current = stack_top * self.indent_delta;
137	124	}
138	125	return indent_current;
139	126	}
...	...	@@ -141,10 +128,9 @@ pub fn AutoIndentingStream(comptime indent_delta: usize, comptime WriterType: ty
141	128	}
142	129
143	130	pub fn autoIndentingStream(
144		comptime indent_delta: usize,
	131	indent_delta: usize,
145	132	underlying_stream: anytype,
146		allocator: *Allocator,
147		) AutoIndentingStream(indent_delta, @TypeOf(underlying_stream).Child) {
	133	) AutoIndentingStream(@TypeOf(underlying_stream).Child) {
148	134	comptime assert(@typeInfo(@TypeOf(underlying_stream)) == .Pointer);
149		return AutoIndentingStream(indent_delta, @TypeOf(underlying_stream).Child).init(underlying_stream, allocator);
	135	return AutoIndentingStream(@TypeOf(underlying_stream).Child).init(indent_delta, underlying_stream);
150	136	}

lib/std/io/change_detection_stream.zig+2-2

...	...	@@ -11,11 +11,11 @@ pub fn ChangeDetectionStream(comptime WriterType: type) type {
11	11	pub const Writer = io.Writer(*Self, Error, write);
12	12
13	13	anything_changed: bool = false,
14		writer_pointer: *WriterType,
	14	writer_pointer: *const WriterType,
15	15	source_index: usize,
16	16	source: []const u8,
17	17
18		pub fn init(source: []const u8, writer_pointer: *WriterType) Self {
	18	pub fn init(source: []const u8, writer_pointer: *const WriterType) Self {
19	19	return Self{
20	20	.writer_pointer = writer_pointer,
21	21	.source_index = 0,

lib/std/io/find_byte_out_stream.zig+2-2

...	...	@@ -10,11 +10,11 @@ pub fn FindByteOutStream(comptime WriterType: type) type {
10	10	pub const Error = WriterType.Error;
11	11	pub const Writer = io.Writer(*Self, Error, write);
12	12
13		writer_pointer: *WriterType,
	13	writer_pointer: *const WriterType,
14	14	byte_found: bool,
15	15	byte: u8,
16	16
17		pub fn init(byte: u8, writer_pointer: *WriterType) Self {
	17	pub fn init(byte: u8, writer_pointer: *const WriterType) Self {
18	18	return Self{
19	19	.writer_pointer = writer_pointer,
20	20	.byte = byte,

lib/std/target.zig+1-1

...	...	@@ -101,7 +101,7 @@ pub const Target = struct {
101	101
102	102	/// Latest Windows version that the Zig Standard Library is aware of
103	103	pub const latest = WindowsVersion.win10_20h1;
104
	104
105	105	pub const Range = struct {
106	106	min: WindowsVersion,
107	107	max: WindowsVersion,

lib/std/zig/parser_test.zig+5-5

...	...	@@ -2827,7 +2827,7 @@ test "zig fmt: inline asm" {
2827	2827	\\ return asm volatile ("syscall"
2828	2828	\\ : [ret] "={rax}" (-> usize)
2829	2829	\\ : [number] "{rax}" (number),
2830		\\ [arg1] "{rdi}" (arg1)
	2830	\\ [arg1] "{rdi}" (arg1)
2831	2831	\\ : "rcx", "r11"
2832	2832	\\ );
2833	2833	\\}
...	...	@@ -2930,14 +2930,14 @@ test "zig fmt: inline asm parameter alignment" {
2930	2930	\\ \\ foo
2931	2931	\\ \\ bar
2932	2932	\\ : [_] "" (-> usize),
2933		\\ [_] "" (-> usize)
	2933	\\ [_] "" (-> usize)
2934	2934	\\ );
2935	2935	\\ asm volatile (
2936	2936	\\ \\ foo
2937	2937	\\ \\ bar
2938	2938	\\ :
2939	2939	\\ : [_] "" (0),
2940		\\ [_] "" (0)
	2940	\\ [_] "" (0)
2941	2941	\\ );
2942	2942	\\ asm volatile (
2943	2943	\\ \\ foo
...	...	@@ -2950,9 +2950,9 @@ test "zig fmt: inline asm parameter alignment" {
2950	2950	\\ \\ foo
2951	2951	\\ \\ bar
2952	2952	\\ : [_] "" (-> usize),
2953		\\ [_] "" (-> usize)
	2953	\\ [_] "" (-> usize)
2954	2954	\\ : [_] "" (0),
2955		\\ [_] "" (0)
	2955	\\ [_] "" (0)
2956	2956	\\ : "", ""
2957	2957	\\ );
2958	2958	\\}

lib/std/zig/render.zig+34-34

...	...	@@ -24,7 +24,7 @@ pub fn render(allocator: mem.Allocator, stream: anytype, tree: ast.Tree) (meta
24	24
25	25	var s = stream.*;
26	26	var change_detection_stream = std.io.changeDetectionStream(tree.source, &s);
27		var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &change_detection_stream, allocator);
	27	var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &change_detection_stream);
28	28	defer auto_indenting_stream.deinit();
29	29
30	30	try renderRoot(allocator, &auto_indenting_stream, tree);
...	...	@@ -389,11 +389,11 @@ fn renderExpression(
389	389	}
390	390
391	391	if (block.statements.len == 0) {
392		try stream.pushIndentNextLine();
	392	stream.pushIndentNextLine();
393	393	defer stream.popIndent();
394	394	try renderToken(tree, stream, block.lbrace, Space.None);
395	395	} else {
396		try stream.pushIndentNextLine();
	396	stream.pushIndentNextLine();
397	397	defer stream.popIndent();
398	398
399	399	try renderToken(tree, stream, block.lbrace, Space.Newline);
...	...	@@ -463,7 +463,7 @@ fn renderExpression(
463	463	try renderExpression(allocator, stream, tree, payload, Space.Space);
464	464	}
465	465
466		try stream.pushIndentOneShot();
	466	stream.pushIndentOneShot();
467	467	return renderExpression(allocator, stream, tree, infix_op_node.rhs, space);
468	468	},
469	469
...	...	@@ -524,7 +524,7 @@ fn renderExpression(
524	524	};
525	525
526	526	try renderToken(tree, stream, infix_op_node.op_token, after_op_space);
527		try stream.pushIndentOneShot();
	527	stream.pushIndentOneShot();
528	528	return renderExpression(allocator, stream, tree, infix_op_node.rhs, space);
529	529	},
530	530
...	...	@@ -718,7 +718,7 @@ fn renderExpression(
718	718	}
719	719
720	720	{
721		try stream.pushIndent();
	721	stream.pushIndent();
722	722	defer stream.popIndent();
723	723	try renderToken(tree, stream, lbrace, Space.None);
724	724	}
...	...	@@ -783,7 +783,7 @@ fn renderExpression(
783	783
784	784	// Null stream for counting the printed length of each expression
785	785	var counting_stream = std.io.countingOutStream(std.io.null_out_stream);
786		var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &counting_stream, allocator);
	786	var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &counting_stream);
787	787	defer auto_indenting_stream.deinit();
788	788
789	789	for (exprs) \|expr, i\| {
...	...	@@ -796,7 +796,7 @@ fn renderExpression(
796	796	}
797	797
798	798	{
799		try stream.pushIndentNextLine();
	799	stream.pushIndentNextLine();
800	800	defer stream.popIndent();
801	801	try renderToken(tree, stream, lbrace, Space.Newline);
802	802
...	...	@@ -880,7 +880,7 @@ fn renderExpression(
880	880	}
881	881
882	882	{
883		try stream.pushIndentNextLine();
	883	stream.pushIndentNextLine();
884	884	defer stream.popIndent();
885	885	try renderToken(tree, stream, lbrace, Space.None);
886	886	}
...	...	@@ -902,7 +902,7 @@ fn renderExpression(
902	902	// render field expressions until a LF is found
903	903	for (field_inits) \|field_init\| {
904	904	var find_stream = std.io.findByteOutStream('\n', &std.io.null_out_stream);
905		var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &find_stream, allocator);
	905	var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &find_stream);
906	906	defer auto_indenting_stream.deinit();
907	907
908	908	try renderExpression(allocator, &auto_indenting_stream, tree, field_init, Space.None);
...	...	@@ -963,7 +963,7 @@ fn renderExpression(
963	963	.node => \|node\| try renderExpression(allocator, stream, tree, node, Space.None),
964	964	}
965	965
966		try stream.pushIndentNextLine();
	966	stream.pushIndentNextLine();
967	967	defer stream.popIndent();
968	968
969	969	try renderToken(tree, stream, lbrace, Space.Newline);
...	...	@@ -1011,7 +1011,7 @@ fn renderExpression(
1011	1011
1012	1012	const params = call.params();
1013	1013	for (params) \|param_node, i\| {
1014		try stream.pushIndent();
	1014	stream.pushIndent();
1015	1015	defer stream.popIndent();
1016	1016
1017	1017	if (i + 1 < params.len) {
...	...	@@ -1031,7 +1031,7 @@ fn renderExpression(
1031	1031
1032	1032	const params = call.params();
1033	1033	for (params) \|param_node, i\| {
1034		if (param_node.*.tag == .MultilineStringLiteral) try stream.pushIndentOneShot();
	1034	if (param_node.*.tag == .MultilineStringLiteral) stream.pushIndentOneShot();
1035	1035
1036	1036	try renderExpression(allocator, stream, tree, param_node, Space.None);
1037	1037
...	...	@@ -1058,7 +1058,7 @@ fn renderExpression(
1058	1058	{
1059	1059	const new_space = if (ends_with_comment) Space.Newline else Space.None;
1060	1060
1061		try stream.pushIndent();
	1061	stream.pushIndent();
1062	1062	defer stream.popIndent();
1063	1063	try renderExpression(allocator, stream, tree, suffix_op.index_expr, new_space);
1064	1064	}
...	...	@@ -1194,7 +1194,7 @@ fn renderExpression(
1194	1194
1195	1195	try renderToken(tree, stream, grouped_expr.lparen, Space.None);
1196	1196	{
1197		try stream.pushIndentOneShot();
	1197	stream.pushIndentOneShot();
1198	1198	try renderExpression(allocator, stream, tree, grouped_expr.expr, Space.None);
1199	1199	}
1200	1200	return renderToken(tree, stream, grouped_expr.rparen, space);
...	...	@@ -1254,7 +1254,7 @@ fn renderExpression(
1254	1254
1255	1255	if (container_decl.fields_and_decls_len == 0) {
1256	1256	{
1257		try stream.pushIndentNextLine();
	1257	stream.pushIndentNextLine();
1258	1258	defer stream.popIndent();
1259	1259	try renderToken(tree, stream, container_decl.lbrace_token, Space.None); // {
1260	1260	}
...	...	@@ -1289,7 +1289,7 @@ fn renderExpression(
1289	1289
1290	1290	if (src_has_trailing_comma or !src_has_only_fields) {
1291	1291	// One declaration per line
1292		try stream.pushIndentNextLine();
	1292	stream.pushIndentNextLine();
1293	1293	defer stream.popIndent();
1294	1294	try renderToken(tree, stream, container_decl.lbrace_token, .Newline); // {
1295	1295
...	...	@@ -1305,7 +1305,7 @@ fn renderExpression(
1305	1305	// their own line
1306	1306	try renderToken(tree, stream, container_decl.lbrace_token, .Newline); // {
1307	1307
1308		try stream.pushIndent();
	1308	stream.pushIndent();
1309	1309	defer stream.popIndent();
1310	1310
1311	1311	for (fields_and_decls) \|decl, i\| {
...	...	@@ -1361,7 +1361,7 @@ fn renderExpression(
1361	1361
1362	1362	if (src_has_trailing_comma) {
1363	1363	{
1364		try stream.pushIndent();
	1364	stream.pushIndent();
1365	1365	defer stream.popIndent();
1366	1366
1367	1367	try renderToken(tree, stream, lbrace, Space.Newline); // {
...	...	@@ -1451,7 +1451,7 @@ fn renderExpression(
1451	1451	}
1452	1452	} else {
1453	1453	// one param per line
1454		try stream.pushIndent();
	1454	stream.pushIndent();
1455	1455	defer stream.popIndent();
1456	1456	try renderToken(tree, stream, lparen, Space.Newline); // (
1457	1457
...	...	@@ -1530,7 +1530,7 @@ fn renderExpression(
1530	1530	}
1531	1531	} else {
1532	1532	// one param per line
1533		try stream.pushIndent();
	1533	stream.pushIndent();
1534	1534	defer stream.popIndent();
1535	1535	try renderToken(tree, stream, lparen, Space.Newline); // (
1536	1536
...	...	@@ -1627,7 +1627,7 @@ fn renderExpression(
1627	1627	try renderToken(tree, stream, rparen, Space.Space); // )
1628	1628
1629	1629	{
1630		try stream.pushIndentNextLine();
	1630	stream.pushIndentNextLine();
1631	1631	defer stream.popIndent();
1632	1632	try renderToken(tree, stream, lbrace, Space.Newline); // {
1633	1633
...	...	@@ -1711,7 +1711,7 @@ fn renderExpression(
1711	1711	if (same_line) {
1712	1712	return renderExpression(allocator, stream, tree, else_node.body, space);
1713	1713	} else {
1714		try stream.pushIndent();
	1714	stream.pushIndent();
1715	1715	defer stream.popIndent();
1716	1716	return renderExpression(allocator, stream, tree, else_node.body, space);
1717	1717	}
...	...	@@ -1775,7 +1775,7 @@ fn renderExpression(
1775	1775	}
1776	1776
1777	1777	{
1778		if (!body_is_block) try stream.pushIndent();
	1778	if (!body_is_block) stream.pushIndent();
1779	1779	defer if (!body_is_block) stream.popIndent();
1780	1780	try renderExpression(allocator, stream, tree, while_node.body, after_body_space);
1781	1781	}
...	...	@@ -1826,7 +1826,7 @@ fn renderExpression(
1826	1826	};
1827	1827
1828	1828	{
1829		if (!body_on_same_line) try stream.pushIndent();
	1829	if (!body_on_same_line) stream.pushIndent();
1830	1830	defer if (!body_on_same_line) stream.popIndent();
1831	1831	try renderExpression(allocator, stream, tree, for_node.body, space_after_body); // { body }
1832	1832	}
...	...	@@ -1882,7 +1882,7 @@ fn renderExpression(
1882	1882	const else_is_block = nodeIsBlock(@"else".body);
1883	1883
1884	1884	{
1885		try stream.pushIndent();
	1885	stream.pushIndent();
1886	1886	defer stream.popIndent();
1887	1887	try renderExpression(allocator, stream, tree, if_node.body, Space.Newline);
1888	1888	}
...	...	@@ -1903,12 +1903,12 @@ fn renderExpression(
1903	1903	try renderExpression(allocator, stream, tree, payload, Space.Newline);
1904	1904	}
1905	1905
1906		try stream.pushIndent();
	1906	stream.pushIndent();
1907	1907	defer stream.popIndent();
1908	1908	return renderExpression(allocator, stream, tree, @"else".body, space);
1909	1909	}
1910	1910	} else {
1911		try stream.pushIndent();
	1911	stream.pushIndent();
1912	1912	defer stream.popIndent();
1913	1913	return renderExpression(allocator, stream, tree, if_node.body, space);
1914	1914	}
...	...	@@ -1949,7 +1949,7 @@ fn renderExpression(
1949	1949	}
1950	1950
1951	1951	asmblk: {
1952		try stream.pushIndent();
	1952	stream.pushIndent();
1953	1953	defer stream.popIndent();
1954	1954
1955	1955	if (asm_node.outputs.len == 0 and asm_node.inputs.len == 0 and asm_node.clobbers.len == 0) {
...	...	@@ -1968,7 +1968,7 @@ fn renderExpression(
1968	1968	} else blk: {
1969	1969	try renderToken(tree, stream, colon1, Space.Space); // :
1970	1970
1971		try stream.pushIndentN(2);
	1971	stream.pushIndent();
1972	1972	defer stream.popIndent();
1973	1973
1974	1974	for (asm_node.outputs) \|*asm_output, i\| {
...	...	@@ -1999,7 +1999,7 @@ fn renderExpression(
1999	1999	break :blk tree.nextToken(colon2);
2000	2000	} else blk: {
2001	2001	try renderToken(tree, stream, colon2, Space.Space); // :
2002		try stream.pushIndentN(2);
	2002	stream.pushIndent();
2003	2003	defer stream.popIndent();
2004	2004	for (asm_node.inputs) \|*asm_input, i\| {
2005	2005	if (i + 1 < asm_node.inputs.len) {
...	...	@@ -2025,7 +2025,7 @@ fn renderExpression(
2025	2025	};
2026	2026
2027	2027	try renderToken(tree, stream, colon3, Space.Space); // :
2028		try stream.pushIndentN(2);
	2028	stream.pushIndent();
2029	2029	defer stream.popIndent();
2030	2030	for (asm_node.clobbers) \|clobber_node, i\| {
2031	2031	if (i + 1 >= asm_node.clobbers.len) {
...	...	@@ -2078,7 +2078,7 @@ fn renderArrayType(
2078	2078	const new_space = if (ends_with_comment) Space.Newline else Space.None;
2079	2079	{
2080	2080	const do_indent = (starts_with_comment or ends_with_comment);
2081		if (do_indent) try stream.pushIndent();
	2081	if (do_indent) stream.pushIndent();
2082	2082	defer if (do_indent) stream.popIndent();
2083	2083
2084	2084	try renderToken(tree, stream, lbracket, Space.None); // [
...	...	@@ -2212,7 +2212,7 @@ fn renderVarDecl(
2212	2212	if (var_decl.getTrailer("init_node")) \|init_node\| {
2213	2213	const s = if (init_node.tag == .MultilineStringLiteral) Space.None else Space.Space;
2214	2214	try renderToken(tree, stream, var_decl.getTrailer("eq_token").?, s); // =
2215		try stream.pushIndentOneShot();
	2215	stream.pushIndentOneShot();
2216	2216	try renderExpression(allocator, stream, tree, init_node, Space.None);
2217	2217	}
2218	2218

author	Lachlan Easton <lachlan@lakebythewoods.xyz> 2020-08-31 23:39:30+10:00
committer	Lachlan Easton <lachlan@lakebythewoods.xyz> 2020-08-31 23:39:50+10:00
log	5aca3baea62326dee301ec29c567dc224baa4a08
tree	66897f2950cb209d463601c90cd37d02ee0d5280
parent	50c8a53188bdd20321990b7a4999f534b9e613dd

zig fmt: Remove dynamic stack from auto-indenting-stream