ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove macros use in objects mofule

Browse source
This commit is contained in:
IlyaShurupov 2024-03-24 21:55:25 +03:00
parent 0fb9326c08
commit 7927226484
31 changed files with 362 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/tests/TestCompiler.cpp
View file

@ -16,9 +16,9 @@ SUITE(Compiler) {
TEST(Basic) {
objTestModule.initialize();
{
{
// no errors
auto method = NDO_CAST(MethodObject, NDO->create("method"));
auto method = objects_api::cast<MethodObject>(NDO->create("method"));
method->mScript->mReadable->val = "print 1 * 20 + 10;";
method->compile();
@ -30,7 +30,7 @@ SUITE(Compiler) {
{
// with errors
auto method = NDO_CAST(MethodObject, NDO->create("method"));
auto method = objects_api::cast<MethodObject>(NDO->create("method"));
method->mScript->mReadable->val = "print undefinedVariable;";
method->compile();
@ -42,7 +42,7 @@ SUITE(Compiler) {
objTestModule.deinitialize();
}
/*
TEST(ErrorHandling) {
objTestModule.initialize();

6
Objects/tests/TestCore.cpp
View file

@ -13,7 +13,7 @@ SUITE(Core) {
objTestModule.initialize();
{
auto integer = NDO_CAST(IntObject, NDO->create("int"));
auto integer = objects_api::cast<IntObject>(NDO->create("int"));
integer->val = 10;
@ -25,8 +25,8 @@ SUITE(Core) {
printf("%s\n", NDO->toString(savedInt).c_str());
CHECK(NDO->compare(integer, savedInt));
CHECK(NDO_CAST(IntObject, savedInt));
CHECK(integer->val == NDO_CAST(IntObject, savedInt)->val);
CHECK(objects_api::cast<IntObject>(savedInt));
CHECK(integer->val == objects_api::cast<IntObject>(savedInt)->val);
NDO->destroy(integer);
NDO->destroy(savedInt);

20
Objects/tests/TestInterpreter.cpp
View file

@ -47,10 +47,10 @@ auto script = R"(
SUITE(Interpreter) {
TEST(Entry) {
objTestModule.initialize();
{
auto method = NDO_CAST(MethodObject, NDO->create("method"));
auto interpreter = NDO_CAST(InterpreterObject, NDO->create("interpreter"));
auto method = objects_api::cast<MethodObject>(NDO->create("method"));
auto interpreter = objects_api::cast<InterpreterObject>(NDO->create("interpreter"));
interpreter->getMember<LinkObject>("target method")->setLink(method);
@ -71,8 +71,8 @@ SUITE(Interpreter) {
objTestModule.initialize();
{
auto method = NDO_CAST(MethodObject, NDO->create("method"));
auto interpreter = NDO_CAST(InterpreterObject, NDO->create("interpreter"));
auto method = objects_api::cast<MethodObject>(NDO->create("method"));
auto interpreter = objects_api::cast<InterpreterObject>(NDO->create("interpreter"));
interpreter->getMember<LinkObject>("target method")->setLink(method);
@ -83,7 +83,7 @@ SUITE(Interpreter) {
NDO->save(interpreter, "interp.o");
auto interpreterLoaded = NDO_CAST(InterpreterObject, NDO->load("interp.o"));
auto interpreterLoaded = objects_api::cast<InterpreterObject>(NDO->load("interp.o"));
interpreterLoaded->exec();
@ -102,8 +102,8 @@ SUITE(Interpreter) {
{
auto compileStartCount = getObjCount();
auto method = NDO_CAST(MethodObject, NDO->create("method"));
auto interpreter = NDO_CAST(InterpreterObject, NDO->create("interpreter"));
auto method = objects_api::cast<MethodObject>(NDO->create("method"));
auto interpreter = objects_api::cast<InterpreterObject>(NDO->create("interpreter"));
interpreter->getMember<LinkObject>("target method")->setLink(method);
@ -143,8 +143,8 @@ SUITE(Interpreter) {
objTestModule.initialize();
{
auto method = NDO_CAST(MethodObject, NDO->create("method"));
auto interpreter = NDO_CAST(InterpreterObject, NDO->create("interpreter"));
auto method = objects_api::cast<MethodObject>(NDO->create("method"));
auto interpreter = objects_api::cast<InterpreterObject>(NDO->create("interpreter"));
interpreter->getMember<LinkObject>("target method")->setLink(method);

8
Objects/tests/TestPrimitives.cpp
View file

@ -16,19 +16,19 @@ SUITE(PrimitiveObjects) {
objTestModule.initialize();
{
auto integer = NDO_CAST(IntObject, NDO->create("int"));
auto integer = objects_api::cast<IntObject>(NDO->create("int"));
integer->val = 10;
auto dict = NDO_CAST(DictObject, NDO->create("dict"));
auto dict = objects_api::cast<DictObject>(NDO->create("dict"));
dict->put("val", integer);
NDO->save(dict, "dict.o");
auto dictLoaded = NDO_CAST(DictObject, NDO->load("dict.o"));
auto dictLoaded = objects_api::cast<DictObject>(NDO->load("dict.o"));
CHECK(dictLoaded->presents("val").isValid());
CHECK(NDO_CAST(IntObject, dictLoaded->get("val"))->val == 10);
CHECK(objects_api::cast<IntObject>(dictLoaded->get("val"))->val == 10);
NDO->destroy(dict);
NDO->destroy(dictLoaded);