Browse Source

Small renaming

tempestpy_adaptions
Matthias Volk 6 years ago
parent
commit
97b14e35d5
  1. 12
      src/storm-dft/parser/DFTGalileoParser.cpp

12
src/storm-dft/parser/DFTGalileoParser.cpp

@ -174,12 +174,12 @@ namespace storm {
template<typename ValueType> template<typename ValueType>
std::pair<bool, ValueType> DFTGalileoParser<ValueType>::parseValue(std::string name, std::string& line, ValueParser<ValueType>& valueParser) { std::pair<bool, ValueType> DFTGalileoParser<ValueType>::parseValue(std::string name, std::string& line, ValueParser<ValueType>& valueParser) {
// Build regex for: name=(value) // Build regex for: name=(value)
std::regex lambdaRegex(name + "\\s*=\\s*([^\\s]*)");
std::regex nameRegex(name + "\\s*=\\s*([^\\s]*)");
std::smatch match; std::smatch match;
if (std::regex_search(line, match, lambdaRegex)) {
if (std::regex_search(line, match, nameRegex)) {
std::string value = match.str(1); std::string value = match.str(1);
// Remove matched part // Remove matched part
line = std::regex_replace(line, lambdaRegex, "");
line = std::regex_replace(line, nameRegex, "");
return std::make_pair(true, valueParser.parseValue(value)); return std::make_pair(true, valueParser.parseValue(value));
} else { } else {
// No match found // No match found
@ -190,12 +190,12 @@ namespace storm {
template<typename ValueType> template<typename ValueType>
std::pair<bool, unsigned> DFTGalileoParser<ValueType>::parseNumber(std::string name, std::string& line) { std::pair<bool, unsigned> DFTGalileoParser<ValueType>::parseNumber(std::string name, std::string& line) {
// Build regex for: name=(number) // Build regex for: name=(number)
std::regex lambdaRegex(name + "\\s*=\\s*([[:digit:]]+)");
std::regex nameRegex(name + "\\s*=\\s*([[:digit:]]+)");
std::smatch match; std::smatch match;
if (std::regex_search(line, match, lambdaRegex)) {
if (std::regex_search(line, match, nameRegex)) {
std::string value = match.str(1); std::string value = match.str(1);
// Remove matched part // Remove matched part
line = std::regex_replace(line, lambdaRegex, "");
line = std::regex_replace(line, nameRegex, "");
return std::make_pair(true, NumberParser<unsigned>::parse(value)); return std::make_pair(true, NumberParser<unsigned>::parse(value));
} else { } else {
// No match found // No match found

Loading…
Cancel
Save