|
@@ -41,63 +41,63 @@ void ls_std::KvParser::_assignDocument(const std::shared_ptr<ls_std::KvDocument>
|
|
this->document = _document;
|
|
this->document = _document;
|
|
}
|
|
}
|
|
|
|
|
|
-bool ls_std::KvParser::_lineHasPair(ls_std::KvParseData _parseData)
|
|
|
|
|
|
+bool ls_std::KvParser::_lineHasPair(ls_std::KvParseParameter _parseParameter)
|
|
{
|
|
{
|
|
- return _parseData.line.contains("=") && _parseData.line.contains(";");
|
|
|
|
|
|
+ return _parseParameter.line.contains("=") && _parseParameter.line.contains(";");
|
|
}
|
|
}
|
|
|
|
|
|
void ls_std::KvParser::_parse(const ls_std::byte_field &_data)
|
|
void ls_std::KvParser::_parse(const ls_std::byte_field &_data)
|
|
{
|
|
{
|
|
for (std::string::size_type index = 0; index < _data.size(); index++)
|
|
for (std::string::size_type index = 0; index < _data.size(); index++)
|
|
{
|
|
{
|
|
- ls_std::KvParseData parseData = ls_std::KvParser::_readLine(_data, index);
|
|
|
|
- this->_parsePair(parseData);
|
|
|
|
- index = parseData.index;
|
|
|
|
|
|
+ ls_std::KvParseParameter parseParameter = ls_std::KvParser::_readLine(_data, index);
|
|
|
|
+ this->_parsePair(parseParameter);
|
|
|
|
+ index = parseParameter.index;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-void ls_std::KvParser::_parsePair(ls_std::KvParseData _parseData)
|
|
|
|
|
|
+void ls_std::KvParser::_parsePair(ls_std::KvParseParameter _parseParameter)
|
|
{
|
|
{
|
|
- if (ls_std::KvParser::_lineHasPair(_parseData))
|
|
|
|
|
|
+ if (ls_std::KvParser::_lineHasPair(_parseParameter))
|
|
{
|
|
{
|
|
- size_t equalSignPosition = _parseData.line.toString().find('=');
|
|
|
|
- ls_std::kv_key key = _parseData.line.toString().substr(0, equalSignPosition);
|
|
|
|
- ls_std::kv_value value = _parseData.line.toString().substr(equalSignPosition + 1);
|
|
|
|
|
|
+ size_t equalSignPosition = _parseParameter.line.toString().find('=');
|
|
|
|
+ ls_std::kv_key key = _parseParameter.line.toString().substr(0, equalSignPosition);
|
|
|
|
+ ls_std::kv_value value = _parseParameter.line.toString().substr(equalSignPosition + 1);
|
|
value = value.substr(0, value.find(';'));
|
|
value = value.substr(0, value.find(';'));
|
|
|
|
|
|
this->document->addPair(ls_std::KvPair{key, value});
|
|
this->document->addPair(ls_std::KvPair{key, value});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-ls_std::KvParseData ls_std::KvParser::_readLine(const ls_std::byte_field &_data, std::string::size_type _index)
|
|
|
|
|
|
+ls_std::KvParseParameter ls_std::KvParser::_readLine(const ls_std::byte_field &_data, std::string::size_type _index)
|
|
{
|
|
{
|
|
- ls_std::KvParseData parseData{};
|
|
|
|
- parseData.line = _data.substr(_index);
|
|
|
|
|
|
+ ls_std::KvParseParameter parseParameter{};
|
|
|
|
+ parseParameter.line = _data.substr(_index);
|
|
|
|
|
|
- if (parseData.line.contains(ls_std::NewLine::getWindowsNewLine()))
|
|
|
|
|
|
+ if (parseParameter.line.contains(ls_std::NewLine::getWindowsNewLine()))
|
|
{
|
|
{
|
|
- ls_std::KvParser::_readLineWithWindowsLineBreak(parseData);
|
|
|
|
|
|
+ ls_std::KvParser::_readLineWithWindowsLineBreak(parseParameter);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- if (parseData.line.contains(ls_std::NewLine::getUnixNewLine()))
|
|
|
|
|
|
+ if (parseParameter.line.contains(ls_std::NewLine::getUnixNewLine()))
|
|
{
|
|
{
|
|
- ls_std::KvParser::_readLineWithUnixLineBreak(parseData);
|
|
|
|
|
|
+ ls_std::KvParser::_readLineWithUnixLineBreak(parseParameter);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- parseData.index = _index + parseData.line.toString().size();
|
|
|
|
- return parseData;
|
|
|
|
|
|
+ parseParameter.index = _index + parseParameter.line.toString().size();
|
|
|
|
+ return parseParameter;
|
|
}
|
|
}
|
|
|
|
|
|
-void ls_std::KvParser::_readLineWithUnixLineBreak(ls_std::KvParseData &_parseData)
|
|
|
|
|
|
+void ls_std::KvParser::_readLineWithUnixLineBreak(ls_std::KvParseParameter &_parseParameter)
|
|
{
|
|
{
|
|
- size_t newLinePosition = _parseData.line.toString().find(ls_std::NewLine::getUnixNewLine());
|
|
|
|
- _parseData.line = _parseData.line.toString().substr(0, newLinePosition);
|
|
|
|
|
|
+ size_t newLinePosition = _parseParameter.line.toString().find(ls_std::NewLine::getUnixNewLine());
|
|
|
|
+ _parseParameter.line = _parseParameter.line.toString().substr(0, newLinePosition);
|
|
}
|
|
}
|
|
|
|
|
|
-void ls_std::KvParser::_readLineWithWindowsLineBreak(ls_std::KvParseData &_parseData)
|
|
|
|
|
|
+void ls_std::KvParser::_readLineWithWindowsLineBreak(ls_std::KvParseParameter &_parseParameter)
|
|
{
|
|
{
|
|
- size_t newLinePosition = _parseData.line.toString().find(ls_std::NewLine::getWindowsNewLine());
|
|
|
|
- _parseData.line = _parseData.line.toString().substr(0, newLinePosition + 1);
|
|
|
|
|
|
+ size_t newLinePosition = _parseParameter.line.toString().find(ls_std::NewLine::getWindowsNewLine());
|
|
|
|
+ _parseParameter.line = _parseParameter.line.toString().substr(0, newLinePosition + 1);
|
|
}
|
|
}
|