From e09e3f3f75a8b756f4e5014967a89082488cc7e7 Mon Sep 17 00:00:00 2001 From: dehnert Date: Thu, 29 Dec 2016 12:36:19 +0100 Subject: [PATCH] making the phoenix rise from the ashes (aka boost 1.63) --- src/storm/parser/PrismParser.cpp | 4 ++-- src/storm/parser/PrismParser.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storm/parser/PrismParser.cpp b/src/storm/parser/PrismParser.cpp index 7b1056adf..564d83187 100644 --- a/src/storm/parser/PrismParser.cpp +++ b/src/storm/parser/PrismParser.cpp @@ -202,7 +202,7 @@ namespace storm { | (qi::lit("<") > -identifier > qi::lit(">")[qi::_a = true])) > +(qi::char_ - qi::lit(";")) - > qi::lit(";"))[qi::_val = phoenix::bind(&PrismParser::createCommand, phoenix::ref(*this), qi::_1, qi::_r1)]; + > qi::lit(";"))[qi::_val = phoenix::bind(&PrismParser::createDummyCommand, phoenix::ref(*this), qi::_1, qi::_r1)]; commandDefinition.name("command definition"); moduleDefinition = ((qi::lit("module") >> identifier >> *(variableDefinition(qi::_a, qi::_b))) > *commandDefinition(qi::_r1) > qi::lit("endmodule"))[qi::_val = phoenix::bind(&PrismParser::createModule, phoenix::ref(*this), qi::_1, qi::_a, qi::_b, qi::_2, qi::_r1)]; @@ -484,7 +484,7 @@ namespace storm { return storm::prism::Command(globalProgramInformation.currentCommandIndex - 1, markovian, actionIndex, realActionName, guardExpression, updates, this->getFilename()); } - storm::prism::Command PrismParser::createCommand(boost::optional const& actionName, GlobalProgramInformation& globalProgramInformation) const { + storm::prism::Command PrismParser::createDummyCommand(boost::optional const& actionName, GlobalProgramInformation& globalProgramInformation) const { STORM_LOG_ASSERT(!this->secondRun, "Dummy procedure must not be called in second run."); std::string realActionName = actionName ? actionName.get() : ""; diff --git a/src/storm/parser/PrismParser.h b/src/storm/parser/PrismParser.h index 6dd257fe6..64aaa7dba 100644 --- a/src/storm/parser/PrismParser.h +++ b/src/storm/parser/PrismParser.h @@ -269,7 +269,7 @@ namespace storm { storm::prism::Assignment createAssignment(std::string const& variableName, storm::expressions::Expression assignedExpression) const; storm::prism::Update createUpdate(storm::expressions::Expression likelihoodExpression, std::vector const& assignments, GlobalProgramInformation& globalProgramInformation) const; storm::prism::Command createCommand(bool markovianCommand, boost::optional const& actionName, storm::expressions::Expression guardExpression, std::vector const& updates, GlobalProgramInformation& globalProgramInformation) const; - storm::prism::Command createCommand(boost::optional const& actionName, GlobalProgramInformation& globalProgramInformation) const; + storm::prism::Command createDummyCommand(boost::optional const& actionName, GlobalProgramInformation& globalProgramInformation) const; storm::prism::BooleanVariable createBooleanVariable(std::string const& variableName, storm::expressions::Expression initialValueExpression) const; storm::prism::IntegerVariable createIntegerVariable(std::string const& variableName, storm::expressions::Expression lowerBoundExpression, storm::expressions::Expression upperBoundExpression, storm::expressions::Expression initialValueExpression) const; storm::prism::Module createModule(std::string const& moduleName, std::vector const& booleanVariables, std::vector const& integerVariables, std::vector const& commands, GlobalProgramInformation& globalProgramInformation) const;