[tint] Move utils/text/symbol* to utils/symbol
Breaks a cyclic dependency in utils
Change-Id: I31dae3086a6b277e3807b3e051e978e3106eaf71
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/143760
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index f56bf0d..cbf508f 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -206,10 +206,10 @@
"utils/generation_id.cc",
"utils/generation_id.h",
"utils/reflection/reflection.h",
- "utils/text/symbol.cc",
- "utils/text/symbol.h",
- "utils/text/symbol_table.cc",
- "utils/text/symbol_table.h",
+ "utils/symbol/symbol.cc",
+ "utils/symbol/symbol.h",
+ "utils/symbol/symbol_table.cc",
+ "utils/symbol/symbol_table.h",
]
deps = [ ":libtint_utils_src" ]
}
@@ -2434,8 +2434,8 @@
sources = [
"utils/containers/scope_stack_test.cc",
"utils/reflection/reflection_test.cc",
- "utils/text/symbol_table_test.cc",
- "utils/text/symbol_test.cc",
+ "utils/symbol/symbol_table_test.cc",
+ "utils/symbol/symbol_test.cc",
]
deps = [ ":libtint_symbols_src" ]
}
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index a44a9d8..4ccb30e 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -568,10 +568,10 @@
utils/text/string.h
utils/text/string_stream.cc
utils/text/string_stream.h
- utils/text/symbol.cc
- utils/text/symbol.h
- utils/text/symbol_table.cc
- utils/text/symbol_table.h
+ utils/symbol/symbol.cc
+ utils/symbol/symbol.h
+ utils/symbol/symbol_table.cc
+ utils/symbol/symbol_table.h
utils/text/text_generator.cc
utils/text/text_generator.h
utils/traits/traits.h
@@ -1169,8 +1169,8 @@
utils/text/float_to_string_test.cc
utils/text/string_stream_test.cc
utils/text/string_test.cc
- utils/text/symbol_table_test.cc
- utils/text/symbol_test.cc
+ utils/symbol/symbol_table_test.cc
+ utils/symbol/symbol_test.cc
utils/text/unicode_test.cc
utils/traits/traits_test.cc
)
diff --git a/src/tint/lang/core/ir/module.h b/src/tint/lang/core/ir/module.h
index 1ae271e..724c660 100644
--- a/src/tint/lang/core/ir/module.h
+++ b/src/tint/lang/core/ir/module.h
@@ -30,7 +30,7 @@
#include "src/tint/utils/generation_id.h"
#include "src/tint/utils/memory/block_allocator.h"
#include "src/tint/utils/result/result.h"
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
namespace tint::ir {
diff --git a/src/tint/lang/core/type/array.cc b/src/tint/lang/core/type/array.cc
index a3831a4..59747ae 100644
--- a/src/tint/lang/core/type/array.cc
+++ b/src/tint/lang/core/type/array.cc
@@ -20,8 +20,8 @@
#include "src/tint/lang/core/type/texture_dimension.h"
#include "src/tint/utils/ice/ice.h"
#include "src/tint/utils/math/hash.h"
+#include "src/tint/utils/symbol/symbol_table.h"
#include "src/tint/utils/text/string_stream.h"
-#include "src/tint/utils/text/symbol_table.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Array);
diff --git a/src/tint/lang/core/type/array_count.h b/src/tint/lang/core/type/array_count.h
index 17cd5c4..7ab196f 100644
--- a/src/tint/lang/core/type/array_count.h
+++ b/src/tint/lang/core/type/array_count.h
@@ -20,7 +20,7 @@
#include "src/tint/lang/core/type/clone_context.h"
#include "src/tint/lang/core/type/unique_node.h"
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/builtin_structs.cc b/src/tint/lang/core/type/builtin_structs.cc
index c3fbbc0..f919af5 100644
--- a/src/tint/lang/core/type/builtin_structs.cc
+++ b/src/tint/lang/core/type/builtin_structs.cc
@@ -29,8 +29,8 @@
#include "src/tint/lang/core/type/u32.h"
#include "src/tint/lang/core/type/vector.h"
#include "src/tint/utils/rtti/switch.h"
+#include "src/tint/utils/symbol/symbol_table.h"
#include "src/tint/utils/text/string.h"
-#include "src/tint/utils/text/symbol_table.h"
namespace tint::type {
diff --git a/src/tint/lang/core/type/builtin_structs_test.cc b/src/tint/lang/core/type/builtin_structs_test.cc
index 589e5df..3052663 100644
--- a/src/tint/lang/core/type/builtin_structs_test.cc
+++ b/src/tint/lang/core/type/builtin_structs_test.cc
@@ -25,7 +25,7 @@
#include "src/tint/lang/core/type/u32.h"
#include "src/tint/lang/core/type/vector.h"
#include "src/tint/utils/generation_id.h"
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/core/type/manager.h b/src/tint/lang/core/type/manager.h
index 602b3b2..5b13a74 100644
--- a/src/tint/lang/core/type/manager.h
+++ b/src/tint/lang/core/type/manager.h
@@ -28,7 +28,7 @@
#include "src/tint/lang/core/type/unique_node.h"
#include "src/tint/utils/containers/unique_allocator.h"
#include "src/tint/utils/math/hash.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::type {
diff --git a/src/tint/lang/core/type/struct.cc b/src/tint/lang/core/type/struct.cc
index e816e8b..7792923 100644
--- a/src/tint/lang/core/type/struct.cc
+++ b/src/tint/lang/core/type/struct.cc
@@ -21,8 +21,8 @@
#include "src/tint/lang/core/type/manager.h"
#include "src/tint/utils/math/hash.h"
+#include "src/tint/utils/symbol/symbol_table.h"
#include "src/tint/utils/text/string_stream.h"
-#include "src/tint/utils/text/symbol_table.h"
TINT_INSTANTIATE_TYPEINFO(tint::type::Struct);
TINT_INSTANTIATE_TYPEINFO(tint::type::StructMember);
diff --git a/src/tint/lang/core/type/struct.h b/src/tint/lang/core/type/struct.h
index e110f81..7194f82 100644
--- a/src/tint/lang/core/type/struct.h
+++ b/src/tint/lang/core/type/struct.h
@@ -27,7 +27,7 @@
#include "src/tint/lang/core/type/node.h"
#include "src/tint/lang/core/type/type.h"
#include "src/tint/utils/containers/vector.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::type {
diff --git a/src/tint/lang/spirv/reader/ast_parser/type.h b/src/tint/lang/spirv/reader/ast_parser/type.h
index 832ac94..4c31f03 100644
--- a/src/tint/lang/spirv/reader/ast_parser/type.h
+++ b/src/tint/lang/spirv/reader/ast_parser/type.h
@@ -27,7 +27,7 @@
#include "src/tint/lang/wgsl/ast/type.h"
#include "src/tint/utils/memory/block_allocator.h"
#include "src/tint/utils/rtti/castable.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint {
diff --git a/src/tint/lang/spirv/writer/printer/printer.h b/src/tint/lang/spirv/writer/printer/printer.h
index 99efacf..390155c 100644
--- a/src/tint/lang/spirv/writer/printer/printer.h
+++ b/src/tint/lang/spirv/writer/printer/printer.h
@@ -28,7 +28,7 @@
#include "src/tint/utils/containers/hashmap.h"
#include "src/tint/utils/containers/vector.h"
#include "src/tint/utils/diagnostic/diagnostic.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::ir {
diff --git a/src/tint/lang/wgsl/ast/clone_context.h b/src/tint/lang/wgsl/ast/clone_context.h
index 47f6ebf..ef6efc8 100644
--- a/src/tint/lang/wgsl/ast/clone_context.h
+++ b/src/tint/lang/wgsl/ast/clone_context.h
@@ -31,7 +31,7 @@
#include "src/tint/utils/ice/ice.h"
#include "src/tint/utils/macros/compiler.h"
#include "src/tint/utils/rtti/castable.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
#include "src/tint/utils/traits/traits.h"
// Forward declarations
diff --git a/src/tint/lang/wgsl/ast/function.h b/src/tint/lang/wgsl/ast/function.h
index b766397..354f030 100644
--- a/src/tint/lang/wgsl/ast/function.h
+++ b/src/tint/lang/wgsl/ast/function.h
@@ -28,7 +28,7 @@
#include "src/tint/lang/wgsl/ast/location_attribute.h"
#include "src/tint/lang/wgsl/ast/parameter.h"
#include "src/tint/lang/wgsl/ast/pipeline_stage.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/ast/identifier.h b/src/tint/lang/wgsl/ast/identifier.h
index bf0400f..2365627 100644
--- a/src/tint/lang/wgsl/ast/identifier.h
+++ b/src/tint/lang/wgsl/ast/identifier.h
@@ -16,7 +16,7 @@
#define SRC_TINT_LANG_WGSL_AST_IDENTIFIER_H_
#include "src/tint/lang/wgsl/ast/node.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/program/program.h b/src/tint/lang/wgsl/program/program.h
index 7e887e7..e3ad1a9 100644
--- a/src/tint/lang/wgsl/program/program.h
+++ b/src/tint/lang/wgsl/program/program.h
@@ -23,7 +23,7 @@
#include "src/tint/lang/wgsl/ast/function.h"
#include "src/tint/lang/wgsl/sem/info.h"
#include "src/tint/utils/generation_id.h"
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
// Forward Declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/call_target.cc b/src/tint/lang/wgsl/sem/call_target.cc
index cee9cb8..85c079b 100644
--- a/src/tint/lang/wgsl/sem/call_target.cc
+++ b/src/tint/lang/wgsl/sem/call_target.cc
@@ -17,7 +17,7 @@
#include <utility>
#include "src/tint/utils/math/hash.h"
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
TINT_INSTANTIATE_TYPEINFO(tint::sem::CallTarget);
diff --git a/src/tint/lang/wgsl/sem/function.h b/src/tint/lang/wgsl/sem/function.h
index 8adb916..ccf290c 100644
--- a/src/tint/lang/wgsl/sem/function.h
+++ b/src/tint/lang/wgsl/sem/function.h
@@ -25,7 +25,7 @@
#include "src/tint/lang/wgsl/sem/call.h"
#include "src/tint/utils/containers/unique_vector.h"
#include "src/tint/utils/containers/vector.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/statement.h b/src/tint/lang/wgsl/sem/statement.h
index 65b52c2..5b27cb6 100644
--- a/src/tint/lang/wgsl/sem/statement.h
+++ b/src/tint/lang/wgsl/sem/statement.h
@@ -19,7 +19,7 @@
#include "src/tint/lang/wgsl/sem/behavior.h"
#include "src/tint/lang/wgsl/sem/node.h"
#include "src/tint/utils/containers/hashmap.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/lang/wgsl/sem/struct.h b/src/tint/lang/wgsl/sem/struct.h
index 20dcdce..966d712 100644
--- a/src/tint/lang/wgsl/sem/struct.h
+++ b/src/tint/lang/wgsl/sem/struct.h
@@ -22,7 +22,7 @@
#include "src/tint/lang/core/type/type.h"
#include "src/tint/lang/wgsl/ast/struct.h"
#include "src/tint/utils/containers/vector.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
// Forward declarations
namespace tint::ast {
diff --git a/src/tint/utils/containers/scope_stack.h b/src/tint/utils/containers/scope_stack.h
index 76b9ff7..03da975 100644
--- a/src/tint/utils/containers/scope_stack.h
+++ b/src/tint/utils/containers/scope_stack.h
@@ -18,7 +18,7 @@
#include "src/tint/utils/containers/hashmap.h"
#include "src/tint/utils/containers/vector.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
namespace tint {
diff --git a/src/tint/utils/text/symbol.cc b/src/tint/utils/symbol/symbol.cc
similarity index 97%
rename from src/tint/utils/text/symbol.cc
rename to src/tint/utils/symbol/symbol.cc
index 336083f..cd2a25f 100644
--- a/src/tint/utils/text/symbol.cc
+++ b/src/tint/utils/symbol/symbol.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
#include <utility>
diff --git a/src/tint/utils/text/symbol.h b/src/tint/utils/symbol/symbol.h
similarity index 96%
rename from src/tint/utils/text/symbol.h
rename to src/tint/utils/symbol/symbol.h
index dff6b95..6872986 100644
--- a/src/tint/utils/text/symbol.h
+++ b/src/tint/utils/symbol/symbol.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_TEXT_SYMBOL_H_
-#define SRC_TINT_UTILS_TEXT_SYMBOL_H_
+#ifndef SRC_TINT_UTILS_SYMBOL_SYMBOL_H_
+#define SRC_TINT_UTILS_SYMBOL_SYMBOL_H_
#include <string>
@@ -120,4 +120,4 @@
} // namespace std
-#endif // SRC_TINT_UTILS_TEXT_SYMBOL_H_
+#endif // SRC_TINT_UTILS_SYMBOL_SYMBOL_H_
diff --git a/src/tint/utils/text/symbol_table.cc b/src/tint/utils/symbol/symbol_table.cc
similarity index 97%
rename from src/tint/utils/text/symbol_table.cc
rename to src/tint/utils/symbol/symbol_table.cc
index 9276232..f541b6a 100644
--- a/src/tint/utils/text/symbol_table.cc
+++ b/src/tint/utils/symbol/symbol_table.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
#include "src/tint/utils/ice/ice.h"
diff --git a/src/tint/utils/text/symbol_table.h b/src/tint/utils/symbol/symbol_table.h
similarity index 95%
rename from src/tint/utils/text/symbol_table.h
rename to src/tint/utils/symbol/symbol_table.h
index a95780c..88a08da 100644
--- a/src/tint/utils/text/symbol_table.h
+++ b/src/tint/utils/symbol/symbol_table.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_UTILS_TEXT_SYMBOL_TABLE_H_
-#define SRC_TINT_UTILS_TEXT_SYMBOL_TABLE_H_
+#ifndef SRC_TINT_UTILS_SYMBOL_SYMBOL_TABLE_H_
+#define SRC_TINT_UTILS_SYMBOL_SYMBOL_TABLE_H_
#include <string>
#include "src/tint/utils/containers/hashmap.h"
#include "src/tint/utils/memory/bump_allocator.h"
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
namespace tint {
@@ -108,4 +108,4 @@
} // namespace tint
-#endif // SRC_TINT_UTILS_TEXT_SYMBOL_TABLE_H_
+#endif // SRC_TINT_UTILS_SYMBOL_SYMBOL_TABLE_H_
diff --git a/src/tint/utils/text/symbol_table_test.cc b/src/tint/utils/symbol/symbol_table_test.cc
similarity index 96%
rename from src/tint/utils/text/symbol_table_test.cc
rename to src/tint/utils/symbol/symbol_table_test.cc
index 76eadef..33d0ff7 100644
--- a/src/tint/utils/text/symbol_table_test.cc
+++ b/src/tint/utils/symbol/symbol_table_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/text/symbol_table.h"
+#include "src/tint/utils/symbol/symbol_table.h"
#include "gtest/gtest-spi.h"
diff --git a/src/tint/utils/text/symbol_test.cc b/src/tint/utils/symbol/symbol_test.cc
similarity index 96%
rename from src/tint/utils/text/symbol_test.cc
rename to src/tint/utils/symbol/symbol_test.cc
index 37d4d40..137462e 100644
--- a/src/tint/utils/text/symbol_test.cc
+++ b/src/tint/utils/symbol/symbol_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/utils/text/symbol.h"
+#include "src/tint/utils/symbol/symbol.h"
#include "gtest/gtest.h"
