From fa2be8735648d2fdd18e1eb671dfa4bd7084db42 Mon Sep 17 00:00:00 2001 From: Dominik Drexler Date: Thu, 4 Jan 2024 18:40:25 +0100 Subject: [PATCH] . --- CMakeLists.txt | 5 ++--- include/loki/common/ast/config.hpp | 2 +- src/domain/ast/parser.hpp | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab8f92d2..2e5fd085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,10 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Establish project ############################################################## -project(Loki VERSION 0.1 LANGUAGES CXX) +project(Loki VERSION 0.1 LANGUAGES C CXX) # Compilation flags, some configuration-specific -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -pedantic") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -pedantic -fPIC") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -fomit-frame-pointer") set(CMAKE_CXX_FLAGS_DEBUG "-O3 -DDEBUG") @@ -106,7 +106,6 @@ install( ) - ########### # Exports # ########### diff --git a/include/loki/common/ast/config.hpp b/include/loki/common/ast/config.hpp index c19bbd08..30bc09e6 100644 --- a/include/loki/common/ast/config.hpp +++ b/include/loki/common/ast/config.hpp @@ -29,7 +29,7 @@ namespace loki { namespace x3 = boost::spirit::x3; - using Position = boost::spirit::x3::position_tagged; + using Position = x3::position_tagged; using PositionList = std::vector; // Our iterator type diff --git a/src/domain/ast/parser.hpp b/src/domain/ast/parser.hpp index 69b267f4..5e28305d 100644 --- a/src/domain/ast/parser.hpp +++ b/src/domain/ast/parser.hpp @@ -181,7 +181,7 @@ namespace loki::domain { struct StructureClass; typedef x3::rule define_keyword_type; - typedef x3::rule domain_keyword_type; + typedef x3::rule domain_keyword_type; typedef x3::rule name_type; typedef x3::rule variable_type; @@ -335,13 +335,13 @@ namespace loki::domain { requirement_constraints_type, requirement_action_costs_type, requirement_type) BOOST_SPIRIT_DECLARE( - type_type, type_object_type, type_number_type, type_either_type, + type_type, type_object_type, type_number_type, type_either_type, typed_list_of_names_recursively_type, typed_list_of_names_type, typed_list_of_variables_recursively_type, typed_list_of_variables_type) BOOST_SPIRIT_DECLARE(atomic_formula_skeleton_type) - BOOST_SPIRIT_DECLARE(atomic_function_skeleton_total_cost_type, atomic_function_skeleton_general_type, atomic_function_skeleton_type, + BOOST_SPIRIT_DECLARE(atomic_function_skeleton_total_cost_type, atomic_function_skeleton_general_type, atomic_function_skeleton_type, function_typed_list_of_atomic_function_skeletons_recursively_type, function_typed_list_of_atomic_function_skeletons_type) BOOST_SPIRIT_DECLARE(atomic_formula_of_terms_type, atom_type, negated_atom_type, literal_type) @@ -379,7 +379,7 @@ namespace loki::domain { BOOST_SPIRIT_DECLARE(numeric_term_type) - BOOST_SPIRIT_DECLARE(effect_type, effect_production_literal_type, + BOOST_SPIRIT_DECLARE(effect_type, effect_production_literal_type, effect_production_numeric_fluent_total_cost_type, effect_production_numeric_fluent_general_type, effect_production_type, effect_conditional_forall_type, effect_conditional_when_type, effect_conditional_type, action_symbol_type, action_body_type, action_type,