rename templates for .pas to .pasgen

HashLoad · Aug 11, 2023 · 1863248 · 1863248
1 parent 6b87e52
commit 1863248
Show file tree

Hide file tree

Showing 56 changed files with 37 additions and 78 deletions.
diff --git a/clibr/clibr.interfaces.cpp b/clibr/clibr.interfaces.cpp
@@ -2,6 +2,5 @@
 
 namespace clibr
 {
-	ICommand::~ICommand() {};
-	ICli::~ICli() {};
+
 }
diff --git a/clibr/clibr.interfaces.hpp b/clibr/clibr.interfaces.hpp
@@ -74,7 +74,7 @@ namespace clibr
         /// <summary>
         /// Virtual destructor to ensure proper destruction of derived classes.
         /// </summary>
-        virtual ~ICli() = 0;
+        virtual ~ICli() = default;
     };
 
     /// <summary>
@@ -95,7 +95,7 @@ namespace clibr
         /// <summary>
         /// Virtual destructor to ensure proper destruction of derived classes.
         /// </summary>
-        virtual ~ICommand() = 0;
+        virtual ~ICommand() = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.all.cpp b/clibr/commands/clibr.command.all.cpp
@@ -45,8 +45,6 @@ namespace clibr
         return true;
     };
 
-    CommandAll::~CommandAll() {};
-
     void CommandAll::_createModule(const std::string& dirName,
         const std::string& fileName, ICli* cli)
     {

diff --git a/clibr/commands/clibr.command.all.hpp b/clibr/commands/clibr.command.all.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandAll() override;
+        ~CommandAll() override = default;
     private:
         void _createModule(const std::string& dirName, const std::string& fileName, clibr::ICli* cli);
         void _createController(const std::string& dirName, const std::string& fileName, clibr::ICli* cli);

diff --git a/clibr/commands/clibr.command.c.cpp b/clibr/commands/clibr.command.c.cpp
@@ -31,7 +31,7 @@ namespace clibr
             std::filesystem::create_directories(sourcePath);
         }
 
-        std::string templateFilePath{ cli->pathTemp() + "/controller.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/controller.pasgen" };
         std::string templateFileName{ sourcePath + "/" + unitName + ".controller.pas" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{unitName}", unitName) };
@@ -54,6 +54,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandController::~CommandController() {};
 }
diff --git a/clibr/commands/clibr.command.c.hpp b/clibr/commands/clibr.command.c.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandController() override;
+        ~CommandController() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.dpr.cpp b/clibr/commands/clibr.command.dpr.cpp
@@ -61,8 +61,6 @@ namespace clibr
         return true;
     };
 
-    CommandGenerateProject::~CommandGenerateProject() {};
-
     void CommandGenerateProject::_createProject(const std::string& dirName,
         const std::string& fileName, ICli* cli)
     {

diff --git a/clibr/commands/clibr.command.dpr.hpp b/clibr/commands/clibr.command.dpr.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandGenerateProject() override;
+        ~CommandGenerateProject() override = default;
     private:
         void _createProject(const std::string& dirName, const std::string& fileName, ICli* cli);
         void _createAppModule(const std::string& dirName, const std::string& fileName, ICli* cli);

diff --git a/clibr/commands/clibr.command.h.cpp b/clibr/commands/clibr.command.h.cpp
@@ -22,8 +22,6 @@ namespace clibr
         return true;
     };
 
-    CommandHelp::~CommandHelp() {};
-
     void CommandHelp::_executeInternal() {
 
         ListText printText;

diff --git a/clibr/commands/clibr.command.h.hpp b/clibr/commands/clibr.command.h.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName, 
             ICli* cli) override;
-        ~CommandHelp() override;
+        ~CommandHelp() override = default;
     private:
         void _executeInternal();
         void _executeInternalG();

diff --git a/clibr/commands/clibr.command.handler.cpp b/clibr/commands/clibr.command.handler.cpp
@@ -31,7 +31,7 @@ namespace clibr
             std::filesystem::create_directories(sourcePath);
         }
 
-        std::string templateFilePath{ cli->pathTemp() + "/handler.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/handler.pasgen" };
         std::string templateFileName{ sourcePath + "/" + unitName + ".route.handler.pas" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{unitName}", unitName) };
@@ -54,6 +54,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandRouteHandler::~CommandRouteHandler() {};
 }
diff --git a/clibr/commands/clibr.command.handler.hpp b/clibr/commands/clibr.command.handler.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandRouteHandler() override;
+        ~CommandRouteHandler() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.i.cpp b/clibr/commands/clibr.command.i.cpp
@@ -14,6 +14,4 @@ namespace clibr
 
         return true;
     };
-
-    CommandInfra::~CommandInfra() {};
 }
diff --git a/clibr/commands/clibr.command.i.hpp b/clibr/commands/clibr.command.i.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandInfra() override;
+        ~CommandInfra() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.info.cpp b/clibr/commands/clibr.command.info.cpp
@@ -31,6 +31,4 @@ namespace clibr
         Print::printHelp(Utils::join(printText, '\n'));
         return true;
     };
-
-    CommandInfo::~CommandInfo() {};
 }
diff --git a/clibr/commands/clibr.command.info.hpp b/clibr/commands/clibr.command.info.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandInfo() override;
+        ~CommandInfo() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.m.cpp b/clibr/commands/clibr.command.m.cpp
@@ -34,8 +34,8 @@ namespace clibr
         }
 
         std::string templateFilePath{ "" };
-        isAppModule ? templateFilePath = cli->pathTemp() + "/module.app.pas" :
-            templateFilePath = cli->pathTemp() + "/module.pas";
+        isAppModule ? templateFilePath = cli->pathTemp() + "/module.app.pasgen" :
+            templateFilePath = cli->pathTemp() + "/module.pasgen";
         std::string templateFileName{ sourcePath + "/" + unitName + ".module.pas" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{moduleName}", className) };
@@ -68,8 +68,6 @@ namespace clibr
         return success;
     };
 
-    CommandModule::~CommandModule() {};
-
     bool CommandModule::_argGuardExist(const ICli* cli)
     {
         const MapTags& tags = cli->tags();
@@ -78,7 +76,7 @@ namespace clibr
 
     std::string CommandModule::_generateGuardBody(const std::string& camelCaseName, const ICli* cli)
     {
-        std::string templateFilePath = cli->pathTemp() + "/" + "body.pas";
+        std::string templateFilePath = cli->pathTemp() + "/" + "body.pasgen";
         std::string templateContent = Utils::readFromFile(templateFilePath);
         std::string modifiedContent = Utils::replaceString(templateContent, "{className}", "T" + camelCaseName);
 
@@ -87,7 +85,7 @@ namespace clibr
 
     std::string CommandModule::_generateGuardHeader(const std::string& camelCaseName, const ICli* cli)
     {
-        std::string templateFilePath = cli->pathTemp() + "/" + "header.pas";
+        std::string templateFilePath = cli->pathTemp() + "/" + "header.pasgen";
         std::string templateContent = Utils::readFromFile(templateFilePath);
         std::string modifiedContent = Utils::replaceString(templateContent, "{className}", "T" + camelCaseName);
 

diff --git a/clibr/commands/clibr.command.m.hpp b/clibr/commands/clibr.command.m.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName, 
             ICli* cli) override;
-        ~CommandModule() override;
+        ~CommandModule() override = default;
     private:
       bool _argGuardExist(const ICli* cli);
       std::string _generateGuardBody(const std::string& camelCaseName, const ICli* cli);

diff --git a/clibr/commands/clibr.command.pipe.cpp b/clibr/commands/clibr.command.pipe.cpp
@@ -30,7 +30,7 @@ namespace clibr
         {
             std::filesystem::create_directories(sourcePath);
         }
-        std::string templateFilePath{ cli->pathTemp() + "/pipe.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/pipe.pasgen" };
         std::string templateFileName{ dirName + "/" + unitName + ".dpr" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{pipeName}", className) };
@@ -52,6 +52,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandTransformPipe::~CommandTransformPipe() {};
 }
diff --git a/clibr/commands/clibr.command.pipe.hpp b/clibr/commands/clibr.command.pipe.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandTransformPipe() override;
+        ~CommandTransformPipe() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.r.cpp b/clibr/commands/clibr.command.r.cpp
@@ -14,6 +14,4 @@ namespace clibr
 
         return true;
     };
-
-    CommandRepository::~CommandRepository() {};
 }
diff --git a/clibr/commands/clibr.command.r.hpp b/clibr/commands/clibr.command.r.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandRepository() override;
+        ~CommandRepository() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.s.cpp b/clibr/commands/clibr.command.s.cpp
@@ -30,7 +30,7 @@ namespace clibr
         {
             std::filesystem::create_directories(sourcePath);
         }
-        std::string templateFilePath{ cli->pathTemp() + "/service.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/service.pasgen" };
         std::string templateFileName{ sourcePath + "/" + unitName + ".service.pas" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{unitName}", unitName) };
@@ -52,6 +52,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandService::~CommandService() {};
 }
diff --git a/clibr/commands/clibr.command.s.hpp b/clibr/commands/clibr.command.s.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandService() override;
+        ~CommandService() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.templates.cpp b/clibr/commands/clibr.command.templates.cpp
@@ -37,6 +37,4 @@ namespace clibr
         Print::printHelp(Utils::join(printText, '\n'));
         return true;
     };
-
-    CommandTemplates::~CommandTemplates() {};
 }
diff --git a/clibr/commands/clibr.command.templates.hpp b/clibr/commands/clibr.command.templates.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandTemplates() override;
+        ~CommandTemplates() override = default;
     };
 }
 

diff --git a/clibr/commands/clibr.command.v.cpp b/clibr/commands/clibr.command.v.cpp
@@ -14,6 +14,4 @@ namespace clibr
         Print::printVersion(version);
         return true;
     };
-
-    CommandVersion::~CommandVersion() {};
 }
diff --git a/clibr/commands/clibr.command.v.hpp b/clibr/commands/clibr.command.v.hpp
@@ -13,7 +13,7 @@ namespace clibr
     public:
         bool execute(const std::string& dirName, const std::string& fileName,
             ICli* cli) override;
-        ~CommandVersion() override;
+        ~CommandVersion() override = default;
     };
 }
 

diff --git a/clibr/commands/console/clibr.command.dpr.console.cpp b/clibr/commands/console/clibr.command.dpr.console.cpp
@@ -13,7 +13,7 @@ namespace clibr
         std::string unitName{ Utils::toLowerCase(fileName) };
         std::string camelCaseName{ std::string(1, std::toupper(fileName[0])) + fileName.substr(1) };
         std::string programName{ Utils::regexReplaceAll(camelCaseName, "-", "_") };
-        std::string templateFilePath{ cli->pathTemp() + "/console.project.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/console.project.pasgen" };
         std::string templateFileName{ dirName + "/" + unitName + ".dpr" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{programName}", programName) };
@@ -25,6 +25,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandGenerateProjectConsole::~CommandGenerateProjectConsole() {};
 }
diff --git a/clibr/commands/console/clibr.command.dpr.console.hpp b/clibr/commands/console/clibr.command.dpr.console.hpp
@@ -13,7 +13,7 @@ namespace clibr
 	public:
 		bool execute(const std::string& dirName, const std::string& fileName,
 			ICli* cli) override;
-		~CommandGenerateProjectConsole() override;
+		~CommandGenerateProjectConsole() override = default;
 	};
 }
 

diff --git a/clibr/commands/horse/clibr.command.dpr.horse.cpp b/clibr/commands/horse/clibr.command.dpr.horse.cpp
@@ -13,7 +13,7 @@ namespace clibr
         std::string unitName{ Utils::toLowerCase(fileName) };
         std::string camelCaseName{ std::string(1, std::toupper(fileName[0])) + fileName.substr(1) };
         std::string programName{ Utils::regexReplaceAll(camelCaseName, "-", "_") };
-        std::string templateFilePath{ cli->pathTemp() + "/horse.project.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/horse.project.pasgen" };
         std::string templateFileName{ dirName + "/" + unitName + ".dpr" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{programName}", programName) };
@@ -25,6 +25,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandGenerateProjectHorse::~CommandGenerateProjectHorse() {};
 }
diff --git a/clibr/commands/horse/clibr.command.dpr.horse.hpp b/clibr/commands/horse/clibr.command.dpr.horse.hpp
@@ -13,7 +13,7 @@ namespace clibr
 	public:
 		bool execute(const std::string& dirName, const std::string& fileName,
 			ICli* cli) override;
-		~CommandGenerateProjectHorse() override;
+		~CommandGenerateProjectHorse() override = default;
 	};
 }
 

diff --git a/clibr/commands/horse/clibr.command.handler.horse.cpp b/clibr/commands/horse/clibr.command.handler.horse.cpp
@@ -31,7 +31,7 @@ namespace clibr
             std::filesystem::create_directories(sourcePath);
         }
 
-        std::string templateFilePath{ cli->pathTemp() + "/horse.handler.pas" };
+        std::string templateFilePath{ cli->pathTemp() + "/horse.handler.pasgen" };
         std::string templateFileName{ sourcePath + "/" + unitName + ".route.handler.pas" };
         std::string templateContent{ Utils::readFromFile(templateFilePath) };
         std::string modifiedContent{ Utils::replaceString(templateContent, "{unitName}", unitName) };
@@ -54,6 +54,4 @@ namespace clibr
         }
         return isSuccess;
     };
-
-    CommandRouteHandlerHorse::~CommandRouteHandlerHorse() {};
 }
diff --git a/clibr/commands/horse/clibr.command.handler.horse.hpp b/clibr/commands/horse/clibr.command.handler.horse.hpp
@@ -13,7 +13,7 @@ namespace clibr
 	public:
 		bool execute(const std::string& dirName, const std::string& fileName,
 			ICli* cli) override;
-		~CommandRouteHandlerHorse() override;
+		~CommandRouteHandlerHorse() override = default;
 	};
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,4 @@ namespace clibr @@
             return true;
         };
-        CommandInfra::~CommandInfra() {};
     }