Commit ae0a219d1f5495acc4d82421fa24d84186c2a40d | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-11-11 11:52:50-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-11-11 13:02:39-05:00
log	ae0a219d1f5495acc4d82421fa24d84186c2a40d
tree	10d73e06d67c23cb03bd975bf97d1bfc7aa29a53
parent	cd5c9c8998f1669059cee3d915831ee539dea2b6
signature	Commit is signed but in an unrecognized format.

stop accepting deprecated `use` keyword

closes #2591

5 files changed, 13 insertions(+), 27 deletions(-)

lib
- std
  - zig
    parser_test.zig
    render.zig
    tokenizer.zig
src
- tokenizer.cpp
test
- compare_output.zig

lib/std/zig/parser_test.zig-10

...	...	@@ -1,13 +1,3 @@
1		// TODO remove `use` keyword eventually: https://github.com/ziglang/zig/issues/2591
2		test "zig fmt: change use to usingnamespace" {
3		try testTransform(
4		\\use @import("std");
5		,
6		\\usingnamespace @import("std");
7		\\
8		);
9		}
10
11	1	test "zig fmt: async function" {
12	2	try testCanonical(
13	3	\\pub const Server = struct {

lib/std/zig/render.zig+1-3

...	...	@@ -226,9 +226,7 @@ fn renderTopLevelDecl(allocator: mem.Allocator, stream: var, tree: ast.Tree, i
226	226	if (use_decl.visib_token) \|visib_token\| {
227	227	try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub
228	228	}
229		// TODO after depracating use, go back to this:
230		//try renderToken(tree, stream, use_decl.use_token, indent, start_col, Space.Space); // usingnamespace
231		try stream.write("usingnamespace ");
	229	try renderToken(tree, stream, use_decl.use_token, indent, start_col, Space.Space); // usingnamespace
232	230	try renderExpression(allocator, stream, tree, indent, start_col, use_decl.expr, Space.None);
233	231	try renderToken(tree, stream, use_decl.semicolon_token, indent, start_col, Space.Newline); // ;
234	232	},

lib/std/zig/tokenizer.zig-1

...	...	@@ -59,7 +59,6 @@ pub const Token = struct {
59	59	Keyword{ .bytes = "undefined", .id = Id.Keyword_undefined },
60	60	Keyword{ .bytes = "union", .id = Id.Keyword_union },
61	61	Keyword{ .bytes = "unreachable", .id = Id.Keyword_unreachable },
62		Keyword{ .bytes = "use", .id = Id.Keyword_usingnamespace },
63	62	Keyword{ .bytes = "usingnamespace", .id = Id.Keyword_usingnamespace },
64	63	Keyword{ .bytes = "var", .id = Id.Keyword_var },
65	64	Keyword{ .bytes = "volatile", .id = Id.Keyword_volatile },

src/tokenizer.cpp-1

...	...	@@ -153,7 +153,6 @@ static const struct ZigKeyword zig_keywords[] = {
153	153	{"undefined", TokenIdKeywordUndefined},
154	154	{"union", TokenIdKeywordUnion},
155	155	{"unreachable", TokenIdKeywordUnreachable},
156		{"use", TokenIdKeywordUsingNamespace},
157	156	{"usingnamespace", TokenIdKeywordUsingNamespace},
158	157	{"var", TokenIdKeywordVar},
159	158	{"volatile", TokenIdKeywordVolatile},

test/compare_output.zig+12-12

...	...	@@ -14,8 +14,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
14	14
15	15	cases.addCase(x: {
16	16	var tc = cases.create("multiple files with private function",
17		\\use @import("std").io;
18		\\use @import("foo.zig");
	17	\\usingnamespace @import("std").io;
	18	\\usingnamespace @import("foo.zig");
19	19	\\
20	20	\\pub fn main() void {
21	21	\\ privateFunction();
...	...	@@ -29,7 +29,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
29	29	, "OK 1\nOK 2\n");
30	30
31	31	tc.addSourceFile("foo.zig",
32		\\use @import("std").io;
	32	\\usingnamespace @import("std").io;
33	33	\\
34	34	\\// purposefully conflicting function with main.zig
35	35	\\// but it's private so it should be OK
...	...	@@ -48,8 +48,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
48	48
49	49	cases.addCase(x: {
50	50	var tc = cases.create("import segregation",
51		\\use @import("foo.zig");
52		\\use @import("bar.zig");
	51	\\usingnamespace @import("foo.zig");
	52	\\usingnamespace @import("bar.zig");
53	53	\\
54	54	\\pub fn main() void {
55	55	\\ foo_function();
...	...	@@ -58,7 +58,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
58	58	, "OK\nOK\n");
59	59
60	60	tc.addSourceFile("foo.zig",
61		\\use @import("std").io;
	61	\\usingnamespace @import("std").io;
62	62	\\pub fn foo_function() void {
63	63	\\ const stdout = &(getStdOut() catch unreachable).outStream().stream;
64	64	\\ stdout.print("OK\n") catch unreachable;
...	...	@@ -66,8 +66,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
66	66	);
67	67
68	68	tc.addSourceFile("bar.zig",
69		\\use @import("other.zig");
70		\\use @import("std").io;
	69	\\usingnamespace @import("other.zig");
	70	\\usingnamespace @import("std").io;
71	71	\\
72	72	\\pub fn bar_function() void {
73	73	\\ if (foo_function()) {
...	...	@@ -88,8 +88,8 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
88	88	});
89	89
90	90	cases.addCase(x: {
91		var tc = cases.create("two files use import each other",
92		\\use @import("a.zig");
	91	var tc = cases.create("two files usingnamespace import each other",
	92	\\usingnamespace @import("a.zig");
93	93	\\
94	94	\\pub fn main() void {
95	95	\\ ok();
...	...	@@ -97,7 +97,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
97	97	, "OK\n");
98	98
99	99	tc.addSourceFile("a.zig",
100		\\use @import("b.zig");
	100	\\usingnamespace @import("b.zig");
101	101	\\const io = @import("std").io;
102	102	\\
103	103	\\pub const a_text = "OK\n";
...	...	@@ -109,7 +109,7 @@ pub fn addCases(cases: *tests.CompareOutputContext) void {
109	109	);
110	110
111	111	tc.addSourceFile("b.zig",
112		\\use @import("a.zig");
	112	\\usingnamespace @import("a.zig");
113	113	\\
114	114	\\pub const b_text = a_text;
115	115	);