Merge pull request #1459 from dgelessus/console_parsing

Refactor and add tests for console command parsing
H-uru · Sep 18, 2023 · 7ebef73 · 7ebef73
2 parents dedae35 + 1ccefa3
commit 7ebef73
Show file tree

Hide file tree

Showing 11 changed files with 1,151 additions and 246 deletions.
diff --git a/Sources/Plasma/FeatureLib/pfConsoleCore/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConsoleCore/CMakeLists.txt
@@ -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})

diff --git a/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp b/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
@@ -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>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -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.
 
@@ -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)

diff --git a/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.h b/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.h
@@ -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();
@@ -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();