Fixed #4 added autohelp print

Author: sea5kg

scripts.wsjcpp/generate.WsjcppArgumentProcessor.wsjcpp-script

@@ -40,9 +40,9 @@ class " class_name " : public WsjcppArgumentProcessor {
     public:
         " class_name "();
 
-        virtual bool applyParameterArgument(const std::string &sProgramName, const std::string &sArgumentName, const std::string &sValue);
-        virtual bool applySingleArgument(const std::string &sProgramName, const std::string &sArgumentName);
-        virtual int exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams);
+        virtual bool applyParameterArgument(const std::string &sProgramName, const std::string &sArgumentName, const std::string &sValue) override;
+        virtual bool applySingleArgument(const std::string &sProgramName, const std::string &sArgumentName) override;
+        virtual int exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams) override;
 };
 
 #endif // " ifndef_header
@@ -87,7 +87,7 @@ bool " class_name "::applyParameterArgument(
 
 int " class_name "::exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams) {
     WsjcppLog::err(TAG, \"Not implemented\");
-    return -1; 
+    return -10;
 }
 "
 

src/ArgumentProcessors/argument_processor_main.cpp

@@ -35,13 +35,6 @@ bool ArgumentProcessorMain::applyParameterArgument(
     return false;
 }
 
-// ---------------------------------------------------------------------
-
-int ArgumentProcessorMain::exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams) {
-    WsjcppLog::err(TAG, "Not implemented");
-    return -1;
-}
-
 // ---------------------------------------------------------------------
 // ArgumentProcessorSubcommand1
 

src/ArgumentProcessors/argument_processor_main.h

@@ -6,11 +6,8 @@
 class ArgumentProcessorMain : public WsjcppArgumentProcessor {
     public:
         ArgumentProcessorMain();
-
-
         virtual bool applySingleArgument(const std::string &sProgramName, const std::string &sArgumentName);
         virtual bool applyParameterArgument(const std::string &sProgramName, const std::string &sArgumentName, const std::string &sValue);
-        virtual int exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams);
 };
 
 class ArgumentProcessorSubcommand1 : public WsjcppArgumentProcessor {

src/wsjcpp_arguments.cpp

@@ -1,6 +1,9 @@
 #include "wsjcpp_arguments.h"
 #include <wsjcpp_core.h>
 
+// ---------------------------------------------------------------------
+// WsjcppArgumentSingle
+
 WsjcppArgumentSingle::WsjcppArgumentSingle(const std::string &sName, const std::string &sDescription) {
     TAG = "WsjcppArgumentSingle-" + sName;
     m_sName = sName;
@@ -20,6 +23,7 @@ std::string WsjcppArgumentSingle::getDescription() {
 }
 
 // ---------------------------------------------------------------------
+// WsjcppArgumentParameter
 
 WsjcppArgumentParameter::WsjcppArgumentParameter(
     const std::string &sName,
@@ -63,6 +67,7 @@ void WsjcppArgumentParameter::setValue(const std::string &sValue) {
 }
 
 // ---------------------------------------------------------------------
+// WsjcppArgumentProcessor
 
 WsjcppArgumentProcessor::WsjcppArgumentProcessor(
     const std::vector<std::string> &vNames, 
@@ -333,18 +338,19 @@ bool WsjcppArgumentProcessor::applySingleArgument(const std::string &sProgramNam
 // ---------------------------------------------------------------------
 
 bool WsjcppArgumentProcessor::applyParameterArgument(const std::string &sProgramName, const std::string &sArgumentName, const std::string &sValue) {
-    WsjcppLog::throw_err(TAG, "No support parameter argument '" + sArgumentName + "' for '" + getNamesAsString() + "'");
+    WsjcppLog::err(TAG, "No support parameter argument '" + sArgumentName + "' for '" + getNamesAsString() + "'");
     return false;
 }
 
 // ---------------------------------------------------------------------
 
 int WsjcppArgumentProcessor::exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams) {
-    WsjcppLog::throw_err(TAG, "Processor '" + getNamesAsString() + "' has not implementation");
-    return -1;
+    WsjcppLog::err(TAG, "Processor '" + getNamesAsString() + "' has not implementation");
+    return -10;
 }
 
 // ---------------------------------------------------------------------
+// WsjcppArguments
 
 WsjcppArguments::WsjcppArguments(int argc, const char* argv[], WsjcppArgumentProcessor *pRoot) {
     TAG = "WsjcppArguments";
@@ -354,12 +360,21 @@ WsjcppArguments::WsjcppArguments(int argc, const char* argv[], WsjcppArgumentPro
     m_sProgramName = m_vArguments[0];
     m_vArguments.erase(m_vArguments.begin());
     m_pRoot = pRoot;
+    m_bEnablePrintAutoHelp = true;
 }
 
 // ---------------------------------------------------------------------
 
 WsjcppArguments::~WsjcppArguments() {
-    // TODO
+    for (int i = 0; i < m_vProcessors.size(); i++) {
+        delete m_vProcessors[i];
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppArguments::enablePrintAutoHelp(bool bEnablePrintAutoHelp) {
+    m_bEnablePrintAutoHelp = bEnablePrintAutoHelp;
 }
 
 // ---------------------------------------------------------------------
@@ -416,8 +431,12 @@ int WsjcppArguments::recursiveExec(
     if (vSubArguments.size() > 0 && vSubArguments[0] == "help") {
         return pArgumentProcessor->help(vRoutes, vSubArguments);
     }
-
-    return pArgumentProcessor->exec(vRoutes, vSubArguments);
+    
+    int nResult = pArgumentProcessor->exec(vRoutes, vSubArguments);
+    if (nResult == -10 && m_bEnablePrintAutoHelp) {
+        pArgumentProcessor->help(vRoutes, vSubArguments);
+    }
+    return nResult;
 }
 
 // ---------------------------------------------------------------------

src/wsjcpp_arguments.h

@@ -74,7 +74,7 @@ class WsjcppArgumentProcessor {
             const std::vector<std::string> &vSubParams
         );
         bool hasMoreOptions();
-        
+
         virtual bool applySingleArgument(const std::string &sProgramName, const std::string &sArgumentName);
         virtual bool applyParameterArgument(const std::string &sProgramName, const std::string &sArgumentName, const std::string &sValue);
         virtual int exec(const std::vector<std::string> &vRoutes, const std::vector<std::string> &vSubParams);
@@ -113,6 +113,7 @@ class WsjcppArguments {
     public:
         WsjcppArguments(int argc, const char* argv[], WsjcppArgumentProcessor *pRoot);
         ~WsjcppArguments();
+        void enablePrintAutoHelp(bool bEnablePrintAutoHelp);
         int exec();
 
     private:
@@ -132,7 +133,9 @@ class WsjcppArguments {
         std::string TAG;
         std::vector<std::string> m_vArguments;
         std::string m_sProgramName;
+        bool m_bEnablePrintAutoHelp;
         std::vector<WsjcppArgumentProcessor *> m_vProcessors;
+        
 };
 
 // ---------------------------------------------------------------------