authorgravatar for johnnymarler@gmail.comJonathan Marler <johnnymarler@gmail.com> 2023-10-09 08:26:53-06:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2023-10-10 00:51:58+03:00
log3a47bc715404752e7f4156177bfb7975cfa06aec
tree2dd97d3b455ec599dfd39fb33331565553d15900
parent9e341a6da3a646dac7b1ed8d48c3ad6cc62418d0

Grammar: Use `ContainerDeclaration*` instead of `ContainerDeclarations`

`ContainerDeclarations` is an abstraction of `ContainerDeclaration*`. Removing this abstraction allows the `ContainerMembers` rule to contain more concrete information without having to look at the definition of `ContainerDeclarations`.

2 files changed, 4 insertions(+), 4 deletions(-)

doc/langref.html.in+2-2
...@@ -12371,9 +12371,9 @@ fn readU32Be() u32 {}...@@ -12371,9 +12371,9 @@ fn readU32Be() u32 {}
12371Root <- skip container_doc_comment? ContainerMembers eof12371Root <- skip container_doc_comment? ContainerMembers eof
1237212372
12373# *** Top level ***12373# *** Top level ***
12374ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations)12374ContainerMembers <- ContainerDeclaration* (ContainerField COMMA)* (ContainerField / ContainerDeclaration*)
1237512375
12376ContainerDeclarations <- (TestDecl / ComptimeDecl / doc_comment? KEYWORD_pub? Decl)*12376ContainerDeclaration <- TestDecl / ComptimeDecl / doc_comment? KEYWORD_pub? Decl
1237712377
12378TestDecl <- KEYWORD_test (STRINGLITERALSINGLE / IDENTIFIER)? Block12378TestDecl <- KEYWORD_test (STRINGLITERALSINGLE / IDENTIFIER)? Block
1237912379
lib/std/zig/Parse.zig+2-2
...@@ -205,9 +205,9 @@ pub fn parseZon(p: *Parse) !void {...@@ -205,9 +205,9 @@ pub fn parseZon(p: *Parse) !void {
205 };205 };
206}206}
207207
208/// ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations)208/// ContainerMembers <- ContainerDeclaration* (ContainerField COMMA)* (ContainerField / ContainerDeclaration*)
209///209///
210/// ContainerDeclarations <- (TestDecl / ComptimeDecl / doc_comment? KEYWORD_pub? Decl)*210/// ContainerDeclaration <- TestDecl / ComptimeDecl / doc_comment? KEYWORD_pub? Decl
211///211///
212/// ComptimeDecl <- KEYWORD_comptime Block212/// ComptimeDecl <- KEYWORD_comptime Block
213fn parseContainerMembers(p: *Parse) !Members {213fn parseContainerMembers(p: *Parse) !Members {