Renamed “pddlparse” library to simply “pddl”.

.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

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)
 

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)

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

app/main.cpp

@@ -8,13 +8,13 @@
 #include <colorlog/Logger.h>
 #include <colorlog/Priority.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/Mode.h>
-#include <pddlparse/Normalize.h>
-#include <pddlparse/NormalizedASTOutput.h>
-#include <pddlparse/Parse.h>
-#include <pddlparse/detail/normalization/Reduction.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/Mode.h>
+#include <pddl/Normalize.h>
+#include <pddl/NormalizedASTOutput.h>
+#include <pddl/Parse.h>
+#include <pddl/detail/normalization/Reduction.h>
 
 #include <plasp/LanguageDetection.h>
 #include <plasp/TranslatorException.h>

include/plasp/pddl/TranslatorASP.h

@@ -3,8 +3,8 @@
 
 #include <colorlog/ColorStream.h>
 
-#include <pddlparse/NormalizedASTForward.h>
-#include <pddlparse/Parse.h>
+#include <pddl/NormalizedASTForward.h>
+#include <pddl/Parse.h>
 
 namespace plasp
 {

include/plasp/pddl/translation/ConditionalEffect.h

@@ -3,7 +3,7 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 #include <plasp/TranslatorException.h>
 

include/plasp/pddl/translation/DerivedPredicate.h

@@ -3,8 +3,8 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/Parse.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/Parse.h>
 
 #include <plasp/pddl/translation/Primitives.h>
 #include <plasp/pddl/translation/Variables.h>

include/plasp/pddl/translation/DerivedPredicatePrecondition.h

@@ -3,7 +3,7 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 #include <plasp/TranslatorException.h>
 

include/plasp/pddl/translation/Effect.h

@@ -3,7 +3,7 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 #include <plasp/TranslatorException.h>
 

include/plasp/pddl/translation/Goal.h

@@ -3,7 +3,7 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 #include <plasp/TranslatorException.h>
 

include/plasp/pddl/translation/Precondition.h

@@ -3,7 +3,7 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 #include <plasp/TranslatorException.h>
 

include/plasp/pddl/translation/Predicate.h

@@ -3,8 +3,8 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/Parse.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/Parse.h>
 
 #include <plasp/pddl/translation/Primitives.h>
 #include <plasp/pddl/translation/Variables.h>

include/plasp/pddl/translation/Primitives.h

@@ -3,7 +3,7 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 #include <plasp/TranslatorException.h>
 

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 <pddlparse/NormalizedAST.h>
+#include <pddl/NormalizedAST.h>
 
 namespace plasp
 {

include/plasp/pddl/translation/Variables.h

@@ -3,8 +3,8 @@
 
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/Parse.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/Parse.h>
 
 #include <plasp/TranslatorException.h>
 

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)

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 <limits>
 #include <experimental/optional>
@@ -7,7 +7,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <pddlparse/ASTForward.h>
+#include <pddl/ASTForward.h>
 
 namespace pddl
 {

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 <iosfwd>
 #include <memory>
@@ -7,7 +7,7 @@
 #include <set>
 #include <vector>
 
-#include <pddlparse/Variant.h>
+#include <pddl/Variant.h>
 
 namespace pddl
 {

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 <colorlog/ColorStream.h>
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/detail/OutputUtils.h>
-#include <pddlparse/detail/parsing/Requirement.h>
+#include <pddl/AST.h>
+#include <pddl/detail/OutputUtils.h>
+#include <pddl/detail/parsing/Requirement.h>
 
 namespace pddl
 {

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 <functional>
 
-#include <pddlparse/Mode.h>
-#include <pddlparse/Tokenizer.h>
+#include <pddl/Mode.h>
+#include <pddl/Tokenizer.h>
 
 namespace pddl
 {

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 <exception>
 #include <experimental/optional>

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 <functional>
 
-#include <pddlparse/Tokenizer.h>
+#include <pddl/Tokenizer.h>
 
 namespace pddl
 {

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 <pddlparse/AST.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Description.h>
+#include <pddl/AST.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Description.h>
 
 namespace pddl
 {

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 <limits>
 #include <experimental/optional>
@@ -7,7 +7,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/AST.h>
+#include <pddl/AST.h>
 
 namespace pddl
 {

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 <colorlog/ColorStream.h>
 #include <colorlog/Formatting.h>
 
-#include <pddlparse/ASTOutput.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/OutputUtils.h>
-#include <pddlparse/detail/parsing/Requirement.h>
+#include <pddl/ASTOutput.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/OutputUtils.h>
+#include <pddl/detail/parsing/Requirement.h>
 
 namespace pddl
 {

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 <experimental/optional>
 
-#include <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <iostream>
 

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 <mapbox/variant.hpp>
 

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 <pddlparse/AST.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/AST.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/AST.h>
-#include <pddlparse/Variant.h>
+#include <pddl/AST.h>
+#include <pddl/Variant.h>
 
 namespace pddl
 {

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 <colorlog/Formatting.h>
 

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 <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
 
 namespace pddl
 {

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 <string>
 
-#include <pddlparse/AST.h>
+#include <pddl/AST.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
+#include <pddl/ASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/Exception.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/Exception.h>
 
-#include <pddlparse/NormalizedASTForward.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/NormalizedASTForward.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/NormalizedASTForward.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/NormalizedASTForward.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/AST.h>
-#include <pddlparse/Context.h>
+#include <pddl/AST.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/AST.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
-#include <pddlparse/detail/parsing/VariableDeclaration.h>
+#include <pddl/AST.h>
+#include <pddl/Context.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
+#include <pddl/detail/parsing/VariableDeclaration.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/AST.h>
-#include <pddlparse/Context.h>
+#include <pddl/AST.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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 <pddlparse/Context.h>
-#include <pddlparse/Exception.h>
+#include <pddl/Context.h>
+#include <pddl/Exception.h>
 
 namespace pddl
 {

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 <pddlparse/Tokenizer.h>
+#include <pddl/Tokenizer.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
+#include <pddl/detail/VariableStack.h>
 
 namespace pddl
 {

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 <pddlparse/ASTForward.h>
-#include <pddlparse/Context.h>
+#include <pddl/ASTForward.h>
+#include <pddl/Context.h>
 
 namespace pddl
 {

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

lib/pddl/src/pddl/Parse.cpp

@@ -1,7 +1,7 @@
-#include <pddlparse/Parse.h>
+#include <pddl/Parse.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/detail/parsing/Description.h>
+#include <pddl/AST.h>
+#include <pddl/detail/parsing/Description.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/Requirements.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/Requirements.h>
+#include <pddl/detail/Requirements.h>
 
 #include <algorithm>
 
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/parsing/Requirement.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/parsing/Requirement.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/SignatureMatching.cpp

@@ -1,4 +1,4 @@
-#include <pddlparse/detail/SignatureMatching.h>
+#include <pddl/detail/SignatureMatching.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/VariableStack.cpp

@@ -1,8 +1,8 @@
-#include <pddlparse/detail/VariableStack.h>
+#include <pddl/detail/VariableStack.h>
 
 #include <algorithm>
 
-#include <pddlparse/AST.h>
+#include <pddl/AST.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Action.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/normalization/Action.h>
+#include <pddl/detail/normalization/Action.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Effect.h>
-#include <pddlparse/detail/normalization/Precondition.h>
+#include <pddl/AST.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Effect.h>
+#include <pddl/detail/normalization/Precondition.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/AtomicFormula.cpp

@@ -1,8 +1,8 @@
-#include <pddlparse/detail/normalization/AtomicFormula.h>
+#include <pddl/detail/normalization/AtomicFormula.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/ConditionalEffect.cpp

@@ -1,10 +1,10 @@
-#include <pddlparse/detail/normalization/Effect.h>
+#include <pddl/detail/normalization/Effect.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Literal.h>
-#include <pddlparse/detail/normalization/Precondition.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Literal.h>
+#include <pddl/detail/normalization/Precondition.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Description.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/normalization/Description.h>
+#include <pddl/detail/normalization/Description.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Domain.h>
-#include <pddlparse/detail/normalization/Problem.h>
+#include <pddl/AST.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Domain.h>
+#include <pddl/detail/normalization/Problem.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Domain.cpp

@@ -1,8 +1,8 @@
-#include <pddlparse/detail/normalization/Domain.h>
+#include <pddl/detail/normalization/Domain.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Action.h>
+#include <pddl/AST.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Action.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Effect.cpp

@@ -1,11 +1,11 @@
-#include <pddlparse/detail/normalization/Effect.h>
+#include <pddl/detail/normalization/Effect.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/ConditionalEffect.h>
-#include <pddlparse/detail/normalization/Literal.h>
-#include <pddlparse/detail/normalization/Precondition.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/ConditionalEffect.h>
+#include <pddl/detail/normalization/Literal.h>
+#include <pddl/detail/normalization/Precondition.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Fact.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/normalization/Fact.h>
+#include <pddl/detail/normalization/Fact.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Literal.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Literal.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/InitialState.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/normalization/InitialState.h>
+#include <pddl/detail/normalization/InitialState.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/Fact.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/Fact.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Literal.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/normalization/Literal.h>
+#include <pddl/detail/normalization/Literal.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/AtomicFormula.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/AtomicFormula.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Precondition.cpp

@@ -1,11 +1,11 @@
-#include <pddlparse/detail/normalization/Precondition.h>
+#include <pddl/detail/normalization/Precondition.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/AtomicFormula.h>
-#include <pddlparse/detail/normalization/CollectFreeVariables.h>
-#include <pddlparse/detail/normalization/Reduction.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/AtomicFormula.h>
+#include <pddl/detail/normalization/CollectFreeVariables.h>
+#include <pddl/detail/normalization/Reduction.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Problem.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/normalization/Problem.h>
+#include <pddl/detail/normalization/Problem.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/InitialState.h>
-#include <pddlparse/detail/normalization/Precondition.h>
+#include <pddl/AST.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/InitialState.h>
+#include <pddl/detail/normalization/Precondition.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/normalization/Reduction.cpp

@@ -1,10 +1,10 @@
-#include <pddlparse/detail/normalization/Reduction.h>
+#include <pddl/detail/normalization/Reduction.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/NormalizedAST.h>
-#include <pddlparse/detail/normalization/AtomicFormula.h>
-#include <pddlparse/detail/normalization/CollectFreeVariables.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/NormalizedAST.h>
+#include <pddl/detail/normalization/AtomicFormula.h>
+#include <pddl/detail/normalization/CollectFreeVariables.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Action.cpp

@@ -1,13 +1,13 @@
-#include <pddlparse/detail/parsing/Action.h>
+#include <pddl/detail/parsing/Action.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/ASTContext.h>
-#include <pddlparse/detail/VariableStack.h>
-#include <pddlparse/detail/parsing/Effect.h>
-#include <pddlparse/detail/parsing/Precondition.h>
-#include <pddlparse/detail/parsing/Utils.h>
-#include <pddlparse/detail/parsing/VariableDeclaration.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/ASTContext.h>
+#include <pddl/detail/VariableStack.h>
+#include <pddl/detail/parsing/Effect.h>
+#include <pddl/detail/parsing/Precondition.h>
+#include <pddl/detail/parsing/Utils.h>
+#include <pddl/detail/parsing/VariableDeclaration.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/AtomicFormula.cpp

@@ -1,8 +1,8 @@
-#include <pddlparse/detail/parsing/AtomicFormula.h>
+#include <pddl/detail/parsing/AtomicFormula.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/detail/parsing/Predicate.h>
-#include <pddlparse/detail/parsing/Unsupported.h>
+#include <pddl/AST.h>
+#include <pddl/detail/parsing/Predicate.h>
+#include <pddl/detail/parsing/Unsupported.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Constant.cpp

@@ -1,7 +1,7 @@
-#include <pddlparse/detail/parsing/Constant.h>
+#include <pddl/detail/parsing/Constant.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/ConstantDeclaration.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/parsing/ConstantDeclaration.h>
+#include <pddl/detail/parsing/ConstantDeclaration.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/ASTCopy.h>
-#include <pddlparse/detail/parsing/PrimitiveType.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/ASTCopy.h>
+#include <pddl/detail/parsing/PrimitiveType.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Description.cpp

@@ -1,10 +1,10 @@
-#include <pddlparse/detail/parsing/Description.h>
+#include <pddl/detail/parsing/Description.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/parsing/Domain.h>
-#include <pddlparse/detail/parsing/Problem.h>
-#include <pddlparse/detail/parsing/Utils.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/parsing/Domain.h>
+#include <pddl/detail/parsing/Problem.h>
+#include <pddl/detail/parsing/Utils.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Domain.cpp

@@ -1,14 +1,14 @@
-#include <pddlparse/detail/parsing/Domain.h>
+#include <pddl/detail/parsing/Domain.h>
 
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/Requirements.h>
-#include <pddlparse/detail/parsing/Action.h>
-#include <pddlparse/detail/parsing/ConstantDeclaration.h>
-#include <pddlparse/detail/parsing/PredicateDeclaration.h>
-#include <pddlparse/detail/parsing/PrimitiveTypeDeclaration.h>
-#include <pddlparse/detail/parsing/Requirement.h>
-#include <pddlparse/detail/parsing/Unsupported.h>
-#include <pddlparse/detail/parsing/Utils.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/Requirements.h>
+#include <pddl/detail/parsing/Action.h>
+#include <pddl/detail/parsing/ConstantDeclaration.h>
+#include <pddl/detail/parsing/PredicateDeclaration.h>
+#include <pddl/detail/parsing/PrimitiveTypeDeclaration.h>
+#include <pddl/detail/parsing/Requirement.h>
+#include <pddl/detail/parsing/Unsupported.h>
+#include <pddl/detail/parsing/Utils.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Effect.cpp

@@ -1,11 +1,11 @@
-#include <pddlparse/detail/parsing/Effect.h>
+#include <pddl/detail/parsing/Effect.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/detail/parsing/AtomicFormula.h>
-#include <pddlparse/detail/parsing/Expressions.h>
-#include <pddlparse/detail/parsing/Precondition.h>
-#include <pddlparse/detail/parsing/Unsupported.h>
-#include <pddlparse/detail/parsing/Utils.h>
+#include <pddl/AST.h>
+#include <pddl/detail/parsing/AtomicFormula.h>
+#include <pddl/detail/parsing/Expressions.h>
+#include <pddl/detail/parsing/Precondition.h>
+#include <pddl/detail/parsing/Unsupported.h>
+#include <pddl/detail/parsing/Utils.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Fact.cpp

@@ -1,9 +1,9 @@
-#include <pddlparse/detail/parsing/Fact.h>
+#include <pddl/detail/parsing/Fact.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/detail/parsing/AtomicFormula.h>
-#include <pddlparse/detail/parsing/Expressions.h>
-#include <pddlparse/detail/parsing/Unsupported.h>
+#include <pddl/AST.h>
+#include <pddl/detail/parsing/AtomicFormula.h>
+#include <pddl/detail/parsing/Expressions.h>
+#include <pddl/detail/parsing/Unsupported.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/InitialState.cpp

@@ -1,8 +1,8 @@
-#include <pddlparse/detail/parsing/InitialState.h>
+#include <pddl/detail/parsing/InitialState.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/parsing/Fact.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/parsing/Fact.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Precondition.cpp

@@ -1,10 +1,10 @@
-#include <pddlparse/detail/parsing/Precondition.h>
+#include <pddl/detail/parsing/Precondition.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/detail/parsing/AtomicFormula.h>
-#include <pddlparse/detail/parsing/Expressions.h>
-#include <pddlparse/detail/parsing/Unsupported.h>
-#include <pddlparse/detail/parsing/Utils.h>
+#include <pddl/AST.h>
+#include <pddl/detail/parsing/AtomicFormula.h>
+#include <pddl/detail/parsing/Expressions.h>
+#include <pddl/detail/parsing/Unsupported.h>
+#include <pddl/detail/parsing/Utils.h>
 
 namespace pddl
 {

lib/pddl/src/pddl/detail/parsing/Predicate.cpp

@@ -1,11 +1,11 @@
-#include <pddlparse/detail/parsing/Predicate.h>
+#include <pddl/detail/parsing/Predicate.h>
 
-#include <pddlparse/AST.h>
-#include <pddlparse/Exception.h>
-#include <pddlparse/detail/SignatureMatching.h>
-#include <pddlparse/detail/parsing/Constant.h>
-#include <pddlparse/detail/parsing/Variable.h>
-#include <pddlparse/detail/parsing/VariableDeclaration.h>
+#include <pddl/AST.h>
+#include <pddl/Exception.h>
+#include <pddl/detail/SignatureMatching.h>
+#include <pddl/detail/parsing/Constant.h>
+#include <pddl/detail/parsing/Variable.h>
+#include <pddl/detail/parsing/VariableDeclaration.h>
 
 namespace pddl
 {