towards getting rid of code duplication in storm-pars-cli

src/storm-pars-cli/storm-pars.cpp

@@ -6,7 +6,7 @@
 
 #include "storm/settings/SettingsManager.h"
 #include "storm/api/storm.h"
-#include "storm/cli/cli.h"
+#include "storm-cli-utilities/cli.h"
 #include "storm/models/ModelBase.h"
 #include "storm/storage/SymbolicModelDescription.h"
 #include "storm/utility/file.h"
@@ -23,7 +23,7 @@
 #include "storm/exceptions/InvalidSettingsException.h"
 #include "storm/exceptions/NotSupportedException.h"
 
-#include "storm/cli/cli.cpp"
+#include "storm-cli-utilities/cli.cpp"
 
 namespace storm {
     namespace pars {
@@ -336,7 +336,16 @@ namespace storm {
             processInputWithValueTypeAndDdlib<storm::dd::DdType::Sylvan, storm::RationalFunction>(symbolicInput);
         }
 
-        int64_t process(const int argc, const char** argv) {
+    }
+}
+
+
+/*!
+ * Main entry point of the executable storm-pars.
+ */
+int main(const int argc, const char** argv) {
+
+    try {
         storm::utility::setUp();
         storm::cli::printHeader("Storm-pars", argc, argv);
         storm::settings::initializeParsSettings("Storm-pars", "storm-pars");
@@ -346,7 +355,7 @@ namespace storm {
             return -1;
         }
 
-            processOptions();
+        storm::pars::processOptions();
 
         totalTimer.stop();
         if (storm::settings::getModule<storm::settings::modules::ResourceSettings>().isPrintTimeAndMemorySet()) {
@@ -355,18 +364,6 @@ namespace storm {
 
         storm::utility::cleanUp();
         return 0;
-        }
-    }
-}
-
-
-/*!
- * Main entry point of the executable storm-pars.
- */
-int main(const int argc, const char** argv) {
-
-    try {
-        return storm::pars::process(argc, argv);
     } catch (storm::exceptions::BaseException const& exception) {
         STORM_LOG_ERROR("An exception caused Storm-pars to terminate. The message of the exception is: " << exception.what());
         return 1;