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

Made plasp compatible to recent tokenizer changes.

Browse Source
This commit is contained in:
Patrick Lühne
2017-06-19 00:28:17 +02:00
parent 9fe489de53
commit 586e93190c
22 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,9 +46,9 @@ class Description
Context &m_context;
tokenize::Stream::Position m_domainPosition;
tokenize::StreamPosition m_domainPosition;
std::unique_ptr<Domain> m_domain;
tokenize::Stream::Position m_problemPosition;
tokenize::StreamPosition m_problemPosition;
std::unique_ptr<Problem> m_problem;
};

10
include/plasp/pddl/Domain.h
View File

@@ -75,19 +75,19 @@ class Domain
std::string m_name;
tokenize::Stream::Position m_requirementsPosition;
tokenize::StreamPosition m_requirementsPosition;
Requirements m_requirements;
tokenize::Stream::Position m_typesPosition;
tokenize::StreamPosition m_typesPosition;
expressions::PrimitiveTypes m_types;
tokenize::Stream::Position m_constantsPosition;
tokenize::StreamPosition m_constantsPosition;
expressions::Constants m_constants;
tokenize::Stream::Position m_predicatesPosition;
tokenize::StreamPosition m_predicatesPosition;
expressions::PredicateDeclarations m_predicates;
std::vector<tokenize::Stream::Position> m_actionPositions;
std::vector<tokenize::StreamPosition> m_actionPositions;
std::vector<std::unique_ptr<Action>> m_actions;
expressions::DerivedPredicates m_derivedPredicates;

10
include/plasp/pddl/Problem.h
View File

@@ -64,18 +64,18 @@ class Problem
std::string m_name;
tokenize::Stream::Position m_domainPosition;
tokenize::StreamPosition m_domainPosition;
tokenize::Stream::Position m_requirementsPosition;
tokenize::StreamPosition m_requirementsPosition;
Requirements m_requirements;
tokenize::Stream::Position m_objectsPosition;
tokenize::StreamPosition m_objectsPosition;
expressions::Constants m_objects;
tokenize::Stream::Position m_initialStatePosition;
tokenize::StreamPosition m_initialStatePosition;
std::unique_ptr<InitialState> m_initialState;
tokenize::Stream::Position m_goalPosition;
tokenize::StreamPosition m_goalPosition;
ExpressionPointer m_goal;
};

2
include/plasp/pddl/expressions/NAry.h
View File

@@ -79,7 +79,7 @@ boost::intrusive_ptr<Derived> NAry<Derived>::parse(Context &context,
}
if (expression->m_arguments.empty())
context.logger.log(output::Priority::Warning, tokenizer.location(), "“" + Derived::Identifier + "” expressions should not be empty");
context.logger.log(output::Priority::Warning, tokenizer, "“" + Derived::Identifier + "” expressions should not be empty");
tokenizer.expect<std::string>(")");