diff options
| Commit | 4ae838df9d22037273fe97edc25971e6358549fb (patch) | |
|---|---|---|
| Author | 2022-05-30 20:18:20 +0300 | |
| Committer | 2022-05-30 20:18:20 +0300 | |
| Files | f9028216e5c832b5a89715b6452492eb0d4085b2 /src | |
| FMI-OOP-P2_Tables-4ae838df9d22037273fe97edc25971e6358549fb.tar FMI-OOP-P2_Tables-4ae838df9d22037273fe97edc25971e6358549fb.tar.gz FMI-OOP-P2_Tables-4ae838df9d22037273fe97edc25971e6358549fb.zip | ||
| Parent | 09b94a7471f2ac5b2958f0fee735c692a444b9ba (diff) | |
Autocommit at 30.05.2022 @ 20:18
4 files changed, 6 insertions, 8 deletions
| -rw-r--r-- | src/ test.table | 5 | ||||
| -rw-r--r-- | src/Generic/ConsoleInterface/Menu.cpp | 2 | ||||
| -rw-r--r-- | src/UserInterface/UserInterface.cpp | 5 | ||||
| -rw-r--r-- | src/test.table | 2 |
diff --git a/src/ test.table b/src/ test.table deleted file mode 100644 index 147e7e9..0000000 --- a/src/ test.table +++ /dev/null @@ -1,5 +0,0 @@ -8.6,3,"String","= 3 * R0C1 + R0C0 ^ R0C1 * 27 / R0C1 - 2 * 2.5 * 2 * 2 + R0C2 ^ R0C2",, -,,,,, -,,,,, -,,,,, -,,,,, diff --git a/src/Generic/ConsoleInterface/Menu.cpp b/src/Generic/ConsoleInterface/Menu.cpp index 910e946..d547990 100644 --- a/src/Generic/ConsoleInterface/Menu.cpp +++ b/src/Generic/ConsoleInterface/Menu.cpp @@ -51,7 +51,7 @@ void Menu::navigate() const { index = menuOptions.get_count(); for (unsigned i = 0; i < menuOptions.get_count() && index == menuOptions.get_count(); i++) { - if (strncmp(buffer + startIndex, menuOptions[i].get_name(), commandEnd) == 0) + if (strncmp(buffer + startIndex, menuOptions[i].get_name(), commandEnd - startIndex) == 0) index = i; } diff --git a/src/UserInterface/UserInterface.cpp b/src/UserInterface/UserInterface.cpp index bf92f00..d2de4f3 100644 --- a/src/UserInterface/UserInterface.cpp +++ b/src/UserInterface/UserInterface.cpp @@ -78,7 +78,10 @@ void UserInterface::com_print(const char* params) { } void UserInterface::com_edit(const char* params) { - while (*params == ' ') params++; + if (*params != 'R') { + printLine("Error: Invalid cell position format! Expected R<number>C<number>"); + return; + } unsigned row = atoi(++params); while (*params != 'C') params++; diff --git a/src/test.table b/src/test.table index e4ca704..147e7e9 100644 --- a/src/test.table +++ b/src/test.table @@ -1,4 +1,4 @@ -8.6,0,"String","= 3 * R0C1 + R0C0 ^ R0C1 * 27 / R0C1 - 2 * 2.5 * 2 * 2 + R0C2 ^ R0C2",, +8.6,3,"String","= 3 * R0C1 + R0C0 ^ R0C1 * 27 / R0C1 - 2 * 2.5 * 2 * 2 + R0C2 ^ R0C2",, ,,,,, ,,,,, ,,,,, |