compile and link parsers in seperate binary

src/CMakeLists.txt

@@ -6,6 +6,7 @@ add_custom_target(binaries)
 
 add_subdirectory(storm)
 add_subdirectory(storm-counterexamples)
+add_subdirectory(storm-parsers)
 add_subdirectory(storm-cli-utilities)
 add_subdirectory(storm-pgcl)
 add_subdirectory(storm-pgcl-cli)

src/storm-cli-utilities/CMakeLists.txt

@@ -17,7 +17,7 @@ set_target_properties(storm-cli-utilities PROPERTIES DEFINE_SYMBOL "")
 list(APPEND STORM_TARGETS storm-cli-utilities)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 
-target_link_libraries(storm-cli-utilities PUBLIC storm storm-counterexamples)
+target_link_libraries(storm-cli-utilities PUBLIC storm storm-counterexamples storm-parsers)
 
 # Install storm headers to include directory.
 foreach(HEADER ${STORM_CLI_UTIL_HEADERS})

src/storm-cli-utilities/model-handling.h

@@ -3,6 +3,7 @@
 #include "storm/api/storm.h"
 
 #include "storm-counterexamples/api/counterexamples.h"
+#include "storm-parsers/api/storm-parsers.h"
 
 #include "storm/utility/resources.h"
 #include "storm/utility/file.h"

src/storm-dft-cli/storm-dft.cpp

@@ -7,6 +7,8 @@
 #include "storm/settings/modules/ResourceSettings.h"
 #include "storm/settings/modules/GeneralSettings.h"
 
+
+#include "storm-parsers/api/storm-parsers.h"
 #include "storm/utility/initialize.h"
 #include "storm-cli-utilities/cli.h"
 

src/storm-dft/parser/DFTGalileoParser.h

@@ -3,12 +3,12 @@
 #include <map>
 
 #include "storm/storage/expressions/ExpressionManager.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 #include "storm/storage/expressions/ExpressionEvaluator.h"
 
 #include "storm-dft/storage/dft/DFT.h"
 #include "storm-dft/builder/DFTBuilder.h"
-#include "storm/parser/ValueParser.h"
+#include "storm-parsers/parser/ValueParser.h"
 
 
 namespace storm {

src/storm-dft/parser/DFTJsonParser.h

@@ -3,7 +3,7 @@
 #include <map>
 
 #include "storm/storage/expressions/ExpressionManager.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 #include "storm/storage/expressions/ExpressionEvaluator.h"
 
 #include "storm-dft/storage/dft/DFT.h"

src/storm-gspn-cli/storm-gspn.cpp

@@ -14,7 +14,7 @@
 #include "api/storm.h"
 #include "storm-cli-utilities/cli.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 
 #include "storm/storage/expressions/ExpressionManager.h"
 #include "storm/storage/jani/Model.h"

src/storm-gspn/builder/ExplicitGspnModelBuilder.cpp

@@ -5,7 +5,7 @@
 //#include "storm/utility/macros.h"
 //#include "storm/exceptions/NotImplementedException.h"
 //#include "storm/storage/expressions/ExpressionManager.h"
-//#include "storm/parser/FormulaParser.h"
+//#include "storm-parsers/parser/FormulaParser.h"
 //#include "storm/storage/expressions/ExpressionEvaluator.h"
 //
 //namespace storm {

src/storm-parsers/CMakeLists.txt

@@ -0,0 +1,42 @@
+file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-parsers/*.h ${PROJECT_SOURCE_DIR}/src/storm-parsers/*.cpp)
+
+register_source_groups_from_filestructure("${ALL_FILES}" storm-parsers)
+
+
+
+file(GLOB_RECURSE STORM_PARSER_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-parsers/*/*.cpp)
+file(GLOB_RECURSE STORM_PARSER_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-parsers/*/*.h)
+
+
+# Disable Debug compiler flags for PrismParser to lessen memory consumption during compilation
+SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/src/storm-parsers/parser/PrismParser.cpp PROPERTIES COMPILE_FLAGS -g0)
+# Create storm-dft.
+add_library(storm-parsers SHARED ${STORM_PARSER_SOURCES} ${STORM_PARSER_HEADERS})
+
+# Remove define symbol for shared libstorm.
+set_target_properties(storm-parsers PROPERTIES DEFINE_SYMBOL "")
+#add_dependencies(storm resources)
+list(APPEND STORM_TARGETS storm-parsers)
+set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
+
+target_link_libraries(storm-parsers PUBLIC storm)
+
+# Install storm headers to include directory.
+foreach(HEADER ${STORM_PARSER_HEADERS})
+	string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
+	string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
+	string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
+	add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
+		COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		DEPENDS ${HEADER}
+	)
+	list(APPEND STORM_PARSER_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
+endforeach()
+add_custom_target(copy_storm_parser_headers DEPENDS ${STORM_PARSER_OUTPUT_HEADERS} ${STORM_PARSER_HEADERS})
+add_dependencies(storm-parsers copy_storm_parser_headers)
+
+# installation
+install(TARGETS storm-parsers EXPORT storm_Targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL)
+

src/storm/api/model_descriptions.cpp → src/storm-parsers/api/model_descriptions.cpp

@@ -1,7 +1,7 @@
-#include "storm/api/model_descriptions.h"
+#include "model_descriptions.h"
 
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
-#include "storm/parser/JaniParser.h"
+#include "storm-parsers/parser/JaniParser.h"
 
 #include "storm/storage/jani/Model.h"
 #include "storm/storage/jani/Property.h"

src/storm-parsers/api/properties.cpp

@@ -0,0 +1,71 @@
+
+
+#include "storm-parsers/parser/FormulaParser.h"
+#include "storm/api/properties.h"
+
+
+#include "storm/storage/SymbolicModelDescription.h"
+#include "storm/storage/prism/Program.h"
+#include "storm/storage/jani/Model.h"
+#include "storm/storage/jani/Property.h"
+
+#include "storm/logic/Formula.h"
+
+#include "storm/utility/cli.h"
+
+
+namespace storm {
+    namespace api {
+
+        boost::optional <std::set<std::string>> parsePropertyFilter(std::string const &propertyFilter) {
+            if (propertyFilter == "all") {
+                return boost::none;
+            }
+            std::vector <std::string> propertyNames = storm::utility::cli::parseCommaSeparatedStrings(propertyFilter);
+            std::set <std::string> propertyNameSet(propertyNames.begin(), propertyNames.end());
+            return propertyNameSet;
+        }
+
+        std::vector <storm::jani::Property> parseProperties(storm::parser::FormulaParser &formulaParser, std::string const &inputString, boost::optional <std::set<std::string>> const &propertyFilter) {
+            // If the given property is a file, we parse it as a file, otherwise we assume it's a property.
+            std::vector <storm::jani::Property> properties;
+            if (std::ifstream(inputString).good()) {
+                STORM_LOG_INFO("Loading properties from file: " << inputString << std::endl);
+                properties = formulaParser.parseFromFile(inputString);
+            } else {
+                properties = formulaParser.parseFromString(inputString);
+            }
+
+            return filterProperties(properties, propertyFilter);
+        }
+
+        std::vector <storm::jani::Property> parseProperties(std::string const &inputString, boost::optional <std::set<std::string>> const &propertyFilter) {
+            auto exprManager = std::make_shared<storm::expressions::ExpressionManager>();
+            storm::parser::FormulaParser formulaParser(exprManager);
+            return parseProperties(formulaParser, inputString, propertyFilter);
+        }
+
+        std::vector <storm::jani::Property> parsePropertiesForJaniModel(std::string const &inputString, storm::jani::Model const &model, boost::optional <std::set<std::string>> const &propertyFilter) {
+            storm::parser::FormulaParser formulaParser(model.getManager().getSharedPointer());
+            auto formulas = parseProperties(formulaParser, inputString, propertyFilter);
+            return substituteConstantsInProperties(formulas, model.getConstantsSubstitution());
+        }
+
+        std::vector <storm::jani::Property> parsePropertiesForPrismProgram(std::string const &inputString, storm::prism::Program const &program, boost::optional <std::set<std::string>> const &propertyFilter) {
+            storm::parser::FormulaParser formulaParser(program);
+            auto formulas = parseProperties(formulaParser, inputString, propertyFilter);
+            return substituteConstantsInProperties(formulas, program.getConstantsSubstitution());
+        }
+
+        std::vector <storm::jani::Property> parsePropertiesForSymbolicModelDescription(std::string const &inputString, storm::storage::SymbolicModelDescription const &modelDescription, boost::optional <std::set<std::string>> const &propertyFilter) {
+            std::vector <storm::jani::Property> result;
+            if (modelDescription.isPrismProgram()) {
+                result = storm::api::parsePropertiesForPrismProgram(inputString, modelDescription.asPrismProgram(), propertyFilter);
+            } else {
+                STORM_LOG_ASSERT(modelDescription.isJaniModel(), "Unknown model description type.");
+                result = storm::api::parsePropertiesForJaniModel(inputString, modelDescription.asJaniModel(), propertyFilter);
+            }
+            return result;
+        }
+    }
+}

src/storm-parsers/api/properties.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <string>
+#include <set>
+#include <map>
+#include <vector>
+#include <memory>
+#include <boost/optional.hpp>
+
+namespace storm {
+    namespace parser {
+        class FormulaParser;
+    }
+    namespace jani {
+        class Property;
+        class Model;
+    }
+    namespace expressions {
+        class Variable;
+        class Expression;
+    }
+    namespace prism {
+        class Program;
+    }
+    namespace storage {
+        class SymbolicModelDescription;
+    }
+    namespace logic {
+        class Formula;
+    }
+    
+    namespace api {
+        boost::optional<std::set<std::string>> parsePropertyFilter(std::string const& propertyFilter);
+
+        // Parsing properties.
+        std::vector<storm::jani::Property> parseProperties(storm::parser::FormulaParser& formulaParser, std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
+        std::vector<storm::jani::Property> parseProperties(std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
+        std::vector<storm::jani::Property> parsePropertiesForPrismProgram(std::string const& inputString, storm::prism::Program const& program, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
+        std::vector<storm::jani::Property> parsePropertiesForJaniModel(std::string const& inputString, storm::jani::Model const& model, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
+        std::vector<storm::jani::Property> parsePropertiesForSymbolicModelDescription(std::string const& inputString, storm::storage::SymbolicModelDescription const& modelDescription, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
+
+    }
+}

src/storm-parsers/api/storm-parsers.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#include "storm-parsers/api/model_descriptions.h"
+#include "storm-parsers/api/properties.h"

src/storm/parser/AtomicPropositionLabelingParser.cpp → src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp

@@ -5,14 +5,14 @@
  *      Author: Gereon Kremer
  */
 
-#include "storm/parser/AtomicPropositionLabelingParser.h"
+#include "storm-parsers/parser/AtomicPropositionLabelingParser.h"
 
 #include <cstring>
 #include <string>
 #include <iostream>
 
 #include "storm/utility/cstring.h"
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/exceptions/FileIoException.h"
 

src/storm/parser/AutoParser.cpp → src/storm-parsers/parser/AutoParser.cpp

@@ -1,12 +1,12 @@
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
 
 #include "storm/models/sparse/StandardRewardModel.h"
 
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 
-#include "storm/parser/DeterministicModelParser.h"
+#include "storm-parsers/parser/DeterministicModelParser.h"
-#include "storm/parser/NondeterministicModelParser.h"
+#include "storm-parsers/parser/NondeterministicModelParser.h"
-#include "storm/parser/MarkovAutomatonParser.h"
+#include "storm-parsers/parser/MarkovAutomatonParser.h"
 #include "storm/utility/macros.h"
 #include "storm/exceptions/WrongFormatException.h"
 

src/storm/parser/DeterministicModelParser.cpp → src/storm-parsers/parser/DeterministicModelParser.cpp

@@ -1,13 +1,13 @@
-#include "storm/parser/DeterministicModelParser.h"
+#include "storm-parsers/parser/DeterministicModelParser.h"
 
 #include <string>
 #include <vector>
 
 #include "storm/models/sparse/StandardRewardModel.h"
 
-#include "storm/parser/DeterministicSparseTransitionParser.h"
+#include "storm-parsers/parser/DeterministicSparseTransitionParser.h"
-#include "storm/parser/SparseItemLabelingParser.h"
+#include "storm-parsers/parser/SparseItemLabelingParser.h"
-#include "storm/parser/SparseStateRewardParser.h"
+#include "storm-parsers/parser/SparseStateRewardParser.h"
 
 #include "storm/adapters/RationalFunctionAdapter.h"
 

src/storm/parser/DeterministicSparseTransitionParser.cpp → src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp

@@ -1,4 +1,4 @@
-#include "storm/parser/DeterministicSparseTransitionParser.h"
+#include "storm-parsers/parser/DeterministicSparseTransitionParser.h"
 
 #include <cstdio>
 #include <cstring>
@@ -9,7 +9,7 @@
 
 #include "storm/utility/constants.h"
 #include "storm/utility/cstring.h"
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 #include "storm/exceptions/FileIoException.h"
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/exceptions/InvalidArgumentException.h"

src/storm/parser/DirectEncodingParser.cpp → src/storm-parsers/parser/DirectEncodingParser.cpp

@@ -1,4 +1,4 @@
-#include "storm/parser/DirectEncodingParser.h"
+#include "storm-parsers/parser/DirectEncodingParser.h"
 
 #include <iostream>
 #include <string>

src/storm/parser/DirectEncodingParser.h → src/storm-parsers/parser/DirectEncodingParser.h

@@ -1,7 +1,7 @@
 #ifndef STORM_PARSER_DIRECTENCODINGPARSER_H_
 #define STORM_PARSER_DIRECTENCODINGPARSER_H_
 
-#include "storm/parser/ValueParser.h"
+#include "storm-parsers/parser/ValueParser.h"
 #include "storm/models/sparse/Model.h"
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/storage/sparse/ModelComponents.h"

src/storm/parser/ExpressionCreator.h → src/storm-parsers/parser/ExpressionCreator.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <memory>
 // Very ugly, but currently we would like to have the symbol table here.
-#include "storm/parser/SpiritParserDefinitions.h"
+#include "storm-parsers/parser/SpiritParserDefinitions.h"
 
 #include <boost/optional.hpp>
 #include "storm/adapters/RationalNumberAdapter.h"

src/storm/parser/ExpressionParser.cpp → src/storm-parsers/parser/ExpressionParser.cpp

@@ -1,10 +1,10 @@
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 #include "storm/exceptions/InvalidArgumentException.h"
 #include "storm/exceptions/InvalidTypeException.h"
 #include "storm/exceptions/WrongFormatException.h"
 
 #include "storm/utility/constants.h"
-#include "storm/parser/ExpressionCreator.h"
+#include "storm-parsers/parser/ExpressionCreator.h"
 #include "storm/storage/expressions/Expression.h"
 
 

src/storm/parser/ExpressionParser.h → src/storm-parsers/parser/ExpressionParser.h

@@ -2,8 +2,8 @@
 
 #include <sstream>
 
-#include "storm/parser/SpiritParserDefinitions.h"
+#include "storm-parsers/parser/SpiritParserDefinitions.h"
-#include "storm/parser/SpiritErrorHandler.h"
+#include "storm-parsers/parser/SpiritErrorHandler.h"
 #include "storm/storage/expressions/OperatorType.h"
 
 #include "storm/adapters/RationalNumberAdapter.h"

src/storm/parser/FormulaParser.cpp → src/storm-parsers/parser/FormulaParser.cpp

@@ -1,8 +1,8 @@
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 
 #include <fstream>
 
-#include "storm/parser/SpiritErrorHandler.h"
+#include "storm-parsers/parser/SpiritErrorHandler.h"
 
 #include "storm/storage/prism/Program.h"
 

src/storm/parser/FormulaParser.h → src/storm-parsers/parser/FormulaParser.h

@@ -3,8 +3,8 @@
 
 #include <sstream>
 
-#include "storm/parser/SpiritParserDefinitions.h"
+#include "storm-parsers/parser/SpiritParserDefinitions.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 #include "storm/storage/jani/Property.h"
 #include "storm/storage/expressions/Expression.h"
 #include "storm/utility/macros.h"

src/storm/parser/FormulaParserGrammar.h → src/storm-parsers/parser/FormulaParserGrammar.h

@@ -3,11 +3,11 @@
 #include <memory>
 #include <fstream>
 
-#include "storm/parser/SpiritErrorHandler.h"
+#include "storm-parsers/parser/SpiritErrorHandler.h"
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/storage/jani/Property.h"
 #include "storm/logic/Formulas.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 
 #include "storm/modelchecker/results/FilterType.h"
 

src/storm/parser/ImcaMarkovAutomatonParser.cpp → src/storm-parsers/parser/ImcaMarkovAutomatonParser.cpp

@@ -1,4 +1,4 @@
-#include "storm/parser/ImcaMarkovAutomatonParser.h"
+#include "storm-parsers/parser/ImcaMarkovAutomatonParser.h"
 
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/modules/BuildSettings.h"

src/storm/parser/ImcaMarkovAutomatonParser.h → src/storm-parsers/parser/ImcaMarkovAutomatonParser.h

@@ -7,7 +7,7 @@
 #include "storm/models/sparse/MarkovAutomaton.h"
 #include "storm/generator/StateBehavior.h"
 
-#include "storm/parser/SpiritErrorHandler.h"
+#include "storm-parsers/parser/SpiritErrorHandler.h"
 
 namespace storm {
     namespace parser {

src/storm/parser/MappedFile.cpp → src/storm-parsers/parser/MappedFile.cpp

@@ -5,7 +5,7 @@
  *      Author: Manuel Sascha Weiand
  */
 
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 
 #include <fstream>
 #include <cstring>

src/storm/parser/MarkovAutomatonParser.h → src/storm-parsers/parser/MarkovAutomatonParser.h

@@ -2,7 +2,7 @@
 #define STORM_PARSER_MARKOVAUTOMATONPARSER_H_
 
 #include "storm/models/sparse/MarkovAutomaton.h"
-#include "storm/parser/MarkovAutomatonSparseTransitionParser.h"
+#include "storm-parsers/parser/MarkovAutomatonSparseTransitionParser.h"
 
 namespace storm {
     namespace parser {

src/storm/parser/MarkovAutomatonSparseTransitionParser.cpp → src/storm-parsers/parser/MarkovAutomatonSparseTransitionParser.cpp

@@ -4,7 +4,7 @@
 #include "storm/settings/modules/CoreSettings.h"
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/exceptions/FileIoException.h"
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 #include "storm/utility/cstring.h"
 #include "storm/utility/constants.h"
 #include "storm/utility/macros.h"

src/storm/parser/NondeterministicModelParser.cpp → src/storm-parsers/parser/NondeterministicModelParser.cpp

@@ -1,13 +1,13 @@
-#include "storm/parser/NondeterministicModelParser.h"
+#include "storm-parsers/parser/NondeterministicModelParser.h"
 
 #include <string>
 #include <vector>
 
 #include "storm/models/sparse/StandardRewardModel.h"
 
-#include "storm/parser/NondeterministicSparseTransitionParser.h"
+#include "storm-parsers/parser/NondeterministicSparseTransitionParser.h"
-#include "storm/parser/SparseItemLabelingParser.h"
+#include "storm-parsers/parser/SparseItemLabelingParser.h"
-#include "storm/parser/SparseStateRewardParser.h"
+#include "storm-parsers/parser/SparseStateRewardParser.h"
 
 #include "storm/adapters/RationalFunctionAdapter.h"
 #include "storm/utility/macros.h"

src/storm/parser/NondeterministicSparseTransitionParser.cpp → src/storm-parsers/parser/NondeterministicSparseTransitionParser.cpp

@@ -1,8 +1,8 @@
-#include "storm/parser/NondeterministicSparseTransitionParser.h"
+#include "storm-parsers/parser/NondeterministicSparseTransitionParser.h"
 
 #include <string>
 
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/modules/CoreSettings.h"
 #include "storm/exceptions/FileIoException.h"

src/storm/parser/PrismParser.cpp → src/storm-parsers/parser/PrismParser.cpp

@@ -1,4 +1,4 @@
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 
 #include "storm/storage/prism/Compositions.h"
 
@@ -11,7 +11,7 @@
 
 #include "storm/storage/expressions/ExpressionManager.h"
 
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 
 namespace storm {
     namespace parser {

src/storm/parser/PrismParser.h → src/storm-parsers/parser/PrismParser.h

@@ -6,8 +6,8 @@
 #include <memory>
 #include <iomanip>
 
-#include "storm/parser/SpiritParserDefinitions.h"
+#include "storm-parsers/parser/SpiritParserDefinitions.h"
-#include "storm/parser/SpiritErrorHandler.h"
+#include "storm-parsers/parser/SpiritErrorHandler.h"
 #include "storm/storage/prism/Program.h"
 #include "storm/storage/expressions/Expression.h"
 

src/storm/parser/SparseChoiceLabelingParser.cpp → src/storm-parsers/parser/SparseChoiceLabelingParser.cpp

@@ -1,10 +1,10 @@
-#include "storm/parser/SparseChoiceLabelingParser.h"
+#include "storm-parsers/parser/SparseChoiceLabelingParser.h"
 
 #include "storm/utility/macros.h"
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/exceptions/OutOfRangeException.h"
 #include "storm/exceptions/FileIoException.h"
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 #include "storm/utility/cstring.h"
 
 namespace storm {

src/storm/parser/SparseItemLabelingParser.cpp → src/storm-parsers/parser/SparseItemLabelingParser.cpp

@@ -1,11 +1,11 @@
-#include "storm/parser/SparseItemLabelingParser.h"
+#include "storm-parsers/parser/SparseItemLabelingParser.h"
 
 #include <cstring>
 #include <string>
 #include <iostream>
 
 #include "storm/utility/cstring.h"
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 
 #include "storm/utility/macros.h"
 #include "storm/exceptions/WrongFormatException.h"

src/storm/parser/SparseItemLabelingParser.h → src/storm-parsers/parser/SparseItemLabelingParser.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <boost/optional.hpp>
 
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 #include "storm/models/sparse/StateLabeling.h"
 #include "storm/models/sparse/ChoiceLabeling.h"
 

src/storm/parser/SparseStateRewardParser.cpp → src/storm-parsers/parser/SparseStateRewardParser.cpp

@@ -1,11 +1,11 @@
 #include <iostream>
-#include "storm/parser/SparseStateRewardParser.h"
+#include "storm-parsers/parser/SparseStateRewardParser.h"
 
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/exceptions/OutOfRangeException.h"
 #include "storm/exceptions/FileIoException.h"
 #include "storm/utility/cstring.h"
-#include "storm/parser/MappedFile.h"
+#include "storm-parsers/parser/MappedFile.h"
 
 #include "storm/adapters/RationalFunctionAdapter.h"
 #include "storm/utility/macros.h"

src/storm/parser/SpiritErrorHandler.h → src/storm-parsers/parser/SpiritErrorHandler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "storm/parser/SpiritParserDefinitions.h"
+#include "storm-parsers/parser/SpiritParserDefinitions.h"
 
 #include "storm/utility/macros.h"
 #include "storm/exceptions/WrongFormatException.h"

src/storm/parser/ValueParser.cpp → src/storm-parsers/parser/ValueParser.cpp

@@ -1,4 +1,4 @@
-#include "storm/parser/ValueParser.h"
+#include "storm-parsers/parser/ValueParser.h"
 
 #include "storm/exceptions/NotSupportedException.h"
 

src/storm/parser/ValueParser.h → src/storm-parsers/parser/ValueParser.h

@@ -2,7 +2,7 @@
 #define STORM_PARSER_VALUEPARSER_H_
 
 #include "storm/storage/expressions/ExpressionManager.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 #include "storm/storage/expressions/ExpressionEvaluator.h"
 #include "storm/exceptions/WrongFormatException.h"
 

src/storm-pgcl/parser/PgclParser.h

@@ -5,9 +5,9 @@
 #include <memory>
 #include <iomanip>
 // Includes files for building and parsing the PGCL program
-#include "storm/parser/SpiritParserDefinitions.h"
+#include "storm-parsers/parser/SpiritParserDefinitions.h"
-#include "storm/parser/SpiritErrorHandler.h"
+#include "storm-parsers/parser/SpiritErrorHandler.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 #include "storm/storage/expressions/ExpressionManager.h"
 #include "storm/storage/expressions/Expression.h"
 #include "storm-pgcl/storage/pgcl/PgclProgram.h"

src/storm/CMakeLists.txt

@@ -28,8 +28,6 @@ if (ADDITIONAL_LINK_DIRS)
 	link_directories(${ADDITIONAL_LINK_DIRS})
 endif(ADDITIONAL_LINK_DIRS)
 
-# Disable Debug compiler flags for PrismParser to lessen memory consumption during compilation
-SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/src/storm/parser/PrismParser.cpp PROPERTIES COMPILE_FLAGS -g0)
 
 ###############################################################################
 ##                                                                            

src/storm/api/builder.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
-#include "storm/parser/DirectEncodingParser.h"
+#include "storm-parsers/parser/DirectEncodingParser.h"
-#include "storm/parser/ImcaMarkovAutomatonParser.h"
+#include "storm-parsers/parser/ImcaMarkovAutomatonParser.h"
 
 #include "storm/storage/SymbolicModelDescription.h"
 

src/storm/api/properties.cpp

@@ -1,6 +1,5 @@
 #include "storm/api/properties.h"
 
-#include "storm/parser/FormulaParser.h"
 
 #include "storm/storage/SymbolicModelDescription.h"
 #include "storm/storage/prism/Program.h"
@@ -13,57 +12,7 @@
 
 namespace storm {
     namespace api {
-        
-        boost::optional<std::set<std::string>> parsePropertyFilter(std::string const& propertyFilter) {
-            if (propertyFilter == "all") {
-                return boost::none;
-            }
-            std::vector<std::string> propertyNames = storm::utility::cli::parseCommaSeparatedStrings(propertyFilter);
-            std::set<std::string> propertyNameSet(propertyNames.begin(), propertyNames.end());
-            return propertyNameSet;
-        }
 
-        std::vector<storm::jani::Property> parseProperties(storm::parser::FormulaParser& formulaParser, std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter) {
-            // If the given property is a file, we parse it as a file, otherwise we assume it's a property.
-            std::vector<storm::jani::Property> properties;
-            if (std::ifstream(inputString).good()) {
-                STORM_LOG_INFO("Loading properties from file: " << inputString << std::endl);
-                properties = formulaParser.parseFromFile(inputString);
-            } else {
-                properties = formulaParser.parseFromString(inputString);
-            }
-            
-            return filterProperties(properties, propertyFilter);
-        }
-        
-        std::vector<storm::jani::Property> parseProperties(std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter) {
-            auto exprManager = std::make_shared<storm::expressions::ExpressionManager>();
-            storm::parser::FormulaParser formulaParser(exprManager);
-            return parseProperties(formulaParser, inputString, propertyFilter);
-        }
-        
-        std::vector<storm::jani::Property> parsePropertiesForJaniModel(std::string const& inputString, storm::jani::Model const& model, boost::optional<std::set<std::string>> const& propertyFilter) {
-            storm::parser::FormulaParser formulaParser(model.getManager().getSharedPointer());
-            auto formulas = parseProperties(formulaParser, inputString, propertyFilter);
-            return substituteConstantsInProperties(formulas, model.getConstantsSubstitution());
-        }
-        
-        std::vector<storm::jani::Property> parsePropertiesForPrismProgram(std::string const& inputString, storm::prism::Program const& program, boost::optional<std::set<std::string>> const& propertyFilter) {
-            storm::parser::FormulaParser formulaParser(program);
-            auto formulas = parseProperties(formulaParser, inputString, propertyFilter);
-            return substituteConstantsInProperties(formulas, program.getConstantsSubstitution());
-        }
-        
-        std::vector<storm::jani::Property> parsePropertiesForSymbolicModelDescription(std::string const& inputString, storm::storage::SymbolicModelDescription const& modelDescription, boost::optional<std::set<std::string>> const& propertyFilter) {
-            std::vector<storm::jani::Property> result;
-            if (modelDescription.isPrismProgram()) {
-                result = storm::api::parsePropertiesForPrismProgram(inputString, modelDescription.asPrismProgram(), propertyFilter);
-            } else {
-                STORM_LOG_ASSERT(modelDescription.isJaniModel(), "Unknown model description type.");
-                result = storm::api::parsePropertiesForJaniModel(inputString, modelDescription.asJaniModel(), propertyFilter);
-            }
-            return result;
-        }
         
         std::vector<storm::jani::Property> substituteConstantsInProperties(std::vector<storm::jani::Property> const& properties, std::map<storm::expressions::Variable, storm::expressions::Expression> const& substitution) {
             std::vector<storm::jani::Property> preprocessedProperties;

src/storm/api/properties.h

@@ -8,9 +8,7 @@
 #include <boost/optional.hpp>
 
 namespace storm {
-    namespace parser {
+
-        class FormulaParser;
-    }
     namespace jani {
         class Property;
         class Model;
@@ -30,14 +28,6 @@ namespace storm {
     }
     
     namespace api {
-        boost::optional<std::set<std::string>> parsePropertyFilter(std::string const& propertyFilter);
-
-        // Parsing properties.
-        std::vector<storm::jani::Property> parseProperties(storm::parser::FormulaParser& formulaParser, std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
-        std::vector<storm::jani::Property> parseProperties(std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
-        std::vector<storm::jani::Property> parsePropertiesForPrismProgram(std::string const& inputString, storm::prism::Program const& program, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
-        std::vector<storm::jani::Property> parsePropertiesForJaniModel(std::string const& inputString, storm::jani::Model const& model, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
-        std::vector<storm::jani::Property> parsePropertiesForSymbolicModelDescription(std::string const& inputString, storm::storage::SymbolicModelDescription const& modelDescription, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
 
         // Process properties.
         std::vector<storm::jani::Property> substituteConstantsInProperties(std::vector<storm::jani::Property> const& properties, std::map<storm::expressions::Variable, storm::expressions::Expression> const& substitution);

src/storm/api/storm.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "storm/api/model_descriptions.h"
 #include "storm/api/properties.h"
 #include "storm/api/builder.h"
 #include "storm/api/bisimulation.h"

src/test/storm-pars/CMakeLists.txt

@@ -13,7 +13,7 @@ foreach (testsuite modelchecker utility)
 
 	  file(GLOB_RECURSE TEST_${testsuite}_FILES ${STORM_TESTS_BASE_PATH}/${testsuite}/*.h ${STORM_TESTS_BASE_PATH}/${testsuite}/*.cpp)
       add_executable (test-pars-${testsuite} ${TEST_${testsuite}_FILES} ${STORM_TESTS_BASE_PATH}/storm-test.cpp)
-	  target_link_libraries(test-pars-${testsuite} storm-pars)
+	  target_link_libraries(test-pars-${testsuite} storm-pars storm-parsers)
 	  target_link_libraries(test-pars-${testsuite} ${STORM_TEST_LINK_LIBRARIES})
 
 	  add_dependencies(test-pars-${testsuite} test-resources)

src/test/storm-pars/modelchecker/ParametricDtmcPrctlModelCheckerTest.cpp

@@ -2,13 +2,13 @@
 #include "storm-config.h"
 #include "test/storm_gtest.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
 #include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/storage/expressions/ExpressionManager.h"
 #include "storm/api/builder.h"
 

src/test/storm-pars/modelchecker/SparseDtmcParameterLiftingTest.cpp

@@ -8,6 +8,8 @@
 #include "storm-pars/api/storm-pars.h"
 #include "storm/api/storm.h"
 
+#include "storm-parsers/api/storm-parsers.h"
+
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 namespace {

src/test/storm-pars/modelchecker/SparseMdpParameterLiftingTest.cpp

@@ -8,6 +8,8 @@
 #include "storm-pars/api/storm-pars.h"
 #include "storm/api/storm.h"
 
+#include "storm-parsers/api/storm-parsers.h"
+
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 namespace {

src/test/storm-pars/modelchecker/SymbolicParametricDtmcPrctlModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/utility/solver.h"
 #include "storm/storage/SymbolicModelDescription.h"
@@ -9,7 +9,7 @@
 #include "storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 #include "storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 #include "storm/solver/SymbolicEliminationLinearEquationSolver.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/DdPrismModelBuilder.h"
 #include "storm/models/symbolic/StandardRewardModel.h"
 #include "storm/models/symbolic/Dtmc.h"

src/test/storm-pars/utility/ModelInstantiatorTest.cpp

@@ -13,6 +13,7 @@
 
 #include "storm-pars/utility/ModelInstantiator.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 #include "storm/models/sparse/Model.h"
 #include "storm/models/sparse/Dtmc.h"
 #include "storm/models/sparse/Mdp.h"

src/test/storm/CMakeLists.txt

@@ -13,7 +13,7 @@ foreach (testsuite abstraction adapter builder logic modelchecker parser permiss
 
 	  file(GLOB_RECURSE TEST_${testsuite}_FILES ${STORM_TESTS_BASE_PATH}/${testsuite}/*.h ${STORM_TESTS_BASE_PATH}/${testsuite}/*.cpp)
       add_executable (test-${testsuite} ${TEST_${testsuite}_FILES} ${STORM_TESTS_BASE_PATH}/storm-test.cpp)
-	  target_link_libraries(test-${testsuite} storm)
+	  target_link_libraries(test-${testsuite} storm storm-parsers)
 	  target_link_libraries(test-${testsuite} ${STORM_TEST_LINK_LIBRARIES})
 
 	  add_dependencies(test-${testsuite} test-resources)

src/test/storm/abstraction/PrismMenuGameTest.cpp

@@ -3,7 +3,7 @@
 
 #ifdef STORM_HAVE_MSAT
 
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 
 #include "storm/abstraction/MenuGameRefiner.h"
 #include "storm/abstraction/prism/PrismMenuGameAbstractor.h"

src/test/storm/builder/DdJaniModelBuilderTest.cpp

@@ -10,7 +10,7 @@
 #include "storm/storage/jani/Compositions.h"
 
 #include "storm/models/symbolic/StandardRewardModel.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/DdJaniModelBuilder.h"
 
 #include "storm/settings/SettingMemento.h"

src/test/storm/builder/DdPrismModelBuilderTest.cpp

@@ -8,7 +8,7 @@
 #include "storm/models/symbolic/Ctmc.h"
 #include "storm/models/symbolic/Mdp.h"
 #include "storm/models/symbolic/StandardRewardModel.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/DdPrismModelBuilder.h"
 
 TEST(DdPrismModelBuilderTest_Sylvan, Dtmc) {

src/test/storm/builder/ExplicitJaniModelBuilderTest.cpp

@@ -3,7 +3,7 @@
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/models/sparse/MarkovAutomaton.h"
 #include "storm/settings/SettingMemento.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/ExplicitModelBuilder.h"
 #include "storm/generator/JaniNextStateGenerator.h"
 #include "storm/storage/jani/Model.h"

src/test/storm/builder/ExplicitJitJaniModelBuilderTest.cpp

@@ -3,7 +3,7 @@
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/models/sparse/MarkovAutomaton.h"
 #include "storm/settings/SettingMemento.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/jit/ExplicitJitJaniModelBuilder.h"
 #include "storm/storage/jani/Model.h"
 

src/test/storm/builder/ExplicitPrismModelBuilderTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/models/sparse/MarkovAutomaton.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/ExplicitModelBuilder.h"
 
 

src/test/storm/logic/FragmentCheckerTest.cpp

@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/FragmentChecker.h"
 #include "storm/exceptions/WrongFormatException.h"
 #include "storm/storage/expressions/ExpressionManager.h"

src/test/storm/modelchecker/ConditionalDtmcPrctlModelCheckerTest.cpp

@@ -2,12 +2,12 @@
 #include "test/storm_gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
 #include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/api/builder.h"
 #include "storm/storage/expressions/ExpressionManager.h"
 

src/test/storm/modelchecker/CtmcCslModelCheckerTest.cpp

@@ -3,9 +3,10 @@
 #include "storm-config.h"
 
 #include "storm/api/builder.h"
-#include "storm/api/model_descriptions.h"
+#include "storm-parsers/api/model_descriptions.h"
 #include "storm/api/properties.h"
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/api/properties.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/solver/EigenLinearEquationSolver.h"
 #include "storm/models/sparse/StandardRewardModel.h"
@@ -18,7 +19,7 @@
 #include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 #include "storm/modelchecker/results/QualitativeCheckResult.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/storage/expressions/ExpressionManager.h"
 #include "storm/settings/modules/CoreSettings.h"
 #include "storm/environment/solver/NativeSolverEnvironment.h"

src/test/storm/modelchecker/DtmcPrctlModelCheckerTest.cpp

@@ -3,9 +3,10 @@
 #include "storm-config.h"
 
 #include "storm/api/builder.h"
-#include "storm/api/model_descriptions.h"
+#include "storm-parsers/api/model_descriptions.h"
 #include "storm/api/properties.h"
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/api/properties.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/solver/EigenLinearEquationSolver.h"
 #include "storm/models/sparse/StandardRewardModel.h"
@@ -19,7 +20,7 @@
 #include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 #include "storm/modelchecker/results/QualitativeCheckResult.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/storage/expressions/ExpressionManager.h"
 #include "storm/settings/modules/CoreSettings.h"
 #include "storm/environment/solver/NativeSolverEnvironment.h"

src/test/storm/modelchecker/ExplicitDtmcPrctlModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
@@ -9,8 +9,8 @@
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/modules/GeneralSettings.h"
 #include "storm/settings/SettingMemento.h"
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/ExplicitModelBuilder.h"
 #include "storm/storage/expressions/ExpressionManager.h"
 

src/test/storm/modelchecker/ExplicitMdpPrctlModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/solver/StandardMinMaxLinearEquationSolver.h"
 #include "storm/models/sparse/StandardRewardModel.h"
@@ -10,8 +10,8 @@
 
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/ExplicitModelBuilder.h"
 
 TEST(ExplicitMdpPrctlModelCheckerTest, Dice) {

src/test/storm/modelchecker/GameBasedDtmcModelCheckerTest.cpp

@@ -1,13 +1,13 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/utility/solver.h"
 #include "storm/modelchecker/abstraction/GameBasedMdpModelChecker.h"
 #include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/DdPrismModelBuilder.h"
 #include "storm/models/symbolic/StandardRewardModel.h"
 #include "storm/models/symbolic/Dtmc.h"

src/test/storm/modelchecker/GameBasedMdpModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/models/symbolic/StandardRewardModel.h"
 #include "storm/models/sparse/Model.h"
@@ -13,6 +13,8 @@
 
 #include "storm/api/storm.h"
 
+#include "storm-parsers/api/storm-parsers.h"
+
 #if defined STORM_HAVE_MSAT
 TEST(GameBasedMdpModelCheckerTest, Dice_Cudd) {
 #else

src/test/storm/modelchecker/LraDtmcPrctlModelCheckerTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 #include "test/storm_gtest.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/settings/SettingMemento.h"
 #include "storm/logic/Formulas.h"
 #include "storm/solver/NativeLinearEquationSolver.h"
@@ -17,7 +17,7 @@
 #include "storm/environment/solver/EigenSolverEnvironment.h"
 #include "storm/environment/solver/GmmxxSolverEnvironment.h"
 
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
 #include "storm/builder/ExplicitModelBuilder.h"
 
 namespace {

src/test/storm/modelchecker/LraMdpPrctlModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/solver/StandardMinMaxLinearEquationSolver.h"
 #include "storm/models/sparse/StandardRewardModel.h"
@@ -12,7 +12,7 @@
 #include "storm/settings/modules/GeneralSettings.h"
 
 #include "storm/settings/modules/NativeEquationSolverSettings.h"
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
 
 TEST(LraMdpPrctlModelCheckerTest, LRA_SingleMec) {
     storm::storage::SparseMatrixBuilder<double> matrixBuilder;

src/test/storm/modelchecker/MdpPrctlModelCheckerTest.cpp

@@ -4,8 +4,9 @@
 #include "test/storm_gtest.h"
 
 #include "storm/api/builder.h"
-#include "storm/api/model_descriptions.h"
+#include "storm-parsers/api/model_descriptions.h"
 #include "storm/api/properties.h"
+#include "storm-parsers/api/properties.h"
 
 #include "storm/models/sparse/Mdp.h"
 #include "storm/models/symbolic/Mdp.h"

src/test/storm/modelchecker/SchedulerGenerationMdpPrctlModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/solver/StandardMinMaxLinearEquationSolver.h"
 #include "storm/models/sparse/StandardRewardModel.h"
@@ -12,8 +12,8 @@
 
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
 #include "storm/builder/ExplicitModelBuilder.h"
 
 namespace {

src/test/storm/modelchecker/SparseDtmcEliminationModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 #include "storm/logic/Formulas.h"
 #include "storm/models/sparse/StandardRewardModel.h"
 #include "storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.h"
@@ -10,7 +10,7 @@
 
 #include "storm/settings/modules/GeneralSettings.h"
 #include "storm/settings/SettingMemento.h"
-#include "storm/parser/AutoParser.h"
+#include "storm-parsers/parser/AutoParser.h"
 
 TEST(SparseDtmcEliminationModelCheckerTest, Die) {
     std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser<>::parseModel(STORM_TEST_RESOURCES_DIR "/tra/die.tra", STORM_TEST_RESOURCES_DIR "/lab/die.lab", "", STORM_TEST_RESOURCES_DIR "/rew/die.coin_flips.trans.rew");

src/test/storm/modelchecker/SparseDtmcMultiDimensionalRewardUnfoldingTest.cpp

@@ -7,6 +7,7 @@
 #include "storm/settings/SettingsManager.h"
 #include "storm/utility/constants.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 #include "storm/environment/Environment.h"
 
 TEST(SparseDtmcMultiDimensionalRewardUnfoldingTest, cost_bounded_die) {

src/test/storm/modelchecker/SparseExplorationModelCheckerTest.cpp

@@ -4,8 +4,8 @@
 #include "storm/logic/Formulas.h"
 #include "storm/modelchecker/exploration/SparseExplorationModelChecker.h"
 #include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "storm/parser/PrismParser.h"
+#include "storm-parsers/parser/PrismParser.h"
-#include "storm/parser/FormulaParser.h"
+#include "storm-parsers/parser/FormulaParser.h"
 
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/modules/ExplorationSettings.h"

src/test/storm/modelchecker/SparseMaCbMultiObjectiveModelCheckerTest.cpp

@@ -9,6 +9,7 @@
 #include "storm/settings/modules/MultiObjectiveSettings.h"
 #include "storm/settings/SettingsManager.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 
 #include "storm/environment/Environment.h"
 

src/test/storm/modelchecker/SparseMaPcaaMultiObjectiveModelCheckerTest.cpp

@@ -14,6 +14,7 @@
 #include "storm/settings/modules/MultiObjectiveSettings.h"
 #include "storm/settings/SettingsManager.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 
 #include "storm/environment/Environment.h"
 

src/test/storm/modelchecker/SparseMdpCbMultiObjectiveModelCheckerTest.cpp

@@ -7,6 +7,7 @@
 #include "storm/settings/modules/GeneralSettings.h"
 #include "storm/settings/SettingsManager.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 
 #include "storm/environment/Environment.h"
 

src/test/storm/modelchecker/SparseMdpMultiDimensionalRewardUnfoldingTest.cpp

@@ -10,6 +10,7 @@
 #include "storm/settings/SettingsManager.h"
 #include "storm/utility/constants.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 #include "storm/environment/Environment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 

src/test/storm/modelchecker/SparseMdpPcaaMultiObjectiveModelCheckerTest.cpp

@@ -10,6 +10,7 @@
 #include "storm/settings/modules/GeneralSettings.h"
 #include "storm/settings/SettingsManager.h"
 #include "storm/api/storm.h"
+#include "storm-parsers/api/storm-parsers.h"
 #include "storm/environment/Environment.h"
 
 TEST(SparseMdpPcaaMultiObjectiveModelCheckerTest, consensus) {