Add helper function is_start_of_compound_statement

Author: reima

naga/src/front/wgsl/parse/mod.rs

@@ -2121,7 +2121,7 @@ impl Parser {
                     let _ = lexer.next();
                     this.pop_rule_span(lexer);
                 }
-                (Token::Paren('{') | Token::Attribute, _) => {
+                (token, _) if is_start_of_compound_statement(token) => {
                     let (inner, span) = this.block(lexer, ctx, brace_nesting_level)?;
                     block.stmts.push(ast::Statement {
                         kind: ast::StatementKind::Block(inner),
@@ -2288,13 +2288,10 @@ impl Parser {
                                             let value = this.switch_value(lexer, ctx)?;
                                             if lexer.skip(Token::Separator(',')) {
                                                 // list of values ends with ':' or a compound statement
-                                                // indicated by an attribute or '{'
-                                                if matches!(
-                                                    lexer.peek().0,
-                                                    Token::Separator(':')
-                                                        | Token::Attribute
-                                                        | Token::Paren('{')
-                                                ) {
+                                                let next_token = lexer.peek().0;
+                                                if next_token == Token::Separator(':')
+                                                    || is_start_of_compound_statement(next_token)
+                                                {
                                                     break value;
                                                 }
                                             } else {
@@ -3252,3 +3249,7 @@ impl Parser {
             })
     }
 }
+
+const fn is_start_of_compound_statement<'a>(token: Token<'a>) -> bool {
+    matches!(token, Token::Attribute | Token::Paren('{'))
+}