commit b44fe3c034b281ce292aca83414fae7d9607c5d1
author dan sinclair <dj2@everburning.com> Tue Jul 21 13:44:27 2020 +0000
committer dan sinclair <dsinclair@chromium.org> Tue Jul 21 13:44:27 2020 +0000
tree b900ad7cd4b1d9047a071577d41d82271db19baa
parent 50080b74e14ea3cf76ce3553a7115887df22af86

Emit call statements from the various backends.

This CL adds emission of CallStatement to the various backends.

Bug: tint:45
Change-Id: Ia2bdf0433f136c516ecccdcbc64a5365094220af
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25281
Reviewed-by: David Neto <dneto@google.com>

src/writer/wgsl/generator_impl.cc

diff --git a/src/writer/wgsl/generator_impl.cc b/src/writer/wgsl/generator_impl.cc
index 817da91..4eb9583 100644
--- a/src/writer/wgsl/generator_impl.cc
+++ b/src/writer/wgsl/generator_impl.cc
@@ -26,6 +26,7 @@
 #include "src/ast/break_statement.h"
 #include "src/ast/builtin_decoration.h"
 #include "src/ast/call_expression.h"
+#include "src/ast/call_statement.h"
 #include "src/ast/case_statement.h"
 #include "src/ast/cast_expression.h"
 #include "src/ast/constructor_expression.h"
@@ -631,6 +632,14 @@
   if (stmt->IsBreak()) {
     return EmitBreak(stmt->AsBreak());
   }
+  if (stmt->IsCall()) {
+    make_indent();
+    if (!EmitCall(stmt->AsCall()->expr())) {
+      return false;
+    }
+    out_ << ";" << std::endl;
+    return true;
+  }
   if (stmt->IsContinue()) {
     return EmitContinue(stmt->AsContinue());
   }
@@ -656,7 +665,7 @@
     return EmitVariable(stmt->AsVariableDecl()->variable());
   }
 
-  error_ = "unknown statement type";
+  error_ = "unknown statement type: " + stmt->str();
   return false;
 }
 

src/writer/wgsl/generator_impl_call_test.cc

diff --git a/src/writer/wgsl/generator_impl_call_test.cc b/src/writer/wgsl/generator_impl_call_test.cc
index 91a5a4c..3ed0b3d 100644
--- a/src/writer/wgsl/generator_impl_call_test.cc
+++ b/src/writer/wgsl/generator_impl_call_test.cc
@@ -16,6 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "src/ast/call_expression.h"
+#include "src/ast/call_statement.h"
 #include "src/ast/identifier_expression.h"
 #include "src/writer/wgsl/generator_impl.h"
 
@@ -47,6 +48,21 @@
   EXPECT_EQ(g.result(), "my_func(param1, param2)");
 }
 
+TEST_F(WgslGeneratorImplTest, EmitStatement_Call) {
+  auto id = std::make_unique<ast::IdentifierExpression>("my_func");
+  ast::ExpressionList params;
+  params.push_back(std::make_unique<ast::IdentifierExpression>("param1"));
+  params.push_back(std::make_unique<ast::IdentifierExpression>("param2"));
+
+  ast::CallStatement call(
+      std::make_unique<ast::CallExpression>(std::move(id), std::move(params)));
+
+  GeneratorImpl g;
+  g.increment_indent();
+  ASSERT_TRUE(g.EmitStatement(&call)) << g.error();
+  EXPECT_EQ(g.result(), "  my_func(param1, param2);\n");
+}
+
 }  // namespace
 }  // namespace wgsl
 }  // namespace writer