authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-12-26 16:35:24+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-12-26 16:36:29+02:00
log0b859831ad8a0c9df11e8da11f13739ed2dcf0d5
treece138b381700c44e26d65aa3e0f4ab1c7ebb36ff
parent3535c4b3b67a3c325ff8040477e35b9b1415d7ae

update grammar in langref

Closes #14072

2 files changed, 45 insertions(+), 26 deletions(-)

doc/langref.html.in+41-22
...@@ -12062,24 +12062,24 @@ ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerFiel...@@ -12062,24 +12062,24 @@ ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerFiel
1206212062
12063ContainerDeclarations12063ContainerDeclarations
12064 <- TestDecl ContainerDeclarations12064 <- TestDecl ContainerDeclarations
12065 / TopLevelComptime ContainerDeclarations12065 / ComptimeDecl ContainerDeclarations
12066 / doc_comment? KEYWORD_pub? TopLevelDecl ContainerDeclarations12066 / doc_comment? KEYWORD_pub? Decl ContainerDeclarations
12067 /12067 /
1206812068
12069TestDecl <- doc_comment? KEYWORD_test STRINGLITERALSINGLE? Block12069TestDecl <- KEYWORD_test STRINGLITERALSINGLE? Block
1207012070
12071TopLevelComptime <- doc_comment? KEYWORD_comptime BlockExpr12071ComptimeDecl <- KEYWORD_comptime Block
1207212072
12073TopLevelDecl12073Decl
12074 <- (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE? / (KEYWORD_inline / KEYWORD_noinline))? FnProto (SEMICOLON / Block)12074 <- (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE? / (KEYWORD_inline / KEYWORD_noinline))? FnProto (SEMICOLON / Block)
12075 / (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE?)? KEYWORD_threadlocal? VarDecl12075 / (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE?)? KEYWORD_threadlocal? VarDecl
12076 / KEYWORD_usingnamespace Expr SEMICOLON12076 / KEYWORD_usingnamespace Expr SEMICOLON
1207712077
12078FnProto <- KEYWORD_fn IDENTIFIER? LPAREN ParamDeclList RPAREN ByteAlign? LinkSection? CallConv? EXCLAMATIONMARK? TypeExpr12078FnProto <- KEYWORD_fn IDENTIFIER? LPAREN ParamDeclList RPAREN ByteAlign? AddrSpace? LinkSection? CallConv? EXCLAMATIONMARK? TypeExpr
1207912079
12080VarDecl <- (KEYWORD_const / KEYWORD_var) IDENTIFIER (COLON TypeExpr)? ByteAlign? LinkSection? (EQUAL Expr)? SEMICOLON12080VarDecl <- (KEYWORD_const / KEYWORD_var) IDENTIFIER (COLON TypeExpr)? ByteAlign? AddrSpace? LinkSection? (EQUAL Expr)? SEMICOLON
1208112081
12082ContainerField <- doc_comment? KEYWORD_comptime? IDENTIFIER (COLON (KEYWORD_anytype / TypeExpr) ByteAlign?)? (EQUAL Expr)?12082ContainerField <- doc_comment? KEYWORD_comptime? IDENTIFIER (COLON TypeExpr ByteAlign?)? (EQUAL Expr)?
1208312083
12084# *** Block Level ***12084# *** Block Level ***
12085Statement12085Statement
...@@ -12240,6 +12240,8 @@ WhileContinueExpr <- COLON LPAREN AssignExpr RPAREN...@@ -12240,6 +12240,8 @@ WhileContinueExpr <- COLON LPAREN AssignExpr RPAREN
1224012240
12241LinkSection <- KEYWORD_linksection LPAREN Expr RPAREN12241LinkSection <- KEYWORD_linksection LPAREN Expr RPAREN
1224212242
12243AddrSpace <- KEYWORD_addrspace LPAREN Expr RPAREN
12244
12243# Fn specific12245# Fn specific
12244CallConv <- KEYWORD_callconv LPAREN Expr RPAREN12246CallConv <- KEYWORD_callconv LPAREN Expr RPAREN
1224512247
...@@ -12267,7 +12269,7 @@ PtrIndexPayload <- PIPE ASTERISK? IDENTIFIER (COMMA IDENTIFIER)? PIPE...@@ -12267,7 +12269,7 @@ PtrIndexPayload <- PIPE ASTERISK? IDENTIFIER (COMMA IDENTIFIER)? PIPE
1226712269
1226812270
12269# Switch specific12271# Switch specific
12270SwitchProng <- SwitchCase EQUALRARROW PtrPayload? AssignExpr12272SwitchProng <- KEYWORD_inline? SwitchCase EQUALRARROW PtrIndexPayload? AssignExpr
1227112273
12272SwitchCase12274SwitchCase
12273 <- SwitchItem (COMMA SwitchItem)* COMMA?12275 <- SwitchItem (COMMA SwitchItem)* COMMA?
...@@ -12278,11 +12280,15 @@ SwitchItem <- Expr (DOT3 Expr)?...@@ -12278,11 +12280,15 @@ SwitchItem <- Expr (DOT3 Expr)?
12278# Operators12280# Operators
12279AssignOp12281AssignOp
12280 <- ASTERISKEQUAL12282 <- ASTERISKEQUAL
12283 / ASTERISKPIPEEQUAL
12281 / SLASHEQUAL12284 / SLASHEQUAL
12282 / PERCENTEQUAL12285 / PERCENTEQUAL
12283 / PLUSEQUAL12286 / PLUSEQUAL
12287 / PLUSPIPEEQUAL
12284 / MINUSEQUAL12288 / MINUSEQUAL
12289 / MINUSPIPEEQUAL
12285 / LARROW2EQUAL12290 / LARROW2EQUAL
12291 / LARROW2PIPEEQUAL
12286 / RARROW2EQUAL12292 / RARROW2EQUAL
12287 / AMPERSANDEQUAL12293 / AMPERSANDEQUAL
12288 / CARETEQUAL12294 / CARETEQUAL
...@@ -12310,6 +12316,7 @@ BitwiseOp...@@ -12310,6 +12316,7 @@ BitwiseOp
12310BitShiftOp12316BitShiftOp
12311 <- LARROW212317 <- LARROW2
12312 / RARROW212318 / RARROW2
12319 / LARROW2PIPE
1231312320
12314AdditionOp12321AdditionOp
12315 <- PLUS12322 <- PLUS
...@@ -12317,6 +12324,8 @@ AdditionOp...@@ -12317,6 +12324,8 @@ AdditionOp
12317 / PLUS212324 / PLUS2
12318 / PLUSPERCENT12325 / PLUSPERCENT
12319 / MINUSPERCENT12326 / MINUSPERCENT
12327 / PLUSPIPE
12328 / MINUSPIPE
1232012329
12321MultiplyOp12330MultiplyOp
12322 <- PIPE212331 <- PIPE2
...@@ -12325,6 +12334,7 @@ MultiplyOp...@@ -12325,6 +12334,7 @@ MultiplyOp
12325 / PERCENT12334 / PERCENT
12326 / ASTERISK212335 / ASTERISK2
12327 / ASTERISKPERCENT12336 / ASTERISKPERCENT
12337 / ASTERISKPIPE
1232812338
12329PrefixOp12339PrefixOp
12330 <- EXCLAMATIONMARK12340 <- EXCLAMATIONMARK
...@@ -12338,8 +12348,8 @@ PrefixOp...@@ -12338,8 +12348,8 @@ PrefixOp
12338PrefixTypeOp12348PrefixTypeOp
12339 <- QUESTIONMARK12349 <- QUESTIONMARK
12340 / KEYWORD_anyframe MINUSRARROW12350 / KEYWORD_anyframe MINUSRARROW
12341 / SliceTypeStart (ByteAlign / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)*12351 / SliceTypeStart (ByteAlign / AddrSpace / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)*
12342 / PtrTypeStart (KEYWORD_align LPAREN Expr (COLON INTEGER COLON INTEGER)? RPAREN / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)*12352 / PtrTypeStart (AddrSpace / KEYWORD_align LPAREN Expr (COLON INTEGER COLON INTEGER)? RPAREN / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)*
12343 / ArrayTypeStart12353 / ArrayTypeStart
1234412354
12345SuffixOp12355SuffixOp
...@@ -12364,7 +12374,7 @@ ArrayTypeStart <- LBRACKET Expr (COLON Expr)? RBRACKET...@@ -12364,7 +12374,7 @@ ArrayTypeStart <- LBRACKET Expr (COLON Expr)? RBRACKET
12364ContainerDeclAuto <- ContainerDeclType LBRACE container_doc_comment? ContainerMembers RBRACE12374ContainerDeclAuto <- ContainerDeclType LBRACE container_doc_comment? ContainerMembers RBRACE
1236512375
12366ContainerDeclType12376ContainerDeclType
12367 <- KEYWORD_struct12377 <- KEYWORD_struct (LPAREN Expr RPAREN)?
12368 / KEYWORD_opaque12378 / KEYWORD_opaque
12369 / KEYWORD_enum (LPAREN Expr RPAREN)?12379 / KEYWORD_enum (LPAREN Expr RPAREN)?
12370 / KEYWORD_union (LPAREN (KEYWORD_enum (LPAREN Expr RPAREN)? / Expr) RPAREN)?12380 / KEYWORD_union (LPAREN (KEYWORD_enum (LPAREN Expr RPAREN)? / Expr) RPAREN)?
...@@ -12455,7 +12465,7 @@ string_char...@@ -12455,7 +12465,7 @@ string_char
12455 / [^\\"\n]12465 / [^\\"\n]
1245612466
12457container_doc_comment <- ('//!' [^\n]* [ \n]*)+12467container_doc_comment <- ('//!' [^\n]* [ \n]*)+
12458doc_comment <- ('///' [^\n]* [ \n]*)+12468doc_comment <- ('///' [^\n]* [ \n]*)+ skip
12459line_comment <- '//' ![!/][^\n]* / '////' [^\n]*12469line_comment <- '//' ![!/][^\n]* / '////' [^\n]*
12460line_string <- ("\\\\" [^\n]* [ \n]*)+12470line_string <- ("\\\\" [^\n]* [ \n]*)+
12461skip <- ([ \n] / line_comment)*12471skip <- ([ \n] / line_comment)*
...@@ -12483,11 +12493,13 @@ BUILTINIDENTIFIER <- "@"[A-Za-z_][A-Za-z0-9_]* skip...@@ -12483,11 +12493,13 @@ BUILTINIDENTIFIER <- "@"[A-Za-z_][A-Za-z0-9_]* skip
1248312493
12484AMPERSAND <- '&' ![=] skip12494AMPERSAND <- '&' ![=] skip
12485AMPERSANDEQUAL <- '&=' skip12495AMPERSANDEQUAL <- '&=' skip
12486ASTERISK <- '*' ![*%=] skip12496ASTERISK <- '*' ![*%=|] skip
12487ASTERISK2 <- '**' skip12497ASTERISK2 <- '**' skip
12488ASTERISKEQUAL <- '*=' skip12498ASTERISKEQUAL <- '*=' skip
12489ASTERISKPERCENT <- '*%' ![=] skip12499ASTERISKPERCENT <- '*%' ![=] skip
12490ASTERISKPERCENTEQUAL <- '*%=' skip12500ASTERISKPERCENTEQUAL <- '*%=' skip
12501ASTERISKPIPE <- '*|' ![=] skip
12502ASTERISKPIPEEQUAL <- '*|=' skip
12491CARET <- '^' ![=] skip12503CARET <- '^' ![=] skip
12492CARETEQUAL <- '^=' skip12504CARETEQUAL <- '^=' skip
12493COLON <- ':' skip12505COLON <- ':' skip
...@@ -12503,27 +12515,33 @@ EQUALRARROW <- '=>' skip...@@ -12503,27 +12515,33 @@ EQUALRARROW <- '=>' skip
12503EXCLAMATIONMARK <- '!' ![=] skip12515EXCLAMATIONMARK <- '!' ![=] skip
12504EXCLAMATIONMARKEQUAL <- '!=' skip12516EXCLAMATIONMARKEQUAL <- '!=' skip
12505LARROW <- '<' ![<=] skip12517LARROW <- '<' ![<=] skip
12506LARROW2 <- '<<' ![=] skip12518LARROW2 <- '<<' ![=|] skip
12507LARROW2EQUAL <- '<<=' skip12519LARROW2EQUAL <- '<<=' skip
12520LARROW2PIPE <- '<<|' ![=] skip
12521LARROW2PIPEEQUAL <- '<<|=' skip
12508LARROWEQUAL <- '<=' skip12522LARROWEQUAL <- '<=' skip
12509LBRACE <- '{' skip12523LBRACE <- '{' skip
12510LBRACKET <- '[' skip12524LBRACKET <- '[' skip
12511LPAREN <- '(' skip12525LPAREN <- '(' skip
12512MINUS <- '-' ![%=>] skip12526MINUS <- '-' ![%=>|] skip
12513MINUSEQUAL <- '-=' skip12527MINUSEQUAL <- '-=' skip
12514MINUSPERCENT <- '-%' ![=] skip12528MINUSPERCENT <- '-%' ![=] skip
12515MINUSPERCENTEQUAL <- '-%=' skip12529MINUSPERCENTEQUAL <- '-%=' skip
12530MINUSPIPE <- '-|' ![=] skip
12531MINUSPIPEEQUAL <- '-|=' skip
12516MINUSRARROW <- '->' skip12532MINUSRARROW <- '->' skip
12517PERCENT <- '%' ![=] skip12533PERCENT <- '%' ![=] skip
12518PERCENTEQUAL <- '%=' skip12534PERCENTEQUAL <- '%=' skip
12519PIPE <- '|' ![|=] skip12535PIPE <- '|' ![|=] skip
12520PIPE2 <- '||' skip12536PIPE2 <- '||' skip
12521PIPEEQUAL <- '|=' skip12537PIPEEQUAL <- '|=' skip
12522PLUS <- '+' ![%+=] skip12538PLUS <- '+' ![%+=|] skip
12523PLUS2 <- '++' skip12539PLUS2 <- '++' skip
12524PLUSEQUAL <- '+=' skip12540PLUSEQUAL <- '+=' skip
12525PLUSPERCENT <- '+%' ![=] skip12541PLUSPERCENT <- '+%' ![=] skip
12526PLUSPERCENTEQUAL <- '+%=' skip12542PLUSPERCENTEQUAL <- '+%=' skip
12543PLUSPIPE <- '+|' ![=] skip
12544PLUSPIPEEQUAL <- '+|=' skip
12527LETTERC <- 'c' skip12545LETTERC <- 'c' skip
12528QUESTIONMARK <- '?' skip12546QUESTIONMARK <- '?' skip
12529RARROW <- '>' ![>=] skip12547RARROW <- '>' ![>=] skip
...@@ -12539,6 +12557,7 @@ SLASHEQUAL <- '/=' skip...@@ -12539,6 +12557,7 @@ SLASHEQUAL <- '/=' skip
12539TILDE <- '~' skip12557TILDE <- '~' skip
1254012558
12541end_of_word <- ![a-zA-Z0-9_] skip12559end_of_word <- ![a-zA-Z0-9_] skip
12560KEYWORD_addrspace <- 'addrspace' end_of_word
12542KEYWORD_align <- 'align' end_of_word12561KEYWORD_align <- 'align' end_of_word
12543KEYWORD_allowzero <- 'allowzero' end_of_word12562KEYWORD_allowzero <- 'allowzero' end_of_word
12544KEYWORD_and <- 'and' end_of_word12563KEYWORD_and <- 'and' end_of_word
...@@ -12588,11 +12607,11 @@ KEYWORD_var <- 'var' end_of_word...@@ -12588,11 +12607,11 @@ KEYWORD_var <- 'var' end_of_word
12588KEYWORD_volatile <- 'volatile' end_of_word12607KEYWORD_volatile <- 'volatile' end_of_word
12589KEYWORD_while <- 'while' end_of_word12608KEYWORD_while <- 'while' end_of_word
1259012609
12591keyword <- KEYWORD_align / KEYWORD_allowzero / KEYWORD_and / KEYWORD_anyframe12610keyword <- KEYWORD_addrspace / KEYWORD_align / KEYWORD_allowzero / KEYWORD_and
12592 / KEYWORD_anytype / KEYWORD_asm / KEYWORD_async / KEYWORD_await12611 / KEYWORD_anyframe / KEYWORD_anytype / KEYWORD_asm / KEYWORD_async
12593 / KEYWORD_break / KEYWORD_callconv / KEYWORD_catch / KEYWORD_comptime12612 / KEYWORD_await / KEYWORD_break / KEYWORD_callconv / KEYWORD_catch
12594 / KEYWORD_const / KEYWORD_continue / KEYWORD_defer / KEYWORD_else12613 / KEYWORD_comptime / KEYWORD_const / KEYWORD_continue / KEYWORD_defer
12595 / KEYWORD_enum / KEYWORD_errdefer / KEYWORD_error / KEYWORD_export12614 / KEYWORD_else / KEYWORD_enum / KEYWORD_errdefer / KEYWORD_error / KEYWORD_export
12596 / KEYWORD_extern / KEYWORD_fn / KEYWORD_for / KEYWORD_if12615 / KEYWORD_extern / KEYWORD_fn / KEYWORD_for / KEYWORD_if
12597 / KEYWORD_inline / KEYWORD_noalias / KEYWORD_nosuspend / KEYWORD_noinline12616 / KEYWORD_inline / KEYWORD_noalias / KEYWORD_nosuspend / KEYWORD_noinline
12598 / KEYWORD_opaque / KEYWORD_or / KEYWORD_orelse / KEYWORD_packed12617 / KEYWORD_opaque / KEYWORD_or / KEYWORD_orelse / KEYWORD_packed
lib/std/zig/parse.zig+4-4
...@@ -240,10 +240,10 @@ const Parser = struct {...@@ -240,10 +240,10 @@ const Parser = struct {
240 /// ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations)240 /// ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations)
241 /// ContainerDeclarations241 /// ContainerDeclarations
242 /// <- TestDecl ContainerDeclarations242 /// <- TestDecl ContainerDeclarations
243 /// / TopLevelComptime ContainerDeclarations243 /// / ComptimeDecl ContainerDeclarations
244 /// / KEYWORD_pub? TopLevelDecl ContainerDeclarations244 /// / doc_comment? KEYWORD_pub? Decl ContainerDeclarations
245 /// /245 /// /
246 /// TopLevelComptime <- KEYWORD_comptime Block246 /// ComptimeDecl <- KEYWORD_comptime Block
247 fn parseContainerMembers(p: *Parser) !Members {247 fn parseContainerMembers(p: *Parser) !Members {
248 const scratch_top = p.scratch.items.len;248 const scratch_top = p.scratch.items.len;
249 defer p.scratch.shrinkRetainingCapacity(scratch_top);249 defer p.scratch.shrinkRetainingCapacity(scratch_top);
...@@ -622,7 +622,7 @@ const Parser = struct {...@@ -622,7 +622,7 @@ const Parser = struct {
622 };622 };
623 }623 }
624624
625 /// TopLevelDecl625 /// Decl
626 /// <- (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE? / (KEYWORD_inline / KEYWORD_noinline))? FnProto (SEMICOLON / Block)626 /// <- (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE? / (KEYWORD_inline / KEYWORD_noinline))? FnProto (SEMICOLON / Block)
627 /// / (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE?)? KEYWORD_threadlocal? VarDecl627 /// / (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE?)? KEYWORD_threadlocal? VarDecl
628 /// / KEYWORD_usingnamespace Expr SEMICOLON628 /// / KEYWORD_usingnamespace Expr SEMICOLON