Added logic for handling escape characters at the end for substitution

Author: Neko-Box-Coder

Src/runcpp2/Data/StageInfo.cpp

@@ -282,7 +282,54 @@ namespace
                 ssLOG_ERROR("INTERNAL ERROR, missing substitution value for \"" << substitution << "\"");
                 return false;
             }
-            const std::string& currentValue = substitutionMap.at(substitution).at(substituteValueIndex);
+            
+            std::string currentValue = substitutionMap.at(substitution).at(substituteValueIndex);
+            
+            //Escape escapes character at the end if any
+            {
+                std::vector<char> escapeChars = {'\\'};
+                #ifdef _WIN32
+                    escapeChars.emplace_back('^');
+                #endif
+                if(!currentValue.empty())
+                {
+                    int currentValIndex = currentValue.size();
+                    while(currentValIndex > 0)
+                    {
+                        --currentValIndex;
+                        bool found = false;
+                        for(int j = 0; j < escapeChars.size(); ++j)
+                        {
+                            if(currentValue[currentValIndex] == escapeChars[j])
+                            {
+                                found = true;
+                                break;
+                            }
+                        }
+                        
+                        if(!found)
+                        {
+                            ++currentValIndex;
+                            break;
+                        }
+                    }
+                    
+                    if(currentValIndex < currentValue.size())
+                    {
+                        const std::string foundEscapes = currentValue.substr(currentValIndex);
+                        std::string newEndEscapes;
+                        //Just repeat the escape characters
+                        for(int j = 0; j < foundEscapes.size(); ++j)
+                        {
+                            newEndEscapes.push_back(foundEscapes[j]);
+                            newEndEscapes.push_back(foundEscapes[j]);
+                        }
+                    
+                        currentValue = currentValue.substr(0, currentValIndex) + newEndEscapes;
+                    }
+                }
+            }
+            
             ssLOG_DEBUG("Replacing \"" << substitution << "\" with \"" << currentValue << 
                         "\" in \"" << escapedString << "\"");
 
@@ -436,8 +483,8 @@ bool runcpp2::Data::StageInfo::ConstructCommand(const SubstitutionMap& substitut
             {
                 if(substitutionMap.count(substitutionsInCurrentPart.at(j)) == 0)
                 {
-                    ssLOG_DEBUG("No substitution found for " << substitutionsInCurrentPart.at(j) << " in " <<
-                                currentRunParts.at(i).CommandPart);
+                    ssLOG_DEBUG("No substitution found for " << substitutionsInCurrentPart.at(j) << 
+                                " in " << currentRunParts.at(i).CommandPart);
 
                     ssLOG_DEBUG("Current run part is type repeat, skipping to next");
                     continue;

mkdocs/docs/TODO.md

@@ -8,7 +8,12 @@
         - Add initialize submodule option for git
     - Async/Multi-thread compile and dependencies processing
     - Ability to skip DefaultPlatform and DefaultProfile
-
+    - Handle escape characters at the end
+        - To avoid situation like this:
+            - Substitution string: `-I "{path}"`
+            - Substitution value: `.\`
+            - Substituted string: `-I ".\"`
+                - Where the path contains escape character which escaped the wrapping quotes
 
 ## Planned
 
@@ -76,12 +81,6 @@ endfunction()
 print_target_properties(matplot)
 -->
 - Add the ability to specify different profiles(?)/defines for different source files
-- Handle escape characters at the end
-    - To avoid situation like this:
-        - Substitution string: -I "{path}"
-        - Substitution value: .\
-        - Substituted string: -I ".\"
-            - Where the path contains escape character which escaped the wrapping quotes
 - Use <csignal> to handle potential segfaults
 - Use System2 subprocess if no prepend commands to be safer
 - Add tests and examples (On Windows as well)