From 6e8a23097ac58a13ae0e812cd51253936595490f Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Wed, 15 Feb 2023 02:35:32 +0000 Subject: [PATCH] Cleanup some includes. Remove some ast/ includes of sem/ files and remove some program_builder includes from sem/ files. The AST->SEM includes were not needed, the program_builder include was replaced with more specific AST headers. Change-Id: I8cf7fdee311a87687a5737853caff0ac082c9ba6 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/119901 Commit-Queue: Ben Clayton Auto-Submit: Dan Sinclair Kokoro: Kokoro Reviewed-by: Ben Clayton --- src/tint/ast/enable.cc | 1 - src/tint/ast/expression.cc | 3 --- src/tint/sem/break_if_statement.cc | 2 +- src/tint/sem/for_loop_statement.cc | 2 +- src/tint/sem/if_statement.cc | 2 +- src/tint/sem/loop_statement.cc | 3 ++- src/tint/sem/switch_statement.cc | 3 ++- src/tint/sem/while_statement.cc | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/tint/ast/enable.cc b/src/tint/ast/enable.cc index 9da44c7520..896b0197ef 100644 --- a/src/tint/ast/enable.cc +++ b/src/tint/ast/enable.cc @@ -15,7 +15,6 @@ #include "src/tint/ast/enable.h" #include "src/tint/program_builder.h" -#include "src/tint/sem/variable.h" TINT_INSTANTIATE_TYPEINFO(tint::ast::Enable); diff --git a/src/tint/ast/expression.cc b/src/tint/ast/expression.cc index 8eacff17c5..b9482fa18a 100644 --- a/src/tint/ast/expression.cc +++ b/src/tint/ast/expression.cc @@ -14,9 +14,6 @@ #include "src/tint/ast/expression.h" -#include "src/tint/sem/info.h" -#include "src/tint/sem/value_expression.h" - TINT_INSTANTIATE_TYPEINFO(tint::ast::Expression); namespace tint::ast { diff --git a/src/tint/sem/break_if_statement.cc b/src/tint/sem/break_if_statement.cc index c9fc014e40..0d4a59dbc5 100644 --- a/src/tint/sem/break_if_statement.cc +++ b/src/tint/sem/break_if_statement.cc @@ -14,7 +14,7 @@ #include "src/tint/sem/break_if_statement.h" -#include "src/tint/program_builder.h" +#include "src/tint/ast/break_if_statement.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::BreakIfStatement); diff --git a/src/tint/sem/for_loop_statement.cc b/src/tint/sem/for_loop_statement.cc index 1e6aa6dccb..d27c8582be 100644 --- a/src/tint/sem/for_loop_statement.cc +++ b/src/tint/sem/for_loop_statement.cc @@ -14,7 +14,7 @@ #include "src/tint/sem/for_loop_statement.h" -#include "src/tint/program_builder.h" +#include "src/tint/ast/for_loop_statement.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::ForLoopStatement); diff --git a/src/tint/sem/if_statement.cc b/src/tint/sem/if_statement.cc index a79555a325..f9c8673efc 100644 --- a/src/tint/sem/if_statement.cc +++ b/src/tint/sem/if_statement.cc @@ -14,7 +14,7 @@ #include "src/tint/sem/if_statement.h" -#include "src/tint/program_builder.h" +#include "src/tint/ast/if_statement.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::IfStatement); diff --git a/src/tint/sem/loop_statement.cc b/src/tint/sem/loop_statement.cc index 1d4db8a236..7dfc0db94f 100644 --- a/src/tint/sem/loop_statement.cc +++ b/src/tint/sem/loop_statement.cc @@ -14,7 +14,8 @@ #include "src/tint/sem/loop_statement.h" -#include "src/tint/program_builder.h" +#include "src/tint/ast/block_statement.h" +#include "src/tint/ast/loop_statement.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::LoopStatement); TINT_INSTANTIATE_TYPEINFO(tint::sem::LoopContinuingBlockStatement); diff --git a/src/tint/sem/switch_statement.cc b/src/tint/sem/switch_statement.cc index 874c3904ad..4ee46716a8 100644 --- a/src/tint/sem/switch_statement.cc +++ b/src/tint/sem/switch_statement.cc @@ -14,7 +14,8 @@ #include "src/tint/sem/switch_statement.h" -#include "src/tint/program_builder.h" +#include "src/tint/ast/case_statement.h" +#include "src/tint/ast/switch_statement.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::CaseStatement); TINT_INSTANTIATE_TYPEINFO(tint::sem::CaseSelector); diff --git a/src/tint/sem/while_statement.cc b/src/tint/sem/while_statement.cc index 495f83fefa..eed8109b5f 100644 --- a/src/tint/sem/while_statement.cc +++ b/src/tint/sem/while_statement.cc @@ -14,7 +14,7 @@ #include "src/tint/sem/while_statement.h" -#include "src/tint/program_builder.h" +#include "src/tint/ast/while_statement.h" TINT_INSTANTIATE_TYPEINFO(tint::sem::WhileStatement);