commit 9d27ab70439e3c0fb971fc89865e984a2369a28c
author dan sinclair <dsinclair@chromium.org> Fri Aug 19 22:07:23 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 19 22:07:23 2022 +0000
tree 99b0c81d2536d5a76187a637f2bc638f4e5b37c2
parent d0ccb1aae63ae89338a94e317436863c825cd130

Update parser comments.

This CL updates a few parser comments to match spec.

Bug: tint:1633
Change-Id: I8cde5ea9a85f0ca58b914d2741ad131d1fa374c6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/99700
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/tint/reader/wgsl/parser_impl.cc

diff --git a/src/tint/reader/wgsl/parser_impl.cc b/src/tint/reader/wgsl/parser_impl.cc
index 6459ce7..733a2ea 100644
--- a/src/tint/reader/wgsl/parser_impl.cc
+++ b/src/tint/reader/wgsl/parser_impl.cc
@@ -1533,7 +1533,7 @@
 }
 
 // param
-//   : attribute_list* ident_with_type_decl
+//   : attribute_list* ident COLON type_decl
 Expect<ast::Parameter*> ParserImpl::expect_param() {
     auto attrs = attribute_list();
 
@@ -2563,20 +2563,6 @@
     return Failure::kErrored;
 }
 
-// singular_expression
-//   : primary_expression postfix_expr
-Maybe<const ast::Expression*> ParserImpl::singular_expression() {
-    auto prefix = primary_expression();
-    if (prefix.errored) {
-        return Failure::kErrored;
-    }
-    if (!prefix.matched) {
-        return Failure::kNoMatch;
-    }
-
-    return postfix_expression(prefix.value);
-}
-
 // argument_expression_list
 //   : PAREN_LEFT ((expression COMMA)* expression COMMA?)? PAREN_RIGHT
 Expect<ParserImpl::ExpressionList> ParserImpl::expect_argument_expression_list(
@@ -2814,6 +2800,20 @@
     return math.value;
 }
 
+// singular_expression
+//   : primary_expression postfix_expr
+Maybe<const ast::Expression*> ParserImpl::singular_expression() {
+    auto prefix = primary_expression();
+    if (prefix.errored) {
+        return Failure::kErrored;
+    }
+    if (!prefix.matched) {
+        return Failure::kNoMatch;
+    }
+
+    return postfix_expression(prefix.value);
+}
+
 // unary_expression
 //   : singular_expression
 //   | MINUS unary_expression
@@ -2821,6 +2821,8 @@
 //   | TILDE unary_expression
 //   | STAR unary_expression
 //   | AND unary_expression
+//
+// The `primary_expression postfix_expression ?` is moved out into a `singular_expression`
 Maybe<const ast::Expression*> ParserImpl::unary_expression() {
     auto& t = peek();