Builds with MSVC again

1 files changed, 879 insertions, 815 deletions

diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp b/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp
index a170089..0f931fa 100644
--- a/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp
+++ b/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp
@@ -26,7 +26,7 @@
 /* %endif */
 
 /* %if-c-only */
-
+    
 /* %endif */
 
 /* %if-c-only */
@@ -58,7 +58,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -76,7 +76,7 @@ typedef uint64_t flex_uint64_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 #endif /* ! C99 */
@@ -230,8 +230,8 @@ typedef size_t yy_size_t;
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-#define YY_LESS_LINENO(n)
-
+    #define YY_LESS_LINENO(n)
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -250,13 +250,14 @@ typedef size_t yy_size_t;
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state {
-	/* %if-c-only */
+struct yy_buffer_state
+	{
+/* %if-c-only */
 	FILE *yy_input_file;
-	/* %endif */
+/* %endif */
 
-	/* %if-c++-only */
-	/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 	char *yy_ch_buf;		/* input buffer */
 	char *yy_buf_pos;		/* current position in input buffer */
@@ -290,9 +291,9 @@ struct yy_buffer_state {
 	 */
 	int yy_at_bol;
 
-	int yy_bs_lineno; /**< The line count. */
-	int yy_bs_column; /**< The column count. */
-
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -314,7 +315,7 @@ struct yy_buffer_state {
 	 */
 #define YY_BUFFER_EOF_PENDING 2
 
-};
+	};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
 /* %if-c-only Standard (non-C++) definition */
@@ -437,159 +438,160 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 #define YY_END_OF_BUFFER 45
 /* This struct is not used in this scanner,
    but its presence is necessary. */
-struct yy_trans_info {
+struct yy_trans_info
+	{
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
-};
-static yyconst flex_int16_t yy_accept[102] = {
-	0,
-	0,    0,   45,   43,   42,   42,    6,   43,   12,   23,
-	43,   31,   32,   10,   13,   29,   14,   28,   11,   39,
-	30,   19,   37,   20,   40,   40,   33,   34,   24,   40,
-	40,   40,   40,   40,   40,   40,   40,   40,   35,   25,
-	36,    7,   42,   21,    0,   38,    0,   26,    0,   41,
-	0,    8,    9,   39,   15,   17,   22,   18,   16,   40,
-	0,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-	40,   40,   40,   27,    0,   41,    0,    1,   40,   40,
-	40,    2,   40,   40,   40,   40,   40,   40,   40,   40,
-	40,   40,    3,   40,   40,   40,    4,    5,   40,   40,
-
-	0
-} ;
-
-static yyconst flex_int32_t yy_ec[256] = {
-	0,
-	1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    2,    4,    5,    1,    1,    6,    7,    8,    9,
-	10,   11,   12,   13,   14,   15,   16,   17,   17,   17,
-	17,   17,   17,   17,   17,   17,   17,    1,   18,   19,
-	20,   21,    1,    1,   22,   22,   22,   22,   22,   22,
-	22,   22,   22,   22,   22,   23,   22,   22,   22,   22,
-	22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-	24,   25,   26,   27,   22,    1,   28,   29,   22,   30,
-
-	31,   32,   33,   34,   35,   22,   36,   37,   38,   39,
-	40,   41,   22,   42,   43,   44,   45,   22,   22,   22,
-	46,   22,   47,   48,   49,   50,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1
-} ;
-
-static yyconst flex_int32_t yy_meta[51] = {
-	0,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    2,    1,    1,    1,
-	1,    2,    2,    1,    1,    1,    1,    2,    2,    2,
-	2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-	2,    2,    2,    2,    2,    2,    1,    1,    1,    1
-} ;
-
-static yyconst flex_int16_t yy_base[106] = {
-	0,
-	0,    0,  141,  142,   49,   51,  120,   50,  142,  132,
-	48,  142,  142,  142,  126,  142,  123,  142,  142,  119,
-	142,   38,  115,   39,    0,  129,  142,  142,  142,   26,
-	105,   93,  100,   86,   87,   28,   86,   88,  142,   78,
-	142,  142,   65,  142,   58,  142,  122,  142,   57,  142,
-	66,  142,  142,  107,  142,  142,  142,  142,  142,    0,
-	65,   79,   82,   77,   83,   75,   79,   71,   81,   75,
-	79,   68,   69,  142,   63,   68,   76,    0,   74,   79,
-	66,    0,   67,   61,   57,   57,   66,   61,   64,   63,
-	48,   45,    0,   54,   48,   46,    0,    0,   50,   48,
-
-	142,  101,  103,   75,  105
-} ;
-
-static yyconst flex_int16_t yy_def[106] = {
-	0,
-	101,    1,  101,  101,  101,  101,  101,  102,  101,  101,
-	103,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  104,  104,  101,  101,  101,  104,
-	104,  104,  104,  104,  104,  104,  104,  104,  101,  101,
-	101,  101,  101,  101,  102,  101,  102,  101,  103,  101,
-	105,  101,  101,  101,  101,  101,  101,  101,  101,  104,
-	102,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-	104,  104,  104,  101,  103,  103,  105,  104,  104,  104,
-	104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-	104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-
-	0,  101,  101,  101,  101
-} ;
-
-static yyconst flex_int16_t yy_nxt[193] = {
-	0,
-	4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-	14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-	24,   25,   26,   27,    4,   28,   29,   25,   30,   25,
-	25,   31,   25,   25,   32,   25,   33,   34,   25,   25,
-	35,   25,   36,   37,   38,   25,   39,   40,   41,   42,
-	43,   43,   43,   43,   46,   50,   55,   56,   58,   59,
-	62,   70,   46,   71,   50,   63,   43,   43,   49,   46,
-	50,   64,   51,   76,   47,   50,   60,   78,   49,   97,
-	100,   51,   47,   76,   99,   98,   96,   51,   78,   47,
-	77,   95,   51,   78,   93,   94,   93,   93,   92,   91,
-
-	77,   45,   45,   49,   49,   75,   75,   90,   89,   78,
-	78,   88,   87,   86,   85,   84,   83,   82,   78,   81,
-	80,   79,   78,   54,  101,   74,   73,   72,   69,   68,
-	67,   66,   65,   61,   57,   54,   53,   52,   48,   44,
-	101,    3,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101
-
-} ;
-
-static yyconst flex_int16_t yy_chk[193] = {
-	0,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	5,    5,    6,    6,    8,   11,   22,   22,   24,   24,
-	30,   36,   45,   36,   49,   30,   43,   43,   51,   61,
-	75,   30,   11,   51,    8,   76,  104,  100,   77,   95,
-	99,   49,   45,   77,   96,   95,   94,   75,   92,   61,
-	51,   91,   76,   90,   89,   88,   87,   86,   85,   84,
-
-	77,  102,  102,  103,  103,  105,  105,   83,   81,   80,
-	79,   73,   72,   71,   70,   69,   68,   67,   66,   65,
-	64,   63,   62,   54,   47,   40,   38,   37,   35,   34,
-	33,   32,   31,   26,   23,   20,   17,   15,   10,    7,
-	3,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-	101,  101
-
-} ;
-
-static yyconst flex_int16_t yy_rule_linenum[44] = {
-	0,
-	27,   32,   33,   34,   35,   37,   38,   39,   40,   42,
-	43,   44,   46,   47,   49,   50,   52,   53,   54,   55,
-	57,   58,   60,   61,   62,   65,   66,   68,   69,   70,
-	72,   73,   75,   76,   78,   79,   81,   83,   85,   86,
-	88,   90,   92
-} ;
+	};
+static yyconst flex_int16_t yy_accept[102] =
+    {   0,
+        0,    0,   45,   43,   42,   42,    6,   43,   12,   23,
+       43,   31,   32,   10,   13,   29,   14,   28,   11,   39,
+       30,   19,   37,   20,   40,   40,   33,   34,   24,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   35,   25,
+       36,    7,   42,   21,    0,   38,    0,   26,    0,   41,
+        0,    8,    9,   39,   15,   17,   22,   18,   16,   40,
+        0,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   27,    0,   41,    0,    1,   40,   40,
+       40,    2,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,    3,   40,   40,   40,    4,    5,   40,   40,
+
+        0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    1,    1,    6,    7,    8,    9,
+       10,   11,   12,   13,   14,   15,   16,   17,   17,   17,
+       17,   17,   17,   17,   17,   17,   17,    1,   18,   19,
+       20,   21,    1,    1,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   23,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       24,   25,   26,   27,   22,    1,   28,   29,   22,   30,
+
+       31,   32,   33,   34,   35,   22,   36,   37,   38,   39,
+       40,   41,   22,   42,   43,   44,   45,   22,   22,   22,
+       46,   22,   47,   48,   49,   50,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[51] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    2,    1,    1,    1,
+        1,    2,    2,    1,    1,    1,    1,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[106] =
+    {   0,
+        0,    0,  141,  142,   49,   51,  120,   50,  142,  132,
+       48,  142,  142,  142,  126,  142,  123,  142,  142,  119,
+      142,   38,  115,   39,    0,  129,  142,  142,  142,   26,
+      105,   93,  100,   86,   87,   28,   86,   88,  142,   78,
+      142,  142,   65,  142,   58,  142,  122,  142,   57,  142,
+       66,  142,  142,  107,  142,  142,  142,  142,  142,    0,
+       65,   79,   82,   77,   83,   75,   79,   71,   81,   75,
+       79,   68,   69,  142,   63,   68,   76,    0,   74,   79,
+       66,    0,   67,   61,   57,   57,   66,   61,   64,   63,
+       48,   45,    0,   54,   48,   46,    0,    0,   50,   48,
+
+      142,  101,  103,   75,  105
+    } ;
+
+static yyconst flex_int16_t yy_def[106] =
+    {   0,
+      101,    1,  101,  101,  101,  101,  101,  102,  101,  101,
+      103,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  104,  104,  101,  101,  101,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  101,  101,
+      101,  101,  101,  101,  102,  101,  102,  101,  103,  101,
+      105,  101,  101,  101,  101,  101,  101,  101,  101,  104,
+      102,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  101,  103,  103,  105,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+
+        0,  101,  101,  101,  101
+    } ;
+
+static yyconst flex_int16_t yy_nxt[193] =
+    {   0,
+        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
+       14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
+       24,   25,   26,   27,    4,   28,   29,   25,   30,   25,
+       25,   31,   25,   25,   32,   25,   33,   34,   25,   25,
+       35,   25,   36,   37,   38,   25,   39,   40,   41,   42,
+       43,   43,   43,   43,   46,   50,   55,   56,   58,   59,
+       62,   70,   46,   71,   50,   63,   43,   43,   49,   46,
+       50,   64,   51,   76,   47,   50,   60,   78,   49,   97,
+      100,   51,   47,   76,   99,   98,   96,   51,   78,   47,
+       77,   95,   51,   78,   93,   94,   93,   93,   92,   91,
+
+       77,   45,   45,   49,   49,   75,   75,   90,   89,   78,
+       78,   88,   87,   86,   85,   84,   83,   82,   78,   81,
+       80,   79,   78,   54,  101,   74,   73,   72,   69,   68,
+       67,   66,   65,   61,   57,   54,   53,   52,   48,   44,
+      101,    3,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101
+
+    } ;
+
+static yyconst flex_int16_t yy_chk[193] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        5,    5,    6,    6,    8,   11,   22,   22,   24,   24,
+       30,   36,   45,   36,   49,   30,   43,   43,   51,   61,
+       75,   30,   11,   51,    8,   76,  104,  100,   77,   95,
+       99,   49,   45,   77,   96,   95,   94,   75,   92,   61,
+       51,   91,   76,   90,   89,   88,   87,   86,   85,   84,
+
+       77,  102,  102,  103,  103,  105,  105,   83,   81,   80,
+       79,   73,   72,   71,   70,   69,   68,   67,   66,   65,
+       64,   63,   62,   54,   47,   40,   38,   37,   35,   34,
+       33,   32,   31,   26,   23,   20,   17,   15,   10,    7,
+        3,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101
+
+    } ;
+
+static yyconst flex_int16_t yy_rule_linenum[44] =
+    {   0,
+       27,   32,   33,   34,   35,   37,   38,   39,   40,   42,
+       43,   44,   46,   47,   49,   50,   52,   53,   54,   55,
+       57,   58,   60,   61,   62,   65,   66,   68,   69,   70,
+       72,   73,   75,   76,   78,   79,   81,   83,   85,   86,
+       88,   90,   92
+    } ;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -603,7 +605,7 @@ static yyconst flex_int16_t yy_rule_linenum[44] = {
 /* see: http://spinroot.com/spin/Man/operators.html */
 #define YY_NO_UNISTD_H 1
 #line 14 "promela.l"
-
+  
 #include "../PromelaParser.h"
 #include "promela.tab.hpp"
 #define YYSTYPE PROMELA_STYPE
@@ -632,39 +634,40 @@ static yyconst flex_int16_t yy_rule_linenum[44] = {
 /* %if-reentrant */
 
 /* Holds the entire state of the reentrant scanner. */
-struct yyguts_t {
-
-	/* User-defined. Not touched by flex. */
-	YY_EXTRA_TYPE yyextra_r;
-
-	/* The rest are the same as the globals declared in the non-reentrant scanner. */
-	FILE *yyin_r, *yyout_r;
-	size_t yy_buffer_stack_top; /**< index of top of stack. */
-	size_t yy_buffer_stack_max; /**< capacity of stack. */
-	YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
-	char yy_hold_char;
-	yy_size_t yy_n_chars;
-	yy_size_t yyleng_r;
-	char *yy_c_buf_p;
-	int yy_init;
-	int yy_start;
-	int yy_did_buffer_switch_on_eof;
-	int yy_start_stack_ptr;
-	int yy_start_stack_depth;
-	int *yy_start_stack;
-	yy_state_type yy_last_accepting_state;
-	char* yy_last_accepting_cpos;
-
-	int yylineno_r;
-	int yy_flex_debug_r;
-
-	char *yytext_r;
-	int yy_more_flag;
-	int yy_more_len;
-
-	YYSTYPE * yylval_r;
-
-}; /* end struct yyguts_t */
+struct yyguts_t
+    {
+
+    /* User-defined. Not touched by flex. */
+    YY_EXTRA_TYPE yyextra_r;
+
+    /* The rest are the same as the globals declared in the non-reentrant scanner. */
+    FILE *yyin_r, *yyout_r;
+    size_t yy_buffer_stack_top; /**< index of top of stack. */
+    size_t yy_buffer_stack_max; /**< capacity of stack. */
+    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+    char yy_hold_char;
+    yy_size_t yy_n_chars;
+    yy_size_t yyleng_r;
+    char *yy_c_buf_p;
+    int yy_init;
+    int yy_start;
+    int yy_did_buffer_switch_on_eof;
+    int yy_start_stack_ptr;
+    int yy_start_stack_depth;
+    int *yy_start_stack;
+    yy_state_type yy_last_accepting_state;
+    char* yy_last_accepting_cpos;
+
+    int yylineno_r;
+    int yy_flex_debug_r;
+
+    char *yytext_r;
+    int yy_more_flag;
+    int yy_more_len;
+
+    YYSTYPE * yylval_r;
+
+    }; /* end struct yyguts_t */
 
 /* %if-c-only */
 
@@ -674,10 +677,10 @@ static int yy_init_globals (yyscan_t yyscanner );
 
 /* %if-reentrant */
 
-/* This must go here because YYSTYPE and YYLTYPE are included
- * from bison output in section 1.*/
-#    define yylval yyg->yylval_r
-
+    /* This must go here because YYSTYPE and YYLTYPE are included
+     * from bison output in section 1.*/
+    #    define yylval yyg->yylval_r
+    
 int promela_lex_init (yyscan_t* scanner);
 
 int promela_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
@@ -737,8 +740,8 @@ extern int promela_wrap (yyscan_t yyscanner );
 
 /* %not-for-header */
 
-static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
-
+    static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
+    
 /* %ok-for-header */
 
 /* %endif */
@@ -868,7 +871,7 @@ static int input (yyscan_t yyscanner );
 /* %if-c-only Standard (non-C++) definition */
 
 extern int promela_lex \
-(YYSTYPE * yylval_param ,yyscan_t yyscanner);
+               (YYSTYPE * yylval_param ,yyscan_t yyscanner);
 
 #define YY_DECL int promela_lex \
                (YYSTYPE * yylval_param , yyscan_t yyscanner)
@@ -897,21 +900,23 @@ extern int promela_lex \
 
 /** The main scanner function which does all the work.
  */
-YY_DECL {
+YY_DECL
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	/* %% [7.0] user's declarations go here */
+/* %% [7.0] user's declarations go here */
 #line 25 "promela.l"
 
 
 #line 915 "promela.lex.yy.cpp"
 
-	yylval = yylval_param;
+    yylval = yylval_param;
 
-	if ( !yyg->yy_init ) {
+	if ( !yyg->yy_init )
+		{
 		yyg->yy_init = 1;
 
 #ifdef YY_USER_INIT
@@ -922,30 +927,31 @@ YY_DECL {
 			yyg->yy_start = 1;	/* first start state */
 
 		if ( ! yyin )
-			/* %if-c-only */
+/* %if-c-only */
 			yyin = stdin;
-		/* %endif */
-		/* %if-c++-only */
-		/* %endif */
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 		if ( ! yyout )
-			/* %if-c-only */
+/* %if-c-only */
 			yyout = stdout;
-		/* %endif */
-		/* %if-c++-only */
-		/* %endif */
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 
 		if ( ! YY_CURRENT_BUFFER ) {
 			promela_ensure_buffer_stack (yyscanner);
 			YY_CURRENT_BUFFER_LVALUE =
-			promela__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+				promela__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
 		}
 
 		promela__load_buffer_state(yyscanner );
-	}
+		}
 
-	while ( 1 ) {	/* loops until end-of-file is reached */
-		/* %% [8.0] yymore()-related code goes here */
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+/* %% [8.0] yymore()-related code goes here */
 		yy_cp = yyg->yy_c_buf_p;
 
 		/* Support of yytext. */
@@ -956,38 +962,43 @@ YY_DECL {
 		 */
 		yy_bp = yy_cp;
 
-		/* %% [9.0] code to set up and find next match goes here */
+/* %% [9.0] code to set up and find next match goes here */
 		yy_current_state = yyg->yy_start;
 yy_match:
-		do {
+		do
+			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] ) {
+			if ( yy_accept[yy_current_state] )
+				{
 				yyg->yy_last_accepting_state = yy_current_state;
 				yyg->yy_last_accepting_cpos = yy_cp;
-			}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) {
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 102 )
 					yy_c = yy_meta[(unsigned int) yy_c];
-			}
+				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
-		} while ( yy_current_state != 101 );
+			}
+		while ( yy_current_state != 101 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
 yy_find_action:
-		/* %% [10.0] code to find the action number goes here */
+/* %% [10.0] code to find the action number goes here */
 		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
-		/* %% [11.0] code for yylineno update goes here */
+/* %% [11.0] code for yylineno update goes here */
 
 do_action:	/* This label is used only to access EOF actions. */
 
-		/* %% [12.0] debug code goes here */
-		if ( yy_flex_debug ) {
+/* %% [12.0] debug code goes here */
+		if ( yy_flex_debug )
+			{
 			if ( yy_act == 0 )
 				fprintf( stderr, "--scanner backing up\n" );
 			else if ( yy_act < 44 )
@@ -1000,369 +1011,377 @@ do_action:	/* This label is used only to access EOF actions. */
 				fprintf( stderr, "--(end of buffer or a NUL)\n" );
 			else
 				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
-		}
+			}
 
-		switch ( yy_act ) {
-			/* beginning of action switch */
-			/* %% [13.0] actions go here */
-		case 0: /* must back up */
+		switch ( yy_act )
+	{ /* beginning of action switch */
+/* %% [13.0] actions go here */
+			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
 			*yy_cp = yyg->yy_hold_char;
 			yy_cp = yyg->yy_last_accepting_cpos;
 			yy_current_state = yyg->yy_last_accepting_state;
 			goto yy_find_action;
 
-		case 1:
-			YY_RULE_SETUP
+case 1:
+YY_RULE_SETUP
 #line 27 "promela.l"
-			{
-				yylval->value = strdup(yytext);
-				return TYPE;
-			}
-			YY_BREAK
-		case 2:
-			YY_RULE_SETUP
+{
+  yylval->value = strdup(yytext);
+  return PML_TYPE;
+}
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
 #line 32 "promela.l"
-			{ return LEN; }
-			YY_BREAK
-		case 3:
-			YY_RULE_SETUP
+{ return PML_LEN; }
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
 #line 33 "promela.l"
-			{ yylval->value = strdup(yytext); return CONST; }
-			YY_BREAK
-		case 4:
-			YY_RULE_SETUP
+{ yylval->value = strdup(yytext); return PML_CONST; }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
 #line 34 "promela.l"
-			{ return PRINT; }
-			YY_BREAK
-		case 5:
-			YY_RULE_SETUP
+{ return PML_PRINT; }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
 #line 35 "promela.l"
-			{ return PRINTM; }
-			YY_BREAK
-		case 6:
-			YY_RULE_SETUP
+{ return PML_PRINTM; }
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
 #line 37 "promela.l"
-			{ return NEG; }
-			YY_BREAK
-		case 7:
-			YY_RULE_SETUP
+{ return PML_NEG; }
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
 #line 38 "promela.l"
-			{ return COMPL; }
-			YY_BREAK
-		case 8:
-			YY_RULE_SETUP
+{ return PML_COMPL; }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
 #line 39 "promela.l"
-			{ return INCR; }
-			YY_BREAK
-		case 9:
-			YY_RULE_SETUP
+{ return PML_INCR; }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
 #line 40 "promela.l"
-			{ return DECR; }
-			YY_BREAK
-		case 10:
-			YY_RULE_SETUP
+{ return PML_DECR; }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
 #line 42 "promela.l"
-			{ return TIMES; }
-			YY_BREAK
-		case 11:
-			YY_RULE_SETUP
+{ return PML_TIMES; }
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
 #line 43 "promela.l"
-			{ return DIVIDE; }
-			YY_BREAK
-		case 12:
-			YY_RULE_SETUP
+{ return PML_DIVIDE; }
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
 #line 44 "promela.l"
-			{ return MODULO; }
-			YY_BREAK
-		case 13:
-			YY_RULE_SETUP
+{ return PML_MODULO; }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
 #line 46 "promela.l"
-			{ return PLUS; }
-			YY_BREAK
-		case 14:
-			YY_RULE_SETUP
+{ return PML_PLUS; }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
 #line 47 "promela.l"
-			{ return MINUS; }
-			YY_BREAK
-		case 15:
-			YY_RULE_SETUP
+{ return PML_MINUS; }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
 #line 49 "promela.l"
-			{ return LSHIFT; }
-			YY_BREAK
-		case 16:
-			YY_RULE_SETUP
+{ return PML_LSHIFT; }
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
 #line 50 "promela.l"
-			{ return RSHIFT; }
-			YY_BREAK
-		case 17:
-			YY_RULE_SETUP
+{ return PML_RSHIFT; }
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
 #line 52 "promela.l"
-			{ return LE; }
-			YY_BREAK
-		case 18:
-			YY_RULE_SETUP
+{ return PML_LE; }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
 #line 53 "promela.l"
-			{ return GE; }
-			YY_BREAK
-		case 19:
-			YY_RULE_SETUP
+{ return PML_GE; }
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
 #line 54 "promela.l"
-			{ return LT; }
-			YY_BREAK
-		case 20:
-			YY_RULE_SETUP
+{ return PML_LT; }
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
 #line 55 "promela.l"
-			{ return GT; }
-			YY_BREAK
-		case 21:
-			YY_RULE_SETUP
+{ return PML_GT; }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
 #line 57 "promela.l"
-			{ return NE; }
-			YY_BREAK
-		case 22:
-			YY_RULE_SETUP
+{ return PML_NE; }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
 #line 58 "promela.l"
-			{ return EQ; }
-			YY_BREAK
-		case 23:
-			YY_RULE_SETUP
+{ return PML_EQ; }
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
 #line 60 "promela.l"
-			{ return BITAND; }
-			YY_BREAK
-		case 24:
-			YY_RULE_SETUP
+{ return PML_BITAND; }
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
 #line 61 "promela.l"
-			{ return BITXOR; }
-			YY_BREAK
-		case 25:
-			YY_RULE_SETUP
+{ return PML_BITXOR; }
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
 #line 62 "promela.l"
-			{ return BITOR; }
-			YY_BREAK
-		case 26:
-			YY_RULE_SETUP
+{ return PML_BITOR; }
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
 #line 65 "promela.l"
-			{ return AND; }
-			YY_BREAK
-		case 27:
-			YY_RULE_SETUP
+{ return PML_AND; }
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
 #line 66 "promela.l"
-			{ return OR; }
-			YY_BREAK
-		case 28:
-			YY_RULE_SETUP
+{ return PML_OR; }
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
 #line 68 "promela.l"
-			{ return DOT; }
-			YY_BREAK
-		case 29:
-			YY_RULE_SETUP
+{ return PML_DOT; }
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
 #line 69 "promela.l"
-			{ return COMMA; }
-			YY_BREAK
-		case 30:
-			YY_RULE_SETUP
+{ return PML_COMMA; }
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
 #line 70 "promela.l"
-			{ return SEMI; }
-			YY_BREAK
-		case 31:
-			YY_RULE_SETUP
+{ return PML_SEMI; }
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
 #line 72 "promela.l"
-			{ return '('; }
-			YY_BREAK
-		case 32:
-			YY_RULE_SETUP
+{ return '('; }
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
 #line 73 "promela.l"
-			{ return ')'; }
-			YY_BREAK
-		case 33:
-			YY_RULE_SETUP
+{ return ')'; }
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
 #line 75 "promela.l"
-			{ return '['; }
-			YY_BREAK
-		case 34:
-			YY_RULE_SETUP
+{ return '['; }
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
 #line 76 "promela.l"
-			{ return ']'; }
-			YY_BREAK
-		case 35:
-			YY_RULE_SETUP
+{ return ']'; }
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
 #line 78 "promela.l"
-			{ return '{'; }
-			YY_BREAK
-		case 36:
-			YY_RULE_SETUP
+{ return '{'; }
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
 #line 79 "promela.l"
-			{ return '}'; }
-			YY_BREAK
-		case 37:
-			YY_RULE_SETUP
+{ return '}'; }
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
 #line 81 "promela.l"
-			{ return ASGN; }
-			YY_BREAK
-		case 38:
-			/* rule 38 can match eol */
-			YY_RULE_SETUP
+{ return PML_ASGN; }
+	YY_BREAK
+case 38:
+/* rule 38 can match eol */
+YY_RULE_SETUP
 #line 83 "promela.l"
-			{ yylval->value = strdup(yytext); return(STRING); }
-			YY_BREAK
-		case 39:
-			YY_RULE_SETUP
+{ yylval->value = strdup(yytext); return(PML_STRING); }
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
 #line 85 "promela.l"
-			{ yylval->value = strdup(yytext); return CONST; }
-			YY_BREAK
-		case 40:
-			YY_RULE_SETUP
+{ yylval->value = strdup(yytext); return PML_CONST; }
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
 #line 86 "promela.l"
-			{ yylval->value = strdup(yytext); return NAME; }
-			YY_BREAK
-		case 41:
-			/* rule 41 can match eol */
-			YY_RULE_SETUP
+{ yylval->value = strdup(yytext); return PML_NAME; }
+	YY_BREAK
+case 41:
+/* rule 41 can match eol */
+YY_RULE_SETUP
 #line 88 "promela.l"
-			{ }
-			YY_BREAK
-		case 42:
-			/* rule 42 can match eol */
-			YY_RULE_SETUP
+{ }
+	YY_BREAK
+case 42:
+/* rule 42 can match eol */
+YY_RULE_SETUP
 #line 90 "promela.l"
-			/* eat up whitespace */
-			YY_BREAK
-		case 43:
-			YY_RULE_SETUP
+/* eat up whitespace */
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
 #line 92 "promela.l"
-			{ /*printf( "Unrecognized character: %s\n", yytext ); */ }
-			YY_BREAK
-		case 44:
-			YY_RULE_SETUP
+{ /*printf( "Unrecognized character: %s\n", yytext ); */ }
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
 #line 93 "promela.l"
-			ECHO;
-			YY_BREAK
+ECHO;
+	YY_BREAK
 #line 1253 "promela.lex.yy.cpp"
-		case YY_STATE_EOF(INITIAL):
-			yyterminate();
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
 
-		case YY_END_OF_BUFFER: {
-			/* Amount of text matched not including the EOB char. */
-			int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
 
-			/* Undo the effects of YY_DO_BEFORE_ACTION. */
-			*yy_cp = yyg->yy_hold_char;
-			YY_RESTORE_YY_MORE_OFFSET
-
-			if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) {
-				/* We're scanning a new file or input source.  It's
-				 * possible that this happened because the user
-				 * just pointed yyin at a new source and called
-				 * promela_lex().  If so, then we have to assure
-				 * consistency between YY_CURRENT_BUFFER and our
-				 * globals.  Here is the right place to do so, because
-				 * this is the first action (other than possibly a
-				 * back-up) that will match for the new input source.
-				 */
-				yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-				YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-				YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = yyg->yy_hold_char;
+		YY_RESTORE_YY_MORE_OFFSET
 
-			/* Note that here we test for yy_c_buf_p "<=" to the position
-			 * of the first EOB in the buffer, since yy_c_buf_p will
-			 * already have been incremented past the NUL character
-			 * (since all states make transitions on EOB to the
-			 * end-of-buffer state).  Contrast this with the test
-			 * in input().
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * promela_lex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
 			 */
-			if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) {
-				/* This was really a NUL. */
-				yy_state_type yy_next_state;
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
 
-				yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
+			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state( yyscanner );
+			yy_current_state = yy_get_previous_state( yyscanner );
 
-				/* Okay, we're now positioned to make the NUL
-				 * transition.  We couldn't have
-				 * yy_get_previous_state() go ahead and do it
-				 * for us because it doesn't know how to deal
-				 * with the possibility of jamming (and we don't
-				 * want to build jamming into it because then it
-				 * will run more slowly).
-				 */
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
 
-				yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
+			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
 
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
 
-				if ( yy_next_state ) {
-					/* Consume the NUL. */
-					yy_cp = ++yyg->yy_c_buf_p;
-					yy_current_state = yy_next_state;
-					goto yy_match;
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++yyg->yy_c_buf_p;
+				yy_current_state = yy_next_state;
+				goto yy_match;
 				}
 
-				else {
-					/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
-					yy_cp = yyg->yy_last_accepting_cpos;
-					yy_current_state = yyg->yy_last_accepting_state;
-					goto yy_find_action;
+			else
+				{
+/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
+				yy_cp = yyg->yy_last_accepting_cpos;
+				yy_current_state = yyg->yy_last_accepting_state;
+				goto yy_find_action;
 				}
 			}
 
-			else switch ( yy_get_next_buffer( yyscanner ) ) {
-				case EOB_ACT_END_OF_FILE: {
-					yyg->yy_did_buffer_switch_on_eof = 0;
-
-					if ( promela_wrap(yyscanner ) ) {
-						/* Note: because we've taken care in
-						 * yy_get_next_buffer() to have set up
-						 * yytext, we can now set up
-						 * yy_c_buf_p so that if some total
-						 * hoser (like flex itself) wants to
-						 * call the scanner after we return the
-						 * YY_NULL, it'll still work - another
-						 * YY_NULL will get returned.
-						 */
-						yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
-
-						yy_act = YY_STATE_EOF(YY_START);
-						goto do_action;
+		else switch ( yy_get_next_buffer( yyscanner ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				yyg->yy_did_buffer_switch_on_eof = 0;
+
+				if ( promela_wrap(yyscanner ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
 					}
 
-					else {
-						if ( ! yyg->yy_did_buffer_switch_on_eof )
-							YY_NEW_FILE;
+				else
+					{
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
 					}
-					break;
+				break;
 				}
 
-				case EOB_ACT_CONTINUE_SCAN:
-					yyg->yy_c_buf_p =
-					    yyg->yytext_ptr + yy_amount_of_matched_text;
+			case EOB_ACT_CONTINUE_SCAN:
+				yyg->yy_c_buf_p =
+					yyg->yytext_ptr + yy_amount_of_matched_text;
 
-					yy_current_state = yy_get_previous_state( yyscanner );
+				yy_current_state = yy_get_previous_state( yyscanner );
 
-					yy_cp = yyg->yy_c_buf_p;
-					yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-					goto yy_match;
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_match;
 
-				case EOB_ACT_LAST_MATCH:
-					yyg->yy_c_buf_p =
-					    &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
+			case EOB_ACT_LAST_MATCH:
+				yyg->yy_c_buf_p =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
 
-					yy_current_state = yy_get_previous_state( yyscanner );
+				yy_current_state = yy_get_previous_state( yyscanner );
 
-					yy_cp = yyg->yy_c_buf_p;
-					yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-					goto yy_find_action;
-				}
-			break;
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
 		}
 
-		default:
-			YY_FATAL_ERROR(
-			    "fatal flex scanner internal error--no action found" );
-		} /* end of action switch */
-	} /* end of scanning one token */
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
 } /* end of promela_lex */
 /* %ok-for-header */
 
@@ -1386,7 +1405,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	register char *source = yyg->yytext_ptr;
 	register int number_to_move, i;
@@ -1394,24 +1413,26 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
 		YY_FATAL_ERROR(
-		    "fatal flex scanner internal error--end of buffer missed" );
+		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) {
-		/* Don't try to fill the buffer, so this is an EOF. */
-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) {
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
+			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
 			 */
 			return EOB_ACT_END_OF_FILE;
-		}
+			}
 
-		else {
+		else
+			{
 			/* We matched some text prior to the EOB, first
 			 * process it.
 			 */
 			return EOB_ACT_LAST_MATCH;
+			}
 		}
-	}
 
 	/* Try to read more data. */
 
@@ -1427,20 +1448,22 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		 */
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
 
-	else {
-		yy_size_t num_to_read =
-		    YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
-		while ( num_to_read <= 0 ) {
-			/* Not enough room in the buffer - grow it. */
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
 			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-			    (int) (yyg->yy_c_buf_p - b->yy_ch_buf);
+				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
 
-			if ( b->yy_is_our_buffer ) {
+			if ( b->yy_is_our_buffer )
+				{
 				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
@@ -1449,45 +1472,49 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 					b->yy_buf_size *= 2;
 
 				b->yy_ch_buf = (char *)
-				               /* Include room in for 2 EOB chars. */
-				               promela_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
-			} else
+					/* Include room in for 2 EOB chars. */
+					promela_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
+				}
+			else
 				/* Can't grow it, we don't own it. */
 				b->yy_ch_buf = 0;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
-				    "fatal error - scanner input buffer overflow" );
+				"fatal error - scanner input buffer overflow" );
 
 			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
 
 			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-			              number_to_move - 1;
+						number_to_move - 1;
 
-		}
+			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-		          yyg->yy_n_chars, num_to_read );
+			yyg->yy_n_chars, num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-	}
+		}
 
-	if ( yyg->yy_n_chars == 0 ) {
-		if ( number_to_move == YY_MORE_ADJ ) {
+	if ( yyg->yy_n_chars == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
 			ret_val = EOB_ACT_END_OF_FILE;
 			promela_restart(yyin  ,yyscanner);
-		}
+			}
 
-		else {
+		else
+			{
 			ret_val = EOB_ACT_LAST_MATCH;
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-			    YY_BUFFER_EOF_PENDING;
+				YY_BUFFER_EOF_PENDING;
+			}
 		}
-	}
 
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
@@ -1514,32 +1541,35 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 /* %if-c-only */
 /* %not-for-header */
 
-static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
+    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	/* %% [15.0] code to get the start state into yy_current_state goes here */
+/* %% [15.0] code to get the start state into yy_current_state goes here */
 	yy_current_state = yyg->yy_start;
 
-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) {
-		/* %% [16.0] code to find the next state goes here */
+	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
+		{
+/* %% [16.0] code to find the next state goes here */
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] ) {
+		if ( yy_accept[yy_current_state] )
+			{
 			yyg->yy_last_accepting_state = yy_current_state;
 			yyg->yy_last_accepting_cpos = yy_cp;
-		}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) {
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 102 )
 				yy_c = yy_meta[(unsigned int) yy_c];
-		}
+			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	}
+		}
 
 	return yy_current_state;
 }
@@ -1550,26 +1580,28 @@ static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
  *	next_state = yy_try_NUL_trans( current_state );
  */
 /* %if-c-only */
-static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
 	register int yy_is_jam;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	/* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
+/* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
 	register char *yy_cp = yyg->yy_c_buf_p;
 
 	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] ) {
+	if ( yy_accept[yy_current_state] )
+		{
 		yyg->yy_last_accepting_state = yy_current_state;
 		yyg->yy_last_accepting_cpos = yy_cp;
-	}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) {
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 102 )
 			yy_c = yy_meta[(unsigned int) yy_c];
-	}
+		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 101);
 
@@ -1578,27 +1610,27 @@ static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_
 
 /* %if-c-only */
 
-static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
+    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
 	register char *yy_cp;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	yy_cp = yyg->yy_c_buf_p;
+    yy_cp = yyg->yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
 	*yy_cp = yyg->yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) {
-		/* need to shift things up to make room */
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
 		register yy_size_t number_to_move = yyg->yy_n_chars + 2;
 		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-		                          YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-		    &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
 		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
@@ -1606,15 +1638,15 @@ static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-		    yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
 		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-	}
+		}
 
 	*--yy_cp = (char) c;
 
-	/* %% [18.0] update yylineno here */
+/* %% [18.0] update yylineno here */
 
 	yyg->yytext_ptr = yy_bp;
 	yyg->yy_hold_char = *yy_cp;
@@ -1627,9 +1659,9 @@ static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
 /* %if-c-only */
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput (yyscan_t yyscanner)
+    static int yyinput (yyscan_t yyscanner)
 #else
-static int input  (yyscan_t yyscanner)
+    static int input  (yyscan_t yyscanner)
 #endif
 
 /* %endif */
@@ -1637,11 +1669,12 @@ static int input  (yyscan_t yyscanner)
 /* %endif */
 {
 	int c;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	*yyg->yy_c_buf_p = yyg->yy_hold_char;
 
-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) {
+	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
@@ -1650,53 +1683,55 @@ static int input  (yyscan_t yyscanner)
 			/* This was really a NUL. */
 			*yyg->yy_c_buf_p = '\0';
 
-		else {
-			/* need more input */
+		else
+			{ /* need more input */
 			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
 			++yyg->yy_c_buf_p;
 
-			switch ( yy_get_next_buffer( yyscanner ) ) {
-			case EOB_ACT_LAST_MATCH:
-				/* This happens because yy_g_n_b()
-				 * sees that we've accumulated a
-				 * token and flags that we need to
-				 * try matching the token before
-				 * proceeding.  But for input(),
-				 * there's no matching to consider.
-				 * So convert the EOB_ACT_LAST_MATCH
-				 * to EOB_ACT_END_OF_FILE.
-				 */
-
-				/* Reset buffer status. */
-				promela_restart(yyin ,yyscanner);
-
-				/*FALLTHROUGH*/
-
-			case EOB_ACT_END_OF_FILE: {
-				if ( promela_wrap(yyscanner ) )
-					return 0;
-
-				if ( ! yyg->yy_did_buffer_switch_on_eof )
-					YY_NEW_FILE;
+			switch ( yy_get_next_buffer( yyscanner ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					promela_restart(yyin ,yyscanner);
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( promela_wrap(yyscanner ) )
+						return 0;
+
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
 #ifdef __cplusplus
-				return yyinput(yyscanner);
+					return yyinput(yyscanner);
 #else
-				return input(yyscanner);
+					return input(yyscanner);
 #endif
-			}
+					}
 
-			case EOB_ACT_CONTINUE_SCAN:
-				yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
-				break;
+				case EOB_ACT_CONTINUE_SCAN:
+					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
+					break;
+				}
 			}
 		}
-	}
 
 	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
 	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
 	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
 
-	/* %% [19.0] update BOL and yylineno */
+/* %% [19.0] update BOL and yylineno */
 
 	return c;
 }
@@ -1710,17 +1745,17 @@ static int input  (yyscan_t yyscanner)
  * @note This function does not reset the start condition to @c INITIAL .
  */
 /* %if-c-only */
-void promela_restart  (FILE * input_file , yyscan_t yyscanner)
+    void promela_restart  (FILE * input_file , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	if ( ! YY_CURRENT_BUFFER ) {
-		promela_ensure_buffer_stack (yyscanner);
+	if ( ! YY_CURRENT_BUFFER ){
+        promela_ensure_buffer_stack (yyscanner);
 		YY_CURRENT_BUFFER_LVALUE =
-		    promela__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+            promela__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
 	}
 
 	promela__init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
@@ -1732,28 +1767,29 @@ void promela_restart  (FILE * input_file , yyscan_t yyscanner)
  * @param yyscanner The scanner object.
  */
 /* %if-c-only */
-void promela__switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
+    void promela__switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		promela_pop_buffer_state();
 	 *		promela_push_buffer_state(new_buffer);
-	 */
+     */
 	promela_ensure_buffer_stack (yyscanner);
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( YY_CURRENT_BUFFER ) {
+	if ( YY_CURRENT_BUFFER )
+		{
 		/* Flush out information for old buffer. */
 		*yyg->yy_c_buf_p = yyg->yy_hold_char;
 		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-	}
+		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 	promela__load_buffer_state(yyscanner );
@@ -1772,7 +1808,7 @@ static void promela__load_buffer_state  (yyscan_t yyscanner)
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
 	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
@@ -1786,13 +1822,13 @@ static void promela__load_buffer_state  (yyscan_t yyscanner)
  * @return the allocated buffer state.
  */
 /* %if-c-only */
-YY_BUFFER_STATE promela__create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
+    YY_BUFFER_STATE promela__create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) promela_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in promela__create_buffer()" );
@@ -1818,12 +1854,12 @@ YY_BUFFER_STATE promela__create_buffer  (FILE * file, int  size , yyscan_t yysca
  * @param yyscanner The scanner object.
  */
 /* %if-c-only */
-void promela__delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+    void promela__delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	if ( ! b )
 		return;
@@ -1849,36 +1885,36 @@ void promela__delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
  * such as during a promela_restart() or at EOF.
  */
 /* %if-c-only */
-static void promela__init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
+    static void promela__init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 
 {
 	int oerrno = errno;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	promela__flush_buffer(b ,yyscanner);
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-	/* If b is the current buffer, then promela__init_buffer was _probably_
-	 * called from promela_restart() or through yy_get_next_buffer.
-	 * In that case, we don't want to reset the lineno or column.
-	 */
-	if (b != YY_CURRENT_BUFFER) {
-		b->yy_bs_lineno = 1;
-		b->yy_bs_column = 0;
-	}
-
-	/* %if-c-only */
+    /* If b is the current buffer, then promela__init_buffer was _probably_
+     * called from promela_restart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
 
-	b->yy_is_interactive = 0;
+/* %if-c-only */
 
-	/* %endif */
-	/* %if-c++-only */
-	/* %endif */
+        b->yy_is_interactive = 0;
+    
+/* %endif */
+/* %if-c++-only */
+/* %endif */
 	errno = oerrno;
 }
 
@@ -1887,12 +1923,12 @@ static void promela__init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yy
  * @param yyscanner The scanner object.
  */
 /* %if-c-only */
-void promela__flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+    void promela__flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	if ( ! b )
 		return;
 
@@ -1927,19 +1963,20 @@ void promela_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	if (new_buffer == NULL)
 		return;
 
 	promela_ensure_buffer_stack(yyscanner);
 
 	/* This block is copied from promela__switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER ) {
+	if ( YY_CURRENT_BUFFER )
+		{
 		/* Flush out information for old buffer. */
 		*yyg->yy_c_buf_p = yyg->yy_hold_char;
 		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-	}
+		}
 
 	/* Only push if top exists. Otherwise, replace top. */
 	if (YY_CURRENT_BUFFER)
@@ -1963,7 +2000,7 @@ void promela_pop_buffer_state (yyscan_t yyscanner)
 /* %if-c++-only */
 /* %endif */
 {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 	if (!YY_CURRENT_BUFFER)
 		return;
 
@@ -1990,38 +2027,38 @@ static void promela_ensure_buffer_stack (yyscan_t yyscanner)
 /* %endif */
 {
 	yy_size_t num_to_alloc;
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	if (!yyg->yy_buffer_stack) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
-		 */
+         */
 		num_to_alloc = 1;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)promela_alloc
-		                       (num_to_alloc * sizeof(struct yy_buffer_state*)
-		                        , yyscanner);
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
 		if ( ! yyg->yy_buffer_stack )
 			YY_FATAL_ERROR( "out of dynamic memory in promela_ensure_buffer_stack()" );
-
+								  
 		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		yyg->yy_buffer_stack_max = num_to_alloc;
 		yyg->yy_buffer_stack_top = 0;
 		return;
 	}
 
-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1) {
+	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
 		int grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)promela_realloc
-		                       (yyg->yy_buffer_stack,
-		                        num_to_alloc * sizeof(struct yy_buffer_state*)
-		                        , yyscanner);
+								(yyg->yy_buffer_stack,
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
 		if ( ! yyg->yy_buffer_stack )
 			YY_FATAL_ERROR( "out of dynamic memory in promela_ensure_buffer_stack()" );
 
@@ -2037,14 +2074,15 @@ static void promela_ensure_buffer_stack (yyscan_t yyscanner)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object. 
  */
-YY_BUFFER_STATE promela__scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner) {
+YY_BUFFER_STATE promela__scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
+{
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
-	        base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	        base[size-1] != YY_END_OF_BUFFER_CHAR )
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
@@ -2077,8 +2115,9 @@ YY_BUFFER_STATE promela__scan_buffer  (char * base, yy_size_t  size , yyscan_t y
  * @note If you want to scan bytes that may contain NUL values, then use
  *       promela__scan_bytes() instead.
  */
-YY_BUFFER_STATE promela__scan_string (yyconst char * yystr , yyscan_t yyscanner) {
-
+YY_BUFFER_STATE promela__scan_string (yyconst char * yystr , yyscan_t yyscanner)
+{
+    
 	return promela__scan_bytes(yystr,strlen(yystr) ,yyscanner);
 }
 /* %endif */
@@ -2091,11 +2130,12 @@ YY_BUFFER_STATE promela__scan_string (yyconst char * yystr , yyscan_t yyscanner)
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE promela__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner) {
+YY_BUFFER_STATE promela__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n, i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) promela_alloc(n ,yyscanner );
@@ -2125,8 +2165,9 @@ YY_BUFFER_STATE promela__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybyte
 #endif
 
 /* %if-c-only */
-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) {
-	(void) fprintf( stderr, "%s\n", msg );
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+{
+    	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 /* %endif */
@@ -2158,9 +2199,10 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) {
 /** Get the user-defined data for this scanner.
  * @param yyscanner The scanner object.
  */
-YY_EXTRA_TYPE promela_get_extra  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yyextra;
+YY_EXTRA_TYPE promela_get_extra  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyextra;
 }
 
 /* %endif */
@@ -2168,58 +2210,64 @@ YY_EXTRA_TYPE promela_get_extra  (yyscan_t yyscanner) {
 /** Get the current line number.
  * @param yyscanner The scanner object.
  */
-int promela_get_lineno  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if (! YY_CURRENT_BUFFER)
-		return 0;
-
-	return yylineno;
+int promela_get_lineno  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yylineno;
 }
 
 /** Get the current column number.
  * @param yyscanner The scanner object.
  */
-int promela_get_column  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if (! YY_CURRENT_BUFFER)
-		return 0;
-
-	return yycolumn;
+int promela_get_column  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yycolumn;
 }
 
 /** Get the input stream.
  * @param yyscanner The scanner object.
  */
-FILE *promela_get_in  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yyin;
+FILE *promela_get_in  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyin;
 }
 
 /** Get the output stream.
  * @param yyscanner The scanner object.
  */
-FILE *promela_get_out  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yyout;
+FILE *promela_get_out  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyout;
 }
 
 /** Get the length of the current token.
  * @param yyscanner The scanner object.
  */
-yy_size_t promela_get_leng  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yyleng;
+yy_size_t promela_get_leng  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyleng;
 }
 
 /** Get the current token.
  * @param yyscanner The scanner object.
  */
 
-char *promela_get_text  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yytext;
+char *promela_get_text  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yytext;
 }
 
 /* %if-reentrant */
@@ -2228,9 +2276,10 @@ char *promela_get_text  (yyscan_t yyscanner) {
  * @param user_defined The data to be associated with this scanner.
  * @param yyscanner The scanner object.
  */
-void promela_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyextra = user_defined ;
+void promela_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyextra = user_defined ;
 }
 
 /* %endif */
@@ -2239,28 +2288,30 @@ void promela_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner) {
  * @param line_number
  * @param yyscanner The scanner object.
  */
-void promela_set_lineno (int  line_number , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	/* lineno is only valid if an input buffer exists. */
-	if (! YY_CURRENT_BUFFER )
-		yy_fatal_error( "promela_set_lineno called with no buffer" , yyscanner);
+void promela_set_lineno (int  line_number , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	yylineno = line_number;
+        /* lineno is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           yy_fatal_error( "promela_set_lineno called with no buffer" , yyscanner); 
+    
+    yylineno = line_number;
 }
 
 /** Set the current column.
  * @param line_number
  * @param yyscanner The scanner object.
  */
-void promela_set_column (int  column_no , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	/* column is only valid if an input buffer exists. */
-	if (! YY_CURRENT_BUFFER )
-		yy_fatal_error( "promela_set_column called with no buffer" , yyscanner);
+void promela_set_column (int  column_no , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	yycolumn = column_no;
+        /* column is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           yy_fatal_error( "promela_set_column called with no buffer" , yyscanner); 
+    
+    yycolumn = column_no;
 }
 
 /** Set the input stream. This does not discard the current
@@ -2269,24 +2320,28 @@ void promela_set_column (int  column_no , yyscan_t yyscanner) {
  * @param yyscanner The scanner object.
  * @see promela__switch_to_buffer
  */
-void promela_set_in (FILE *  in_str , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyin = in_str ;
+void promela_set_in (FILE *  in_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyin = in_str ;
 }
 
-void promela_set_out (FILE *  out_str , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyout = out_str ;
+void promela_set_out (FILE *  out_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyout = out_str ;
 }
 
-int promela_get_debug  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yy_flex_debug;
+int promela_get_debug  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yy_flex_debug;
 }
 
-void promela_set_debug (int  bdebug , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yy_flex_debug = bdebug ;
+void promela_set_debug (int  bdebug , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yy_flex_debug = bdebug ;
 }
 
 /* %endif */
@@ -2296,14 +2351,16 @@ void promela_set_debug (int  bdebug , yyscan_t yyscanner) {
 
 /* %if-bison-bridge */
 
-YYSTYPE * promela_get_lval  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yylval;
+YYSTYPE * promela_get_lval  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yylval;
 }
 
-void promela_set_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yylval = yylval_param;
+void promela_set_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yylval = yylval_param;
 }
 
 /* %endif */
@@ -2318,22 +2375,22 @@ void promela_set_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner) {
 int promela_lex_init(yyscan_t* ptr_yy_globals)
 
 {
-	if (ptr_yy_globals == NULL) {
-		errno = EINVAL;
-		return 1;
-	}
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
 
-	*ptr_yy_globals = (yyscan_t) promela_alloc ( sizeof( struct yyguts_t ), NULL );
+    *ptr_yy_globals = (yyscan_t) promela_alloc ( sizeof( struct yyguts_t ), NULL );
 
-	if (*ptr_yy_globals == NULL) {
-		errno = ENOMEM;
-		return 1;
-	}
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
 
-	/* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
-	memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
 
-	return yy_init_globals ( *ptr_yy_globals );
+    return yy_init_globals ( *ptr_yy_globals );
 }
 
 /* promela_lex_init_extra has the same functionality as promela_lex_init, but follows the
@@ -2347,74 +2404,76 @@ int promela_lex_init(yyscan_t* ptr_yy_globals)
 int promela_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
 
 {
-	struct yyguts_t dummy_yyguts;
-
-	promela_set_extra (yy_user_defined, &dummy_yyguts);
-
-	if (ptr_yy_globals == NULL) {
-		errno = EINVAL;
-		return 1;
-	}
-
-	*ptr_yy_globals = (yyscan_t) promela_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-
-	if (*ptr_yy_globals == NULL) {
-		errno = ENOMEM;
-		return 1;
-	}
-
-	/* By setting to 0xAA, we expose bugs in
-	yy_init_globals. Leave at 0x00 for releases. */
-	memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
-	promela_set_extra (yy_user_defined, *ptr_yy_globals);
-
-	return yy_init_globals ( *ptr_yy_globals );
+    struct yyguts_t dummy_yyguts;
+
+    promela_set_extra (yy_user_defined, &dummy_yyguts);
+
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+	
+    *ptr_yy_globals = (yyscan_t) promela_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
+	
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+    
+    /* By setting to 0xAA, we expose bugs in
+    yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+    
+    promela_set_extra (yy_user_defined, *ptr_yy_globals);
+    
+    return yy_init_globals ( *ptr_yy_globals );
 }
 
 /* %endif if-c-only */
 
 /* %if-c-only */
-static int yy_init_globals (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	/* Initialization is the same as for the non-reentrant scanner.
-	 * This function is called from promela_lex_destroy(), so don't allocate here.
-	 */
-
-	yyg->yy_buffer_stack = 0;
-	yyg->yy_buffer_stack_top = 0;
-	yyg->yy_buffer_stack_max = 0;
-	yyg->yy_c_buf_p = (char *) 0;
-	yyg->yy_init = 0;
-	yyg->yy_start = 0;
-
-	yyg->yy_start_stack_ptr = 0;
-	yyg->yy_start_stack_depth = 0;
-	yyg->yy_start_stack =  NULL;
-
-	/* Defined in main.c */
+static int yy_init_globals (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from promela_lex_destroy(), so don't allocate here.
+     */
+
+    yyg->yy_buffer_stack = 0;
+    yyg->yy_buffer_stack_top = 0;
+    yyg->yy_buffer_stack_max = 0;
+    yyg->yy_c_buf_p = (char *) 0;
+    yyg->yy_init = 0;
+    yyg->yy_start = 0;
+
+    yyg->yy_start_stack_ptr = 0;
+    yyg->yy_start_stack_depth = 0;
+    yyg->yy_start_stack =  NULL;
+
+/* Defined in main.c */
 #ifdef YY_STDINIT
-	yyin = stdin;
-	yyout = stdout;
+    yyin = stdin;
+    yyout = stdout;
 #else
-	yyin = (FILE *) 0;
-	yyout = (FILE *) 0;
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
 #endif
 
-	/* For future reference: Set errno on error, since we are called by
-	 * promela_lex_init()
-	 */
-	return 0;
+    /* For future reference: Set errno on error, since we are called by
+     * promela_lex_init()
+     */
+    return 0;
 }
 /* %endif */
 
 /* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */
 /* promela_lex_destroy is for both reentrant and non-reentrant scanners. */
-int promela_lex_destroy  (yyscan_t yyscanner) {
-	struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+int promela_lex_destroy  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	/* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER) {
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
 		promela__delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
 		promela_pop_buffer_state(yyscanner);
@@ -2424,20 +2483,20 @@ int promela_lex_destroy  (yyscan_t yyscanner) {
 	promela_free(yyg->yy_buffer_stack ,yyscanner);
 	yyg->yy_buffer_stack = NULL;
 
-	/* Destroy the start condition stack. */
-	promela_free(yyg->yy_start_stack ,yyscanner );
-	yyg->yy_start_stack = NULL;
+    /* Destroy the start condition stack. */
+        promela_free(yyg->yy_start_stack ,yyscanner );
+        yyg->yy_start_stack = NULL;
 
-	/* Reset the globals. This is important in a non-reentrant scanner so the next time
-	 * promela_lex() is called, initialization will occur. */
-	yy_init_globals( yyscanner);
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * promela_lex() is called, initialization will occur. */
+    yy_init_globals( yyscanner);
 
-	/* %if-reentrant */
-	/* Destroy the main struct (reentrant only). */
-	promela_free ( yyscanner , yyscanner );
-	yyscanner = NULL;
-	/* %endif */
-	return 0;
+/* %if-reentrant */
+    /* Destroy the main struct (reentrant only). */
+    promela_free ( yyscanner , yyscanner );
+    yyscanner = NULL;
+/* %endif */
+    return 0;
 }
 /* %endif */
 
@@ -2446,7 +2505,8 @@ int promela_lex_destroy  (yyscan_t yyscanner) {
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) {
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
+{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
@@ -2454,7 +2514,8 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) {
+static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
+{
 	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
@@ -2463,11 +2524,13 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) {
 }
 #endif
 
-void *promela_alloc (yy_size_t  size , yyscan_t yyscanner) {
+void *promela_alloc (yy_size_t  size , yyscan_t yyscanner)
+{
 	return (void *) malloc( size );
 }
 
-void *promela_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner) {
+void *promela_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2478,7 +2541,8 @@ void *promela_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner) {
 	return (void *) realloc( (char *) ptr, size );
 }
 
-void promela_free (void * ptr , yyscan_t yyscanner) {
+void promela_free (void * ptr , yyscan_t yyscanner)
+{
 	free( (char *) ptr );	/* see promela_realloc() for (char *) cast */
 }