Commit 1f81887a7863545d8b89bff6cc7d31941da0abf0 | zig

author	Veikka Tuominen <git@vexu.eu> 2020-05-13 23:35:58+03:00
committer	Veikka Tuominen <git@vexu.eu> 2020-05-13 23:35:58+03:00
log	1f81887a7863545d8b89bff6cc7d31941da0abf0
tree	0afe1df9c8a090d24dceab7486b1ad2fd8abff4b
parent	ad71d959d7d1b5f3a771dc2c1eaf37dbd7cd0852
signature	Commit is signed but in an unrecognized format.

recover after invalid inline/extern

3 files changed, 29 insertions(+), 7 deletions(-)

lib
- std
  - zig
    ast.zig
    parse.zig
    parser_test.zig

lib/std/zig/ast.zig+4

...	...	@@ -129,6 +129,7 @@ pub const Error = union(enum) {
129	129	ExpectedStatement: ExpectedStatement,
130	130	ExpectedVarDeclOrFn: ExpectedVarDeclOrFn,
131	131	ExpectedVarDecl: ExpectedVarDecl,
	132	ExpectedFn: ExpectedFn,
132	133	ExpectedReturnType: ExpectedReturnType,
133	134	ExpectedAggregateKw: ExpectedAggregateKw,
134	135	UnattachedDocComment: UnattachedDocComment,
...	...	@@ -179,6 +180,7 @@ pub const Error = union(enum) {
179	180	.ExpectedStatement => \|*x\| return x.render(tokens, stream),
180	181	.ExpectedVarDeclOrFn => \|*x\| return x.render(tokens, stream),
181	182	.ExpectedVarDecl => \|*x\| return x.render(tokens, stream),
	183	.ExpectedFn => \|*x\| return x.render(tokens, stream),
182	184	.ExpectedReturnType => \|*x\| return x.render(tokens, stream),
183	185	.ExpectedAggregateKw => \|*x\| return x.render(tokens, stream),
184	186	.UnattachedDocComment => \|*x\| return x.render(tokens, stream),
...	...	@@ -231,6 +233,7 @@ pub const Error = union(enum) {
231	233	.ExpectedStatement => \|x\| return x.token,
232	234	.ExpectedVarDeclOrFn => \|x\| return x.token,
233	235	.ExpectedVarDecl => \|x\| return x.token,
	236	.ExpectedFn => \|x\| return x.token,
234	237	.ExpectedReturnType => \|x\| return x.token,
235	238	.ExpectedAggregateKw => \|x\| return x.token,
236	239	.UnattachedDocComment => \|x\| return x.token,
...	...	@@ -280,6 +283,7 @@ pub const Error = union(enum) {
280	283	pub const ExpectedStatement = SingleTokenError("Expected statement, found '{}'");
281	284	pub const ExpectedVarDeclOrFn = SingleTokenError("Expected variable declaration or function, found '{}'");
282	285	pub const ExpectedVarDecl = SingleTokenError("Expected variable declaration, found '{}'");
	286	pub const ExpectedFn = SingleTokenError("Expected function, found '{}'");
283	287	pub const ExpectedReturnType = SingleTokenError("Expected 'var' or return type expression, found '{}'");
284	288	pub const ExpectedAggregateKw = SingleTokenError("Expected '" ++ Token.Id.Keyword_struct.symbol() ++ "', '" ++ Token.Id.Keyword_union.symbol() ++ "', or '" ++ Token.Id.Keyword_enum.symbol() ++ "', found '{}'");
285	289	pub const ExpectedEqOrSemi = SingleTokenError("Expected '=' or ';', found '{}'");

lib/std/zig/parse.zig+10-7

...	...	@@ -360,15 +360,17 @@ fn parseTopLevelDecl(arena: Allocator, it: TokenIterator, tree: *Tree) Error!?
360	360	try tree.errors.push(.{
361	361	.ExpectedSemiOrLBrace = .{ .token = it.index },
362	362	});
363		return null;
	363	return error.ParseError;
364	364	}
365	365
366	366	if (extern_export_inline_token) \|token\| {
367	367	if (tree.tokens.at(token).id == .Keyword_inline or
368	368	tree.tokens.at(token).id == .Keyword_noinline)
369	369	{
370		putBackToken(it, token);
371		return null;
	370	try tree.errors.push(.{
	371	.ExpectedFn = .{ .token = it.index },
	372	});
	373	return error.ParseError;
372	374	}
373	375	}
374	376
...	...	@@ -399,10 +401,11 @@ fn parseTopLevelDecl(arena: Allocator, it: TokenIterator, tree: *Tree) Error!?
399	401	}
400	402
401	403	if (extern_export_inline_token) \|token\| {
402		if (lib_name) \|string_literal_node\|
403		putBackToken(it, string_literal_node.cast(Node.StringLiteral).?.token);
404		putBackToken(it, token);
405		return null;
	404	try tree.errors.push(.{
	405	.ExpectedVarDeclOrFn = .{ .token = it.index },
	406	});
	407	// ignore this and try again;
	408	return error.ParseError;
406	409	}
407	410
408	411	return parseUse(arena, it, tree) catch \|err\| switch (err) {

lib/std/zig/parser_test.zig+15

...	...	@@ -84,6 +84,21 @@ test "recovery: continue after invalid decl" {
84	84	});
85	85	}
86	86
	87	test "recovery: invalid extern/inline" {
	88	try testError(
	89	\\inline test "" { a && b; }
	90	, &[_]Error{
	91	.ExpectedFn,
	92	.InvalidAnd,
	93	});
	94	try testError(
	95	\\extern "" test "" { a && b; }
	96	, &[_]Error{
	97	.ExpectedVarDeclOrFn,
	98	.InvalidAnd,
	99	});
	100	}
	101
87	102	test "zig fmt: top-level fields" {
88	103	try testCanonical(
89	104	\\a: did_you_know,