Fixed (asynch) leader election to comply with our grammar. Added LOG_DEBUG macro.

Former-commit-id: 7b22ecba8e

examples/mdp/asynchronous_leader/leader4.nm

@@ -4,7 +4,7 @@
 
 mdp
 
-const N= 4; // number of processes
+const int N= 4; // number of processes
 
 //----------------------------------------------------------------------------------------------------------------------------
 module process1

examples/mdp/asynchronous_leader/leader5.nm

@@ -4,7 +4,7 @@
 
 mdp
 
-const N= 5; // number of processes
+const int N= 5; // number of processes
 
 //----------------------------------------------------------------------------------------------------------------------------
 module process1

examples/mdp/asynchronous_leader/leader6.nm

@@ -4,7 +4,7 @@
 
 mdp
 
-const N= 6; // number of processes
+const int N= 6; // number of processes
 
 //----------------------------------------------------------------------------------------------------------------------------
 module process1

examples/mdp/asynchronous_leader/leader7.nm

@@ -4,7 +4,7 @@
 
 mdp
 
-const N= 7; // number of processes
+const int N= 7; // number of processes
 
 //----------------------------------------------------------------------------------------------------------------------------
 module process1

src/exceptions/ExceptionMacros.h

@@ -16,8 +16,13 @@ extern log4cplus::Logger logger;
         assert(cond);                           \
     }                                           \
 } while (false)
+#define LOG_DEBUG(message)                      \
+{                                               \
+    LOG4CPLUS_DEBUG(logger, message);           \
+} while (false)
 #else
 #define LOG_ASSERT(cond, message) /* empty */
+#define LOG_DEBUG(message) /* empty */
 #endif
 
 #define LOG_THROW(cond, exception, message)     \

src/parser/PrismParser.cpp

@@ -41,6 +41,7 @@ namespace storm {
                 // Start first run.
                 bool succeeded = qi::phrase_parse(iter, last, grammar, boost::spirit::ascii::space | qi::lit("//") >> *(qi::char_ - qi::eol) >> qi::eol, result);
                 LOG_THROW(succeeded,  storm::exceptions::WrongFormatException, "Parsing failed in first pass.");
+                LOG_DEBUG("First pass of parsing PRISM input finished.");
                 
                 // Start second run.
                 first = PositionIteratorType(input.begin());