patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Simplified parsing of primitive types.

Browse Source
This commit is contained in:
Patrick Lühne 2016-05-20 16:45:15 +02:00
parent 59661621cd
commit 44e7535e64
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/plasp/sas/Description.h
View File

@ -33,7 +33,9 @@ class Description
private: private:
void parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const; void parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const;
size_t parseNumber(std::istream &istream) const;
template<class T>
T parseValue(std::istream &istream) const;
const Variable &parseVariable(std::istream &istream) const; const Variable &parseVariable(std::istream &istream) const;
const Value &parseVariableValue(std::istream &istream, const Variable &variable) const; const Value &parseVariableValue(std::istream &istream, const Variable &variable) const;
AssignedVariable parseAssignedVariable(std::istream &istream) const; AssignedVariable parseAssignedVariable(std::istream &istream) const;

54
src/plasp/sas/Description.cpp
View File

@ -169,9 +169,7 @@ void Description::print(std::ostream &ostream) const
void Description::parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const void Description::parseSectionIdentifier(std::istream &istream, const std::string &expectedSectionIdentifier) const
{ {
std::string sectionIdentifier; const auto sectionIdentifier = parseValue<std::string>(istream);
istream >> sectionIdentifier;
if (sectionIdentifier != expectedSectionIdentifier) if (sectionIdentifier != expectedSectionIdentifier)
throw ParserException("Invalid format, expected " + expectedSectionIdentifier + ", got " + sectionIdentifier); throw ParserException("Invalid format, expected " + expectedSectionIdentifier + ", got " + sectionIdentifier);
@ -179,31 +177,28 @@ void Description::parseSectionIdentifier(std::istream &istream, const std::strin
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
size_t Description::parseNumber(std::istream &istream) const template<class T>
T Description::parseValue(std::istream &istream) const
{ {
auto number = std::numeric_limits<size_t>::max(); T value;
try try
{ {
istream >> number; istream >> value;
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {
throw ParserException(std::string("Could not parse number (") + e.what() + ")"); throw ParserException(std::string("Could not parse value of type ") + typeid(T).name() + "(" + e.what() + ")");
} }
if (number == std::numeric_limits<size_t>::max()) return value;
throw ParserException("Invalid number");
return number;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
const Variable &Description::parseVariable(std::istream &istream) const const Variable &Description::parseVariable(std::istream &istream) const
{ {
auto variableID = std::numeric_limits<size_t>::max(); const auto variableID = parseValue<size_t>(istream);
istream >> variableID;
if (variableID >= m_variables.size()) if (variableID >= m_variables.size())
throw ParserException("Variable index out of range (index " + std::to_string(variableID) + ")"); throw ParserException("Variable index out of range (index " + std::to_string(variableID) + ")");
@ -215,8 +210,7 @@ const Variable &Description::parseVariable(std::istream &istream) const
const Value &Description::parseVariableValue(std::istream &istream, const Variable &variable) const const Value &Description::parseVariableValue(std::istream &istream, const Variable &variable) const
{ {
auto valueID = std::numeric_limits<int>::max(); const auto valueID = parseValue<int>(istream);
istream >> valueID;
if (valueID == -1) if (valueID == -1)
return Value::Any; return Value::Any;
@ -255,7 +249,7 @@ void Description::parseVersionSection(std::istream &istream) const
// Version section // Version section
parseSectionIdentifier(istream, "begin_version"); parseSectionIdentifier(istream, "begin_version");
const auto formatVersion = parseNumber(istream); const auto formatVersion = parseValue<size_t>(istream);
if (formatVersion != 3) if (formatVersion != 3)
throw ParserException("Unsupported SAS format version (" + std::to_string(formatVersion) + ")"); throw ParserException("Unsupported SAS format version (" + std::to_string(formatVersion) + ")");
@ -280,7 +274,7 @@ void Description::parseMetricSection(std::istream &istream)
void Description::parseVariablesSection(std::istream &istream) void Description::parseVariablesSection(std::istream &istream)
{ {
const auto numberOfVariables = parseNumber(istream); const auto numberOfVariables = parseValue<size_t>(istream);
m_variables.resize(numberOfVariables); m_variables.resize(numberOfVariables);
for (size_t i = 0; i < numberOfVariables; i++) for (size_t i = 0; i < numberOfVariables; i++)
@ -289,10 +283,10 @@ void Description::parseVariablesSection(std::istream &istream)
parseSectionIdentifier(istream, "begin_variable"); parseSectionIdentifier(istream, "begin_variable");
istream >> variable.name; variable.name = parseValue<std::string>(istream);
istream >> variable.axiomLayer; variable.axiomLayer = parseValue<int>(istream);
const auto numberOfValues = parseNumber(istream); const auto numberOfValues = parseValue<size_t>(istream);
variable.values.resize(numberOfValues); variable.values.resize(numberOfValues);
istream.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); istream.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
@ -311,7 +305,7 @@ void Description::parseVariablesSection(std::istream &istream)
void Description::parseMutexSection(std::istream &istream) void Description::parseMutexSection(std::istream &istream)
{ {
const auto numberOfMutexGroups = parseNumber(istream); const auto numberOfMutexGroups = parseValue<size_t>(istream);
m_mutexGroups.resize(numberOfMutexGroups); m_mutexGroups.resize(numberOfMutexGroups);
for (size_t i = 0; i < numberOfMutexGroups; i++) for (size_t i = 0; i < numberOfMutexGroups; i++)
@ -320,7 +314,7 @@ void Description::parseMutexSection(std::istream &istream)
auto &mutexGroup = m_mutexGroups[i]; auto &mutexGroup = m_mutexGroups[i];
const auto numberOfFacts = parseNumber(istream); const auto numberOfFacts = parseValue<size_t>(istream);
mutexGroup.facts.reserve(numberOfFacts); mutexGroup.facts.reserve(numberOfFacts);
for (size_t j = 0; j < numberOfFacts; j++) for (size_t j = 0; j < numberOfFacts; j++)
@ -358,7 +352,7 @@ void Description::parseGoalSection(std::istream &istream)
{ {
parseSectionIdentifier(istream, "begin_goal"); parseSectionIdentifier(istream, "begin_goal");
const auto numberOfGoalFacts = parseNumber(istream); const auto numberOfGoalFacts = parseValue<size_t>(istream);
m_goalFacts.reserve(numberOfGoalFacts); m_goalFacts.reserve(numberOfGoalFacts);
for (size_t i = 0; i < numberOfGoalFacts; i++) for (size_t i = 0; i < numberOfGoalFacts; i++)
@ -374,7 +368,7 @@ void Description::parseGoalSection(std::istream &istream)
void Description::parseOperatorSection(std::istream &istream) void Description::parseOperatorSection(std::istream &istream)
{ {
const auto numberOfOperators = parseNumber(istream); const auto numberOfOperators = parseValue<size_t>(istream);
m_operators.resize(numberOfOperators); m_operators.resize(numberOfOperators);
for (size_t i = 0; i < numberOfOperators; i++) for (size_t i = 0; i < numberOfOperators; i++)
@ -386,7 +380,7 @@ void Description::parseOperatorSection(std::istream &istream)
auto &operator_ = m_operators[i]; auto &operator_ = m_operators[i];
std::getline(istream, operator_.name); std::getline(istream, operator_.name);
const auto numberOfPrevailConditions = parseNumber(istream); const auto numberOfPrevailConditions = parseValue<size_t>(istream);
operator_.preconditions.reserve(numberOfPrevailConditions); operator_.preconditions.reserve(numberOfPrevailConditions);
for (size_t j = 0; j < numberOfPrevailConditions; j++) for (size_t j = 0; j < numberOfPrevailConditions; j++)
@ -395,14 +389,14 @@ void Description::parseOperatorSection(std::istream &istream)
operator_.preconditions.push_back(std::move(precondition)); operator_.preconditions.push_back(std::move(precondition));
} }
const auto numberOfEffects = parseNumber(istream); const auto numberOfEffects = parseValue<size_t>(istream);
operator_.effects.reserve(numberOfEffects); operator_.effects.reserve(numberOfEffects);
for (size_t j = 0; j < numberOfEffects; j++) for (size_t j = 0; j < numberOfEffects; j++)
{ {
Effect::Conditions conditions; Effect::Conditions conditions;
const auto numberOfEffectConditions = parseNumber(istream); const auto numberOfEffectConditions = parseValue<size_t>(istream);
conditions.reserve(numberOfEffectConditions); conditions.reserve(numberOfEffectConditions);
for (size_t k = 0; k < numberOfEffectConditions; k++) for (size_t k = 0; k < numberOfEffectConditions; k++)
@ -421,7 +415,7 @@ void Description::parseOperatorSection(std::istream &istream)
operator_.effects.push_back(std::move(effect)); operator_.effects.push_back(std::move(effect));
} }
operator_.costs = parseNumber(istream); operator_.costs = parseValue<size_t>(istream);
parseSectionIdentifier(istream, "end_operator"); parseSectionIdentifier(istream, "end_operator");
} }
@ -431,7 +425,7 @@ void Description::parseOperatorSection(std::istream &istream)
void Description::parseAxiomSection(std::istream &istream) void Description::parseAxiomSection(std::istream &istream)
{ {
const auto numberOfAxiomRules = parseNumber(istream); const auto numberOfAxiomRules = parseValue<size_t>(istream);
m_axiomRules.reserve(numberOfAxiomRules); m_axiomRules.reserve(numberOfAxiomRules);
std::cout << "Axiom rules: " << numberOfAxiomRules << std::endl; std::cout << "Axiom rules: " << numberOfAxiomRules << std::endl;
@ -440,7 +434,7 @@ void Description::parseAxiomSection(std::istream &istream)
{ {
parseSectionIdentifier(istream, "begin_rule"); parseSectionIdentifier(istream, "begin_rule");
const auto numberOfConditions = parseNumber(istream); const auto numberOfConditions = parseValue<size_t>(istream);
AxiomRule::Conditions conditions; AxiomRule::Conditions conditions;
conditions.reserve(numberOfConditions); conditions.reserve(numberOfConditions);