From d8bc689259d62a6555b281fdc7a8c367ea46d316 Mon Sep 17 00:00:00 2001 From: TimQu Date: Tue, 7 Aug 2018 16:27:25 +0200 Subject: [PATCH] Throw an exception instead of assertion when 'wrong' jani was detected --- src/storm-parsers/parser/JaniParser.cpp | 2 +- src/storm/storage/jani/JSONExporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storm-parsers/parser/JaniParser.cpp b/src/storm-parsers/parser/JaniParser.cpp index 7fa6f3462..0d415d388 100644 --- a/src/storm-parsers/parser/JaniParser.cpp +++ b/src/storm-parsers/parser/JaniParser.cpp @@ -1022,7 +1022,7 @@ namespace storm { } STORM_LOG_THROW(false, storm::exceptions::InvalidJaniException, "No supported operator declaration found for complex expressions as " << expressionStructure.dump() << " in " << scopeDescription << "."); } - assert(false); + STORM_LOG_THROW(false, storm::exceptions::InvalidJaniException, "No supported expression found at " << expressionStructure.dump() << " in " << scopeDescription << "."); // Silly warning suppression. return storm::expressions::Expression(); diff --git a/src/storm/storage/jani/JSONExporter.cpp b/src/storm/storage/jani/JSONExporter.cpp index 59ca13d86..42bc15d62 100644 --- a/src/storm/storage/jani/JSONExporter.cpp +++ b/src/storm/storage/jani/JSONExporter.cpp @@ -603,7 +603,7 @@ namespace storm { } } } - STORM_LOG_ASSERT(false, "Expression variable '" << expression.getVariableName() << "' not known in Jani data structures."); + STORM_LOG_THROW(false, storm::exceptions::InvalidJaniException, "Expression variable '" << expression.getVariableName() << "' not known in Jani data structures."); return modernjson::json(); // should not reach this point. } boost::any ExpressionToJson::visit(storm::expressions::UnaryBooleanFunctionExpression const& expression, boost::any const& data) {