Commit 50c8a53188bdd20321990b7a4999f534b9e613dd | zig

author	Lachlan Easton <lachlan@lakebythewoods.xyz> 2020-08-30 10:32:21+10:00
committer	Lachlan Easton <lachlan@lakebythewoods.xyz> 2020-08-30 10:32:21+10:00
log	50c8a53188bdd20321990b7a4999f534b9e613dd
tree	edc5d0a481dc18a160848956451d483e36fc83ff
parent	7d950210a64f51cba6c4edaacbd9c67f12e72604

Use ArrayList instead of fixed array for auto_indenting_stream

3 files changed, 82 insertions(+), 69 deletions(-)

lib
- std
  - io
    auto_indenting_stream.zig
    find_byte_out_stream.zig
  - zig
    render.zig

lib/std/io/auto_indenting_stream.zig+43-33

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

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

...	...	@@ -8,7 +8,7 @@ pub fn FindByteOutStream(comptime WriterType: type) type {
8	8	return struct {
9	9	const Self = @This();
10	10	pub const Error = WriterType.Error;
11		pub const OutStream = io.OutStream(*Self, Error, write);
	11	pub const Writer = io.Writer(*Self, Error, write);
12	12
13	13	writer_pointer: *WriterType,
14	14	byte_found: bool,
...	...	@@ -22,7 +22,7 @@ pub fn FindByteOutStream(comptime WriterType: type) type {
22	22	};
23	23	}
24	24
25		pub fn outStream(self: *Self) OutStream {
	25	pub fn writer(self: *Self) Writer {
26	26	return .{ .context = self };
27	27	}
28	28

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

...	...	@@ -24,7 +24,8 @@ 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);
	27	var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &change_detection_stream, allocator);
	28	defer auto_indenting_stream.deinit();
28	29
29	30	try renderRoot(allocator, &auto_indenting_stream, tree);
30	31
...	...	@@ -388,11 +389,11 @@ fn renderExpression(
388	389	}
389	390
390	391	if (block.statements.len == 0) {
391		stream.pushIndentNextLine();
	392	try stream.pushIndentNextLine();
392	393	defer stream.popIndent();
393	394	try renderToken(tree, stream, block.lbrace, Space.None);
394	395	} else {
395		stream.pushIndentNextLine();
	396	try stream.pushIndentNextLine();
396	397	defer stream.popIndent();
397	398
398	399	try renderToken(tree, stream, block.lbrace, Space.Newline);
...	...	@@ -462,7 +463,7 @@ fn renderExpression(
462	463	try renderExpression(allocator, stream, tree, payload, Space.Space);
463	464	}
464	465
465		stream.pushIndentOneShot();
	466	try stream.pushIndentOneShot();
466	467	return renderExpression(allocator, stream, tree, infix_op_node.rhs, space);
467	468	},
468	469
...	...	@@ -523,7 +524,7 @@ fn renderExpression(
523	524	};
524	525
525	526	try renderToken(tree, stream, infix_op_node.op_token, after_op_space);
526		stream.pushIndentOneShot();
	527	try stream.pushIndentOneShot();
527	528	return renderExpression(allocator, stream, tree, infix_op_node.rhs, space);
528	529	},
529	530
...	...	@@ -717,7 +718,7 @@ fn renderExpression(
717	718	}
718	719
719	720	{
720		stream.pushIndent();
	721	try stream.pushIndent();
721	722	defer stream.popIndent();
722	723	try renderToken(tree, stream, lbrace, Space.None);
723	724	}
...	...	@@ -782,7 +783,8 @@ fn renderExpression(
782	783
783	784	// Null stream for counting the printed length of each expression
784	785	var counting_stream = std.io.countingOutStream(std.io.null_out_stream);
785		var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &counting_stream);
	786	var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &counting_stream, allocator);
	787	defer auto_indenting_stream.deinit();
786	788
787	789	for (exprs) \|expr, i\| {
788	790	counting_stream.bytes_written = 0;
...	...	@@ -794,7 +796,7 @@ fn renderExpression(
794	796	}
795	797
796	798	{
797		stream.pushIndentNextLine();
	799	try stream.pushIndentNextLine();
798	800	defer stream.popIndent();
799	801	try renderToken(tree, stream, lbrace, Space.Newline);
800	802
...	...	@@ -878,7 +880,7 @@ fn renderExpression(
878	880	}
879	881
880	882	{
881		stream.pushIndentNextLine();
	883	try stream.pushIndentNextLine();
882	884	defer stream.popIndent();
883	885	try renderToken(tree, stream, lbrace, Space.None);
884	886	}
...	...	@@ -900,7 +902,8 @@ fn renderExpression(
900	902	// render field expressions until a LF is found
901	903	for (field_inits) \|field_init\| {
902	904	var find_stream = std.io.findByteOutStream('\n', &std.io.null_out_stream);
903		var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &find_stream);
	905	var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &find_stream, allocator);
	906	defer auto_indenting_stream.deinit();
904	907
905	908	try renderExpression(allocator, &auto_indenting_stream, tree, field_init, Space.None);
906	909	if (find_stream.byte_found) break :blk false;
...	...	@@ -960,7 +963,7 @@ fn renderExpression(
960	963	.node => \|node\| try renderExpression(allocator, stream, tree, node, Space.None),
961	964	}
962	965
963		stream.pushIndentNextLine();
	966	try stream.pushIndentNextLine();
964	967	defer stream.popIndent();
965	968
966	969	try renderToken(tree, stream, lbrace, Space.Newline);
...	...	@@ -1008,7 +1011,7 @@ fn renderExpression(
1008	1011
1009	1012	const params = call.params();
1010	1013	for (params) \|param_node, i\| {
1011		stream.pushIndent();
	1014	try stream.pushIndent();
1012	1015	defer stream.popIndent();
1013	1016
1014	1017	if (i + 1 < params.len) {
...	...	@@ -1028,7 +1031,7 @@ fn renderExpression(
1028	1031
1029	1032	const params = call.params();
1030	1033	for (params) \|param_node, i\| {
1031		if (param_node.*.tag == .MultilineStringLiteral) stream.pushIndentOneShot();
	1034	if (param_node.*.tag == .MultilineStringLiteral) try stream.pushIndentOneShot();
1032	1035
1033	1036	try renderExpression(allocator, stream, tree, param_node, Space.None);
1034	1037
...	...	@@ -1055,7 +1058,7 @@ fn renderExpression(
1055	1058	{
1056	1059	const new_space = if (ends_with_comment) Space.Newline else Space.None;
1057	1060
1058		stream.pushIndent();
	1061	try stream.pushIndent();
1059	1062	defer stream.popIndent();
1060	1063	try renderExpression(allocator, stream, tree, suffix_op.index_expr, new_space);
1061	1064	}
...	...	@@ -1191,7 +1194,7 @@ fn renderExpression(
1191	1194
1192	1195	try renderToken(tree, stream, grouped_expr.lparen, Space.None);
1193	1196	{
1194		stream.pushIndentOneShot();
	1197	try stream.pushIndentOneShot();
1195	1198	try renderExpression(allocator, stream, tree, grouped_expr.expr, Space.None);
1196	1199	}
1197	1200	return renderToken(tree, stream, grouped_expr.rparen, space);
...	...	@@ -1251,7 +1254,7 @@ fn renderExpression(
1251	1254
1252	1255	if (container_decl.fields_and_decls_len == 0) {
1253	1256	{
1254		stream.pushIndentNextLine();
	1257	try stream.pushIndentNextLine();
1255	1258	defer stream.popIndent();
1256	1259	try renderToken(tree, stream, container_decl.lbrace_token, Space.None); // {
1257	1260	}
...	...	@@ -1286,7 +1289,7 @@ fn renderExpression(
1286	1289
1287	1290	if (src_has_trailing_comma or !src_has_only_fields) {
1288	1291	// One declaration per line
1289		stream.pushIndentNextLine();
	1292	try stream.pushIndentNextLine();
1290	1293	defer stream.popIndent();
1291	1294	try renderToken(tree, stream, container_decl.lbrace_token, .Newline); // {
1292	1295
...	...	@@ -1302,7 +1305,7 @@ fn renderExpression(
1302	1305	// their own line
1303	1306	try renderToken(tree, stream, container_decl.lbrace_token, .Newline); // {
1304	1307
1305		stream.pushIndent();
	1308	try stream.pushIndent();
1306	1309	defer stream.popIndent();
1307	1310
1308	1311	for (fields_and_decls) \|decl, i\| {
...	...	@@ -1358,7 +1361,7 @@ fn renderExpression(
1358	1361
1359	1362	if (src_has_trailing_comma) {
1360	1363	{
1361		stream.pushIndent();
	1364	try stream.pushIndent();
1362	1365	defer stream.popIndent();
1363	1366
1364	1367	try renderToken(tree, stream, lbrace, Space.Newline); // {
...	...	@@ -1448,7 +1451,7 @@ fn renderExpression(
1448	1451	}
1449	1452	} else {
1450	1453	// one param per line
1451		stream.pushIndent();
	1454	try stream.pushIndent();
1452	1455	defer stream.popIndent();
1453	1456	try renderToken(tree, stream, lparen, Space.Newline); // (
1454	1457
...	...	@@ -1527,7 +1530,7 @@ fn renderExpression(
1527	1530	}
1528	1531	} else {
1529	1532	// one param per line
1530		stream.pushIndent();
	1533	try stream.pushIndent();
1531	1534	defer stream.popIndent();
1532	1535	try renderToken(tree, stream, lparen, Space.Newline); // (
1533	1536
...	...	@@ -1624,7 +1627,7 @@ fn renderExpression(
1624	1627	try renderToken(tree, stream, rparen, Space.Space); // )
1625	1628
1626	1629	{
1627		stream.pushIndentNextLine();
	1630	try stream.pushIndentNextLine();
1628	1631	defer stream.popIndent();
1629	1632	try renderToken(tree, stream, lbrace, Space.Newline); // {
1630	1633
...	...	@@ -1708,7 +1711,7 @@ fn renderExpression(
1708	1711	if (same_line) {
1709	1712	return renderExpression(allocator, stream, tree, else_node.body, space);
1710	1713	} else {
1711		stream.pushIndent();
	1714	try stream.pushIndent();
1712	1715	defer stream.popIndent();
1713	1716	return renderExpression(allocator, stream, tree, else_node.body, space);
1714	1717	}
...	...	@@ -1772,7 +1775,7 @@ fn renderExpression(
1772	1775	}
1773	1776
1774	1777	{
1775		if (!body_is_block) stream.pushIndent();
	1778	if (!body_is_block) try stream.pushIndent();
1776	1779	defer if (!body_is_block) stream.popIndent();
1777	1780	try renderExpression(allocator, stream, tree, while_node.body, after_body_space);
1778	1781	}
...	...	@@ -1823,7 +1826,7 @@ fn renderExpression(
1823	1826	};
1824	1827
1825	1828	{
1826		if (!body_on_same_line) stream.pushIndent();
	1829	if (!body_on_same_line) try stream.pushIndent();
1827	1830	defer if (!body_on_same_line) stream.popIndent();
1828	1831	try renderExpression(allocator, stream, tree, for_node.body, space_after_body); // { body }
1829	1832	}
...	...	@@ -1879,7 +1882,7 @@ fn renderExpression(
1879	1882	const else_is_block = nodeIsBlock(@"else".body);
1880	1883
1881	1884	{
1882		stream.pushIndent();
	1885	try stream.pushIndent();
1883	1886	defer stream.popIndent();
1884	1887	try renderExpression(allocator, stream, tree, if_node.body, Space.Newline);
1885	1888	}
...	...	@@ -1900,12 +1903,12 @@ fn renderExpression(
1900	1903	try renderExpression(allocator, stream, tree, payload, Space.Newline);
1901	1904	}
1902	1905
1903		stream.pushIndent();
	1906	try stream.pushIndent();
1904	1907	defer stream.popIndent();
1905	1908	return renderExpression(allocator, stream, tree, @"else".body, space);
1906	1909	}
1907	1910	} else {
1908		stream.pushIndent();
	1911	try stream.pushIndent();
1909	1912	defer stream.popIndent();
1910	1913	return renderExpression(allocator, stream, tree, if_node.body, space);
1911	1914	}
...	...	@@ -1946,7 +1949,7 @@ fn renderExpression(
1946	1949	}
1947	1950
1948	1951	asmblk: {
1949		stream.pushIndent();
	1952	try stream.pushIndent();
1950	1953	defer stream.popIndent();
1951	1954
1952	1955	if (asm_node.outputs.len == 0 and asm_node.inputs.len == 0 and asm_node.clobbers.len == 0) {
...	...	@@ -1965,7 +1968,7 @@ fn renderExpression(
1965	1968	} else blk: {
1966	1969	try renderToken(tree, stream, colon1, Space.Space); // :
1967	1970
1968		stream.pushIndentN(2);
	1971	try stream.pushIndentN(2);
1969	1972	defer stream.popIndent();
1970	1973
1971	1974	for (asm_node.outputs) \|*asm_output, i\| {
...	...	@@ -1996,7 +1999,7 @@ fn renderExpression(
1996	1999	break :blk tree.nextToken(colon2);
1997	2000	} else blk: {
1998	2001	try renderToken(tree, stream, colon2, Space.Space); // :
1999		stream.pushIndentN(2);
	2002	try stream.pushIndentN(2);
2000	2003	defer stream.popIndent();
2001	2004	for (asm_node.inputs) \|*asm_input, i\| {
2002	2005	if (i + 1 < asm_node.inputs.len) {
...	...	@@ -2022,7 +2025,7 @@ fn renderExpression(
2022	2025	};
2023	2026
2024	2027	try renderToken(tree, stream, colon3, Space.Space); // :
2025		stream.pushIndentN(2);
	2028	try stream.pushIndentN(2);
2026	2029	defer stream.popIndent();
2027	2030	for (asm_node.clobbers) \|clobber_node, i\| {
2028	2031	if (i + 1 >= asm_node.clobbers.len) {
...	...	@@ -2075,7 +2078,7 @@ fn renderArrayType(
2075	2078	const new_space = if (ends_with_comment) Space.Newline else Space.None;
2076	2079	{
2077	2080	const do_indent = (starts_with_comment or ends_with_comment);
2078		if (do_indent) stream.pushIndent();
	2081	if (do_indent) try stream.pushIndent();
2079	2082	defer if (do_indent) stream.popIndent();
2080	2083
2081	2084	try renderToken(tree, stream, lbracket, Space.None); // [
...	...	@@ -2209,7 +2212,7 @@ fn renderVarDecl(
2209	2212	if (var_decl.getTrailer("init_node")) \|init_node\| {
2210	2213	const s = if (init_node.tag == .MultilineStringLiteral) Space.None else Space.Space;
2211	2214	try renderToken(tree, stream, var_decl.getTrailer("eq_token").?, s); // =
2212		stream.pushIndentOneShot();
	2215	try stream.pushIndentOneShot();
2213	2216	try renderExpression(allocator, stream, tree, init_node, Space.None);
2214	2217	}
2215	2218