Skip to content

Commit 44a04ad

Browse files
panda-ptrpanda-ptr
committed
clang-mirror generated ids integration.
1 parent b7b60a2 commit 44a04ad

File tree

4 files changed

+21
-27
lines changed

4 files changed

+21
-27
lines changed

‎CxxTestUtils/inc/GlobalTestUtils.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ namespace test_utils {
2626
inline constexpr std::string_view str_revStrOverloadValRef = "revStrOverloadValRef";
2727
inline constexpr std::string_view str_revStrOverloadValCRef = "revStrOverloadValCRef";
2828

29-
inline constexpr std::string_view str_getComplexNumAsString = "getComplexNumAsString";
30-
31-
inline constexpr std::string_view str_setReal = "complex::setReal";
32-
inline constexpr std::string_view str_setImaginary = "complex::setImaginary";
33-
inline constexpr std::string_view str_getMagnitude = "complex::getMagnitude";
34-
3529
inline constexpr std::string_view SUFFIX_void = "_void";
3630
inline constexpr std::string_view SUFFIX_ctor = "_ctor";
3731
inline constexpr std::string_view SUFFIX_const = "_const";

‎RTLTestRunApp/src/CxxMirrorTests/CxxMirrorThreadingTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ namespace rtl_tests
133133

134134
rtl::type().function<const char*>(str_reverseString).build(reverseString),
135135

136-
rtl::type().function(str_getComplexNumAsString).build(getComplexNumAsString),
136+
rtl::type().function(cxx::fn::getComplexNumAsString::id).build(getComplexNumAsString),
137137

138-
rtl::type().function(str_setReal).build(complex::setReal),
138+
rtl::type().function(cxx::fn::complex::setReal::id).build(complex::setReal),
139139

140-
rtl::type().function(str_setImaginary).build(complex::setImaginary),
140+
rtl::type().function(cxx::fn::complex::setImaginary::id).build(complex::setImaginary),
141141

142-
rtl::type().function(str_getMagnitude).build(complex::getMagnitude),
142+
rtl::type().function(cxx::fn::complex::getMagnitude::id).build(complex::getMagnitude),
143143

144144
rtl::type().function("ext::sendString").build(my_type::ext::sendString),
145145

‎RTLTestRunApp/src/FunctionalityTests/NameSpaceGlobalsTests.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,21 @@ namespace rtl_tests
106106

107107
TEST(FunctionInNameSpace, get_namespace_function_types)
108108
{
109-
optional<Function> setReal = cxx::mirror().getFunction(str_setReal);
109+
optional<Function> setReal = cxx::mirror().getFunction(cxx::fn::complex::setReal::id);
110110
ASSERT_TRUE(setReal);
111111

112-
optional<Function> setImaginary = cxx::mirror().getFunction(str_setImaginary);
112+
optional<Function> setImaginary = cxx::mirror().getFunction(cxx::fn::complex::setImaginary::id);
113113
ASSERT_TRUE(setImaginary);
114114

115-
EXPECT_TRUE(setReal->getFunctionName() == str_setReal);
116-
EXPECT_TRUE(setImaginary->getFunctionName() == str_setImaginary);
115+
EXPECT_TRUE(setReal->getFunctionName() == cxx::fn::complex::setReal::id);
116+
EXPECT_TRUE(setImaginary->getFunctionName() == cxx::fn::complex::setImaginary::id);
117117
}
118118

119119

120120
TEST(FunctionInNameSpace, namespace_function_execute_return)
121121
{
122122
{
123-
optional<Function> fnSetReal = cxx::mirror().getFunction(str_setReal);
123+
optional<Function> fnSetReal = cxx::mirror().getFunction(cxx::fn::complex::setReal::id);
124124
ASSERT_TRUE(fnSetReal);
125125
EXPECT_TRUE(fnSetReal->hasSignature<double>());
126126

@@ -132,7 +132,7 @@ namespace rtl_tests
132132
EXPECT_TRUE(err == rtl::error::None);
133133
ASSERT_TRUE(ret.isEmpty());
134134
} {
135-
optional<Function> fnSetImaginary = cxx::mirror().getFunction(str_setImaginary);
135+
optional<Function> fnSetImaginary = cxx::mirror().getFunction(cxx::fn::complex::setImaginary::id);
136136
ASSERT_TRUE(fnSetImaginary);
137137
EXPECT_TRUE(fnSetImaginary->hasSignature<double>());
138138

@@ -144,7 +144,7 @@ namespace rtl_tests
144144
EXPECT_TRUE(err == rtl::error::None);
145145
ASSERT_TRUE(ret.isEmpty());
146146
} {
147-
optional<Function> fnGetMagnitude = cxx::mirror().getFunction(str_getMagnitude);
147+
optional<Function> fnGetMagnitude = cxx::mirror().getFunction(cxx::fn::complex::getMagnitude::id);
148148
ASSERT_TRUE(fnGetMagnitude);
149149
EXPECT_TRUE(fnGetMagnitude->hasSignature<>()); //empty template params checks for zero arguments.
150150

@@ -166,7 +166,7 @@ namespace rtl_tests
166166

167167
TEST(FunctionInNameSpace, execute_with_wrong_signature)
168168
{
169-
optional<Function> fnSetReal = cxx::mirror().getFunction(str_setReal);
169+
optional<Function> fnSetReal = cxx::mirror().getFunction(cxx::fn::complex::setReal::id);
170170
ASSERT_TRUE(fnSetReal);
171171

172172
EXPECT_TRUE(fnSetReal->hasSignature<double>());
@@ -184,7 +184,7 @@ namespace rtl_tests
184184

185185
TEST(GlobalFunction, get_function_execute_return)
186186
{
187-
optional<Function> fnGetComplexAsStr = cxx::mirror().getFunction(str_getComplexNumAsString);
187+
optional<Function> fnGetComplexAsStr = cxx::mirror().getFunction(cxx::fn::getComplexNumAsString::id);
188188
ASSERT_TRUE(fnGetComplexAsStr);
189189

190190
rtl::function<rtl::Return()> getComplexNumAsStr = fnGetComplexAsStr->argsT<>().returnT<>();

‎RTLTestRunApp/src/FunctionalityTests/TypeAwareInvocationTests/TypeAware_Function.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace rtl_tests
1414
{
1515
TEST(TypeAware_Function, init_errors_validation)
1616
{
17-
std::optional<rtl::Function> setReal = cxx::mirror().getFunction(str_setReal);
17+
std::optional<rtl::Function> setReal = cxx::mirror().getFunction(cxx::fn::complex::setReal::id);
1818
ASSERT_TRUE(setReal);
1919
{
20-
EXPECT_TRUE(setReal->getFunctionName() == str_setReal);
20+
EXPECT_TRUE(setReal->getFunctionName() == cxx::fn::complex::setReal::id);
2121
{
2222
rtl::function<void(double)> functor = setReal->argsT<double>().returnT<void>();
2323
EXPECT_TRUE(functor);
@@ -29,10 +29,10 @@ namespace rtl_tests
2929
}
3030
}
3131

32-
std::optional<rtl::Function> setImaginary = cxx::mirror().getFunction(str_setImaginary);
32+
std::optional<rtl::Function> setImaginary = cxx::mirror().getFunction(cxx::fn::complex::setImaginary::id);
3333
ASSERT_TRUE(setImaginary);
3434
{
35-
EXPECT_TRUE(setImaginary->getFunctionName() == str_setImaginary);
35+
EXPECT_TRUE(setImaginary->getFunctionName() == cxx::fn::complex::setImaginary::id);
3636
{
3737
rtl::function<void(double)> functor = setImaginary->argsT<double>().returnT<void>();
3838
EXPECT_TRUE(functor);
@@ -48,19 +48,19 @@ namespace rtl_tests
4848

4949
TEST(TypeAware_Function, namespace_fn_call_with_known_signature)
5050
{
51-
std::optional<rtl::Function> getMagnitude = cxx::mirror().getFunction(str_getMagnitude);
51+
std::optional<rtl::Function> getMagnitude = cxx::mirror().getFunction(cxx::fn::complex::getMagnitude::id);
5252
ASSERT_TRUE(getMagnitude);
5353

5454
rtl::function<double()> get_magnitude = getMagnitude->argsT<>().returnT<double>();
5555
ASSERT_TRUE(get_magnitude);
5656

57-
std::optional<rtl::Function> setReal = cxx::mirror().getFunction(str_setReal);
57+
std::optional<rtl::Function> setReal = cxx::mirror().getFunction(cxx::fn::complex::setReal::id);
5858
ASSERT_TRUE(setReal);
5959

6060
rtl::function<void(double)> set_real = setReal->argsT<double>().returnT<void>();
6161
ASSERT_TRUE(set_real);
6262

63-
std::optional<rtl::Function> setImaginary = cxx::mirror().getFunction(str_setImaginary);
63+
std::optional<rtl::Function> setImaginary = cxx::mirror().getFunction(cxx::fn::complex::setImaginary::id);
6464
ASSERT_TRUE(setImaginary);
6565

6666
rtl::function<void(double)> set_imaginary = setImaginary->argsT<double>().returnT<void>();
@@ -79,7 +79,7 @@ namespace rtl_tests
7979

8080
TEST(TypeAware_Function, global_fn_call_with_known_signature)
8181
{
82-
std::optional<rtl::Function> getComplexNumStr = cxx::mirror().getFunction(str_getComplexNumAsString);
82+
std::optional<rtl::Function> getComplexNumStr = cxx::mirror().getFunction(cxx::fn::getComplexNumAsString::id);
8383
ASSERT_TRUE(getComplexNumStr);
8484
{
8585
rtl::function<const std::string()> get_complex_num_str = getComplexNumStr->argsT<>().returnT<const std::string>();

0 commit comments

Comments
 (0)