From 0817d416a3eb0fc6c1af2d0934907522794b9567 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sat, 1 May 2021 23:37:58 +0200 Subject: [PATCH] meta: make_meta_any -> make_meta --- src/entt/meta/meta.hpp | 4 ++-- test/entt/meta/meta_any.cpp | 40 +++++++++++++++---------------- test/entt/meta/meta_container.cpp | 32 ++++++++++++------------- test/entt/meta/meta_ctor.cpp | 8 +++---- test/entt/meta/meta_data.cpp | 8 +++---- test/entt/meta/meta_dtor.cpp | 4 ++-- test/entt/meta/meta_func.cpp | 6 ++--- test/entt/meta/meta_handle.cpp | 2 +- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index 9ed31b504..ea15337ab 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -322,7 +322,7 @@ public: * @return This meta any object. */ template - [[deprecated("Use std::in_place_type, entt::make_meta_any or emplace instead")]] + [[deprecated("Use std::in_place_type, entt::make_meta or emplace instead")]] meta_any & operator=(std::reference_wrapper value) { emplace(value.get()); return *this; @@ -631,7 +631,7 @@ private: * @return A properly initialized wrapper for an object of the given type. */ template -meta_any make_meta_any(Args &&... args) { +meta_any make_meta(Args &&... args) { return meta_any{std::in_place_type, std::forward(args)...}; } diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp index c550cfa21..feb642ded 100644 --- a/test/entt/meta/meta_any.cpp +++ b/test/entt/meta/meta_any.cpp @@ -147,7 +147,7 @@ TEST_F(MetaAny, SBOInPlaceTypeConstruction) { TEST_F(MetaAny, SBOAsRefConstruction) { int value = 3; int compare = 42; - auto any = entt::make_meta_any(value); + auto any = entt::make_meta(value); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -159,13 +159,13 @@ TEST_F(MetaAny, SBOAsRefConstruction) { ASSERT_EQ(any.data(), &value); ASSERT_EQ(std::as_const(any).data(), &value); - ASSERT_EQ(any, entt::make_meta_any(value)); - ASSERT_NE(any, entt::make_meta_any(compare)); + ASSERT_EQ(any, entt::make_meta(value)); + ASSERT_NE(any, entt::make_meta(compare)); ASSERT_NE(any, entt::meta_any{42}); ASSERT_EQ(entt::meta_any{3}, any); - any = entt::make_meta_any(value); + any = entt::make_meta(value); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -182,7 +182,7 @@ TEST_F(MetaAny, SBOAsRefConstruction) { TEST_F(MetaAny, SBOAsConstRefConstruction) { int value = 3; int compare = 42; - auto any = entt::make_meta_any(value); + auto any = entt::make_meta(value); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -194,13 +194,13 @@ TEST_F(MetaAny, SBOAsConstRefConstruction) { ASSERT_EQ(any.data(), nullptr); ASSERT_EQ(std::as_const(any).data(), &value); - ASSERT_EQ(any, entt::make_meta_any(value)); - ASSERT_NE(any, entt::make_meta_any(compare)); + ASSERT_EQ(any, entt::make_meta(value)); + ASSERT_NE(any, entt::make_meta(compare)); ASSERT_NE(any, entt::meta_any{42}); ASSERT_EQ(entt::meta_any{3}, any); - any = entt::make_meta_any(value); + any = entt::make_meta(value); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -291,7 +291,7 @@ TEST_F(MetaAny, NoSBOInPlaceTypeConstruction) { TEST_F(MetaAny, NoSBOAsRefConstruction) { fat_t instance{.1, .2, .3, .4}; - auto any = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -303,12 +303,12 @@ TEST_F(MetaAny, NoSBOAsRefConstruction) { ASSERT_EQ(any.data(), &instance); ASSERT_EQ(std::as_const(any).data(), &instance); - ASSERT_EQ(any, entt::make_meta_any(instance)); + ASSERT_EQ(any, entt::make_meta(instance)); ASSERT_EQ(any, entt::meta_any{instance}); ASSERT_NE(entt::meta_any{fat_t{}}, any); - any = entt::make_meta_any(instance); + any = entt::make_meta(instance); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -324,7 +324,7 @@ TEST_F(MetaAny, NoSBOAsRefConstruction) { TEST_F(MetaAny, NoSBOAsConstRefConstruction) { fat_t instance{.1, .2, .3, .4}; - auto any = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -336,12 +336,12 @@ TEST_F(MetaAny, NoSBOAsConstRefConstruction) { ASSERT_EQ(any.data(), nullptr); ASSERT_EQ(std::as_const(any).data(), &instance); - ASSERT_EQ(any, entt::make_meta_any(instance)); + ASSERT_EQ(any, entt::make_meta(instance)); ASSERT_EQ(any, entt::meta_any{instance}); ASSERT_NE(entt::meta_any{fat_t{}}, any); - any = entt::make_meta_any(instance); + any = entt::make_meta(instance); ASSERT_TRUE(any); ASSERT_EQ(any.type(), entt::resolve()); @@ -852,7 +852,7 @@ TEST_F(MetaAny, ConstConvert) { TEST_F(MetaAny, UnmanageableType) { unmanageable_t instance; - auto any = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); entt::meta_any other = any.as_ref(); std::swap(any, other); @@ -876,7 +876,7 @@ TEST_F(MetaAny, Invoke) { using namespace entt::literals; clazz_t instance; - auto any = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); ASSERT_TRUE(any.invoke("func"_hs)); ASSERT_TRUE(any.invoke("member"_hs, 42)); @@ -892,7 +892,7 @@ TEST_F(MetaAny, SetGet) { using namespace entt::literals; clazz_t instance; - auto any = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); ASSERT_TRUE(any.set("value"_hs, 42)); @@ -909,10 +909,10 @@ TEST_F(MetaAny, SetGet) { ASSERT_FALSE(any.get("non_existent"_hs)); } -TEST_F(MetaAny, MakeMetaAny) { +TEST_F(MetaAny, MakeMeta) { int value = 42; - auto any = entt::make_meta_any(value); - auto ref = entt::make_meta_any(value); + auto any = entt::make_meta(value); + auto ref = entt::make_meta(value); ASSERT_TRUE(any); ASSERT_TRUE(ref); diff --git a/test/entt/meta/meta_container.cpp b/test/entt/meta/meta_container.cpp index 10b42c5b7..928ffdb2a 100644 --- a/test/entt/meta/meta_container.cpp +++ b/test/entt/meta/meta_container.cpp @@ -57,7 +57,7 @@ TEST_F(MetaContainer, EmptyAssociativeContainer) { TEST_F(MetaContainer, SequenceContainerIterator) { std::vector vec{2, 3, 4}; - auto any = entt::make_meta_any &>(vec); + auto any = entt::make_meta &>(vec); entt::meta_sequence_container::iterator first{}; auto view = any.as_sequence_container(); @@ -84,7 +84,7 @@ TEST_F(MetaContainer, SequenceContainerIterator) { TEST_F(MetaContainer, AssociativeContainerIterator) { std::map map{{2, 'c'}, {3, 'd'}, {4, 'e'}}; - auto any = entt::make_meta_any &>(map); + auto any = entt::make_meta &>(map); entt::meta_associative_container::iterator first{}; auto view = any.as_associative_container(); @@ -111,7 +111,7 @@ TEST_F(MetaContainer, AssociativeContainerIterator) { TEST_F(MetaContainer, StdVector) { std::vector vec{}; - auto any = entt::make_meta_any &>(vec); + auto any = entt::make_meta &>(vec); auto view = any.as_sequence_container(); @@ -154,7 +154,7 @@ TEST_F(MetaContainer, StdVector) { TEST_F(MetaContainer, StdArray) { std::array arr{}; - auto any = entt::make_meta_any &>(arr); + auto any = entt::make_meta &>(arr); auto view = any.as_sequence_container(); @@ -196,7 +196,7 @@ TEST_F(MetaContainer, StdArray) { TEST_F(MetaContainer, StdMap) { std::map map{{2, 'c'}, {3, 'd'}, {4, 'e'}}; - auto any = entt::make_meta_any &>(map); + auto any = entt::make_meta &>(map); auto view = any.as_associative_container(); @@ -240,7 +240,7 @@ TEST_F(MetaContainer, StdMap) { TEST_F(MetaContainer, StdSet) { std::set set{2, 3, 4}; - auto any = entt::make_meta_any &>(set); + auto any = entt::make_meta &>(set); auto view = any.as_associative_container(); @@ -283,7 +283,7 @@ TEST_F(MetaContainer, StdSet) { TEST_F(MetaContainer, ConstSequenceContainer) { std::vector vec{}; - auto any = entt::make_meta_any &>(vec); + auto any = entt::make_meta &>(vec); auto view = any.as_sequence_container(); @@ -324,7 +324,7 @@ TEST_F(MetaContainer, ConstSequenceContainer) { TEST_F(MetaContainer, ConstKeyValueAssociativeContainer) { std::map map{}; - auto any = entt::make_meta_any &>(map); + auto any = entt::make_meta &>(map); auto view = any.as_associative_container(); @@ -360,7 +360,7 @@ TEST_F(MetaContainer, ConstKeyValueAssociativeContainer) { TEST_F(MetaContainer, ConstKeyOnlyAssociativeContainer) { std::set set{}; - auto any = entt::make_meta_any &>(set); + auto any = entt::make_meta &>(set); auto view = any.as_associative_container(); @@ -409,8 +409,8 @@ TEST_F(MetaContainer, SequenceContainerConstMetaAny) { std::vector vec{42}; test(vec); - test(entt::make_meta_any &>(vec)); - test(entt::make_meta_any &>(vec)); + test(entt::make_meta &>(vec)); + test(entt::make_meta &>(vec)); } TEST_F(MetaContainer, KeyValueAssociativeContainerConstMetaAny) { @@ -426,8 +426,8 @@ TEST_F(MetaContainer, KeyValueAssociativeContainerConstMetaAny) { std::map map{{2, 'c'}}; test(map); - test(entt::make_meta_any &>(map)); - test(entt::make_meta_any &>(map)); + test(entt::make_meta &>(map)); + test(entt::make_meta &>(map)); } TEST_F(MetaContainer, KeyOnlyAssociativeContainerConstMetaAny) { @@ -446,8 +446,8 @@ TEST_F(MetaContainer, KeyOnlyAssociativeContainerConstMetaAny) { std::set set{2}; test(set); - test(entt::make_meta_any &>(set)); - test(entt::make_meta_any &>(set)); + test(entt::make_meta &>(set)); + test(entt::make_meta &>(set)); } TEST_F(MetaContainer, StdVectorBool) { @@ -455,7 +455,7 @@ TEST_F(MetaContainer, StdVectorBool) { using const_proxy_type = typename std::vector::const_reference; std::vector vec{}; - auto any = entt::make_meta_any &>(vec); + auto any = entt::make_meta &>(vec); auto cany = std::as_const(any).as_ref(); auto view = any.as_sequence_container(); diff --git a/test/entt/meta/meta_ctor.cpp b/test/entt/meta/meta_ctor.cpp index 29026e59a..22443eec1 100644 --- a/test/entt/meta/meta_ctor.cpp +++ b/test/entt/meta/meta_ctor.cpp @@ -155,7 +155,7 @@ TEST_F(MetaCtor, ConstNonConstRefArgs) { int ivalue = 42; char cvalue = 'c'; - auto any = entt::resolve().ctor().invoke(entt::make_meta_any(ivalue), entt::make_meta_any(cvalue)); + auto any = entt::resolve().ctor().invoke(entt::make_meta(ivalue), entt::make_meta(cvalue)); ASSERT_TRUE(any); ASSERT_EQ(any.cast().i, 42); @@ -187,8 +187,8 @@ TEST_F(MetaCtor, FuncConstNonConstRefArgs) { int ivalue = 42; auto ctor = entt::resolve().ctor(); - auto any = ctor.invoke(entt::make_meta_any(ivalue)); - auto other = ctor.invoke(entt::make_meta_any(ivalue)); + auto any = ctor.invoke(entt::make_meta(ivalue)); + auto other = ctor.invoke(entt::make_meta(ivalue)); ASSERT_TRUE(any); ASSERT_TRUE(other); @@ -215,7 +215,7 @@ TEST_F(MetaCtor, ExternalMemberFunction) { ASSERT_FALSE(registry.all_of(entity)); - const auto any = ctor.invoke(entt::make_meta_any(registry), entity, 3, 'c'); + const auto any = ctor.invoke(entt::make_meta(registry), entity, 3, 'c'); ASSERT_TRUE(any); ASSERT_TRUE(registry.all_of(entity)); diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp index d33854352..4e94dc8dc 100644 --- a/test/entt/meta/meta_data.cpp +++ b/test/entt/meta/meta_data.cpp @@ -309,11 +309,11 @@ TEST_F(MetaData, SetByRef) { int value{42}; ASSERT_EQ(any.cast().i, 0); - ASSERT_TRUE(entt::resolve().data("i"_hs).set(any, entt::make_meta_any(value))); + ASSERT_TRUE(entt::resolve().data("i"_hs).set(any, entt::make_meta(value))); ASSERT_EQ(any.cast().i, 42); value = 3; - auto wrapper = entt::make_meta_any(value); + auto wrapper = entt::make_meta(value); ASSERT_TRUE(entt::resolve().data("i"_hs).set(any, wrapper.as_ref())); ASSERT_EQ(any.cast().i, 3); @@ -326,11 +326,11 @@ TEST_F(MetaData, SetByConstRef) { int value{42}; ASSERT_EQ(any.cast().i, 0); - ASSERT_TRUE(entt::resolve().data("i"_hs).set(any, entt::make_meta_any(value))); + ASSERT_TRUE(entt::resolve().data("i"_hs).set(any, entt::make_meta(value))); ASSERT_EQ(any.cast().i, 42); value = 3; - auto wrapper = entt::make_meta_any(value); + auto wrapper = entt::make_meta(value); ASSERT_TRUE(entt::resolve().data("i"_hs).set(any, wrapper.as_ref())); ASSERT_EQ(any.cast().i, 3); diff --git a/test/entt/meta/meta_dtor.cpp b/test/entt/meta/meta_dtor.cpp index a5498d2d6..c5c66e1b6 100644 --- a/test/entt/meta/meta_dtor.cpp +++ b/test/entt/meta/meta_dtor.cpp @@ -74,8 +74,8 @@ TEST_F(MetaDtor, AsRefConstruction) { ASSERT_EQ(clazz_t::counter, 0); clazz_t instance{}; - auto any = entt::make_meta_any(instance); - auto cany = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); + auto cany = entt::make_meta(instance); auto cref = cany.as_ref(); auto ref = any.as_ref(); diff --git a/test/entt/meta/meta_func.cpp b/test/entt/meta/meta_func.cpp index 0063171bb..296bf7b0f 100644 --- a/test/entt/meta/meta_func.cpp +++ b/test/entt/meta/meta_func.cpp @@ -332,7 +332,7 @@ TEST_F(MetaFunc, ArgsByRef) { entt::meta_any any{3}; int value = 4; - ASSERT_EQ(func.invoke({}, entt::make_meta_any(value)).cast(), 8); + ASSERT_EQ(func.invoke({}, entt::make_meta(value)).cast(), 8); ASSERT_EQ(func.invoke({}, any.as_ref()).cast(), 6); ASSERT_EQ(any.cast(), 6); ASSERT_EQ(value, 8); @@ -346,7 +346,7 @@ TEST_F(MetaFunc, ArgsByConstRef) { entt::meta_any any{2}; int value = 3; - ASSERT_TRUE(func.invoke(instance, entt::make_meta_any(value))); + ASSERT_TRUE(func.invoke(instance, entt::make_meta(value))); ASSERT_EQ(func_t::value, 9); ASSERT_TRUE(func.invoke(instance, std::as_const(any).as_ref())); @@ -434,7 +434,7 @@ TEST_F(MetaFunc, ExternalMemberFunction) { ASSERT_FALSE(registry.all_of(entity)); - func.invoke({}, entt::make_meta_any(registry), entity); + func.invoke({}, entt::make_meta(registry), entity); ASSERT_TRUE(registry.all_of(entity)); } diff --git a/test/entt/meta/meta_handle.cpp b/test/entt/meta/meta_handle.cpp index 4f4e0ab2c..a7e974683 100644 --- a/test/entt/meta/meta_handle.cpp +++ b/test/entt/meta/meta_handle.cpp @@ -42,7 +42,7 @@ TEST_F(MetaHandle, Functionalities) { ASSERT_TRUE(handle->invoke("incr"_hs)); ASSERT_EQ(instance.value, 1); - auto any = entt::make_meta_any(instance); + auto any = entt::make_meta(instance); handle = entt::meta_handle{any}; ASSERT_FALSE(std::as_const(handle)->invoke("decr"_hs));