From 9199b68080ed3a5ba6ff0371d9bf62f19a7f0212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Wed, 9 Aug 2017 17:52:50 +0200 Subject: [PATCH] =?UTF-8?q?Renamed=20=E2=80=9Cpddlparse=E2=80=9D=20library?= =?UTF-8?q?=20to=20simply=20=E2=80=9Cpddl=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- app/CMakeLists.txt | 2 +- app/main.cpp | 14 ++++++------- include/plasp/pddl/TranslatorASP.h | 4 ++-- .../pddl/translation/ConditionalEffect.h | 2 +- .../plasp/pddl/translation/DerivedPredicate.h | 4 ++-- .../DerivedPredicatePrecondition.h | 2 +- include/plasp/pddl/translation/Effect.h | 2 +- include/plasp/pddl/translation/Goal.h | 2 +- include/plasp/pddl/translation/Precondition.h | 2 +- include/plasp/pddl/translation/Predicate.h | 4 ++-- include/plasp/pddl/translation/Primitives.h | 2 +- .../plasp/pddl/translation/VariableStack.h | 2 +- include/plasp/pddl/translation/Variables.h | 4 ++-- lib/{pddlparse => pddl}/CMakeLists.txt | 8 ++++---- .../pddlparse => pddl/include/pddl}/AST.h | 6 +++--- .../include/pddl}/ASTForward.h | 6 +++--- .../include/pddl}/ASTOutput.h | 10 +++++----- .../pddlparse => pddl/include/pddl}/Context.h | 8 ++++---- .../include/pddl}/Exception.h | 4 ++-- .../pddlparse => pddl/include/pddl}/Mode.h | 6 +++--- .../include/pddl}/Normalize.h | 12 +++++------ .../include/pddl}/NormalizedAST.h | 6 +++--- .../include/pddl}/NormalizedASTForward.h | 6 +++--- .../include/pddl}/NormalizedASTOutput.h | 12 +++++------ .../pddlparse => pddl/include/pddl}/Parse.h | 8 ++++---- .../include/pddl}/Tokenizer.h | 4 ++-- .../pddlparse => pddl/include/pddl}/Variant.h | 4 ++-- .../include/pddl}/detail/ASTContext.h | 8 ++++---- .../include/pddl}/detail/ASTCopy.h | 8 ++++---- .../include/pddl}/detail/OutputUtils.h | 4 ++-- .../include/pddl}/detail/Requirements.h | 8 ++++---- .../include/pddl}/detail/SignatureMatching.h | 6 +++--- .../include/pddl}/detail/VariableStack.h | 6 +++--- .../pddl}/detail/normalization/Action.h | 10 +++++----- .../detail/normalization/AtomicFormula.h | 10 +++++----- .../normalization/CollectFreeVariables.h | 14 ++++++------- .../detail/normalization/ConditionalEffect.h | 10 +++++----- .../pddl}/detail/normalization/Description.h | 10 +++++----- .../pddl}/detail/normalization/Domain.h | 10 +++++----- .../pddl}/detail/normalization/Effect.h | 10 +++++----- .../include/pddl}/detail/normalization/Fact.h | 10 +++++----- .../pddl}/detail/normalization/InitialState.h | 10 +++++----- .../pddl}/detail/normalization/Literal.h | 10 +++++----- .../pddl}/detail/normalization/Precondition.h | 10 +++++----- .../pddl}/detail/normalization/Problem.h | 10 +++++----- .../pddl}/detail/normalization/Reduction.h | 10 +++++----- .../include/pddl}/detail/parsing/Action.h | 8 ++++---- .../pddl}/detail/parsing/AtomicFormula.h | 12 +++++------ .../include/pddl}/detail/parsing/Constant.h | 10 +++++----- .../detail/parsing/ConstantDeclaration.h | 8 ++++---- .../pddl}/detail/parsing/Description.h | 8 ++++---- .../include/pddl}/detail/parsing/Domain.h | 8 ++++---- .../include/pddl}/detail/parsing/Effect.h | 12 +++++------ .../pddl}/detail/parsing/Expressions.h | 16 +++++++-------- .../include/pddl}/detail/parsing/Fact.h | 12 +++++------ .../pddl}/detail/parsing/InitialState.h | 8 ++++---- .../include/pddl}/detail/parsing/Parser.h | 10 +++++----- .../pddl}/detail/parsing/Precondition.h | 12 +++++------ .../include/pddl}/detail/parsing/Predicate.h | 12 +++++------ .../detail/parsing/PredicateDeclaration.h | 8 ++++---- .../pddl}/detail/parsing/PrimitiveType.h | 8 ++++---- .../detail/parsing/PrimitiveTypeDeclaration.h | 8 ++++---- .../include/pddl}/detail/parsing/Problem.h | 8 ++++---- .../pddl}/detail/parsing/Requirement.h | 8 ++++---- .../include/pddl}/detail/parsing/Type.h | 8 ++++---- .../pddl}/detail/parsing/Unsupported.h | 8 ++++---- .../include/pddl}/detail/parsing/Utils.h | 6 +++--- .../include/pddl}/detail/parsing/Variable.h | 10 +++++----- .../detail/parsing/VariableDeclaration.h | 8 ++++---- lib/{pddlparse => pddl}/src/CMakeLists.txt | 18 ++++++++--------- .../src/pddlparse => pddl/src/pddl}/Parse.cpp | 6 +++--- .../src/pddl}/detail/Requirements.cpp | 6 +++--- .../src/pddl}/detail/SignatureMatching.cpp | 2 +- .../src/pddl}/detail/VariableStack.cpp | 4 ++-- .../src/pddl}/detail/normalization/Action.cpp | 10 +++++----- .../detail/normalization/AtomicFormula.cpp | 8 ++++---- .../normalization/ConditionalEffect.cpp | 12 +++++------ .../detail/normalization/Description.cpp | 10 +++++----- .../src/pddl}/detail/normalization/Domain.cpp | 8 ++++---- .../src/pddl}/detail/normalization/Effect.cpp | 14 ++++++------- .../src/pddl}/detail/normalization/Fact.cpp | 10 +++++----- .../detail/normalization/InitialState.cpp | 10 +++++----- .../pddl}/detail/normalization/Literal.cpp | 10 +++++----- .../detail/normalization/Precondition.cpp | 14 ++++++------- .../pddl}/detail/normalization/Problem.cpp | 10 +++++----- .../pddl}/detail/normalization/Reduction.cpp | 12 +++++------ .../src/pddl}/detail/parsing/Action.cpp | 18 ++++++++--------- .../pddl}/detail/parsing/AtomicFormula.cpp | 8 ++++---- .../src/pddl}/detail/parsing/Constant.cpp | 6 +++--- .../detail/parsing/ConstantDeclaration.cpp | 10 +++++----- .../src/pddl}/detail/parsing/Description.cpp | 12 +++++------ .../src/pddl}/detail/parsing/Domain.cpp | 20 +++++++++---------- .../src/pddl}/detail/parsing/Effect.cpp | 14 ++++++------- .../src/pddl}/detail/parsing/Fact.cpp | 10 +++++----- .../src/pddl}/detail/parsing/InitialState.cpp | 8 ++++---- .../src/pddl}/detail/parsing/Precondition.cpp | 12 +++++------ .../src/pddl}/detail/parsing/Predicate.cpp | 14 ++++++------- .../detail/parsing/PredicateDeclaration.cpp | 8 ++++---- .../pddl}/detail/parsing/PrimitiveType.cpp | 6 +++--- .../parsing/PrimitiveTypeDeclaration.cpp | 8 ++++---- .../src/pddl}/detail/parsing/Problem.cpp | 18 ++++++++--------- .../src/pddl}/detail/parsing/Requirement.cpp | 6 +++--- .../src/pddl}/detail/parsing/Type.cpp | 8 ++++---- .../src/pddl}/detail/parsing/Unsupported.cpp | 6 +++--- .../src/pddl}/detail/parsing/Variable.cpp | 6 +++--- .../detail/parsing/VariableDeclaration.cpp | 10 +++++----- lib/{pddlparse => pddl}/tests/CMakeLists.txt | 8 ++++---- .../TestAcceptanceOfOfficialPDDLInstances.cpp | 4 ++-- lib/{pddlparse => pddl}/tests/TestIssues.cpp | 4 ++-- .../tests/TestOfficialPDDLInstances.cpp | 4 ++-- lib/{pddlparse => pddl}/tests/TestParser.cpp | 4 ++-- .../tests/TestSignatureMatching.cpp | 4 ++-- lib/{pddlparse => pddl}/tests/main.cpp | 0 src/CMakeLists.txt | 4 ++-- src/plasp/pddl/TranslatorASP.cpp | 2 +- tests/CMakeLists.txt | 2 +- tests/TestPDDLTranslation.cpp | 6 +++--- 120 files changed, 479 insertions(+), 479 deletions(-) rename lib/{pddlparse => pddl}/CMakeLists.txt (88%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/AST.h (99%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/ASTForward.h (98%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/ASTOutput.h (99%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Context.h (89%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Exception.h (96%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Mode.h (82%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Normalize.h (63%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/NormalizedAST.h (97%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/NormalizedASTForward.h (98%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/NormalizedASTOutput.h (97%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Parse.h (77%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Tokenizer.h (93%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/Variant.h (87%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/ASTContext.h (84%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/ASTCopy.h (97%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/OutputUtils.h (96%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/Requirements.h (84%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/SignatureMatching.h (90%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/VariableStack.h (85%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Action.h (69%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/AtomicFormula.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/CollectFreeVariables.h (93%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/ConditionalEffect.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Description.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Domain.h (67%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Effect.h (69%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Fact.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/InitialState.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Literal.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Precondition.h (69%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Problem.h (68%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/normalization/Reduction.h (65%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Action.h (86%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/AtomicFormula.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Constant.h (73%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/ConstantDeclaration.h (74%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Description.h (78%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Domain.h (87%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Effect.h (66%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Expressions.h (96%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Fact.h (67%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/InitialState.h (72%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Parser.h (81%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Precondition.h (71%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Predicate.h (68%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/PredicateDeclaration.h (70%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/PrimitiveType.h (72%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/PrimitiveTypeDeclaration.h (70%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Problem.h (88%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Requirement.h (75%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Type.h (73%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Unsupported.h (77%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Utils.h (85%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/Variable.h (74%) rename lib/{pddlparse/include/pddlparse => pddl/include/pddl}/detail/parsing/VariableDeclaration.h (76%) rename lib/{pddlparse => pddl}/src/CMakeLists.txt (51%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/Parse.cpp (80%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/Requirements.cpp (96%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/SignatureMatching.cpp (98%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/VariableStack.cpp (96%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Action.cpp (81%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/AtomicFormula.cpp (80%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/ConditionalEffect.cpp (80%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Description.cpp (77%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Domain.cpp (85%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Effect.cpp (85%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Fact.cpp (80%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/InitialState.cpp (77%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Literal.cpp (80%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Precondition.cpp (97%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Problem.cpp (79%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/normalization/Reduction.cpp (96%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Action.cpp (93%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/AtomicFormula.cpp (84%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Constant.cpp (95%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/ConstantDeclaration.cpp (92%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Description.cpp (92%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Domain.cpp (94%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Effect.cpp (94%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Fact.cpp (86%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/InitialState.cpp (85%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Precondition.cpp (92%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Predicate.cpp (88%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/PredicateDeclaration.cpp (86%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/PrimitiveType.cpp (92%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/PrimitiveTypeDeclaration.cpp (93%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Problem.cpp (95%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Requirement.cpp (96%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Type.cpp (87%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Unsupported.cpp (91%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/Variable.cpp (95%) rename lib/{pddlparse/src/pddlparse => pddl/src/pddl}/detail/parsing/VariableDeclaration.cpp (92%) rename lib/{pddlparse => pddl}/tests/CMakeLists.txt (77%) rename lib/{pddlparse => pddl}/tests/TestAcceptanceOfOfficialPDDLInstances.cpp (99%) rename lib/{pddlparse => pddl}/tests/TestIssues.cpp (97%) rename lib/{pddlparse => pddl}/tests/TestOfficialPDDLInstances.cpp (99%) rename lib/{pddlparse => pddl}/tests/TestParser.cpp (98%) rename lib/{pddlparse => pddl}/tests/TestSignatureMatching.cpp (98%) rename lib/{pddlparse => pddl}/tests/main.cpp (100%) diff --git a/.travis.yml b/.travis.yml index 95ab40a..fc92990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,5 +32,5 @@ script: - git submodule update --recursive --init - mkdir -p build/debug - cd build/debug - - cmake ../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=$_CXX -DTOKENIZE_BUILD_TESTS=ON -DPDDLPARSE_BUILD_TESTS=ON -DPLASP_BUILD_TESTS=ON - - make -j3 plasp-app && make -j3 run-tokenize-tests && make -j3 run-pddlparse-tests && make -j3 run-tests + - cmake ../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=$_CXX -DTOKENIZE_BUILD_TESTS=ON -DPDDL_BUILD_TESTS=ON -DPLASP_BUILD_TESTS=ON + - make -j3 plasp-app && make -j3 run-tokenize-tests && make -j3 run-pddl-tests && make -j3 run-tests diff --git a/CHANGELOG.md b/CHANGELOG.md index ab9d99c..1d33034 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Features: Internal: -* reimplemented PDDL parser from scratch as stand-alone library `pddlparse` +* reimplemented PDDL parser from scratch as stand-alone `pddl` library ## 3.0.3 (2016-09-02) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d1f5b5..ec639a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ endif() add_subdirectory(lib/tokenize) add_subdirectory(lib/colorlog) -add_subdirectory(lib/pddlparse) +add_subdirectory(lib/pddl) add_subdirectory(src) add_subdirectory(app) if(PLASP_BUILD_TESTS) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 46c46b4..b220ced 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -11,7 +11,7 @@ set(includes ${PROJECT_SOURCE_DIR}/lib/tokenize/include ${PROJECT_SOURCE_DIR}/lib/colorlog/include ${PROJECT_SOURCE_DIR}/lib/variant/include - ${PROJECT_SOURCE_DIR}/lib/pddlparse/include + ${PROJECT_SOURCE_DIR}/lib/pddl/include ) set(sources diff --git a/app/main.cpp b/app/main.cpp index c98b1bf..803d864 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -8,13 +8,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/plasp/pddl/TranslatorASP.h b/include/plasp/pddl/TranslatorASP.h index 744650c..fe71726 100644 --- a/include/plasp/pddl/TranslatorASP.h +++ b/include/plasp/pddl/TranslatorASP.h @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include namespace plasp { diff --git a/include/plasp/pddl/translation/ConditionalEffect.h b/include/plasp/pddl/translation/ConditionalEffect.h index 0e8a38b..9a7eee1 100644 --- a/include/plasp/pddl/translation/ConditionalEffect.h +++ b/include/plasp/pddl/translation/ConditionalEffect.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/include/plasp/pddl/translation/DerivedPredicate.h b/include/plasp/pddl/translation/DerivedPredicate.h index 6d49883..e8a1cea 100644 --- a/include/plasp/pddl/translation/DerivedPredicate.h +++ b/include/plasp/pddl/translation/DerivedPredicate.h @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/include/plasp/pddl/translation/DerivedPredicatePrecondition.h b/include/plasp/pddl/translation/DerivedPredicatePrecondition.h index abeb4ac..4536475 100644 --- a/include/plasp/pddl/translation/DerivedPredicatePrecondition.h +++ b/include/plasp/pddl/translation/DerivedPredicatePrecondition.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/include/plasp/pddl/translation/Effect.h b/include/plasp/pddl/translation/Effect.h index 5479d2e..115cb70 100644 --- a/include/plasp/pddl/translation/Effect.h +++ b/include/plasp/pddl/translation/Effect.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/include/plasp/pddl/translation/Goal.h b/include/plasp/pddl/translation/Goal.h index ea4c66b..410daf5 100644 --- a/include/plasp/pddl/translation/Goal.h +++ b/include/plasp/pddl/translation/Goal.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/include/plasp/pddl/translation/Precondition.h b/include/plasp/pddl/translation/Precondition.h index e9fa89e..5a457f9 100644 --- a/include/plasp/pddl/translation/Precondition.h +++ b/include/plasp/pddl/translation/Precondition.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/include/plasp/pddl/translation/Predicate.h b/include/plasp/pddl/translation/Predicate.h index 484883e..d52bcaf 100644 --- a/include/plasp/pddl/translation/Predicate.h +++ b/include/plasp/pddl/translation/Predicate.h @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/include/plasp/pddl/translation/Primitives.h b/include/plasp/pddl/translation/Primitives.h index 27d0894..4863353 100644 --- a/include/plasp/pddl/translation/Primitives.h +++ b/include/plasp/pddl/translation/Primitives.h @@ -3,7 +3,7 @@ #include -#include +#include #include diff --git a/include/plasp/pddl/translation/VariableStack.h b/include/plasp/pddl/translation/VariableStack.h index e3b8e0d..647a260 100644 --- a/include/plasp/pddl/translation/VariableStack.h +++ b/include/plasp/pddl/translation/VariableStack.h @@ -1,7 +1,7 @@ #ifndef __PLASP__PDDL__TRANSLATION__VARIABLE_STACK_H #define __PLASP__PDDL__TRANSLATION__VARIABLE_STACK_H -#include +#include namespace plasp { diff --git a/include/plasp/pddl/translation/Variables.h b/include/plasp/pddl/translation/Variables.h index 27f7faf..18445e9 100644 --- a/include/plasp/pddl/translation/Variables.h +++ b/include/plasp/pddl/translation/Variables.h @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include diff --git a/lib/pddlparse/CMakeLists.txt b/lib/pddl/CMakeLists.txt similarity index 88% rename from lib/pddlparse/CMakeLists.txt rename to lib/pddl/CMakeLists.txt index 07954c8..caf5e50 100644 --- a/lib/pddlparse/CMakeLists.txt +++ b/lib/pddl/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) -project(pddlparse) +project(pddl) -option(PDDLPARSE_BUILD_TESTS "Build unit tests" OFF) +option(PDDL_BUILD_TESTS "Build unit tests" OFF) set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -Werror ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}") @@ -23,6 +23,6 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND endif() add_subdirectory(src) -if(PDDLPARSE_BUILD_TESTS) +if(PDDL_BUILD_TESTS) add_subdirectory(tests) -endif(PDDLPARSE_BUILD_TESTS) +endif(PDDL_BUILD_TESTS) diff --git a/lib/pddlparse/include/pddlparse/AST.h b/lib/pddl/include/pddl/AST.h similarity index 99% rename from lib/pddlparse/include/pddlparse/AST.h rename to lib/pddl/include/pddl/AST.h index a1e17ae..704c17c 100644 --- a/lib/pddlparse/include/pddlparse/AST.h +++ b/lib/pddl/include/pddl/AST.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__AST_H -#define __PDDL_PARSE__AST_H +#ifndef __PDDL__AST_H +#define __PDDL__AST_H #include #include @@ -7,7 +7,7 @@ #include #include -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/ASTForward.h b/lib/pddl/include/pddl/ASTForward.h similarity index 98% rename from lib/pddlparse/include/pddlparse/ASTForward.h rename to lib/pddl/include/pddl/ASTForward.h index 280259b..8ea4e16 100644 --- a/lib/pddlparse/include/pddlparse/ASTForward.h +++ b/lib/pddl/include/pddl/ASTForward.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__AST_FORWARD_H -#define __PDDL_PARSE__AST_FORWARD_H +#ifndef __PDDL__AST_FORWARD_H +#define __PDDL__AST_FORWARD_H #include #include @@ -7,7 +7,7 @@ #include #include -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/ASTOutput.h b/lib/pddl/include/pddl/ASTOutput.h similarity index 99% rename from lib/pddlparse/include/pddlparse/ASTOutput.h rename to lib/pddl/include/pddl/ASTOutput.h index fb23a48..0e03a3a 100644 --- a/lib/pddlparse/include/pddlparse/ASTOutput.h +++ b/lib/pddl/include/pddl/ASTOutput.h @@ -1,12 +1,12 @@ -#ifndef __PDDL_PARSE__AST_OUTPUT_H -#define __PDDL_PARSE__AST_OUTPUT_H +#ifndef __PDDL__AST_OUTPUT_H +#define __PDDL__AST_OUTPUT_H #include #include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/Context.h b/lib/pddl/include/pddl/Context.h similarity index 89% rename from lib/pddlparse/include/pddlparse/Context.h rename to lib/pddl/include/pddl/Context.h index b08139e..b92a5bf 100644 --- a/lib/pddlparse/include/pddlparse/Context.h +++ b/lib/pddl/include/pddl/Context.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__CONTEXT_H -#define __PDDL_PARSE__CONTEXT_H +#ifndef __PDDL__CONTEXT_H +#define __PDDL__CONTEXT_H #include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/Exception.h b/lib/pddl/include/pddl/Exception.h similarity index 96% rename from lib/pddlparse/include/pddlparse/Exception.h rename to lib/pddl/include/pddl/Exception.h index b877ffb..ca869e4 100644 --- a/lib/pddlparse/include/pddlparse/Exception.h +++ b/lib/pddl/include/pddl/Exception.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__EXCEPTION_H -#define __PDDL_PARSE__EXCEPTION_H +#ifndef __PDDL__EXCEPTION_H +#define __PDDL__EXCEPTION_H #include #include diff --git a/lib/pddlparse/include/pddlparse/Mode.h b/lib/pddl/include/pddl/Mode.h similarity index 82% rename from lib/pddlparse/include/pddlparse/Mode.h rename to lib/pddl/include/pddl/Mode.h index c3a663e..ada46fd 100644 --- a/lib/pddlparse/include/pddlparse/Mode.h +++ b/lib/pddl/include/pddl/Mode.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__MODE_H -#define __PDDL_PARSE__MODE_H +#ifndef __PDDL__MODE_H +#define __PDDL__MODE_H #include -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/Normalize.h b/lib/pddl/include/pddl/Normalize.h similarity index 63% rename from lib/pddlparse/include/pddlparse/Normalize.h rename to lib/pddl/include/pddl/Normalize.h index 865c3b9..bad5787 100644 --- a/lib/pddlparse/include/pddlparse/Normalize.h +++ b/lib/pddl/include/pddl/Normalize.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__NORMALIZE_H -#define __PDDL_PARSE__NORMALIZE_H +#ifndef __PDDL__NORMALIZE_H +#define __PDDL__NORMALIZE_H -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/NormalizedAST.h b/lib/pddl/include/pddl/NormalizedAST.h similarity index 97% rename from lib/pddlparse/include/pddlparse/NormalizedAST.h rename to lib/pddl/include/pddl/NormalizedAST.h index 841736b..2848aa4 100644 --- a/lib/pddlparse/include/pddlparse/NormalizedAST.h +++ b/lib/pddl/include/pddl/NormalizedAST.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__NORMALIZED_AST_H -#define __PDDL_PARSE__NORMALIZED_AST_H +#ifndef __PDDL__NORMALIZED_AST_H +#define __PDDL__NORMALIZED_AST_H #include #include @@ -7,7 +7,7 @@ #include #include -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/NormalizedASTForward.h b/lib/pddl/include/pddl/NormalizedASTForward.h similarity index 98% rename from lib/pddlparse/include/pddlparse/NormalizedASTForward.h rename to lib/pddl/include/pddl/NormalizedASTForward.h index 4d94f14..3935184 100644 --- a/lib/pddlparse/include/pddlparse/NormalizedASTForward.h +++ b/lib/pddl/include/pddl/NormalizedASTForward.h @@ -1,7 +1,7 @@ -#ifndef __PDDL_PARSE__NORMALIZED_AST_FORWARD_H -#define __PDDL_PARSE__NORMALIZED_AST_FORWARD_H +#ifndef __PDDL__NORMALIZED_AST_FORWARD_H +#define __PDDL__NORMALIZED_AST_FORWARD_H -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/NormalizedASTOutput.h b/lib/pddl/include/pddl/NormalizedASTOutput.h similarity index 97% rename from lib/pddlparse/include/pddlparse/NormalizedASTOutput.h rename to lib/pddl/include/pddl/NormalizedASTOutput.h index e7bc646..9ef870b 100644 --- a/lib/pddlparse/include/pddlparse/NormalizedASTOutput.h +++ b/lib/pddl/include/pddl/NormalizedASTOutput.h @@ -1,13 +1,13 @@ -#ifndef __PDDL_PARSE__NORMALIZED_AST_OUTPUT_H -#define __PDDL_PARSE__NORMALIZED_AST_OUTPUT_H +#ifndef __PDDL__NORMALIZED_AST_OUTPUT_H +#define __PDDL__NORMALIZED_AST_OUTPUT_H #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/Parse.h b/lib/pddl/include/pddl/Parse.h similarity index 77% rename from lib/pddlparse/include/pddlparse/Parse.h rename to lib/pddl/include/pddl/Parse.h index 053b332..953896a 100644 --- a/lib/pddlparse/include/pddlparse/Parse.h +++ b/lib/pddl/include/pddl/Parse.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__PARSE_H -#define __PDDL_PARSE__PARSE_H +#ifndef __PDDL__PARSE_H +#define __PDDL__PARSE_H #include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/Tokenizer.h b/lib/pddl/include/pddl/Tokenizer.h similarity index 93% rename from lib/pddlparse/include/pddlparse/Tokenizer.h rename to lib/pddl/include/pddl/Tokenizer.h index d84013d..2eb1366 100644 --- a/lib/pddlparse/include/pddlparse/Tokenizer.h +++ b/lib/pddl/include/pddl/Tokenizer.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__TOKENIZER_H -#define __PDDL_PARSE__TOKENIZER_H +#ifndef __PDDL__TOKENIZER_H +#define __PDDL__TOKENIZER_H #include diff --git a/lib/pddlparse/include/pddlparse/Variant.h b/lib/pddl/include/pddl/Variant.h similarity index 87% rename from lib/pddlparse/include/pddlparse/Variant.h rename to lib/pddl/include/pddl/Variant.h index f790d34..833da1b 100644 --- a/lib/pddlparse/include/pddlparse/Variant.h +++ b/lib/pddl/include/pddl/Variant.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__VARIANT_H -#define __PDDL_PARSE__VARIANT_H +#ifndef __PDDL__VARIANT_H +#define __PDDL__VARIANT_H #include diff --git a/lib/pddlparse/include/pddlparse/detail/ASTContext.h b/lib/pddl/include/pddl/detail/ASTContext.h similarity index 84% rename from lib/pddlparse/include/pddlparse/detail/ASTContext.h rename to lib/pddl/include/pddl/detail/ASTContext.h index 7e12161..a1f27f7 100644 --- a/lib/pddlparse/include/pddlparse/detail/ASTContext.h +++ b/lib/pddl/include/pddl/detail/ASTContext.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__AST_CONTEXT_H -#define __PDDL_PARSE__DETAIL__AST_CONTEXT_H +#ifndef __PDDL__DETAIL__AST_CONTEXT_H +#define __PDDL__DETAIL__AST_CONTEXT_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/ASTCopy.h b/lib/pddl/include/pddl/detail/ASTCopy.h similarity index 97% rename from lib/pddlparse/include/pddlparse/detail/ASTCopy.h rename to lib/pddl/include/pddl/detail/ASTCopy.h index 2b19b34..7131d8e 100644 --- a/lib/pddlparse/include/pddlparse/detail/ASTCopy.h +++ b/lib/pddl/include/pddl/detail/ASTCopy.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__AST_COPY_H -#define __PDDL_PARSE__DETAIL__AST_COPY_H +#ifndef __PDDL__DETAIL__AST_COPY_H +#define __PDDL__DETAIL__AST_COPY_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/OutputUtils.h b/lib/pddl/include/pddl/detail/OutputUtils.h similarity index 96% rename from lib/pddlparse/include/pddlparse/detail/OutputUtils.h rename to lib/pddl/include/pddl/detail/OutputUtils.h index 893dee4..13c51f2 100644 --- a/lib/pddlparse/include/pddlparse/detail/OutputUtils.h +++ b/lib/pddl/include/pddl/detail/OutputUtils.h @@ -1,5 +1,5 @@ -#ifndef __PDDL_PARSE__DETAIL__OUTPUT_UTILS_H -#define __PDDL_PARSE__DETAIL__OUTPUT_UTILS_H +#ifndef __PDDL__DETAIL__OUTPUT_UTILS_H +#define __PDDL__DETAIL__OUTPUT_UTILS_H #include diff --git a/lib/pddlparse/include/pddlparse/detail/Requirements.h b/lib/pddl/include/pddl/detail/Requirements.h similarity index 84% rename from lib/pddlparse/include/pddlparse/detail/Requirements.h rename to lib/pddl/include/pddl/detail/Requirements.h index eed3463..b92a2c9 100644 --- a/lib/pddlparse/include/pddlparse/detail/Requirements.h +++ b/lib/pddl/include/pddl/detail/Requirements.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__REQUIREMENTS_H -#define __PDDL_PARSE__DETAIL__REQUIREMENTS_H +#ifndef __PDDL__DETAIL__REQUIREMENTS_H +#define __PDDL__DETAIL__REQUIREMENTS_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/SignatureMatching.h b/lib/pddl/include/pddl/detail/SignatureMatching.h similarity index 90% rename from lib/pddlparse/include/pddlparse/detail/SignatureMatching.h rename to lib/pddl/include/pddl/detail/SignatureMatching.h index 273d537..6690334 100644 --- a/lib/pddlparse/include/pddlparse/detail/SignatureMatching.h +++ b/lib/pddl/include/pddl/detail/SignatureMatching.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__SIGNATURE_MATCHING_H -#define __PDDL_PARSE__DETAIL__SIGNATURE_MATCHING_H +#ifndef __PDDL__DETAIL__SIGNATURE_MATCHING_H +#define __PDDL__DETAIL__SIGNATURE_MATCHING_H #include -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/VariableStack.h b/lib/pddl/include/pddl/detail/VariableStack.h similarity index 85% rename from lib/pddlparse/include/pddlparse/detail/VariableStack.h rename to lib/pddl/include/pddl/detail/VariableStack.h index 9153f15..2da4b4e 100644 --- a/lib/pddlparse/include/pddlparse/detail/VariableStack.h +++ b/lib/pddl/include/pddl/detail/VariableStack.h @@ -1,7 +1,7 @@ -#ifndef __PDDL_PARSE__DETAIL__VARIABLE_STACK_H -#define __PDDL_PARSE__DETAIL__VARIABLE_STACK_H +#ifndef __PDDL__DETAIL__VARIABLE_STACK_H +#define __PDDL__DETAIL__VARIABLE_STACK_H -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Action.h b/lib/pddl/include/pddl/detail/normalization/Action.h similarity index 69% rename from lib/pddlparse/include/pddlparse/detail/normalization/Action.h rename to lib/pddl/include/pddl/detail/normalization/Action.h index 0e9e635..04d5c04 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Action.h +++ b/lib/pddl/include/pddl/detail/normalization/Action.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__ACTION_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__ACTION_H +#ifndef __PDDL__DETAIL__NORMALIZATION__ACTION_H +#define __PDDL__DETAIL__NORMALIZATION__ACTION_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/AtomicFormula.h b/lib/pddl/include/pddl/detail/normalization/AtomicFormula.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/normalization/AtomicFormula.h rename to lib/pddl/include/pddl/detail/normalization/AtomicFormula.h index 279fe04..74046a4 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/AtomicFormula.h +++ b/lib/pddl/include/pddl/detail/normalization/AtomicFormula.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__ATOMIC_FORMULA_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__ATOMIC_FORMULA_H +#ifndef __PDDL__DETAIL__NORMALIZATION__ATOMIC_FORMULA_H +#define __PDDL__DETAIL__NORMALIZATION__ATOMIC_FORMULA_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/CollectFreeVariables.h b/lib/pddl/include/pddl/detail/normalization/CollectFreeVariables.h similarity index 93% rename from lib/pddlparse/include/pddlparse/detail/normalization/CollectFreeVariables.h rename to lib/pddl/include/pddl/detail/normalization/CollectFreeVariables.h index 795d44f..bbb4951 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/CollectFreeVariables.h +++ b/lib/pddl/include/pddl/detail/normalization/CollectFreeVariables.h @@ -1,12 +1,12 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__COLLECT_FREE_VARIABLES_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__COLLECT_FREE_VARIABLES_H +#ifndef __PDDL__DETAIL__NORMALIZATION__COLLECT_FREE_VARIABLES_H +#define __PDDL__DETAIL__NORMALIZATION__COLLECT_FREE_VARIABLES_H -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/ConditionalEffect.h b/lib/pddl/include/pddl/detail/normalization/ConditionalEffect.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/normalization/ConditionalEffect.h rename to lib/pddl/include/pddl/detail/normalization/ConditionalEffect.h index 21a3bc7..e0f58ff 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/ConditionalEffect.h +++ b/lib/pddl/include/pddl/detail/normalization/ConditionalEffect.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__CONDITIONAL_EFFECT_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__CONDITIONAL_EFFECT_H +#ifndef __PDDL__DETAIL__NORMALIZATION__CONDITIONAL_EFFECT_H +#define __PDDL__DETAIL__NORMALIZATION__CONDITIONAL_EFFECT_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Description.h b/lib/pddl/include/pddl/detail/normalization/Description.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/normalization/Description.h rename to lib/pddl/include/pddl/detail/normalization/Description.h index d6731e0..34d0be0 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Description.h +++ b/lib/pddl/include/pddl/detail/normalization/Description.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__DESCRIPTION_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__DESCRIPTION_H +#ifndef __PDDL__DETAIL__NORMALIZATION__DESCRIPTION_H +#define __PDDL__DETAIL__NORMALIZATION__DESCRIPTION_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Domain.h b/lib/pddl/include/pddl/detail/normalization/Domain.h similarity index 67% rename from lib/pddlparse/include/pddlparse/detail/normalization/Domain.h rename to lib/pddl/include/pddl/detail/normalization/Domain.h index 0927e00..182ff0b 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Domain.h +++ b/lib/pddl/include/pddl/detail/normalization/Domain.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__DOMAIN_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__DOMAIN_H +#ifndef __PDDL__DETAIL__NORMALIZATION__DOMAIN_H +#define __PDDL__DETAIL__NORMALIZATION__DOMAIN_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Effect.h b/lib/pddl/include/pddl/detail/normalization/Effect.h similarity index 69% rename from lib/pddlparse/include/pddlparse/detail/normalization/Effect.h rename to lib/pddl/include/pddl/detail/normalization/Effect.h index 2ec94ce..b0df512 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Effect.h +++ b/lib/pddl/include/pddl/detail/normalization/Effect.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__EFFECT_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__EFFECT_H +#ifndef __PDDL__DETAIL__NORMALIZATION__EFFECT_H +#define __PDDL__DETAIL__NORMALIZATION__EFFECT_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Fact.h b/lib/pddl/include/pddl/detail/normalization/Fact.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/normalization/Fact.h rename to lib/pddl/include/pddl/detail/normalization/Fact.h index 3dec70c..f43e260 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Fact.h +++ b/lib/pddl/include/pddl/detail/normalization/Fact.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__FACT_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__FACT_H +#ifndef __PDDL__DETAIL__NORMALIZATION__FACT_H +#define __PDDL__DETAIL__NORMALIZATION__FACT_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/InitialState.h b/lib/pddl/include/pddl/detail/normalization/InitialState.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/normalization/InitialState.h rename to lib/pddl/include/pddl/detail/normalization/InitialState.h index e6edaba..8ac8543 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/InitialState.h +++ b/lib/pddl/include/pddl/detail/normalization/InitialState.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__INITIAL_STATE_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__INITIAL_STATE_H +#ifndef __PDDL__DETAIL__NORMALIZATION__INITIAL_STATE_H +#define __PDDL__DETAIL__NORMALIZATION__INITIAL_STATE_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Literal.h b/lib/pddl/include/pddl/detail/normalization/Literal.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/normalization/Literal.h rename to lib/pddl/include/pddl/detail/normalization/Literal.h index f667011..e2170fa 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Literal.h +++ b/lib/pddl/include/pddl/detail/normalization/Literal.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__LITERAL_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__LITERAL_H +#ifndef __PDDL__DETAIL__NORMALIZATION__LITERAL_H +#define __PDDL__DETAIL__NORMALIZATION__LITERAL_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Precondition.h b/lib/pddl/include/pddl/detail/normalization/Precondition.h similarity index 69% rename from lib/pddlparse/include/pddlparse/detail/normalization/Precondition.h rename to lib/pddl/include/pddl/detail/normalization/Precondition.h index aaf2dd9..a90538e 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Precondition.h +++ b/lib/pddl/include/pddl/detail/normalization/Precondition.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__PRECONDITION_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__PRECONDITION_H +#ifndef __PDDL__DETAIL__NORMALIZATION__PRECONDITION_H +#define __PDDL__DETAIL__NORMALIZATION__PRECONDITION_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Problem.h b/lib/pddl/include/pddl/detail/normalization/Problem.h similarity index 68% rename from lib/pddlparse/include/pddlparse/detail/normalization/Problem.h rename to lib/pddl/include/pddl/detail/normalization/Problem.h index d052ef1..3b8ae95 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Problem.h +++ b/lib/pddl/include/pddl/detail/normalization/Problem.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__PROBLEM_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__PROBLEM_H +#ifndef __PDDL__DETAIL__NORMALIZATION__PROBLEM_H +#define __PDDL__DETAIL__NORMALIZATION__PROBLEM_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/normalization/Reduction.h b/lib/pddl/include/pddl/detail/normalization/Reduction.h similarity index 65% rename from lib/pddlparse/include/pddlparse/detail/normalization/Reduction.h rename to lib/pddl/include/pddl/detail/normalization/Reduction.h index 2ee5cc0..e2cfffb 100644 --- a/lib/pddlparse/include/pddlparse/detail/normalization/Reduction.h +++ b/lib/pddl/include/pddl/detail/normalization/Reduction.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__NORMALIZATION__REDUCTION_H -#define __PDDL_PARSE__DETAIL__NORMALIZATION__REDUCTION_H +#ifndef __PDDL__DETAIL__NORMALIZATION__REDUCTION_H +#define __PDDL__DETAIL__NORMALIZATION__REDUCTION_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Action.h b/lib/pddl/include/pddl/detail/parsing/Action.h similarity index 86% rename from lib/pddlparse/include/pddlparse/detail/parsing/Action.h rename to lib/pddl/include/pddl/detail/parsing/Action.h index 19a1d2c..1fccf47 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Action.h +++ b/lib/pddl/include/pddl/detail/parsing/Action.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__ACTION_H -#define __PDDL_PARSE__DETAIL__PARSING__ACTION_H +#ifndef __PDDL__DETAIL__PARSING__ACTION_H +#define __PDDL__DETAIL__PARSING__ACTION_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/AtomicFormula.h b/lib/pddl/include/pddl/detail/parsing/AtomicFormula.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/parsing/AtomicFormula.h rename to lib/pddl/include/pddl/detail/parsing/AtomicFormula.h index e0954bf..7709196 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/AtomicFormula.h +++ b/lib/pddl/include/pddl/detail/parsing/AtomicFormula.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__ATOMIC_FORMULA_H -#define __PDDL_PARSE__DETAIL__PARSING__ATOMIC_FORMULA_H +#ifndef __PDDL__DETAIL__PARSING__ATOMIC_FORMULA_H +#define __PDDL__DETAIL__PARSING__ATOMIC_FORMULA_H -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Constant.h b/lib/pddl/include/pddl/detail/parsing/Constant.h similarity index 73% rename from lib/pddlparse/include/pddlparse/detail/parsing/Constant.h rename to lib/pddl/include/pddl/detail/parsing/Constant.h index 172590d..dd19039 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Constant.h +++ b/lib/pddl/include/pddl/detail/parsing/Constant.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__CONSTANT_H -#define __PDDL_PARSE__DETAIL__PARSING__CONSTANT_H +#ifndef __PDDL__DETAIL__PARSING__CONSTANT_H +#define __PDDL__DETAIL__PARSING__CONSTANT_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/ConstantDeclaration.h b/lib/pddl/include/pddl/detail/parsing/ConstantDeclaration.h similarity index 74% rename from lib/pddlparse/include/pddlparse/detail/parsing/ConstantDeclaration.h rename to lib/pddl/include/pddl/detail/parsing/ConstantDeclaration.h index a39dbca..855210c 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/ConstantDeclaration.h +++ b/lib/pddl/include/pddl/detail/parsing/ConstantDeclaration.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__CONSTANT_DECLARATION_H -#define __PDDL_PARSE__DETAIL__PARSING__CONSTANT_DECLARATION_H +#ifndef __PDDL__DETAIL__PARSING__CONSTANT_DECLARATION_H +#define __PDDL__DETAIL__PARSING__CONSTANT_DECLARATION_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Description.h b/lib/pddl/include/pddl/detail/parsing/Description.h similarity index 78% rename from lib/pddlparse/include/pddlparse/detail/parsing/Description.h rename to lib/pddl/include/pddl/detail/parsing/Description.h index bec35d7..55bd60e 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Description.h +++ b/lib/pddl/include/pddl/detail/parsing/Description.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__DESCRIPTION_H -#define __PDDL_PARSE__DETAIL__PARSING__DESCRIPTION_H +#ifndef __PDDL__DETAIL__PARSING__DESCRIPTION_H +#define __PDDL__DETAIL__PARSING__DESCRIPTION_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Domain.h b/lib/pddl/include/pddl/detail/parsing/Domain.h similarity index 87% rename from lib/pddlparse/include/pddlparse/detail/parsing/Domain.h rename to lib/pddl/include/pddl/detail/parsing/Domain.h index 86cd906..b21f41a 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Domain.h +++ b/lib/pddl/include/pddl/detail/parsing/Domain.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__DOMAIN_H -#define __PDDL_PARSE__DETAIL__PARSING__DOMAIN_H +#ifndef __PDDL__DETAIL__PARSING__DOMAIN_H +#define __PDDL__DETAIL__PARSING__DOMAIN_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Effect.h b/lib/pddl/include/pddl/detail/parsing/Effect.h similarity index 66% rename from lib/pddlparse/include/pddlparse/detail/parsing/Effect.h rename to lib/pddl/include/pddl/detail/parsing/Effect.h index 5e67f22..942447b 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Effect.h +++ b/lib/pddl/include/pddl/detail/parsing/Effect.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__EFFECT_H -#define __PDDL_PARSE__DETAIL__PARSING__EFFECT_H +#ifndef __PDDL__DETAIL__PARSING__EFFECT_H +#define __PDDL__DETAIL__PARSING__EFFECT_H -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h b/lib/pddl/include/pddl/detail/parsing/Expressions.h similarity index 96% rename from lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h rename to lib/pddl/include/pddl/detail/parsing/Expressions.h index efbfb5a..cfb676e 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Expressions.h +++ b/lib/pddl/include/pddl/detail/parsing/Expressions.h @@ -1,12 +1,12 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__EXPRESSIONS_H -#define __PDDL_PARSE__DETAIL__PARSING__EXPRESSIONS_H +#ifndef __PDDL__DETAIL__PARSING__EXPRESSIONS_H +#define __PDDL__DETAIL__PARSING__EXPRESSIONS_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Fact.h b/lib/pddl/include/pddl/detail/parsing/Fact.h similarity index 67% rename from lib/pddlparse/include/pddlparse/detail/parsing/Fact.h rename to lib/pddl/include/pddl/detail/parsing/Fact.h index e55b076..cb5e480 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Fact.h +++ b/lib/pddl/include/pddl/detail/parsing/Fact.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__FACT_H -#define __PDDL_PARSE__DETAIL__PARSING__FACT_H +#ifndef __PDDL__DETAIL__PARSING__FACT_H +#define __PDDL__DETAIL__PARSING__FACT_H -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/InitialState.h b/lib/pddl/include/pddl/detail/parsing/InitialState.h similarity index 72% rename from lib/pddlparse/include/pddlparse/detail/parsing/InitialState.h rename to lib/pddl/include/pddl/detail/parsing/InitialState.h index b4c41a9..1288ba0 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/InitialState.h +++ b/lib/pddl/include/pddl/detail/parsing/InitialState.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__INITIAL_STATE_H -#define __PDDL_PARSE__DETAIL__PARSING__INITIAL_STATE_H +#ifndef __PDDL__DETAIL__PARSING__INITIAL_STATE_H +#define __PDDL__DETAIL__PARSING__INITIAL_STATE_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Parser.h b/lib/pddl/include/pddl/detail/parsing/Parser.h similarity index 81% rename from lib/pddlparse/include/pddlparse/detail/parsing/Parser.h rename to lib/pddl/include/pddl/detail/parsing/Parser.h index 20056b7..90fdd70 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Parser.h +++ b/lib/pddl/include/pddl/detail/parsing/Parser.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSER_H -#define __PDDL_PARSE__DETAIL__PARSER_H +#ifndef __PDDL__DETAIL__PARSER_H +#define __PDDL__DETAIL__PARSER_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Precondition.h b/lib/pddl/include/pddl/detail/parsing/Precondition.h similarity index 71% rename from lib/pddlparse/include/pddlparse/detail/parsing/Precondition.h rename to lib/pddl/include/pddl/detail/parsing/Precondition.h index f6a99da..d9c316e 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Precondition.h +++ b/lib/pddl/include/pddl/detail/parsing/Precondition.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__PRECONDITION_H -#define __PDDL_PARSE__DETAIL__PARSING__PRECONDITION_H +#ifndef __PDDL__DETAIL__PARSING__PRECONDITION_H +#define __PDDL__DETAIL__PARSING__PRECONDITION_H -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Predicate.h b/lib/pddl/include/pddl/detail/parsing/Predicate.h similarity index 68% rename from lib/pddlparse/include/pddlparse/detail/parsing/Predicate.h rename to lib/pddl/include/pddl/detail/parsing/Predicate.h index d7fa173..f90bce9 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Predicate.h +++ b/lib/pddl/include/pddl/detail/parsing/Predicate.h @@ -1,10 +1,10 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__PREDICATE_H -#define __PDDL_PARSE__DETAIL__PARSING__PREDICATE_H +#ifndef __PDDL__DETAIL__PARSING__PREDICATE_H +#define __PDDL__DETAIL__PARSING__PREDICATE_H -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/PredicateDeclaration.h b/lib/pddl/include/pddl/detail/parsing/PredicateDeclaration.h similarity index 70% rename from lib/pddlparse/include/pddlparse/detail/parsing/PredicateDeclaration.h rename to lib/pddl/include/pddl/detail/parsing/PredicateDeclaration.h index e891433..81acb73 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/PredicateDeclaration.h +++ b/lib/pddl/include/pddl/detail/parsing/PredicateDeclaration.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__PREDICATE_DECLARATION_H -#define __PDDL_PARSE__DETAIL__PARSING__PREDICATE_DECLARATION_H +#ifndef __PDDL__DETAIL__PARSING__PREDICATE_DECLARATION_H +#define __PDDL__DETAIL__PARSING__PREDICATE_DECLARATION_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/PrimitiveType.h b/lib/pddl/include/pddl/detail/parsing/PrimitiveType.h similarity index 72% rename from lib/pddlparse/include/pddlparse/detail/parsing/PrimitiveType.h rename to lib/pddl/include/pddl/detail/parsing/PrimitiveType.h index 6ad1406..aa392fe 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/PrimitiveType.h +++ b/lib/pddl/include/pddl/detail/parsing/PrimitiveType.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__PRIMITIVE_TYPE_H -#define __PDDL_PARSE__DETAIL__PARSING__PRIMITIVE_TYPE_H +#ifndef __PDDL__DETAIL__PARSING__PRIMITIVE_TYPE_H +#define __PDDL__DETAIL__PARSING__PRIMITIVE_TYPE_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/PrimitiveTypeDeclaration.h b/lib/pddl/include/pddl/detail/parsing/PrimitiveTypeDeclaration.h similarity index 70% rename from lib/pddlparse/include/pddlparse/detail/parsing/PrimitiveTypeDeclaration.h rename to lib/pddl/include/pddl/detail/parsing/PrimitiveTypeDeclaration.h index 85384c3..740c5e4 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/PrimitiveTypeDeclaration.h +++ b/lib/pddl/include/pddl/detail/parsing/PrimitiveTypeDeclaration.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__PRIMITIVE_TYPE_DECLARATION_H -#define __PDDL_PARSE__DETAIL__PARSING__PRIMITIVE_TYPE_DECLARATION_H +#ifndef __PDDL__DETAIL__PARSING__PRIMITIVE_TYPE_DECLARATION_H +#define __PDDL__DETAIL__PARSING__PRIMITIVE_TYPE_DECLARATION_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Problem.h b/lib/pddl/include/pddl/detail/parsing/Problem.h similarity index 88% rename from lib/pddlparse/include/pddlparse/detail/parsing/Problem.h rename to lib/pddl/include/pddl/detail/parsing/Problem.h index d35e29f..97412ba 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Problem.h +++ b/lib/pddl/include/pddl/detail/parsing/Problem.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__PROBLEM_H -#define __PDDL_PARSE__DETAIL__PARSING__PROBLEM_H +#ifndef __PDDL__DETAIL__PARSING__PROBLEM_H +#define __PDDL__DETAIL__PARSING__PROBLEM_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Requirement.h b/lib/pddl/include/pddl/detail/parsing/Requirement.h similarity index 75% rename from lib/pddlparse/include/pddlparse/detail/parsing/Requirement.h rename to lib/pddl/include/pddl/detail/parsing/Requirement.h index 5f535f0..3f56f0f 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Requirement.h +++ b/lib/pddl/include/pddl/detail/parsing/Requirement.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__REQUIREMENT_H -#define __PDDL_PARSE__DETAIL__PARSING__REQUIREMENT_H +#ifndef __PDDL__DETAIL__PARSING__REQUIREMENT_H +#define __PDDL__DETAIL__PARSING__REQUIREMENT_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Type.h b/lib/pddl/include/pddl/detail/parsing/Type.h similarity index 73% rename from lib/pddlparse/include/pddlparse/detail/parsing/Type.h rename to lib/pddl/include/pddl/detail/parsing/Type.h index 6ce11b8..1794ba2 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Type.h +++ b/lib/pddl/include/pddl/detail/parsing/Type.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__TYPE_H -#define __PDDL_PARSE__DETAIL__PARSING__TYPE_H +#ifndef __PDDL__DETAIL__PARSING__TYPE_H +#define __PDDL__DETAIL__PARSING__TYPE_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Unsupported.h b/lib/pddl/include/pddl/detail/parsing/Unsupported.h similarity index 77% rename from lib/pddlparse/include/pddlparse/detail/parsing/Unsupported.h rename to lib/pddl/include/pddl/detail/parsing/Unsupported.h index 12b3dfc..21df91c 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Unsupported.h +++ b/lib/pddl/include/pddl/detail/parsing/Unsupported.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__UNSUPPORTED_H -#define __PDDL_PARSE__DETAIL__PARSING__UNSUPPORTED_H +#ifndef __PDDL__DETAIL__PARSING__UNSUPPORTED_H +#define __PDDL__DETAIL__PARSING__UNSUPPORTED_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Utils.h b/lib/pddl/include/pddl/detail/parsing/Utils.h similarity index 85% rename from lib/pddlparse/include/pddlparse/detail/parsing/Utils.h rename to lib/pddl/include/pddl/detail/parsing/Utils.h index 7d780ce..a3729e4 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Utils.h +++ b/lib/pddl/include/pddl/detail/parsing/Utils.h @@ -1,7 +1,7 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSE_UTILS_H -#define __PDDL_PARSE__DETAIL__PARSE_UTILS_H +#ifndef __PDDL__DETAIL__PARSE_UTILS_H +#define __PDDL__DETAIL__PARSE_UTILS_H -#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/Variable.h b/lib/pddl/include/pddl/detail/parsing/Variable.h similarity index 74% rename from lib/pddlparse/include/pddlparse/detail/parsing/Variable.h rename to lib/pddl/include/pddl/detail/parsing/Variable.h index bb8dc20..33e1fd2 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/Variable.h +++ b/lib/pddl/include/pddl/detail/parsing/Variable.h @@ -1,9 +1,9 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__VARIABLE_H -#define __PDDL_PARSE__DETAIL__PARSING__VARIABLE_H +#ifndef __PDDL__DETAIL__PARSING__VARIABLE_H +#define __PDDL__DETAIL__PARSING__VARIABLE_H -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/include/pddlparse/detail/parsing/VariableDeclaration.h b/lib/pddl/include/pddl/detail/parsing/VariableDeclaration.h similarity index 76% rename from lib/pddlparse/include/pddlparse/detail/parsing/VariableDeclaration.h rename to lib/pddl/include/pddl/detail/parsing/VariableDeclaration.h index 3396fa2..d2fb6ef 100644 --- a/lib/pddlparse/include/pddlparse/detail/parsing/VariableDeclaration.h +++ b/lib/pddl/include/pddl/detail/parsing/VariableDeclaration.h @@ -1,8 +1,8 @@ -#ifndef __PDDL_PARSE__DETAIL__PARSING__VARIABLE_DECLARATION_H -#define __PDDL_PARSE__DETAIL__PARSING__VARIABLE_DECLARATION_H +#ifndef __PDDL__DETAIL__PARSING__VARIABLE_DECLARATION_H +#define __PDDL__DETAIL__PARSING__VARIABLE_DECLARATION_H -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/CMakeLists.txt b/lib/pddl/src/CMakeLists.txt similarity index 51% rename from lib/pddlparse/src/CMakeLists.txt rename to lib/pddl/src/CMakeLists.txt index a8f65e6..92a6a70 100644 --- a/lib/pddlparse/src/CMakeLists.txt +++ b/lib/pddl/src/CMakeLists.txt @@ -1,16 +1,16 @@ -set(target pddlparse) +set(target pddl) -file(GLOB core_sources "pddlparse/*.cpp") -file(GLOB core_headers "../include/pddlparse/*.h") +file(GLOB core_sources "pddl/*.cpp") +file(GLOB core_headers "../include/pddl/*.h") -file(GLOB detail_sources "pddlparse/detail/*.cpp") -file(GLOB detail_headers "../include/pddlparse/detail/*.h") +file(GLOB detail_sources "pddl/detail/*.cpp") +file(GLOB detail_headers "../include/pddl/detail/*.h") -file(GLOB detail_parsing_sources "pddlparse/detail/parsing/*.cpp") -file(GLOB detail_parsing_headers "../include/pddlparse/detail/parsing/*.h") +file(GLOB detail_parsing_sources "pddl/detail/parsing/*.cpp") +file(GLOB detail_parsing_headers "../include/pddl/detail/parsing/*.h") -file(GLOB detail_normalization_sources "pddlparse/detail/normalization/*.cpp") -file(GLOB detail_normalization_headers "../include/pddlparse/detail/normalization/*.h") +file(GLOB detail_normalization_sources "pddl/detail/normalization/*.cpp") +file(GLOB detail_normalization_headers "../include/pddl/detail/normalization/*.h") set(includes ${PROJECT_SOURCE_DIR}/include diff --git a/lib/pddlparse/src/pddlparse/Parse.cpp b/lib/pddl/src/pddl/Parse.cpp similarity index 80% rename from lib/pddlparse/src/pddlparse/Parse.cpp rename to lib/pddl/src/pddl/Parse.cpp index e4edaf8..581b10e 100644 --- a/lib/pddlparse/src/pddlparse/Parse.cpp +++ b/lib/pddl/src/pddl/Parse.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/Requirements.cpp b/lib/pddl/src/pddl/detail/Requirements.cpp similarity index 96% rename from lib/pddlparse/src/pddlparse/detail/Requirements.cpp rename to lib/pddl/src/pddl/detail/Requirements.cpp index 123a222..d6259b0 100644 --- a/lib/pddlparse/src/pddlparse/detail/Requirements.cpp +++ b/lib/pddl/src/pddl/detail/Requirements.cpp @@ -1,9 +1,9 @@ -#include +#include #include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/SignatureMatching.cpp b/lib/pddl/src/pddl/detail/SignatureMatching.cpp similarity index 98% rename from lib/pddlparse/src/pddlparse/detail/SignatureMatching.cpp rename to lib/pddl/src/pddl/detail/SignatureMatching.cpp index d8b0911..651c1b5 100644 --- a/lib/pddlparse/src/pddlparse/detail/SignatureMatching.cpp +++ b/lib/pddl/src/pddl/detail/SignatureMatching.cpp @@ -1,4 +1,4 @@ -#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/VariableStack.cpp b/lib/pddl/src/pddl/detail/VariableStack.cpp similarity index 96% rename from lib/pddlparse/src/pddlparse/detail/VariableStack.cpp rename to lib/pddl/src/pddl/detail/VariableStack.cpp index 3f53555..1921db4 100644 --- a/lib/pddlparse/src/pddlparse/detail/VariableStack.cpp +++ b/lib/pddl/src/pddl/detail/VariableStack.cpp @@ -1,8 +1,8 @@ -#include +#include #include -#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Action.cpp b/lib/pddl/src/pddl/detail/normalization/Action.cpp similarity index 81% rename from lib/pddlparse/src/pddlparse/detail/normalization/Action.cpp rename to lib/pddl/src/pddl/detail/normalization/Action.cpp index 25df836..8688418 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Action.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Action.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/AtomicFormula.cpp b/lib/pddl/src/pddl/detail/normalization/AtomicFormula.cpp similarity index 80% rename from lib/pddlparse/src/pddlparse/detail/normalization/AtomicFormula.cpp rename to lib/pddl/src/pddl/detail/normalization/AtomicFormula.cpp index c0c098d..91e6c84 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/AtomicFormula.cpp +++ b/lib/pddl/src/pddl/detail/normalization/AtomicFormula.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/ConditionalEffect.cpp b/lib/pddl/src/pddl/detail/normalization/ConditionalEffect.cpp similarity index 80% rename from lib/pddlparse/src/pddlparse/detail/normalization/ConditionalEffect.cpp rename to lib/pddl/src/pddl/detail/normalization/ConditionalEffect.cpp index de377fd..9adba45 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/ConditionalEffect.cpp +++ b/lib/pddl/src/pddl/detail/normalization/ConditionalEffect.cpp @@ -1,10 +1,10 @@ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Description.cpp b/lib/pddl/src/pddl/detail/normalization/Description.cpp similarity index 77% rename from lib/pddlparse/src/pddlparse/detail/normalization/Description.cpp rename to lib/pddl/src/pddl/detail/normalization/Description.cpp index ccba08c..6ea69d1 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Description.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Description.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Domain.cpp b/lib/pddl/src/pddl/detail/normalization/Domain.cpp similarity index 85% rename from lib/pddlparse/src/pddlparse/detail/normalization/Domain.cpp rename to lib/pddl/src/pddl/detail/normalization/Domain.cpp index 19fc523..c88fde0 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Domain.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Domain.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Effect.cpp b/lib/pddl/src/pddl/detail/normalization/Effect.cpp similarity index 85% rename from lib/pddlparse/src/pddlparse/detail/normalization/Effect.cpp rename to lib/pddl/src/pddl/detail/normalization/Effect.cpp index a2af1fe..010524e 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Effect.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Effect.cpp @@ -1,11 +1,11 @@ -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Fact.cpp b/lib/pddl/src/pddl/detail/normalization/Fact.cpp similarity index 80% rename from lib/pddlparse/src/pddlparse/detail/normalization/Fact.cpp rename to lib/pddl/src/pddl/detail/normalization/Fact.cpp index 3199feb..09172fc 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Fact.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Fact.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/InitialState.cpp b/lib/pddl/src/pddl/detail/normalization/InitialState.cpp similarity index 77% rename from lib/pddlparse/src/pddlparse/detail/normalization/InitialState.cpp rename to lib/pddl/src/pddl/detail/normalization/InitialState.cpp index c2d50c1..37bf545 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/InitialState.cpp +++ b/lib/pddl/src/pddl/detail/normalization/InitialState.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Literal.cpp b/lib/pddl/src/pddl/detail/normalization/Literal.cpp similarity index 80% rename from lib/pddlparse/src/pddlparse/detail/normalization/Literal.cpp rename to lib/pddl/src/pddl/detail/normalization/Literal.cpp index a381533..d045d6d 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Literal.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Literal.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Precondition.cpp b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp similarity index 97% rename from lib/pddlparse/src/pddlparse/detail/normalization/Precondition.cpp rename to lib/pddl/src/pddl/detail/normalization/Precondition.cpp index db807c1..e81e6c4 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Precondition.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp @@ -1,11 +1,11 @@ -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Problem.cpp b/lib/pddl/src/pddl/detail/normalization/Problem.cpp similarity index 79% rename from lib/pddlparse/src/pddlparse/detail/normalization/Problem.cpp rename to lib/pddl/src/pddl/detail/normalization/Problem.cpp index 26c6781..45ddf3e 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Problem.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Problem.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/normalization/Reduction.cpp b/lib/pddl/src/pddl/detail/normalization/Reduction.cpp similarity index 96% rename from lib/pddlparse/src/pddlparse/detail/normalization/Reduction.cpp rename to lib/pddl/src/pddl/detail/normalization/Reduction.cpp index 1694a28..cc95c7b 100644 --- a/lib/pddlparse/src/pddlparse/detail/normalization/Reduction.cpp +++ b/lib/pddl/src/pddl/detail/normalization/Reduction.cpp @@ -1,10 +1,10 @@ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp b/lib/pddl/src/pddl/detail/parsing/Action.cpp similarity index 93% rename from lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp rename to lib/pddl/src/pddl/detail/parsing/Action.cpp index 83b97eb..edb102c 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Action.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Action.cpp @@ -1,13 +1,13 @@ -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/AtomicFormula.cpp b/lib/pddl/src/pddl/detail/parsing/AtomicFormula.cpp similarity index 84% rename from lib/pddlparse/src/pddlparse/detail/parsing/AtomicFormula.cpp rename to lib/pddl/src/pddl/detail/parsing/AtomicFormula.cpp index 344d2d1..98e7a80 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/AtomicFormula.cpp +++ b/lib/pddl/src/pddl/detail/parsing/AtomicFormula.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp b/lib/pddl/src/pddl/detail/parsing/Constant.cpp similarity index 95% rename from lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp rename to lib/pddl/src/pddl/detail/parsing/Constant.cpp index 76e30c0..ce6632b 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Constant.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Constant.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp b/lib/pddl/src/pddl/detail/parsing/ConstantDeclaration.cpp similarity index 92% rename from lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp rename to lib/pddl/src/pddl/detail/parsing/ConstantDeclaration.cpp index ab48217..a8c4eaa 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/ConstantDeclaration.cpp +++ b/lib/pddl/src/pddl/detail/parsing/ConstantDeclaration.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp b/lib/pddl/src/pddl/detail/parsing/Description.cpp similarity index 92% rename from lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp rename to lib/pddl/src/pddl/detail/parsing/Description.cpp index f481ff6..9b13900 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Description.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Description.cpp @@ -1,10 +1,10 @@ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp b/lib/pddl/src/pddl/detail/parsing/Domain.cpp similarity index 94% rename from lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp rename to lib/pddl/src/pddl/detail/parsing/Domain.cpp index b403e0a..a80ef71 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Domain.cpp @@ -1,14 +1,14 @@ -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp b/lib/pddl/src/pddl/detail/parsing/Effect.cpp similarity index 94% rename from lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp rename to lib/pddl/src/pddl/detail/parsing/Effect.cpp index 9090439..b82ef85 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Effect.cpp @@ -1,11 +1,11 @@ -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Fact.cpp b/lib/pddl/src/pddl/detail/parsing/Fact.cpp similarity index 86% rename from lib/pddlparse/src/pddlparse/detail/parsing/Fact.cpp rename to lib/pddl/src/pddl/detail/parsing/Fact.cpp index 9fdee5d..f1dd0c8 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Fact.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Fact.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp b/lib/pddl/src/pddl/detail/parsing/InitialState.cpp similarity index 85% rename from lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp rename to lib/pddl/src/pddl/detail/parsing/InitialState.cpp index 9f3d495..1e20d72 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/InitialState.cpp +++ b/lib/pddl/src/pddl/detail/parsing/InitialState.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Precondition.cpp b/lib/pddl/src/pddl/detail/parsing/Precondition.cpp similarity index 92% rename from lib/pddlparse/src/pddlparse/detail/parsing/Precondition.cpp rename to lib/pddl/src/pddl/detail/parsing/Precondition.cpp index 83cd99a..40bba56 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Precondition.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Precondition.cpp @@ -1,10 +1,10 @@ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Predicate.cpp b/lib/pddl/src/pddl/detail/parsing/Predicate.cpp similarity index 88% rename from lib/pddlparse/src/pddlparse/detail/parsing/Predicate.cpp rename to lib/pddl/src/pddl/detail/parsing/Predicate.cpp index 73805ef..4e0f7fc 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Predicate.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Predicate.cpp @@ -1,11 +1,11 @@ -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp b/lib/pddl/src/pddl/detail/parsing/PredicateDeclaration.cpp similarity index 86% rename from lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp rename to lib/pddl/src/pddl/detail/parsing/PredicateDeclaration.cpp index 470861c..c83af10 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/PredicateDeclaration.cpp +++ b/lib/pddl/src/pddl/detail/parsing/PredicateDeclaration.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp b/lib/pddl/src/pddl/detail/parsing/PrimitiveType.cpp similarity index 92% rename from lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp rename to lib/pddl/src/pddl/detail/parsing/PrimitiveType.cpp index 565eb95..2d60ced 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveType.cpp +++ b/lib/pddl/src/pddl/detail/parsing/PrimitiveType.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp b/lib/pddl/src/pddl/detail/parsing/PrimitiveTypeDeclaration.cpp similarity index 93% rename from lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp rename to lib/pddl/src/pddl/detail/parsing/PrimitiveTypeDeclaration.cpp index 7b3cb6e..10e3c69 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/PrimitiveTypeDeclaration.cpp +++ b/lib/pddl/src/pddl/detail/parsing/PrimitiveTypeDeclaration.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp b/lib/pddl/src/pddl/detail/parsing/Problem.cpp similarity index 95% rename from lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp rename to lib/pddl/src/pddl/detail/parsing/Problem.cpp index 3ae91d0..c3eabcc 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Problem.cpp @@ -1,13 +1,13 @@ -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp b/lib/pddl/src/pddl/detail/parsing/Requirement.cpp similarity index 96% rename from lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp rename to lib/pddl/src/pddl/detail/parsing/Requirement.cpp index 2f82ca8..e6da39a 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Requirement.cpp @@ -1,10 +1,10 @@ -#include +#include #include #include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp b/lib/pddl/src/pddl/detail/parsing/Type.cpp similarity index 87% rename from lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp rename to lib/pddl/src/pddl/detail/parsing/Type.cpp index 16f6998..8705faa 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Type.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Type.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Unsupported.cpp b/lib/pddl/src/pddl/detail/parsing/Unsupported.cpp similarity index 91% rename from lib/pddlparse/src/pddlparse/detail/parsing/Unsupported.cpp rename to lib/pddl/src/pddl/detail/parsing/Unsupported.cpp index 2d5feef..602688c 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Unsupported.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Unsupported.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp b/lib/pddl/src/pddl/detail/parsing/Variable.cpp similarity index 95% rename from lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp rename to lib/pddl/src/pddl/detail/parsing/Variable.cpp index 857a507..1286553 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/Variable.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Variable.cpp @@ -1,7 +1,7 @@ -#include +#include -#include -#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp b/lib/pddl/src/pddl/detail/parsing/VariableDeclaration.cpp similarity index 92% rename from lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp rename to lib/pddl/src/pddl/detail/parsing/VariableDeclaration.cpp index eaf44c6..73b44b2 100644 --- a/lib/pddlparse/src/pddlparse/detail/parsing/VariableDeclaration.cpp +++ b/lib/pddl/src/pddl/detail/parsing/VariableDeclaration.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include namespace pddl { diff --git a/lib/pddlparse/tests/CMakeLists.txt b/lib/pddl/tests/CMakeLists.txt similarity index 77% rename from lib/pddlparse/tests/CMakeLists.txt rename to lib/pddl/tests/CMakeLists.txt index 90047cb..41d82b8 100644 --- a/lib/pddlparse/tests/CMakeLists.txt +++ b/lib/pddl/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -set(target pddlparse-tests) +set(target pddl-tests) file(GLOB core_sources "*.cpp") @@ -11,14 +11,14 @@ set(includes set(libraries stdc++fs - pddlparse + pddl ) add_executable(${target} ${core_sources}) target_include_directories(${target} PRIVATE ${includes}) target_link_libraries(${target} ${libraries}) -add_custom_target(run-pddlparse-tests - COMMAND ${CMAKE_BINARY_DIR}/bin/pddlparse-tests --use-colour=yes +add_custom_target(run-pddl-tests + COMMAND ${CMAKE_BINARY_DIR}/bin/pddl-tests --use-colour=yes DEPENDS ${target} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../../tests) diff --git a/lib/pddlparse/tests/TestAcceptanceOfOfficialPDDLInstances.cpp b/lib/pddl/tests/TestAcceptanceOfOfficialPDDLInstances.cpp similarity index 99% rename from lib/pddlparse/tests/TestAcceptanceOfOfficialPDDLInstances.cpp rename to lib/pddl/tests/TestAcceptanceOfOfficialPDDLInstances.cpp index f342067..bd15ea2 100644 --- a/lib/pddlparse/tests/TestAcceptanceOfOfficialPDDLInstances.cpp +++ b/lib/pddl/tests/TestAcceptanceOfOfficialPDDLInstances.cpp @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include namespace fs = std::experimental::filesystem; diff --git a/lib/pddlparse/tests/TestIssues.cpp b/lib/pddl/tests/TestIssues.cpp similarity index 97% rename from lib/pddlparse/tests/TestIssues.cpp rename to lib/pddl/tests/TestIssues.cpp index 15b7c51..53dc71c 100644 --- a/lib/pddlparse/tests/TestIssues.cpp +++ b/lib/pddl/tests/TestIssues.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include namespace fs = std::experimental::filesystem; diff --git a/lib/pddlparse/tests/TestOfficialPDDLInstances.cpp b/lib/pddl/tests/TestOfficialPDDLInstances.cpp similarity index 99% rename from lib/pddlparse/tests/TestOfficialPDDLInstances.cpp rename to lib/pddl/tests/TestOfficialPDDLInstances.cpp index 90c45c6..d87d501 100644 --- a/lib/pddlparse/tests/TestOfficialPDDLInstances.cpp +++ b/lib/pddl/tests/TestOfficialPDDLInstances.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include namespace fs = std::experimental::filesystem; diff --git a/lib/pddlparse/tests/TestParser.cpp b/lib/pddl/tests/TestParser.cpp similarity index 98% rename from lib/pddlparse/tests/TestParser.cpp rename to lib/pddl/tests/TestParser.cpp index 4c9f61c..ea03589 100644 --- a/lib/pddlparse/tests/TestParser.cpp +++ b/lib/pddl/tests/TestParser.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include namespace fs = std::experimental::filesystem; diff --git a/lib/pddlparse/tests/TestSignatureMatching.cpp b/lib/pddl/tests/TestSignatureMatching.cpp similarity index 98% rename from lib/pddlparse/tests/TestSignatureMatching.cpp rename to lib/pddl/tests/TestSignatureMatching.cpp index 659a604..8d59c6e 100644 --- a/lib/pddlparse/tests/TestSignatureMatching.cpp +++ b/lib/pddl/tests/TestSignatureMatching.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include namespace fs = std::experimental::filesystem; diff --git a/lib/pddlparse/tests/main.cpp b/lib/pddl/tests/main.cpp similarity index 100% rename from lib/pddlparse/tests/main.cpp rename to lib/pddl/tests/main.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed28563..c09e5eb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ set(includes ${PROJECT_SOURCE_DIR}/lib/tokenize/include ${PROJECT_SOURCE_DIR}/lib/colorlog/include ${PROJECT_SOURCE_DIR}/lib/variant/include - ${PROJECT_SOURCE_DIR}/lib/pddlparse/include + ${PROJECT_SOURCE_DIR}/lib/pddl/include ) set(sources @@ -50,7 +50,7 @@ set(sources set(libraries ${Boost_LIBRARIES} colorlog - pddlparse + pddl pthread ) diff --git a/src/plasp/pddl/TranslatorASP.cpp b/src/plasp/pddl/TranslatorASP.cpp index f3c9035..4c0e7ec 100644 --- a/src/plasp/pddl/TranslatorASP.cpp +++ b/src/plasp/pddl/TranslatorASP.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fdbd602..8a80e0e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,7 +9,7 @@ set(includes ${PROJECT_SOURCE_DIR}/lib/tokenize/include ${PROJECT_SOURCE_DIR}/lib/colorlog/include ${PROJECT_SOURCE_DIR}/lib/variant/include - ${PROJECT_SOURCE_DIR}/lib/pddlparse/include + ${PROJECT_SOURCE_DIR}/lib/pddl/include ) set(libraries diff --git a/tests/TestPDDLTranslation.cpp b/tests/TestPDDLTranslation.cpp index a7f9760..4ccb89a 100644 --- a/tests/TestPDDLTranslation.cpp +++ b/tests/TestPDDLTranslation.cpp @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include #include