diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_deps b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_deps index 2fa0972..7234cda 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_deps and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_deps differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_log b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_log index c8153a8..8723cb8 100644 --- a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_log +++ b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.ninja_log @@ -35,3 +35,15 @@ 990 1234 7052883195356824 source.exe b75effd0a1405b8c 4 998 7052883611712854 CMakeFiles/source.dir/main.cpp.obj 27ba6efb8bcbc87e 998 1237 7052883614073394 source.exe b75effd0a1405b8c +151 1771 7113154869974938 CMakeFiles/source.dir/subprog.cpp.obj 1d7edd0e9fce1178 +147 1773 7113154869974938 CMakeFiles/source.dir/vm-src.cpp.obj 58985300ff2cd989 +148 1773 7113154869984931 CMakeFiles/source.dir/command.cpp.obj d3df98591b675230 +149 1774 7113154869984931 CMakeFiles/source.dir/command-exec.cpp.obj 8af330b9b71e9707 +145 1804 7113154870285090 CMakeFiles/source.dir/main.cpp.obj 27ba6efb8bcbc87e +9 694 7113158718017742 CMakeFiles/source.dir/stack.cpp.obj 582eb6d8fc3feef9 +11 853 7113158719598061 CMakeFiles/source.dir/command-exec.cpp.obj 8af330b9b71e9707 +8 877 7113158719838114 CMakeFiles/source.dir/command.cpp.obj d3df98591b675230 +4 880 7113158719858131 CMakeFiles/source.dir/subprog.cpp.obj 1d7edd0e9fce1178 +6 932 7113158720388258 CMakeFiles/source.dir/vm-src.cpp.obj 58985300ff2cd989 +7 1200 7113158723068953 CMakeFiles/source.dir/main.cpp.obj 27ba6efb8bcbc87e +1200 2256 7113158733550796 source.exe b75effd0a1405b8c diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command-exec.cpp.obj b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command-exec.cpp.obj index 7d0cb8d..8b79f8f 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command-exec.cpp.obj and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command-exec.cpp.obj differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command.cpp.obj b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command.cpp.obj index 701e184..32c1da7 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command.cpp.obj and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/command.cpp.obj differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/main.cpp.obj b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/main.cpp.obj index a316120..22e1c6c 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/main.cpp.obj and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/main.cpp.obj differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/stack.cpp.obj b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/stack.cpp.obj index f8596c3..a325585 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/stack.cpp.obj and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/stack.cpp.obj differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/subprog.cpp.obj b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/subprog.cpp.obj index 6b2f5b3..3eb1269 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/subprog.cpp.obj and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/subprog.cpp.obj differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/vm-src.cpp.obj b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/vm-src.cpp.obj index 3520ada..b724c04 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/vm-src.cpp.obj and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/CMakeFiles/source.dir/vm-src.cpp.obj differ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/Testing/Temporary/LastTest.log b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/Testing/Temporary/LastTest.log index 000e027..0933e27 100644 --- a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/Testing/Temporary/LastTest.log +++ b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Jul 04 23:57 RTZ 2 () +Start testing: Jul 17 19:44 RTZ 2 () ---------------------------------------------------------- -End testing: Jul 04 23:57 RTZ 2 () +End testing: Jul 17 19:44 RTZ 2 () diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/source.exe b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/source.exe index 0312c89..3983d0a 100644 Binary files a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/source.exe and b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/source.exe differ diff --git a/source/CMakeLists.txt.user b/source/CMakeLists.txt.user index b346f94..5c1c5d8 100644 --- a/source/CMakeLists.txt.user +++ b/source/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/source/stack.cpp b/source/stack.cpp index bb840e4..9257f0f 100644 --- a/source/stack.cpp +++ b/source/stack.cpp @@ -1,7 +1,7 @@ #include "stack.h" #include -int bytesToInt (vector> bytes) { +int Stack::bytesToInt (vector bytes) { // (!) Сделать потом return 0; } @@ -19,17 +19,17 @@ vector Stack::get () { vector result = this->stackStorage[this->stackPointer]; if (this->stackLinker[this->stackPointer] != -1) { if ( - this->stackLinker.size() < bytesToInt(this->stackStorage[this->stackPointer]) + this->stackLinker.size() < this->bytesToInt(this->stackStorage[this->stackPointer]) ) { // (!) Выдать ошибку: такого элемента не существует } else if ( - bytesToInt(this->stackStorage[this->stackPointer]) == this->stackPointer + this->bytesToInt(this->stackStorage[this->stackPointer]) == this->stackPointer ) { // (!) Выдать ошибку: ссылочный элемент не может ссылаться на самого себя } else { - this->stackPointer = bytesToInt(this->stackStorage[this->stackPointer]); + this->stackPointer = this->bytesToInt(this->stackStorage[this->stackPointer]); return this->get(); } } diff --git a/source/stack.h b/source/stack.h index e431aed..8f4432b 100644 --- a/source/stack.h +++ b/source/stack.h @@ -19,6 +19,9 @@ public: vector get (); int size (); private: + int bytesToInt (vector bytes); + //int bytesToInt (vector> bytes); + int stackPointer = -1; int stackSize = 0; vector> stackStorage = {};