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

Reimplemented tokenizer with plain streams.

Browse Source
This commit is contained in:
Patrick Lühne
2017-06-18 15:09:42 +02:00
parent b9b987490b
commit 268fa84c9e
10 changed files with 122 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp
View File

@@ -23,10 +23,10 @@ namespace detail
ActionParser::ActionParser(Context &context, ast::Domain &domain)
: m_context{context},
m_domain{domain},
m_parametersPosition{-1},
m_preconditionPosition{-1},
m_effectPosition{-1},
m_varsPosition{-1}
m_parametersPosition{tokenize::Stream::InvalidPosition},
m_preconditionPosition{tokenize::Stream::InvalidPosition},
m_effectPosition{tokenize::Stream::InvalidPosition},
m_varsPosition{tokenize::Stream::InvalidPosition}
{
}
@@ -40,26 +40,26 @@ ast::ActionPointer ActionParser::parse()
auto &tokenizer = m_context.tokenizer;
if (m_parametersPosition != -1)
if (m_parametersPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_parametersPosition);
parseParameterSection(*action);
}
// For compatibility with old PDDL versions, vars sections are parsed in addition to parameters
if (m_varsPosition != -1)
if (m_varsPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_varsPosition);
parseVarsSection(*action);
}
if (m_preconditionPosition != -1)
if (m_preconditionPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_preconditionPosition);
parsePreconditionSection(*action);
}
if (m_effectPosition != -1)
if (m_effectPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_effectPosition);
parseEffectSection(*action);
@@ -84,7 +84,7 @@ void ActionParser::findSections(ast::Action &action)
const auto setSectionPosition =
[&](const std::string &sectionName, auto &sectionPosition, const auto value, bool unique = false)
{
if (unique && sectionPosition != -1)
if (unique && sectionPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(value);
throw ParserException(tokenizer.location(), "only one “:" + sectionName + "” section allowed");

2
lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp
View File

@@ -19,8 +19,8 @@ namespace detail
void parseAndAddUntypedConstantDeclaration(Context &context, ast::ConstantDeclarations &constantDeclarations)
{
auto &tokenizer = context.tokenizer;
auto constantName = tokenizer.getIdentifier();
auto constantName = tokenizer.getIdentifier();
assert(constantName != "-");
constantDeclarations.emplace_back(std::make_unique<ast::ConstantDeclaration>(std::move(constantName)));

12
lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp
View File

@@ -19,8 +19,8 @@ namespace detail
DescriptionParser::DescriptionParser(Context &context)
: m_context{context},
m_domainPosition{-1},
m_problemPosition{-1}
m_domainPosition{tokenize::Stream::InvalidPosition},
m_problemPosition{tokenize::Stream::InvalidPosition}
{
}
@@ -33,7 +33,7 @@ ast::Description DescriptionParser::parse()
findSections();
if (m_domainPosition == -1)
if (m_domainPosition == tokenize::Stream::InvalidPosition)
throw ParserException("no PDDL domain specified");
tokenizer.seek(m_domainPosition);
@@ -41,7 +41,7 @@ ast::Description DescriptionParser::parse()
auto domain = DomainParser(m_context).parse();
// If no problem is given, return just the domain
if (m_problemPosition == -1)
if (m_problemPosition == tokenize::Stream::InvalidPosition)
return {std::move(domain), std::experimental::nullopt};
tokenizer.seek(m_problemPosition);
@@ -86,7 +86,7 @@ void DescriptionParser::findSections()
if (tokenizer.testAndSkip<std::string>("domain"))
{
if (m_domainPosition != -1)
if (m_domainPosition != tokenize::Stream::InvalidPosition)
throw ParserException(tokenizer.location(), "PDDL description may not contain two domains");
m_domainPosition = position;
@@ -95,7 +95,7 @@ void DescriptionParser::findSections()
}
else if (m_context.tokenizer.testAndSkip<std::string>("problem"))
{
if (m_problemPosition != -1)
if (m_problemPosition != tokenize::Stream::InvalidPosition)
throw ParserException("PDDL description may not contain two problems currently");
m_problemPosition = position;

22
lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp
View File

@@ -22,10 +22,10 @@ namespace detail
DomainParser::DomainParser(Context &context)
: m_context{context},
m_requirementsPosition{-1},
m_typesPosition{-1},
m_constantsPosition{-1},
m_predicatesPosition{-1}
m_requirementsPosition{tokenize::Stream::InvalidPosition},
m_typesPosition{tokenize::Stream::InvalidPosition},
m_constantsPosition{tokenize::Stream::InvalidPosition},
m_predicatesPosition{tokenize::Stream::InvalidPosition}
{
}
@@ -39,32 +39,32 @@ ast::DomainPointer DomainParser::parse()
auto &tokenizer = m_context.tokenizer;
if (m_requirementsPosition != -1)
if (m_requirementsPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_requirementsPosition);
parseRequirementSection(*domain);
}
if (m_typesPosition != -1)
if (m_typesPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_typesPosition);
parseTypeSection(*domain);
}
if (m_constantsPosition != -1)
if (m_constantsPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_constantsPosition);
parseConstantSection(*domain);
}
if (m_predicatesPosition != -1)
if (m_predicatesPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_predicatesPosition);
parsePredicateSection(*domain);
}
for (size_t i = 0; i < m_actionPositions.size(); i++)
if (m_actionPositions[i] != -1)
if (m_actionPositions[i] != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_actionPositions[i]);
parseActionSection(*domain);
@@ -93,7 +93,7 @@ void DomainParser::findSections(ast::Domain &domain)
const auto setSectionPosition =
[&](const std::string &sectionName, auto &sectionPosition, const auto value, bool unique = false)
{
if (unique && sectionPosition != -1)
if (unique && sectionPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(value);
throw ParserException(tokenizer.location(), "only one “:" + sectionName + "” section allowed");
@@ -125,7 +125,7 @@ void DomainParser::findSections(ast::Domain &domain)
setSectionPosition("predicates", m_predicatesPosition, position, true);
else if (tokenizer.testIdentifierAndSkip("action"))
{
m_actionPositions.emplace_back(-1);
m_actionPositions.emplace_back(tokenize::Stream::InvalidPosition);
setSectionPosition("action", m_actionPositions.back(), position);
}
else if (tokenizer.testIdentifierAndSkip("functions")

2
lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp
View File

@@ -19,8 +19,6 @@ ast::PrimitiveTypePointer parsePrimitiveType(Context &context, ast::Domain &doma
auto &tokenizer = context.tokenizer;
auto &types = domain.types;
tokenizer.skipWhiteSpace();
auto typeName = tokenizer.getIdentifier();
if (typeName.empty())

22
lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
View File

@@ -22,11 +22,11 @@ namespace detail
ProblemParser::ProblemParser(Context &context, ast::Domain &domain)
: m_context{context},
m_domain{domain},
m_domainPosition{-1},
m_requirementsPosition{-1},
m_objectsPosition{-1},
m_initialStatePosition{-1},
m_goalPosition{-1}
m_domainPosition{tokenize::Stream::InvalidPosition},
m_requirementsPosition{tokenize::Stream::InvalidPosition},
m_objectsPosition{tokenize::Stream::InvalidPosition},
m_initialStatePosition{tokenize::Stream::InvalidPosition},
m_goalPosition{tokenize::Stream::InvalidPosition}
{
}
@@ -40,31 +40,31 @@ ast::ProblemPointer ProblemParser::parse()
auto &tokenizer = m_context.tokenizer;
if (m_domainPosition == -1)
if (m_domainPosition == tokenize::Stream::InvalidPosition)
throw ParserException(tokenizer.location(), "problem description does not specify a corresponding domain");
tokenizer.seek(m_domainPosition);
parseDomainSection(*problem);
if (m_requirementsPosition != -1)
if (m_requirementsPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_requirementsPosition);
parseRequirementSection(*problem);
}
if (m_objectsPosition != -1)
if (m_objectsPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(m_objectsPosition);
parseObjectSection(*problem);
}
if (m_initialStatePosition == -1)
if (m_initialStatePosition == tokenize::Stream::InvalidPosition)
throw ParserException(tokenizer.location(), "problem description does not specify an initial state");
tokenizer.seek(m_initialStatePosition);
parseInitialStateSection(*problem);
if (m_goalPosition == -1)
if (m_goalPosition == tokenize::Stream::InvalidPosition)
throw ParserException(tokenizer.location(), "problem description does not specify a goal");
tokenizer.seek(m_goalPosition);
@@ -91,7 +91,7 @@ void ProblemParser::findSections(ast::Problem &problem)
const auto setSectionPosition =
[&](const std::string &sectionName, auto &sectionPosition, const auto value, bool unique = false)
{
if (unique && sectionPosition != -1)
if (unique && sectionPosition != tokenize::Stream::InvalidPosition)
{
tokenizer.seek(value);
throw ParserException(tokenizer.location(), "only one “:" + sectionName + "” section allowed");

2
lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp
View File

@@ -19,9 +19,9 @@ namespace detail
void parseAndAddUntypedVariableDeclaration(Context &context, ast::VariableDeclarations &variableDeclarations)
{
auto &tokenizer = context.tokenizer;
tokenizer.expect<std::string>("?");
auto variableName = tokenizer.getIdentifier();
assert(variableName != "-");
variableDeclarations.emplace_back(std::make_unique<ast::VariableDeclaration>(std::move(variableName)));