Use a type definition in Target.hpp

This commit is contained in:
Username404 2021-09-12 13:48:34 +02:00
parent 5f97e94abf
commit d9913d0c9f
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1

View File

@ -21,15 +21,16 @@ protected:
INCLUDECOMPONENT(StandardComponents::types::String);
inline void stringInterpolation(const char* multiline, const string& view) { stringInterpolation(view, multiline, multiline); }
void stringInterpolation(string view, const char* openMultiline = "", const char* closeMultiline = "", const char* concatenationCharacters = "+") {
vector<size_t> interpolationVector;
unsigned long occurrence_position = view.find(interpolationString);
typedef string::size_type strSize;
vector<strSize> interpolationVector;
strSize occurrence_position = view.find(interpolationString);
if (view.find(interpolationCloseString) != string::npos) {
while (occurrence_position != string::npos) {
interpolationVector.push_back(occurrence_position);
occurrence_position = view.find(interpolationString, occurrence_position + strlen(interpolationString));
}
}
unsigned long newLine = view.find('\n');
strSize newLine = view.find('\n');
const bool multiline = newLine != string::npos && not !strcmp(openMultiline, "") && not !strcmp(closeMultiline, openMultiline);
if (not multiline) {
while (newLine != string::npos) {
@ -41,7 +42,7 @@ protected:
const char* const openCharacters = multiline ? openMultiline : "\"";
decltype(openCharacters) closeCharacters = multiline ? closeMultiline : openCharacters;
if (not interpolationVector.empty()) {
unsigned long closingBrace = 0;
strSize closingBrace = 0;
for (unsigned long i = 0; i < interpolationVector.size(); ++i) {
const auto& occurrence = interpolationVector[i];
const bool hasNext = (i + 1) < interpolationVector.size();