Move Number into core namespace.
Move the number file into the correct `tint::core` namespace from
`tint`. The types names are added to the fluent_types file in order to
make usage cleaner.
Change-Id: I3d8c1c0b18f646698e8f77213bcd2a273e8657d6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/146681
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/src/tint/lang/core/constant/composite_test.cc b/src/tint/lang/core/constant/composite_test.cc
index 763f357..8edda2d 100644
--- a/src/tint/lang/core/constant/composite_test.cc
+++ b/src/tint/lang/core/constant/composite_test.cc
@@ -16,12 +16,14 @@
#include "src/tint/lang/core/constant/helper_test.h"
#include "src/tint/lang/core/constant/scalar.h"
+#include "src/tint/lang/core/fluent_types.h"
+
+using namespace tint::core::number_suffixes; // NOLINT
+using namespace tint::core::fluent_types; // NOLINT
namespace tint::core::constant {
namespace {
-using namespace tint::number_suffixes; // NOLINT
-
using ConstantTest_Composite = TestHelper;
TEST_F(ConstantTest_Composite, AllZero) {
@@ -74,10 +76,10 @@
ASSERT_NE(composite->Index(1), nullptr);
ASSERT_EQ(composite->Index(2), nullptr);
- EXPECT_TRUE(composite->Index(0)->Is<Scalar<tint::f32>>());
- EXPECT_EQ(composite->Index(0)->As<Scalar<tint::f32>>()->ValueOf(), 1.0);
- EXPECT_TRUE(composite->Index(1)->Is<Scalar<tint::f32>>());
- EXPECT_EQ(composite->Index(1)->As<Scalar<tint::f32>>()->ValueOf(), 0.0);
+ EXPECT_TRUE(composite->Index(0)->Is<Scalar<f32>>());
+ EXPECT_EQ(composite->Index(0)->As<Scalar<f32>>()->ValueOf(), 1.0);
+ EXPECT_TRUE(composite->Index(1)->Is<Scalar<f32>>());
+ EXPECT_EQ(composite->Index(1)->As<Scalar<f32>>()->ValueOf(), 0.0);
}
TEST_F(ConstantTest_Composite, Clone) {
diff --git a/src/tint/lang/core/constant/eval.cc b/src/tint/lang/core/constant/eval.cc
index 0840065..0da84aa 100644
--- a/src/tint/lang/core/constant/eval.cc
+++ b/src/tint/lang/core/constant/eval.cc
@@ -26,6 +26,7 @@
#include "src/tint/lang/core/constant/scalar.h"
#include "src/tint/lang/core/constant/splat.h"
#include "src/tint/lang/core/constant/value.h"
+#include "src/tint/lang/core/fluent_types.h"
#include "src/tint/lang/core/number.h"
#include "src/tint/lang/core/type/abstract_float.h"
#include "src/tint/lang/core/type/abstract_int.h"
@@ -46,7 +47,8 @@
#include "src/tint/utils/rtti/switch.h"
#include "src/tint/utils/text/string_stream.h"
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::fluent_types; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
namespace tint::core::constant {
namespace {
@@ -370,22 +372,22 @@
[&](const ScalarBase* scalar) {
auto* converted = Switch(
scalar,
- [&](const Scalar<tint::AFloat>* val) {
+ [&](const Scalar<AFloat>* val) {
return ScalarConvert(val, convert->target_ty, ctx);
},
- [&](const Scalar<tint::AInt>* val) {
+ [&](const Scalar<AInt>* val) {
return ScalarConvert(val, convert->target_ty, ctx);
},
- [&](const Scalar<tint::u32>* val) {
+ [&](const Scalar<u32>* val) {
return ScalarConvert(val, convert->target_ty, ctx);
},
- [&](const Scalar<tint::i32>* val) {
+ [&](const Scalar<i32>* val) {
return ScalarConvert(val, convert->target_ty, ctx);
},
- [&](const Scalar<tint::f32>* val) {
+ [&](const Scalar<f32>* val) {
return ScalarConvert(val, convert->target_ty, ctx);
},
- [&](const Scalar<tint::f16>* val) {
+ [&](const Scalar<f16>* val) {
return ScalarConvert(val, convert->target_ty, ctx);
},
[&](const Scalar<bool>* val) {
diff --git a/src/tint/lang/core/constant/eval_binary_op_test.cc b/src/tint/lang/core/constant/eval_binary_op_test.cc
index 8eff2f8..867418b 100644
--- a/src/tint/lang/core/constant/eval_binary_op_test.cc
+++ b/src/tint/lang/core/constant/eval_binary_op_test.cc
@@ -18,7 +18,7 @@
#include "src/tint/utils/result/result.h"
using namespace tint::core::fluent_types; // NOLINT
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
using ::testing::HasSubstr;
namespace tint::core::constant::test {
diff --git a/src/tint/lang/core/constant/eval_bitcast_test.cc b/src/tint/lang/core/constant/eval_bitcast_test.cc
index 745c02e..b977e7c 100644
--- a/src/tint/lang/core/constant/eval_bitcast_test.cc
+++ b/src/tint/lang/core/constant/eval_bitcast_test.cc
@@ -18,7 +18,7 @@
namespace {
using namespace tint::core::fluent_types; // NOLINT
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
struct Case {
Value input;
diff --git a/src/tint/lang/core/constant/eval_builtin_test.cc b/src/tint/lang/core/constant/eval_builtin_test.cc
index 80f87ed..7b1e198 100644
--- a/src/tint/lang/core/constant/eval_builtin_test.cc
+++ b/src/tint/lang/core/constant/eval_builtin_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/utils/result/result.h"
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
using ::testing::HasSubstr;
namespace tint::core::constant::test {
diff --git a/src/tint/lang/core/constant/eval_construction_test.cc b/src/tint/lang/core/constant/eval_construction_test.cc
index 5d9cdc2..7a6f88c 100644
--- a/src/tint/lang/core/constant/eval_construction_test.cc
+++ b/src/tint/lang/core/constant/eval_construction_test.cc
@@ -18,7 +18,7 @@
namespace {
using namespace tint::core::fluent_types; // NOLINT
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
TEST_F(ConstEvalTest, Scalar_AFloat) {
auto* expr = Expr(99.0_a);
diff --git a/src/tint/lang/core/constant/eval_conversion_test.cc b/src/tint/lang/core/constant/eval_conversion_test.cc
index 179f046..1dd68b5 100644
--- a/src/tint/lang/core/constant/eval_conversion_test.cc
+++ b/src/tint/lang/core/constant/eval_conversion_test.cc
@@ -20,7 +20,7 @@
namespace {
using namespace tint::core::fluent_types; // NOLINT
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
enum class Kind {
kScalar,
diff --git a/src/tint/lang/core/constant/eval_indexing_test.cc b/src/tint/lang/core/constant/eval_indexing_test.cc
index c84a71e..679fa56 100644
--- a/src/tint/lang/core/constant/eval_indexing_test.cc
+++ b/src/tint/lang/core/constant/eval_indexing_test.cc
@@ -18,7 +18,7 @@
namespace {
using namespace tint::core::fluent_types; // NOLINT
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
TEST_F(ConstEvalTest, Vec3_Index) {
auto* expr = IndexAccessor(Call<vec3<i32>>(1_i, 2_i, 3_i), 2_i);
diff --git a/src/tint/lang/core/constant/eval_member_access_test.cc b/src/tint/lang/core/constant/eval_member_access_test.cc
index fb6271d..7bc17d8 100644
--- a/src/tint/lang/core/constant/eval_member_access_test.cc
+++ b/src/tint/lang/core/constant/eval_member_access_test.cc
@@ -18,7 +18,7 @@
namespace {
using namespace tint::core::fluent_types; // NOLINT
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
TEST_F(ConstEvalTest, StructMemberAccess) {
Structure("Inner", Vector{
diff --git a/src/tint/lang/core/constant/eval_runtime_semantics_test.cc b/src/tint/lang/core/constant/eval_runtime_semantics_test.cc
index 1407e86..48c17dc 100644
--- a/src/tint/lang/core/constant/eval_runtime_semantics_test.cc
+++ b/src/tint/lang/core/constant/eval_runtime_semantics_test.cc
@@ -16,7 +16,7 @@
#include "src/tint/lang/core/constant/scalar.h"
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
namespace tint::core::constant::test {
namespace {
diff --git a/src/tint/lang/core/constant/eval_unary_op_test.cc b/src/tint/lang/core/constant/eval_unary_op_test.cc
index 39050de..668cf21 100644
--- a/src/tint/lang/core/constant/eval_unary_op_test.cc
+++ b/src/tint/lang/core/constant/eval_unary_op_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/constant/eval_test.h"
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
namespace tint::core::constant::test {
namespace {
diff --git a/src/tint/lang/core/constant/manager_test.cc b/src/tint/lang/core/constant/manager_test.cc
index f01a612..f61ce99 100644
--- a/src/tint/lang/core/constant/manager_test.cc
+++ b/src/tint/lang/core/constant/manager_test.cc
@@ -28,7 +28,7 @@
namespace tint::core::constant {
namespace {
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
template <typename T>
size_t count(const T& range_loopable) {
diff --git a/src/tint/lang/core/constant/scalar.cc b/src/tint/lang/core/constant/scalar.cc
index 3cbc347..71454e2 100644
--- a/src/tint/lang/core/constant/scalar.cc
+++ b/src/tint/lang/core/constant/scalar.cc
@@ -15,12 +15,12 @@
#include "src/tint/lang/core/constant/scalar.h"
TINT_INSTANTIATE_TYPEINFO(tint::core::constant::ScalarBase);
-TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::AInt>);
-TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::AFloat>);
-TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::i32>);
-TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::u32>);
-TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::f16>);
-TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::f32>);
+TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::core::AInt>);
+TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::core::AFloat>);
+TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::core::i32>);
+TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::core::u32>);
+TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::core::f16>);
+TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<tint::core::f32>);
TINT_INSTANTIATE_TYPEINFO(tint::core::constant::Scalar<bool>);
namespace tint::core::constant {
diff --git a/src/tint/lang/core/constant/scalar_test.cc b/src/tint/lang/core/constant/scalar_test.cc
index 999da12..c07baa2 100644
--- a/src/tint/lang/core/constant/scalar_test.cc
+++ b/src/tint/lang/core/constant/scalar_test.cc
@@ -19,7 +19,7 @@
namespace tint::core::constant {
namespace {
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
using ConstantTest_Scalar = TestHelper;
diff --git a/src/tint/lang/core/constant/splat_test.cc b/src/tint/lang/core/constant/splat_test.cc
index 1e7cdc3..ea8692e 100644
--- a/src/tint/lang/core/constant/splat_test.cc
+++ b/src/tint/lang/core/constant/splat_test.cc
@@ -16,12 +16,14 @@
#include "src/tint/lang/core/constant/helper_test.h"
#include "src/tint/lang/core/constant/scalar.h"
+#include "src/tint/lang/core/fluent_types.h"
+
+using namespace tint::core::number_suffixes; // NOLINT
+using namespace tint::core::fluent_types; // NOLINT
namespace tint::core::constant {
namespace {
-using namespace tint::number_suffixes; // NOLINT
-
using ConstantTest_Splat = TestHelper;
TEST_F(ConstantTest_Splat, AllZero) {
@@ -66,8 +68,8 @@
ASSERT_NE(sp->Index(1), nullptr);
ASSERT_EQ(sp->Index(2), nullptr);
- EXPECT_EQ(sp->Index(0)->As<Scalar<tint::f32>>()->ValueOf(), 1.f);
- EXPECT_EQ(sp->Index(1)->As<Scalar<tint::f32>>()->ValueOf(), 1.f);
+ EXPECT_EQ(sp->Index(0)->As<Scalar<f32>>()->ValueOf(), 1.f);
+ EXPECT_EQ(sp->Index(1)->As<Scalar<f32>>()->ValueOf(), 1.f);
}
TEST_F(ConstantTest_Splat, Clone) {
@@ -81,7 +83,7 @@
auto* r = sp->Clone(ctx);
ASSERT_NE(r, nullptr);
EXPECT_TRUE(r->type->Is<core::type::Vector>());
- EXPECT_TRUE(r->el->Is<Scalar<tint::i32>>());
+ EXPECT_TRUE(r->el->Is<Scalar<i32>>());
EXPECT_EQ(r->count, 2u);
}
diff --git a/src/tint/lang/core/constant/value_test.cc b/src/tint/lang/core/constant/value_test.cc
index a8f9308..8305ceb 100644
--- a/src/tint/lang/core/constant/value_test.cc
+++ b/src/tint/lang/core/constant/value_test.cc
@@ -20,7 +20,7 @@
namespace tint::core::constant {
namespace {
-using namespace tint::number_suffixes; // NOLINT
+using namespace tint::core::number_suffixes; // NOLINT
using ConstantTest_Value = TestHelper;
