commit 9bbf8252a93d114aea038297d1c81f5b29949fcc
author Ben Clayton <bclayton@google.com> Wed Jan 06 19:54:01 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed Jan 06 19:54:01 2021 +0000
tree 62751a8f6ff116c85e687f7a558964af1cb8a853
parent 40b4928a73b7b3eead6f62e02e69477324454888

wgsl: Treat // as comment

Also support # as comments for now while we migrate.

See:
https: //github.com/gpuweb/gpuweb/issues/1262
https: //github.com/gpuweb/gpuweb/pull/1326
Change-Id: I3547f575c35f4fd46b95f0f2d8b79f4015364c83
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/36680
Commit-Queue: Ben Clayton <bclayton@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Auto-Submit: Ben Clayton <bclayton@google.com>

src/reader/wgsl/lexer.cc

diff --git a/src/reader/wgsl/lexer.cc b/src/reader/wgsl/lexer.cc
index af8ab7e..9b8f584 100644
--- a/src/reader/wgsl/lexer.cc
+++ b/src/reader/wgsl/lexer.cc
@@ -143,7 +143,8 @@
 }
 
 void Lexer::skip_comments() {
-  if (!matches(pos_, "#")) {
+  // TODO(bclayton): Remove support for # comments
+  if (!matches(pos_, "#") && !matches(pos_, "//")) {
     return;
   }
 

src/reader/wgsl/lexer_test.cc

diff --git a/src/reader/wgsl/lexer_test.cc b/src/reader/wgsl/lexer_test.cc
index 3a9d7bb..8668960 100644
--- a/src/reader/wgsl/lexer_test.cc
+++ b/src/reader/wgsl/lexer_test.cc
@@ -49,9 +49,9 @@
 }
 
 TEST_F(LexerTest, Skips_Comments) {
-  Source::File file("test.wgsl", R"(#starts with comment
-ident1 #ends with comment
-# blank line
+  Source::File file("test.wgsl", R"(//starts with comment
+ident1 //ends with comment
+// blank line
  ident2)");
   Lexer l(&file);
 

src/reader/wgsl/parser_impl_for_stmt_test.cc

diff --git a/src/reader/wgsl/parser_impl_for_stmt_test.cc b/src/reader/wgsl/parser_impl_for_stmt_test.cc
index b112779..42af07d 100644
--- a/src/reader/wgsl/parser_impl_for_stmt_test.cc
+++ b/src/reader/wgsl/parser_impl_for_stmt_test.cc
@@ -135,7 +135,7 @@
      })";
 
   std::string loop_str =
-      R"({ # Introduce new scope for loop variable i
+      R"({ // Introduce new scope for loop variable i
       var i : i32 = 0;
       loop {
         if (!(i < 4)) {

src/reader/wgsl/parser_impl_test.cc

diff --git a/src/reader/wgsl/parser_impl_test.cc b/src/reader/wgsl/parser_impl_test.cc
index 54dde10..95d28cf 100644
--- a/src/reader/wgsl/parser_impl_test.cc
+++ b/src/reader/wgsl/parser_impl_test.cc
@@ -46,7 +46,7 @@
 
 TEST_F(ParserImplTest, HandlesError) {
   auto p = parser(R"(
-fn main() ->  {  # missing return type
+fn main() ->  {  // missing return type
   return;
 })");
 

src/reader/wgsl/parser_test.cc

diff --git a/src/reader/wgsl/parser_test.cc b/src/reader/wgsl/parser_test.cc
index 0ee28ab..1bb967e 100644
--- a/src/reader/wgsl/parser_test.cc
+++ b/src/reader/wgsl/parser_test.cc
@@ -48,7 +48,7 @@
 
 TEST_F(ParserTest, HandlesError) {
   Source::File file("test.wgsl", R"(
-fn main() ->  {  # missing return type
+fn main() ->  {  // missing return type
   return;
 })");
   Parser p(&file);