motiejus/zig
1
Fork 0
Code Releases Activity

zig fmt: re-enable now-passing test cases

Browse Source
This commit is contained in:
Andrew Kelley
2021-02-09 23:07:29 -07:00
parent fa5fcdd734
commit 58db3d2775
3 changed files with 920 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/std/zig/ast.zig
View File

@@ -899,12 +899,12 @@ pub const Tree = struct {
// require recursion due to the optional comma followed by rbrace.
// TODO follow the pattern set by StructInitDotTwoComma which will allow
// lastToken to work for all of these.
.ArrayInit => unreachable,
.ArrayInitOne => unreachable,
.ArrayInitDot => unreachable,
.StructInit => unreachable,
.StructInitOne => unreachable,
.StructInitDot => unreachable,
.ArrayInit => unreachable, // TODO
.ArrayInitOne => unreachable, // TODO
.ArrayInitDot => unreachable, // TODO
.StructInit => unreachable, // TODO
.StructInitOne => unreachable, // TODO
.StructInitDot => unreachable, // TODO
.TaggedUnionEnumTag => unreachable, // TODO
.TaggedUnionEnumTagComma => unreachable, // TODO
@@ -2065,7 +2065,7 @@ pub const Error = union(enum) {
pub const ExpectedVarDeclOrFn = SingleTokenError("Expected variable declaration or function, found '{s}'");
pub const ExpectedVarDecl = SingleTokenError("Expected variable declaration, found '{s}'");
pub const ExpectedFn = SingleTokenError("Expected function, found '{s}'");
pub const ExpectedReturnType = SingleTokenError("Expected 'var' or return type expression, found '{s}'");
pub const ExpectedReturnType = SingleTokenError("Expected return type expression, found '{s}'");
pub const ExpectedAggregateKw = SingleTokenError("Expected '" ++ Token.Tag.Keyword_struct.symbol() ++ "', '" ++ Token.Tag.Keyword_union.symbol() ++ "', '" ++ Token.Tag.Keyword_enum.symbol() ++ "', or '" ++ Token.Tag.Keyword_opaque.symbol() ++ "', found '{s}'");
pub const ExpectedEqOrSemi = SingleTokenError("Expected '=' or ';', found '{s}'");
pub const ExpectedSemiOrLBrace = SingleTokenError("Expected ';' or '{{', found '{s}'");

1833
lib/std/zig/parser_test.zig
View File

File diff suppressed because it is too large Load Diff

6
lib/std/zig/render.zig
View File

@@ -198,7 +198,11 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac
.AnyFrameLiteral,
=> return renderToken(ais, tree, main_tokens[node], space),
.ErrorValue => unreachable, // TODO
.ErrorValue => {
try renderToken(ais, tree, main_tokens[node], .None);
try renderToken(ais, tree, main_tokens[node] + 1, .None);
return renderToken(ais, tree, main_tokens[node] + 2, space);
},
.AnyType => return renderToken(ais, tree, main_tokens[node], space),