Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor and add tests for console command parsing #1459

Merged
merged 17 commits into from
Sep 18, 2023
Merged

Refactor and add tests for console command parsing #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7880b9d
Add unit tests for console command tokenization
dgelessus Jul 29, 2023
7992bd0
Split pfConsoleEngine tokenization of command names and arguments
dgelessus Jul 29, 2023
a906d76
Remove pointless line adjustment at end of pfConsoleEngine tokenization
dgelessus Jul 29, 2023
0ec7972
Remove unused numQuotedParams in pfConsoleEngine::RunCommand
dgelessus Jul 29, 2023
f6e577d
Port pfConsoleEngine tokenization return values to ST::string
dgelessus Jul 29, 2023
e28d073
Add pfConsoleEngine tokenization unit test for empty quotes
dgelessus Jul 29, 2023
cc1b84b
Split pfConsole tokenization code into its own class
dgelessus Jul 30, 2023
7970f45
Refactor pfConsoleTokenizer to be stateful
dgelessus Jul 30, 2023
ff4807f
Port pfConsoleTokenizer fully to ST::string
dgelessus Jul 30, 2023
5f2b034
Refactor console command name parsing and group lookup
dgelessus Jul 30, 2023
018dfa9
Refactor getting full names of console commands/groups
dgelessus Jul 31, 2023
28b65f4
Refactor console command parsing and lookup further where possible
dgelessus Jul 31, 2023
5ecc63f
Refactor console command argument parsing
dgelessus Jul 31, 2023
92034d9
Refactor console argument type checking and variable handling
dgelessus Aug 2, 2023
ff88e4b
Replace fixed-size console paramsArray with vector
dgelessus Aug 3, 2023
9d5e3a1
Fix the last C-style local variables in pfConsoleEngine
dgelessus Aug 10, 2023
1ccefa3
Use std::tuple instead of std::pair for pfConsoleParser returns
dgelessus Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Sources/Plasma/FeatureLib/pfConsoleCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ set(pfConsoleCore_SOURCES
pfConsoleCommandsCore.cpp
pfConsoleContext.cpp
pfConsoleEngine.cpp
pfConsoleParser.cpp
)

set(pfConsoleCore_HEADERS
pfConsoleCmd.h
pfConsoleContext.h
pfConsoleEngine.h
pfConsoleParser.h
)

plasma_library(pfConsoleCore SOURCES ${pfConsoleCore_SOURCES} ${pfConsoleCore_HEADERS})
Expand Down
19 changes: 19 additions & 0 deletions Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]

#include "pfConsoleCmd.h"

#include <string_theory/format>
#include <string_theory/string_stream>

//////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -134,6 +135,15 @@ void pfConsoleCmdGroup::AddSubGroup( pfConsoleCmdGroup *group )
fBaseCmdGroupRef++;
}

ST::string pfConsoleCmdGroup::GetFullName()
{
if (fParentGroup == nullptr || fParentGroup == GetBaseGroup()) {
return fName;
} else {
return ST::format("{}.{}", fParentGroup->GetFullName(), fName);
}
}

//// FindCommand /////////////////////////////////////////////////////////////
// No longer recursive.

Expand Down Expand Up @@ -446,6 +456,15 @@ void pfConsoleCmd::Unlink()
*fPrevPtr = fNext;
}

ST::string pfConsoleCmd::GetFullName()
{
if (fParentGroup == pfConsoleCmdGroup::GetBaseGroup()) {
return fName;
} else {
return ST::format("{}.{}", fParentGroup->GetFullName(), fName);
}
}

//// GetSigEntry /////////////////////////////////////////////////////////////

uint8_t pfConsoleCmd::GetSigEntry(size_t i)
Expand Down
2 changes: 2 additions & 0 deletions Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class pfConsoleCmdGroup

pfConsoleCmdGroup *GetNext() { return fNext; }
ST::string GetName() { return fName; }
ST::string GetFullName();
pfConsoleCmdGroup *GetParent() { return fParentGroup; }

static pfConsoleCmdGroup *GetBaseGroup();
Expand Down Expand Up @@ -262,6 +263,7 @@ class pfConsoleCmd

pfConsoleCmd *GetNext() { return fNext; }
ST::string GetName() { return fName; }
ST::string GetFullName();
ST::string GetHelp() { return fHelpString; }
ST::string GetSignature();

Expand Down
Loading