Skip to content

Commit cb59ab4

Browse files
panda-ptrpanda-ptr
authored
Merge pull request #98 from ReflectCxx/develop
ctor() renamed.
2 parents 9025d96 + 5faea79 commit cb59ab4

18 files changed

Lines changed: 131 additions & 131 deletions

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ From `rtl::Record`, registered member functions can be queried as `rtl::Method`.
9898
Callables are materialized by explicitly providing the argument types we intend to pass. If the signature is valid, the resulting callable can be invoked safely.
9999
For example, the overloaded constructor `Person(std::string, int)` –
100100
```c++
101-
rtl::constructor<std::string, int> personCtor = classPerson->ctor<std::string, int>();
101+
rtl::constructor<std::string, int> personCtor = classPerson->ctorT<std::string, int>();
102102
if (!personCtor) { /* Constructor with expected signature not found. */ }
103103
```
104104
Or the default constructor –
105105
```c++
106-
rtl::constructor<> personCtor = classPerson->ctor();
106+
rtl::constructor<> personCtor = classPerson->ctorT<>();
107107
```
108108
Instances can be created on the `Heap` or `Stack` with automatic lifetime management –
109109
```c++
@@ -134,7 +134,7 @@ The above `getName` invocation is effectively a native function-pointer hop, sin
134134
If the concrete type `Person` is not accessible at the call site, its member functions can still be invoked by erasing the target type and using `rtl::RObject` instead. The previously constructed instance (`robj`) is passed as the target –
135135
```c++
136136
rtl::method<rtl::RObject, std::string()> getName = oGetName->targetT()
137-
.argsT().returnT<std::string>();
137+
.argsT().returnT<std::string>();
138138
auto [err, ret] = getName(robj)(); // Invoke and receive return as std::optional<std::string>.
139139
if (err == rtl::error::None && ret.has_value()) {
140140
std::cout << ret.value();
@@ -143,7 +143,7 @@ if (err == rtl::error::None && ret.has_value()) {
143143
If the return type is also not known at compile time,`rtl::Return` can be used –
144144
```c++
145145
rtl::method<rtl::RObject, rtl::Return()> getName = oGetName->targetT()
146-
.argsT().returnT();
146+
.argsT().returnT();
147147
auto [err, ret] = getName(robj)(); // Invoke and receive rtl::RObject as return, wrapping std::string underneath.
148148
if (err == rtl::error::None && ret.canViewAs<std::string>()) {
149149
const std::string& name = ret.view<std::string>()->get();

‎RTLBenchmarkApp/src/ReflectedCallUnknownReturn.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace
3030

3131
static rtl::RObject nodeObj = []()
3232
{
33-
auto [err, robj] = class_Node.ctor()(rtl::alloc::Stack);
33+
auto [err, robj] = class_Node.ctorT()(rtl::alloc::Stack);
3434
if (robj.isEmpty()) {
3535
std::cerr << "[x] error: " << rtl::to_string(err) << "\n";
3636
}

‎RTLTestRunApp/src/CxxMirrorTests/CxxMirrorObjectTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace rtl_tests
6363

6464
// Create an instance of std::vector<int> on the stack via RTL.
6565
// Uses RObject with stack lifetime.
66-
auto [err, robj] = classVectorInt->ctor()(rtl::alloc::Stack);
66+
auto [err, robj] = classVectorInt->ctorT()(rtl::alloc::Stack);
6767
EXPECT_TRUE(err == rtl::error::None);
6868
ASSERT_FALSE(robj.isEmpty());
6969

‎RTLTestRunApp/src/FunctionalityTests/ClassMethodsTests.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace rtl_tests
4444

4545
const rtl::Record& reflectedClass = itr->second;
4646

47-
auto [err, robj] = reflectedClass.ctor()(rtl::alloc::Stack);
47+
auto [err, robj] = reflectedClass.ctorT<>()(rtl::alloc::Stack);
4848

4949
if (recordName == event::struct_) {
5050
//Event's default constructor is private or deleted.
@@ -82,7 +82,7 @@ namespace rtl_tests
8282
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
8383
ASSERT_TRUE(classBook);
8484

85-
auto [err0, book] = classBook->ctor()(alloc::Heap);
85+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
8686

8787
EXPECT_TRUE(err0 == error::None);
8888
ASSERT_FALSE(book.isEmpty());
@@ -111,7 +111,7 @@ namespace rtl_tests
111111
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
112112
ASSERT_TRUE(classBook);
113113

114-
auto [err0, book] = classBook->ctor()(alloc::Stack);
114+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
115115

116116
EXPECT_TRUE(err0 == error::None);
117117
ASSERT_FALSE(book.isEmpty());
@@ -140,7 +140,7 @@ namespace rtl_tests
140140
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
141141
ASSERT_TRUE(classBook);
142142

143-
auto [err0, book] = classBook->ctor()(alloc::Stack);
143+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
144144

145145
EXPECT_TRUE(err0 == error::None);
146146
ASSERT_FALSE(book.isEmpty());
@@ -172,7 +172,7 @@ namespace rtl_tests
172172
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
173173
ASSERT_TRUE(classBook);
174174

175-
auto [err0, book] = classBook->ctor()(alloc::Stack);
175+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
176176

177177
EXPECT_TRUE(err0 == error::None);
178178
ASSERT_FALSE(book.isEmpty());
@@ -204,7 +204,7 @@ namespace rtl_tests
204204
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
205205
ASSERT_TRUE(classBook);
206206

207-
auto [err0, book] = classBook->ctor()(alloc::Heap);
207+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
208208

209209
EXPECT_TRUE(err0 == error::None);
210210
ASSERT_FALSE(book.isEmpty());
@@ -233,7 +233,7 @@ namespace rtl_tests
233233
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
234234
ASSERT_TRUE(classBook);
235235

236-
auto [err0, book] = classBook->ctor()(alloc::Stack);
236+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
237237

238238
EXPECT_TRUE(err0 == error::None);
239239
ASSERT_FALSE(book.isEmpty());
@@ -262,7 +262,7 @@ namespace rtl_tests
262262
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
263263
ASSERT_TRUE(classBook);
264264

265-
auto [err0, book] = classBook->ctor()(alloc::Heap);
265+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
266266

267267
EXPECT_TRUE(err0 == error::None);
268268
ASSERT_FALSE(book.isEmpty());
@@ -291,7 +291,7 @@ namespace rtl_tests
291291
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
292292
ASSERT_TRUE(classBook);
293293

294-
auto [err0, book] = classBook->ctor()(alloc::Stack);
294+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
295295

296296
EXPECT_TRUE(err0 == error::None);
297297
ASSERT_FALSE(book.isEmpty());
@@ -320,7 +320,7 @@ namespace rtl_tests
320320
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
321321
ASSERT_TRUE(classBook);
322322

323-
auto [err0, book] = classBook->ctor()(alloc::Heap);
323+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
324324

325325
EXPECT_TRUE(err0 == error::None);
326326
ASSERT_FALSE(book.isEmpty());
@@ -351,7 +351,7 @@ namespace rtl_tests
351351
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
352352
ASSERT_TRUE(classBook);
353353

354-
auto [err0, book] = classBook->ctor()(alloc::Stack);
354+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
355355

356356
EXPECT_TRUE(err0 == error::None);
357357
ASSERT_FALSE(book.isEmpty());
@@ -382,7 +382,7 @@ namespace rtl_tests
382382
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
383383
ASSERT_TRUE(classBook);
384384

385-
auto [err0, book] = classBook->ctor()(alloc::Heap);
385+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
386386

387387
EXPECT_TRUE(err0 == error::None);
388388
ASSERT_FALSE(book.isEmpty());
@@ -413,7 +413,7 @@ namespace rtl_tests
413413
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
414414
ASSERT_TRUE(classBook);
415415

416-
auto [err0, book] = classBook->ctor()(alloc::Stack);
416+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
417417

418418
EXPECT_TRUE(err0 == error::None);
419419
ASSERT_FALSE(book.isEmpty());
@@ -444,7 +444,7 @@ namespace rtl_tests
444444
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
445445
ASSERT_TRUE(classBook);
446446

447-
auto [err0, book] = classBook->ctor()(alloc::Stack);
447+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
448448

449449
EXPECT_TRUE(err0 == error::None);
450450
ASSERT_FALSE(book.isEmpty());
@@ -477,7 +477,7 @@ namespace rtl_tests
477477
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
478478
ASSERT_TRUE(classBook);
479479

480-
auto [err0, book] = classBook->ctor()(alloc::Heap);
480+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
481481

482482
EXPECT_TRUE(err0 == error::None);
483483
ASSERT_FALSE(book.isEmpty());
@@ -510,7 +510,7 @@ namespace rtl_tests
510510
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
511511
ASSERT_TRUE(classBook);
512512

513-
auto [err0, book] = classBook->ctor()(alloc::Stack);
513+
auto [err0, book] = classBook->ctorT<>()(alloc::Stack);
514514

515515
EXPECT_TRUE(err0 == error::None);
516516
ASSERT_FALSE(book.isEmpty());
@@ -547,7 +547,7 @@ namespace rtl_tests
547547
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
548548
ASSERT_TRUE(classBook);
549549

550-
auto [err0, book] = classBook->ctor()(alloc::Heap);
550+
auto [err0, book] = classBook->ctorT<>()(alloc::Heap);
551551

552552
EXPECT_TRUE(err0 == error::None);
553553
ASSERT_FALSE(book.isEmpty());

‎RTLTestRunApp/src/FunctionalityTests/ConstMethodOverloadTests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace rtl_tests
2020
optional<Record> classBook = cxx::mirror().getRecord(book::class_);
2121
ASSERT_TRUE(classBook);
2222

23-
auto [err0, book] = classBook->ctor()(alloc::Stack);
23+
auto [err0, book] = classBook->ctorT()(alloc::Stack);
2424
EXPECT_TRUE(err0 == error::None);
2525
ASSERT_FALSE(book.isEmpty());
2626

@@ -90,7 +90,7 @@ namespace rtl_tests
9090
optional<Method> oUpdateLastName = classPerson->getMethod(person::str_updateLastName);
9191
ASSERT_TRUE(oUpdateLastName);
9292

93-
auto [err0, person] = classPerson->ctor<std::string>()(alloc, person::FIRST_NAME);
93+
auto [err0, person] = classPerson->ctorT<std::string>()(alloc, person::FIRST_NAME);
9494

9595
EXPECT_TRUE(err0 == error::None);
9696
ASSERT_FALSE(person.isEmpty());
@@ -130,7 +130,7 @@ namespace rtl_tests
130130
optional<Record> classPerson = cxx::mirror().getRecord(person::class_);
131131
ASSERT_TRUE(classPerson);
132132

133-
auto [err0, person] = classPerson->ctor<std::string>()(alloc, person::FIRST_NAME);
133+
auto [err0, person] = classPerson->ctorT<std::string>()(alloc, person::FIRST_NAME);
134134
EXPECT_TRUE(err0 == error::None);
135135
ASSERT_FALSE(person.isEmpty());
136136

0 commit comments

Comments
 (0)