From 0c8c2fa90083d8a10b79bf73e5e4e8ae58807fa9 Mon Sep 17 00:00:00 2001 From: Nikiroy78 <35032449+Nikiroy78@users.noreply.github.com> Date: Mon, 17 Jul 2023 23:04:51 +0300 Subject: [PATCH] Add modified files --- .../index/stack.cpp.E4C63375E074C517.idx | Bin 3066 -> 3036 bytes .../clangd/index/stack.h.407BE3417D01782A.idx | Bin 1594 -> 1664 bytes .../Testing/Temporary/LastTest.log | 4 ++-- source/CMakeLists.txt.user | 2 +- source/command-exec.cpp | 7 ++++++- source/command.h | 12 ++++++++++++ source/ritualka-commands.txt | 9 +++++++++ 7 files changed, 30 insertions(+), 4 deletions(-) diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/stack.cpp.E4C63375E074C517.idx b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/stack.cpp.E4C63375E074C517.idx index 77cd2607bc5acba7febe5a1ad0179a399f9aaa40..19a2fcf560d64f1dd8ca5f607038234fdb09fa4d 100644 GIT binary patch delta 1521 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 Tb@aEmJ^r>pyDz+Rt7GVIbO`hQ diff --git a/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/stack.h.407BE3417D01782A.idx b/build-source-Desktop_Qt_6_4_1_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/stack.h.407BE3417D01782A.idx index 896b80ffb67d7d24704989a9b9b7d8bff881e395..1597d6209533e88eb559a145343bfab55c742d03 100644 GIT binary patch delta 320 zcmdnR)4_V`jX$D(;AvA4wGLnD=~vi z2iom zimP%1iOGIUWgLHyOzvWKXDv!iD~_0a zo!M}*Jc|-DNV5xzJtN2D78VbAaTakd?}#mmD=Y+Ec(}#6#RU;ONfyb;KUpG~K{kZ4 zY72_1iL1k8S-2%-BqvW~jbjE``H5AV8DyIRo4H0&YEB{p5EK_B7mI@!oFD=Wn7CQj OT(Em!8rsju$p8RNurSyF 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 0933e27..229636e 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 17 19:44 RTZ 2 (ηθμΰ) +Start testing: Jul 17 19:58 RTZ 2 (ηθμΰ) ---------------------------------------------------------- -End testing: Jul 17 19:44 RTZ 2 (ηθμΰ) +End testing: Jul 17 19:58 RTZ 2 (ηθμΰ) diff --git a/source/CMakeLists.txt.user b/source/CMakeLists.txt.user index 5c1c5d8..561718c 100644 --- a/source/CMakeLists.txt.user +++ b/source/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/source/command-exec.cpp b/source/command-exec.cpp index aa92dc7..36bd77d 100644 --- a/source/command-exec.cpp +++ b/source/command-exec.cpp @@ -76,7 +76,7 @@ void CommandExecutor::execute () { } else if (this->bytes.at(0) == byte(0x01)) { // Π Π°Π±ΠΎΡ‚Π° со стэком switch (this->bytes.at(1)) { - case byte(0x01): // Π”ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ Π·Π½Π°Ρ‡Π΅Π½ΠΈΠ΅ Π² стСк + case byte(0x01): { // Π”ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ Π·Π½Π°Ρ‡Π΅Π½ΠΈΠ΅ Π² стСк STACK_PUSH sp(this->bytes, this->globalStack); sp.exec(); while (sp.localStack.size() != 0) { @@ -85,6 +85,10 @@ void CommandExecutor::execute () { sp.localStack.rm(); } break; + } + case byte(0x02): { // Π˜Π·ΠΌΠ΅Π½ΠΈΡ‚ΡŒ Π·Π½Π°Ρ‡Π΅Π½ΠΈΠ΅ Π² стСкС + break; + } } } else if (this->bytes.at(0) == byte(0x04)) { @@ -123,6 +127,7 @@ CommandExecutor::CommandExecutor (vector bytes, Stack globalStack) { {byte(0x00), byte(0x01)}, // void_ender // Stack {byte(0x01), byte(0x01)}, + {byte(0x01), byte(0x02)}, // Stdout-Stdin {byte(0x04), byte(0x00)}, {byte(0x04), byte(0x01)} diff --git a/source/command.h b/source/command.h index 873755a..b27cca2 100644 --- a/source/command.h +++ b/source/command.h @@ -60,6 +60,18 @@ private: vector bytes; }; +/*class STACK_EDIT { +public: + STACK_EDIT (vector bytes, Stack globalStack); + virtual bool checkCorrectSyntax (); + virtual void exec (); + Stack globalStack; + Stack localStack; +private: + // From all comand + vector bytes; +};*/ + class STDOUT { public: // From all command diff --git a/source/ritualka-commands.txt b/source/ritualka-commands.txt index 88a8a44..301b64a 100644 --- a/source/ritualka-commands.txt +++ b/source/ritualka-commands.txt @@ -50,6 +50,15 @@ Example: [0x05] - CALL LIBRARIES ---------------------------- +---------------------------- +[0x06] - LOCAL_VARIABLES +---------------------------- +0x00 {IGNORE_ERRORS:1} +IGNORE_ERRORS : 0x00 - Ignore 0xFF - Not ignore +Create new local variable (link to current sp) +-- +0x01 {VARS_COUNT} +Allocate variable area ---------------------------- [0xFF] - EXTENSIONS OF COMMANDS ----------------------------