Use a type definition in Target.hpp
This commit is contained in:
parent
5f97e94abf
commit
d9913d0c9f
@ -21,15 +21,16 @@ protected:
|
|||||||
INCLUDECOMPONENT(StandardComponents::types::String);
|
INCLUDECOMPONENT(StandardComponents::types::String);
|
||||||
inline void stringInterpolation(const char* multiline, const string& view) { stringInterpolation(view, multiline, multiline); }
|
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 = "+") {
|
void stringInterpolation(string view, const char* openMultiline = "", const char* closeMultiline = "", const char* concatenationCharacters = "+") {
|
||||||
vector<size_t> interpolationVector;
|
typedef string::size_type strSize;
|
||||||
unsigned long occurrence_position = view.find(interpolationString);
|
vector<strSize> interpolationVector;
|
||||||
|
strSize occurrence_position = view.find(interpolationString);
|
||||||
if (view.find(interpolationCloseString) != string::npos) {
|
if (view.find(interpolationCloseString) != string::npos) {
|
||||||
while (occurrence_position != string::npos) {
|
while (occurrence_position != string::npos) {
|
||||||
interpolationVector.push_back(occurrence_position);
|
interpolationVector.push_back(occurrence_position);
|
||||||
occurrence_position = view.find(interpolationString, occurrence_position + strlen(interpolationString));
|
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);
|
const bool multiline = newLine != string::npos && not !strcmp(openMultiline, "") && not !strcmp(closeMultiline, openMultiline);
|
||||||
if (not multiline) {
|
if (not multiline) {
|
||||||
while (newLine != string::npos) {
|
while (newLine != string::npos) {
|
||||||
@ -41,7 +42,7 @@ protected:
|
|||||||
const char* const openCharacters = multiline ? openMultiline : "\"";
|
const char* const openCharacters = multiline ? openMultiline : "\"";
|
||||||
decltype(openCharacters) closeCharacters = multiline ? closeMultiline : openCharacters;
|
decltype(openCharacters) closeCharacters = multiline ? closeMultiline : openCharacters;
|
||||||
if (not interpolationVector.empty()) {
|
if (not interpolationVector.empty()) {
|
||||||
unsigned long closingBrace = 0;
|
strSize closingBrace = 0;
|
||||||
for (unsigned long i = 0; i < interpolationVector.size(); ++i) {
|
for (unsigned long i = 0; i < interpolationVector.size(); ++i) {
|
||||||
const auto& occurrence = interpolationVector[i];
|
const auto& occurrence = interpolationVector[i];
|
||||||
const bool hasNext = (i + 1) < interpolationVector.size();
|
const bool hasNext = (i + 1) < interpolationVector.size();
|
||||||
|
Loading…
Reference in New Issue
Block a user