[Scummvm-git-logs] scummvm master -> 1ff6b254652016e4f368679a67190b737ef6af6d

sev- noreply at scummvm.org
Sat May 13 13:58:13 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ff6b25465 DIRECTOR: LINGO: Implement "the number of castlibs"


Commit: 1ff6b254652016e4f368679a67190b737ef6af6d
    https://github.com/scummvm/scummvm/commit/1ff6b254652016e4f368679a67190b737ef6af6d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-13T15:57:48+02:00

Commit Message:
DIRECTOR: LINGO: Implement "the number of castlibs"

Changed paths:
    engines/director/lingo/lingo-ast.h
    engines/director/lingo/lingo-bytecode.cpp
    engines/director/lingo/lingo-codegen.cpp
    engines/director/lingo/lingo-gr.cpp
    engines/director/lingo/lingo-gr.h
    engines/director/lingo/lingo-gr.y
    engines/director/lingo/lingo-lex.cpp
    engines/director/lingo/lingo-lex.l
    engines/director/lingo/lingo-the.cpp
    engines/director/lingo/lingo-the.h
    engines/director/lingo/lingo.h


diff --git a/engines/director/lingo/lingo-ast.h b/engines/director/lingo/lingo-ast.h
index d06f0eed25a..81bf9d17922 100644
--- a/engines/director/lingo/lingo-ast.h
+++ b/engines/director/lingo/lingo-ast.h
@@ -150,6 +150,7 @@ enum NumberOfType {
 	kNumberOfMenuItems,
 	kNumberOfMenus,
 	kNumberOfXtras,
+	kNumberOfCastlibs,
 };
 
 /* NodeVisitor */
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index e7a7d68ce76..05b734cac8c 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -254,6 +254,7 @@ static LingoV4TheEntity lingoV4TheEntity[] = {
 	{ 0x08, 0x01, kThePerFrameHook,		kTheNOField,		true, kTEANOArgs },
 	{ 0x08, 0x02, kTheCastMembers,		kTheNumber,			false, kTEANOArgs },
 	{ 0x08, 0x03, kTheMenus,			kTheNumber,			false, kTEANOArgs },
+	{ 0x08, 0x04, kTheCastlibs,			kTheNumber,			false, kTEANOArgs }, // D5
 	{ 0x08, 0x05, kTheXtras,			kTheNumber,			false, kTEANOArgs }, // D5
 
 	{ 0x09, 0x01, kTheCast,				kTheName,			true, kTEAItemId },
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 964fd6e438e..1393b2d7bab 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -1404,6 +1404,12 @@ bool LingoCompiler::visitTheOfNode(TheOfNode *node) {
 
 bool LingoCompiler::visitTheNumberOfNode(TheNumberOfNode *node) {
 	switch (node->type) {
+	case kNumberOfCastlibs:
+		codeInt(0); // Put dummy id
+		code1(LC::c_theentitypush);
+		codeInt(kTheCastlibs);
+		codeInt(kTheNumber);
+		break;
 	case kNumberOfChars:
 		COMPILE(node->arg);
 		codeFunc("numberOfChars", 1);
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index b70322bd371..5f4fb7b7a57 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -231,97 +231,98 @@ enum yysymbol_kind_t
   YYSYMBOL_tTHE = 75,                      /* tTHE  */
   YYSYMBOL_tTIME = 76,                     /* tTIME  */
   YYSYMBOL_tXTRAS = 77,                    /* tXTRAS  */
-  YYSYMBOL_tSOUND = 78,                    /* tSOUND  */
-  YYSYMBOL_tSPRITE = 79,                   /* tSPRITE  */
-  YYSYMBOL_tINTERSECTS = 80,               /* tINTERSECTS  */
-  YYSYMBOL_tWITHIN = 81,                   /* tWITHIN  */
-  YYSYMBOL_tTELL = 82,                     /* tTELL  */
-  YYSYMBOL_tPROPERTY = 83,                 /* tPROPERTY  */
-  YYSYMBOL_tON = 84,                       /* tON  */
-  YYSYMBOL_tMETHOD = 85,                   /* tMETHOD  */
-  YYSYMBOL_tENDIF = 86,                    /* tENDIF  */
-  YYSYMBOL_tENDREPEAT = 87,                /* tENDREPEAT  */
-  YYSYMBOL_tENDTELL = 88,                  /* tENDTELL  */
-  YYSYMBOL_tASSERTERROR = 89,              /* tASSERTERROR  */
-  YYSYMBOL_90_ = 90,                       /* '<'  */
-  YYSYMBOL_91_ = 91,                       /* '>'  */
-  YYSYMBOL_92_ = 92,                       /* '&'  */
-  YYSYMBOL_93_ = 93,                       /* '+'  */
-  YYSYMBOL_94_ = 94,                       /* '-'  */
-  YYSYMBOL_95_ = 95,                       /* '*'  */
-  YYSYMBOL_96_ = 96,                       /* '/'  */
-  YYSYMBOL_97_n_ = 97,                     /* '\n'  */
-  YYSYMBOL_98_ = 98,                       /* ','  */
-  YYSYMBOL_99_ = 99,                       /* '('  */
-  YYSYMBOL_100_ = 100,                     /* ')'  */
-  YYSYMBOL_101_ = 101,                     /* '['  */
-  YYSYMBOL_102_ = 102,                     /* ']'  */
-  YYSYMBOL_103_ = 103,                     /* ':'  */
-  YYSYMBOL_YYACCEPT = 104,                 /* $accept  */
-  YYSYMBOL_script = 105,                   /* script  */
-  YYSYMBOL_scriptpartlist = 106,           /* scriptpartlist  */
-  YYSYMBOL_scriptpart = 107,               /* scriptpart  */
-  YYSYMBOL_macro = 108,                    /* macro  */
-  YYSYMBOL_factory = 109,                  /* factory  */
-  YYSYMBOL_method = 110,                   /* method  */
-  YYSYMBOL_methodlist = 111,               /* methodlist  */
-  YYSYMBOL_nonemptymethodlist = 112,       /* nonemptymethodlist  */
-  YYSYMBOL_methodlistline = 113,           /* methodlistline  */
-  YYSYMBOL_handler = 114,                  /* handler  */
-  YYSYMBOL_endargdef = 115,                /* endargdef  */
-  YYSYMBOL_CMDID = 116,                    /* CMDID  */
-  YYSYMBOL_ID = 117,                       /* ID  */
-  YYSYMBOL_idlist = 118,                   /* idlist  */
-  YYSYMBOL_nonemptyidlist = 119,           /* nonemptyidlist  */
-  YYSYMBOL_stmt = 120,                     /* stmt  */
-  YYSYMBOL_stmt_insideif = 121,            /* stmt_insideif  */
-  YYSYMBOL_stmtoneliner = 122,             /* stmtoneliner  */
-  YYSYMBOL_proc = 123,                     /* proc  */
-  YYSYMBOL_cmdargs = 124,                  /* cmdargs  */
-  YYSYMBOL_trailingcomma = 125,            /* trailingcomma  */
-  YYSYMBOL_frameargs = 126,                /* frameargs  */
-  YYSYMBOL_asgn = 127,                     /* asgn  */
-  YYSYMBOL_to = 128,                       /* to  */
-  YYSYMBOL_definevars = 129,               /* definevars  */
-  YYSYMBOL_ifstmt = 130,                   /* ifstmt  */
-  YYSYMBOL_ifelsestmt = 131,               /* ifelsestmt  */
-  YYSYMBOL_endif = 132,                    /* endif  */
-  YYSYMBOL_loop = 133,                     /* loop  */
-  YYSYMBOL_tell = 134,                     /* tell  */
-  YYSYMBOL_when = 135,                     /* when  */
-  YYSYMBOL_stmtlist = 136,                 /* stmtlist  */
-  YYSYMBOL_nonemptystmtlist = 137,         /* nonemptystmtlist  */
-  YYSYMBOL_stmtlistline = 138,             /* stmtlistline  */
-  YYSYMBOL_stmtlist_insideif = 139,        /* stmtlist_insideif  */
-  YYSYMBOL_nonemptystmtlist_insideif = 140, /* nonemptystmtlist_insideif  */
-  YYSYMBOL_stmtlistline_insideif = 141,    /* stmtlistline_insideif  */
-  YYSYMBOL_simpleexpr_nounarymath = 142,   /* simpleexpr_nounarymath  */
-  YYSYMBOL_var = 143,                      /* var  */
-  YYSYMBOL_varorchunk = 144,               /* varorchunk  */
-  YYSYMBOL_varorthe = 145,                 /* varorthe  */
-  YYSYMBOL_chunk = 146,                    /* chunk  */
-  YYSYMBOL_chunktype = 147,                /* chunktype  */
-  YYSYMBOL_object = 148,                   /* object  */
-  YYSYMBOL_refargs = 149,                  /* refargs  */
-  YYSYMBOL_the = 150,                      /* the  */
-  YYSYMBOL_theobj = 151,                   /* theobj  */
-  YYSYMBOL_menu = 152,                     /* menu  */
-  YYSYMBOL_thedatetime = 153,              /* thedatetime  */
-  YYSYMBOL_thenumberof = 154,              /* thenumberof  */
-  YYSYMBOL_inof = 155,                     /* inof  */
-  YYSYMBOL_writablethe = 156,              /* writablethe  */
-  YYSYMBOL_writabletheobj = 157,           /* writabletheobj  */
-  YYSYMBOL_list = 158,                     /* list  */
-  YYSYMBOL_proplist = 159,                 /* proplist  */
-  YYSYMBOL_proppair = 160,                 /* proppair  */
-  YYSYMBOL_unarymath = 161,                /* unarymath  */
-  YYSYMBOL_simpleexpr = 162,               /* simpleexpr  */
-  YYSYMBOL_expr = 163,                     /* expr  */
-  YYSYMBOL_expr_nounarymath = 164,         /* expr_nounarymath  */
-  YYSYMBOL_expr_noeq = 165,                /* expr_noeq  */
-  YYSYMBOL_sprite = 166,                   /* sprite  */
-  YYSYMBOL_exprlist = 167,                 /* exprlist  */
-  YYSYMBOL_nonemptyexprlist = 168          /* nonemptyexprlist  */
+  YYSYMBOL_tCASTLIBS = 78,                 /* tCASTLIBS  */
+  YYSYMBOL_tSOUND = 79,                    /* tSOUND  */
+  YYSYMBOL_tSPRITE = 80,                   /* tSPRITE  */
+  YYSYMBOL_tINTERSECTS = 81,               /* tINTERSECTS  */
+  YYSYMBOL_tWITHIN = 82,                   /* tWITHIN  */
+  YYSYMBOL_tTELL = 83,                     /* tTELL  */
+  YYSYMBOL_tPROPERTY = 84,                 /* tPROPERTY  */
+  YYSYMBOL_tON = 85,                       /* tON  */
+  YYSYMBOL_tMETHOD = 86,                   /* tMETHOD  */
+  YYSYMBOL_tENDIF = 87,                    /* tENDIF  */
+  YYSYMBOL_tENDREPEAT = 88,                /* tENDREPEAT  */
+  YYSYMBOL_tENDTELL = 89,                  /* tENDTELL  */
+  YYSYMBOL_tASSERTERROR = 90,              /* tASSERTERROR  */
+  YYSYMBOL_91_ = 91,                       /* '<'  */
+  YYSYMBOL_92_ = 92,                       /* '>'  */
+  YYSYMBOL_93_ = 93,                       /* '&'  */
+  YYSYMBOL_94_ = 94,                       /* '+'  */
+  YYSYMBOL_95_ = 95,                       /* '-'  */
+  YYSYMBOL_96_ = 96,                       /* '*'  */
+  YYSYMBOL_97_ = 97,                       /* '/'  */
+  YYSYMBOL_98_n_ = 98,                     /* '\n'  */
+  YYSYMBOL_99_ = 99,                       /* ','  */
+  YYSYMBOL_100_ = 100,                     /* '('  */
+  YYSYMBOL_101_ = 101,                     /* ')'  */
+  YYSYMBOL_102_ = 102,                     /* '['  */
+  YYSYMBOL_103_ = 103,                     /* ']'  */
+  YYSYMBOL_104_ = 104,                     /* ':'  */
+  YYSYMBOL_YYACCEPT = 105,                 /* $accept  */
+  YYSYMBOL_script = 106,                   /* script  */
+  YYSYMBOL_scriptpartlist = 107,           /* scriptpartlist  */
+  YYSYMBOL_scriptpart = 108,               /* scriptpart  */
+  YYSYMBOL_macro = 109,                    /* macro  */
+  YYSYMBOL_factory = 110,                  /* factory  */
+  YYSYMBOL_method = 111,                   /* method  */
+  YYSYMBOL_methodlist = 112,               /* methodlist  */
+  YYSYMBOL_nonemptymethodlist = 113,       /* nonemptymethodlist  */
+  YYSYMBOL_methodlistline = 114,           /* methodlistline  */
+  YYSYMBOL_handler = 115,                  /* handler  */
+  YYSYMBOL_endargdef = 116,                /* endargdef  */
+  YYSYMBOL_CMDID = 117,                    /* CMDID  */
+  YYSYMBOL_ID = 118,                       /* ID  */
+  YYSYMBOL_idlist = 119,                   /* idlist  */
+  YYSYMBOL_nonemptyidlist = 120,           /* nonemptyidlist  */
+  YYSYMBOL_stmt = 121,                     /* stmt  */
+  YYSYMBOL_stmt_insideif = 122,            /* stmt_insideif  */
+  YYSYMBOL_stmtoneliner = 123,             /* stmtoneliner  */
+  YYSYMBOL_proc = 124,                     /* proc  */
+  YYSYMBOL_cmdargs = 125,                  /* cmdargs  */
+  YYSYMBOL_trailingcomma = 126,            /* trailingcomma  */
+  YYSYMBOL_frameargs = 127,                /* frameargs  */
+  YYSYMBOL_asgn = 128,                     /* asgn  */
+  YYSYMBOL_to = 129,                       /* to  */
+  YYSYMBOL_definevars = 130,               /* definevars  */
+  YYSYMBOL_ifstmt = 131,                   /* ifstmt  */
+  YYSYMBOL_ifelsestmt = 132,               /* ifelsestmt  */
+  YYSYMBOL_endif = 133,                    /* endif  */
+  YYSYMBOL_loop = 134,                     /* loop  */
+  YYSYMBOL_tell = 135,                     /* tell  */
+  YYSYMBOL_when = 136,                     /* when  */
+  YYSYMBOL_stmtlist = 137,                 /* stmtlist  */
+  YYSYMBOL_nonemptystmtlist = 138,         /* nonemptystmtlist  */
+  YYSYMBOL_stmtlistline = 139,             /* stmtlistline  */
+  YYSYMBOL_stmtlist_insideif = 140,        /* stmtlist_insideif  */
+  YYSYMBOL_nonemptystmtlist_insideif = 141, /* nonemptystmtlist_insideif  */
+  YYSYMBOL_stmtlistline_insideif = 142,    /* stmtlistline_insideif  */
+  YYSYMBOL_simpleexpr_nounarymath = 143,   /* simpleexpr_nounarymath  */
+  YYSYMBOL_var = 144,                      /* var  */
+  YYSYMBOL_varorchunk = 145,               /* varorchunk  */
+  YYSYMBOL_varorthe = 146,                 /* varorthe  */
+  YYSYMBOL_chunk = 147,                    /* chunk  */
+  YYSYMBOL_chunktype = 148,                /* chunktype  */
+  YYSYMBOL_object = 149,                   /* object  */
+  YYSYMBOL_refargs = 150,                  /* refargs  */
+  YYSYMBOL_the = 151,                      /* the  */
+  YYSYMBOL_theobj = 152,                   /* theobj  */
+  YYSYMBOL_menu = 153,                     /* menu  */
+  YYSYMBOL_thedatetime = 154,              /* thedatetime  */
+  YYSYMBOL_thenumberof = 155,              /* thenumberof  */
+  YYSYMBOL_inof = 156,                     /* inof  */
+  YYSYMBOL_writablethe = 157,              /* writablethe  */
+  YYSYMBOL_writabletheobj = 158,           /* writabletheobj  */
+  YYSYMBOL_list = 159,                     /* list  */
+  YYSYMBOL_proplist = 160,                 /* proplist  */
+  YYSYMBOL_proppair = 161,                 /* proppair  */
+  YYSYMBOL_unarymath = 162,                /* unarymath  */
+  YYSYMBOL_simpleexpr = 163,               /* simpleexpr  */
+  YYSYMBOL_expr = 164,                     /* expr  */
+  YYSYMBOL_expr_nounarymath = 165,         /* expr_nounarymath  */
+  YYSYMBOL_expr_noeq = 166,                /* expr_noeq  */
+  YYSYMBOL_sprite = 167,                   /* sprite  */
+  YYSYMBOL_exprlist = 168,                 /* exprlist  */
+  YYSYMBOL_nonemptyexprlist = 169          /* nonemptyexprlist  */
 };
 typedef enum yysymbol_kind_t yysymbol_kind_t;
 
@@ -649,19 +650,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  191
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   4535
+#define YYLAST   4561
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  104
+#define YYNTOKENS  105
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  65
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  331
+#define YYNRULES  332
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  616
+#define YYNSTATES  617
 
 /* YYMAXUTOK -- Last valid token kind.  */
-#define YYMAXUTOK   344
+#define YYMAXUTOK   345
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -676,15 +677,15 @@ union yyalloc
 static const yytype_int8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-      97,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      98,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    92,     2,
-      99,   100,    95,    93,    98,    94,     2,    96,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   103,     2,
-      90,     2,    91,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    93,     2,
+     100,   101,    96,    94,    99,    95,     2,    97,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   104,     2,
+      91,     2,    92,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   101,     2,   102,     2,     2,     2,     2,     2,     2,
+       2,   102,     2,   103,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -709,7 +710,7 @@ static const yytype_int8 yytranslate[] =
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89
+      85,    86,    87,    88,    89,    90
 };
 
 #if YYDEBUG
@@ -740,16 +741,16 @@ static const yytype_int16 yyrline[] =
      661,   662,   665,   666,   669,   674,   677,   682,   688,   689,
      690,   691,   692,   695,   696,   697,   698,   699,   702,   704,
      705,   706,   707,   708,   709,   710,   711,   712,   713,   717,
-     718,   719,   720,   721,   722,   723,   726,   726,   728,   729,
-     732,   733,   734,   735,   736,   739,   740,   741,   747,   751,
-     754,   759,   760,   761,   762,   763,   766,   767,   770,   771,
-     775,   776,   777,   778,   779,   780,   781,   782,   783,   784,
-     785,   786,   787,   788,   789,   790,   791,   792,   793,   800,
+     718,   719,   720,   721,   722,   723,   724,   727,   727,   729,
+     730,   733,   734,   735,   736,   737,   740,   741,   742,   748,
+     752,   755,   760,   761,   762,   763,   764,   767,   768,   771,
+     772,   776,   777,   778,   779,   780,   781,   782,   783,   784,
+     785,   786,   787,   788,   789,   790,   791,   792,   793,   794,
      801,   802,   803,   804,   805,   806,   807,   808,   809,   810,
-     811,   812,   813,   814,   815,   816,   817,   818,   821,   822,
+     811,   812,   813,   814,   815,   816,   817,   818,   819,   822,
      823,   824,   825,   826,   827,   828,   829,   830,   831,   832,
-     833,   834,   835,   836,   837,   838,   841,   842,   845,   846,
-     849,   853
+     833,   834,   835,   836,   837,   838,   839,   842,   843,   846,
+     847,   850,   854
 };
 #endif
 
@@ -777,11 +778,11 @@ yysymbol_name (yysymbol_kind_t yysymbol)
   "tITEMS", "tLINE", "tLINES", "tWORD", "tWORDS", "tABBREVIATED",
   "tABBREV", "tABBR", "tLONG", "tSHORT", "tDATE", "tLAST", "tMENU",
   "tMENUS", "tMENUITEM", "tMENUITEMS", "tNUMBER", "tTHE", "tTIME",
-  "tXTRAS", "tSOUND", "tSPRITE", "tINTERSECTS", "tWITHIN", "tTELL",
-  "tPROPERTY", "tON", "tMETHOD", "tENDIF", "tENDREPEAT", "tENDTELL",
-  "tASSERTERROR", "'<'", "'>'", "'&'", "'+'", "'-'", "'*'", "'/'", "'\\n'",
-  "','", "'('", "')'", "'['", "']'", "':'", "$accept", "script",
-  "scriptpartlist", "scriptpart", "macro", "factory", "method",
+  "tXTRAS", "tCASTLIBS", "tSOUND", "tSPRITE", "tINTERSECTS", "tWITHIN",
+  "tTELL", "tPROPERTY", "tON", "tMETHOD", "tENDIF", "tENDREPEAT",
+  "tENDTELL", "tASSERTERROR", "'<'", "'>'", "'&'", "'+'", "'-'", "'*'",
+  "'/'", "'\\n'", "','", "'('", "')'", "'['", "']'", "':'", "$accept",
+  "script", "scriptpartlist", "scriptpart", "macro", "factory", "method",
   "methodlist", "nonemptymethodlist", "methodlistline", "handler",
   "endargdef", "CMDID", "ID", "idlist", "nonemptyidlist", "stmt",
   "stmt_insideif", "stmtoneliner", "proc", "cmdargs", "trailingcomma",
@@ -799,7 +800,7 @@ yysymbol_name (yysymbol_kind_t yysymbol)
 }
 #endif
 
-#define YYPACT_NINF (-539)
+#define YYPACT_NINF (-534)
 
 #define yypact_value_is_default(Yyn) \
   ((Yyn) == YYPACT_NINF)
@@ -813,68 +814,68 @@ yysymbol_name (yysymbol_kind_t yysymbol)
    STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    3056,  -539,  3550,  -539,  -539,  -539,  -539,    35,  -539,   -13,
-    -539,  3550,  1982,    35,  2080,  -539,  -539,  3550,  -539,    36,
-    -539,  -539,  2178,    51,  3631,  -539,   -70,  -539,  -539,  3550,
-    2178,  1982,  3550,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,  -539,  -539,  -539,  2080,  3550,  3550,   -68,
-    3873,  -539,    98,  3056,  -539,  -539,  -539,  -539,  2178,  -539,
-    -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,    19,  -539,  -539,  2276,  2276,  2080,  2080,
-    2080,  2080,    33,   -28,    12,  -539,  -539,    14,    32,  -539,
-    -539,  -539,  -539,  2276,  2276,  2276,  2276,  2080,  2080,  2374,
-    2080,  2080,  2080,  2080,  3712,  2080,  2374,  2374,  1492,   804,
-       8,    30,    43,  -539,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,   904,  -539,    62,  2080,  4045,  3550,    71,
-      82,  1002,  3550,  2080,  3550,  -539,  -539,    -2,  -539,  -539,
-      83,    85,  1100,    87,    93,    95,   527,    97,  3550,  -539,
-    -539,  -539,  -539,    99,  1198,  -539,  3550,  1590,  -539,  -539,
-    -539,   389,   605,   627,   696,     7,  -539,  -539,  -539,  3550,
-    -539,  -539,  1296,  4406,  -539,   -45,   -18,   -15,   -11,     3,
-       7,   105,   138,  4351,  -539,  -539,  -539,  4065,    73,    92,
-     100,   103,    96,   -69,   -16,  -539,  4406,   106,   102,  1688,
-    -539,  -539,   175,  2080,  2080,  2080,  2080,  2766,  2766,  2962,
-    2080,  2864,  2864,  2080,  2080,  2080,  2080,  2080,  2080,  2080,
-    2080,  -539,  -539,  4159,  -539,  -539,  4124,  3137,  2080,  2080,
-    2080,  2080,  2080,   110,  -539,  -539,  3793,  3793,  3793,     5,
-    4183,   174,  -539,  -539,  2080,     6,  -539,  2080,  -539,  -539,
-    -539,  3873,  3218,  -539,   112,  -539,  -539,  -539,  4100,  2374,
-    2080,  2374,  2080,  2374,  2080,  2374,  2080,  -539,  -539,  -539,
-    -539,    57,  -539,   184,  4419,  -539,  -539,  -539,  -539,  -539,
-    -539,  -539,  -539,  -539,  -539,  1394,  2472,  2374,  2374,  1786,
-    -539,  2080,  2080,  2080,  2080,  -539,  2080,  2570,  -539,  -539,
-    2080,  -539,   113,  2080,    29,    29,    29,    29,  4384,  4384,
-    -539,    50,    29,    29,    29,    29,    50,    10,    10,  -539,
-    -539,   113,  2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,
-    2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,
-    -539,  3461,   197,  3218,    33,  -539,   117,  -539,   118,   119,
-    2080,  2080,  3218,  2668,  4216,  3550,  3550,  -539,  -539,  -539,
-       6,  -539,  4239,  -539,  -539,  -539,   129,  3218,  -539,  3218,
-    1884,  -539,  3922,  -539,  3935,  -539,  3955,  -539,  4010,  -539,
-    -539,  2374,  2080,    57,    57,    57,    57,  2374,  -539,  2374,
-      57,  -539,  2374,  2374,  -539,  -539,  -539,  -539,  -539,  -539,
-    -539,   113,  4406,  4406,  4406,  4406,  4406,  -539,  4406,  4406,
-    2080,   120,  4406,  -539,    29,    29,    29,    29,  4384,  4384,
-    -539,    50,    29,    29,    29,    29,    50,    10,    10,  -539,
-    -539,   113,  -539,  -539,    -3,  3461,  -539,  3299,  -539,  -539,
-    -539,  -539,  4272,   511,   132,  2080,  2080,  2080,  2080,  -539,
-    -539,  -539,    53,  3550,  -539,  -539,   124,  -539,   213,  -539,
-     113,  2374,  2374,  2374,  2374,  -539,  4406,  2374,  2374,  2374,
-    2374,  -539,   195,   154,  -539,  -539,   126,  -539,  -539,  3380,
-     130,  -539,  -539,  3461,  -539,  3218,   194,  2080,   133,  -539,
-     710,  -539,  4030,   710,   710,  -539,   137,  -539,  3550,   136,
-    -539,  -539,  -539,  -539,  -539,  -539,  -539,  -539,   187,  2374,
-    -539,  -539,  3461,  -539,  -539,   173,   182,  2080,  4295,  -539,
-    2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,  2080,
-    2080,  2080,  2080,  2080,  2080,  2080,   190,  3218,    59,  -539,
-    2374,   173,  -539,   164,  4328,  3218,    77,    77,    77,  4439,
-    4439,  -539,    69,    77,    77,    77,    77,    69,    79,    79,
-    -539,  -539,  2080,  -539,  -539,  -539,  -539,  -539,  3218,   183,
-     710,   188,   179,   180,  -539,  -539
+    3047,  -534,  3547,  -534,  -534,  -534,  -534,    32,  -534,   -13,
+    -534,  3547,  1962,    32,  2061,  -534,  -534,  3547,  -534,   -10,
+    -534,  -534,  2160,    92,  3629,  -534,   -66,  -534,  -534,  3547,
+    2160,  1962,  3547,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,  -534,  -534,  -534,  2061,  3547,  3547,   -64,
+    3874,  -534,    52,  3047,  -534,  -534,  -534,  -534,  2160,  -534,
+    -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,   -53,  -534,  -534,  2259,  2259,  2061,  2061,
+    2061,  2061,   -15,   -37,    -8,  -534,  -534,    -3,    -7,  -534,
+    -534,  -534,  -534,  2259,  2259,  2259,  2259,  2061,  2061,  2358,
+    2061,  2061,  2061,  2061,  3711,  2061,  2358,  2358,  1467,   772,
+      16,    35,    40,  -534,  -534,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,   873,  -534,    42,  2061,  4069,  3547,    51,
+      54,   972,  3547,  2061,  3547,  -534,  -534,    -5,  -534,  -534,
+      59,    61,  1071,    68,    70,    77,  4035,    86,  3547,  -534,
+    -534,  -534,  -534,    88,  1170,  -534,  3547,  1566,  -534,  -534,
+    -534,   440,   597,   667,  3923,   121,  -534,  -534,  -534,  3547,
+    -534,  -534,  1269,  4382,  -534,   -20,    -9,     7,    12,    29,
+     121,   102,   159,  4369,  -534,  -534,  -534,  4092,    84,    85,
+     100,   104,    87,   -73,   -35,  -534,  4382,   103,   110,  1665,
+    -534,  -534,   184,  2061,  2061,  2061,  2061,  2754,  2754,  2952,
+    2061,  2853,  2853,  2061,  2061,  2061,  2061,  2061,  2061,  2061,
+    2061,  -534,  -534,  4185,  -534,  -534,  4125,  3129,  2061,  2061,
+    2061,  2061,  2061,   125,  -534,  -534,  3793,  3793,  3793,    21,
+    4198,   196,  -534,  -534,  2061,     8,  -534,  2061,  -534,  -534,
+    -534,  3874,  3211,  -534,   127,  -534,  -534,  -534,  4105,  2358,
+    2061,  2358,  2061,  2358,  2061,  2358,  2061,  -534,  -534,  -534,
+    -534,    34,  -534,   201,  4438,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,  -534,  -534,  -534,  1368,  2457,  2358,  2358,  1764,
+    -534,  2061,  2061,  2061,  2061,  -534,  2061,  2556,  -534,  -534,
+    2061,  -534,   130,  2061,    30,    30,    30,    30,   120,   120,
+    -534,    14,    30,    30,    30,    30,    14,     4,     4,  -534,
+    -534,   130,  2061,  2061,  2061,  2061,  2061,  2061,  2061,  2061,
+    2061,  2061,  2061,  2061,  2061,  2061,  2061,  2061,  2061,  2061,
+    -534,  3457,   216,  3211,   -15,  -534,   135,  -534,   136,   137,
+    2061,  2061,  3211,  2655,  4211,  3547,  3547,  -534,  -534,  -534,
+       8,  -534,  4268,  -534,  -534,  -534,   147,  3211,  -534,  3211,
+    1863,  -534,   463,  -534,  3943,  -534,  3956,  -534,  3979,  -534,
+    -534,  2358,  2061,    34,    34,    34,    34,  2358,  -534,  2358,
+      34,  -534,  -534,  2358,  2358,  -534,  -534,  -534,  -534,  -534,
+    -534,  -534,   130,  4382,  4382,  4382,  4382,  4382,  -534,  4382,
+    4382,  2061,   157,  4382,  -534,    30,    30,    30,    30,   120,
+     120,  -534,    14,    30,    30,    30,    30,    14,     4,     4,
+    -534,  -534,   130,  -534,  -534,    -1,  3457,  -534,  3293,  -534,
+    -534,  -534,  -534,  4281,   527,   171,  2061,  2061,  2061,  2061,
+    -534,  -534,  -534,    45,  3547,  -534,  -534,   162,  -534,   252,
+    -534,   130,  2358,  2358,  2358,  2358,  -534,  4382,  2358,  2358,
+    2358,  2358,  -534,   241,   200,  -534,  -534,   170,  -534,  -534,
+    3375,   177,  -534,  -534,  3457,  -534,  3211,   242,  2061,   179,
+    -534,  4451,  -534,  4013,  4451,  4451,  -534,   181,  -534,  3547,
+     182,  -534,  -534,  -534,  -534,  -534,  -534,  -534,  -534,   210,
+    2358,  -534,  -534,  3457,  -534,  -534,   195,   202,  2061,  4294,
+    -534,  2061,  2061,  2061,  2061,  2061,  2061,  2061,  2061,  2061,
+    2061,  2061,  2061,  2061,  2061,  2061,  2061,   214,  3211,    47,
+    -534,  2358,   195,  -534,   197,  4351,  3211,    99,    99,    99,
+    4464,  4464,  -534,   106,    99,    99,    99,    99,   106,    22,
+      22,  -534,  -534,  2061,  -534,  -534,  -534,  -534,  -534,  3211,
+     205,  4451,   209,   203,   204,  -534,  -534
 };
 
 /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -896,66 +897,66 @@ static const yytype_int16 yydefact[] =
       90,    89,    65,     0,    79,    24,     0,     0,     0,     0,
        0,     0,     0,     0,     0,   124,   101,     0,    99,   179,
      180,   182,   181,    33,    40,    64,    74,    41,    56,    58,
-      34,    46,    49,    77,    70,    68,     0,     0,     0,   328,
-     192,     0,     0,   268,   187,   188,   189,   190,   221,   222,
-     191,   269,   270,   136,   271,     0,     0,     0,    98,     0,
+      34,    46,    49,    77,    70,    68,     0,     0,     0,   329,
+     192,     0,     0,   269,   187,   188,   189,   190,   221,   222,
+     191,   270,   271,   136,   272,     0,     0,     0,    98,     0,
        0,   136,     0,     0,    70,   192,   195,     0,   196,   166,
        0,     0,   136,     0,     0,     0,     0,     0,    98,   104,
      127,     1,     4,     0,   136,    10,     0,     0,   198,   214,
      197,     0,     0,     0,     0,     0,   125,   123,   149,   100,
      212,   213,   138,   139,   183,    27,    28,    29,    51,    66,
-      48,    59,   218,     0,   266,   267,   133,     0,   179,   180,
-     182,   181,     0,   192,     0,   258,   330,     0,   329,     0,
+      48,    59,   218,     0,   267,   268,   133,     0,   179,   180,
+     182,   181,     0,   192,     0,   259,   331,     0,   330,     0,
      116,   117,    60,     0,     0,     0,     0,    31,    61,    55,
        0,    36,    69,     0,     0,     0,     0,     0,     0,     0,
-     137,   129,   289,   136,   290,   126,     0,     0,     0,     0,
+     137,   129,   290,   136,   291,   126,     0,     0,     0,     0,
        0,     0,     0,     0,   122,   115,    45,    30,    32,     0,
-       0,   248,   147,   148,     0,    14,   120,    75,   118,   119,
+       0,   249,   147,   148,     0,    14,   120,    75,   118,   119,
      151,     0,   167,   150,     0,   114,    25,   215,     0,     0,
        0,     0,     0,     0,     0,     0,     0,   208,   210,   211,
      209,     0,   102,    60,   142,   229,   230,   231,   232,   233,
      234,   235,   236,   237,   238,     0,     0,     0,     0,     0,
-     186,     0,     0,     0,     0,   256,     0,     0,   257,   255,
-       0,   184,   136,     0,   281,   282,   279,   280,   283,   284,
-     276,   286,   287,   288,   278,   277,   285,   272,   273,   274,
-     275,   136,     0,     0,     0,     0,     0,     0,     0,     0,
+     186,     0,     0,     0,     0,   257,     0,     0,   258,   256,
+       0,   184,   136,     0,   282,   283,   280,   281,   284,   285,
+     277,   287,   288,   289,   279,   278,   286,   273,   274,   275,
+     276,   136,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   137,
      131,   173,   152,   167,    70,   193,     0,   194,     0,     0,
        0,     0,   167,     0,     0,    23,     0,    18,    19,    12,
       15,    16,     0,   164,   171,   172,     0,   168,   169,   167,
-       0,   199,     0,   203,     0,   205,     0,   201,     0,   246,
-     247,     0,     0,    35,    47,    50,    78,    52,   244,    53,
-      54,   245,    67,    68,   220,   224,   223,   219,   326,   327,
-     134,   136,   264,   265,   263,   261,   262,   259,   260,   331,
-     137,     0,   141,   130,   300,   301,   298,   299,   302,   303,
-     295,   305,   306,   307,   297,   296,   304,   291,   292,   293,
-     294,   136,   177,   178,   158,   174,   175,     0,    11,   143,
-     144,   145,     0,     0,     0,    52,    53,    67,    68,   249,
-     250,   146,     0,    98,    17,   121,     0,   170,    22,   216,
-     136,     0,     0,     0,     0,   207,   140,     0,     0,     0,
-       0,   228,     0,     0,   226,   227,     0,   185,   132,     0,
-       0,   153,   176,   173,   154,   167,     0,     0,     0,   308,
-     251,   309,     0,   253,   254,    20,     0,   165,    23,     0,
-     200,   204,   206,   202,   239,   241,   242,   240,     0,     0,
-     243,   135,   173,   156,   159,   158,     0,     0,     0,   160,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   167,     0,   217,
-       0,   158,   155,     0,     0,   167,   318,   319,   317,   320,
-     321,   314,   323,   324,   325,   316,   315,   322,   310,   311,
-     312,   313,     0,    13,    21,   225,   157,   163,   167,     0,
-     252,     0,     0,     0,   161,   162
+       0,   199,     0,   203,     0,   205,     0,   201,     0,   247,
+     248,     0,     0,    35,    47,    50,    78,    52,   244,    53,
+      54,   245,   246,    67,    68,   220,   224,   223,   219,   327,
+     328,   134,   136,   265,   266,   264,   262,   263,   260,   261,
+     332,   137,     0,   141,   130,   301,   302,   299,   300,   303,
+     304,   296,   306,   307,   308,   298,   297,   305,   292,   293,
+     294,   295,   136,   177,   178,   158,   174,   175,     0,    11,
+     143,   144,   145,     0,     0,     0,    52,    53,    67,    68,
+     250,   251,   146,     0,    98,    17,   121,     0,   170,    22,
+     216,   136,     0,     0,     0,     0,   207,   140,     0,     0,
+       0,     0,   228,     0,     0,   226,   227,     0,   185,   132,
+       0,     0,   153,   176,   173,   154,   167,     0,     0,     0,
+     309,   252,   310,     0,   254,   255,    20,     0,   165,    23,
+       0,   200,   204,   206,   202,   239,   241,   242,   240,     0,
+       0,   243,   135,   173,   156,   159,   158,     0,     0,     0,
+     160,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   167,     0,
+     217,     0,   158,   155,     0,     0,   167,   319,   320,   318,
+     321,   322,   315,   324,   325,   326,   317,   316,   323,   311,
+     312,   313,   314,     0,    13,    21,   225,   157,   163,   167,
+       0,   253,     0,     0,     0,   161,   162
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -539,  -539,  -539,   198,  -539,  -539,  -539,  -539,  -539,  -121,
-    -539,  -383,     0,     9,   -27,  -539,     1,  -374,   -66,  -539,
-      17,  -242,   249,  -539,  -539,  -539,  -539,  -539,  -538,  -539,
-    -539,  -539,  -373,  -539,  -125,  -501,  -539,  -192,  -119,   -22,
-    -130,  -539,    -4,  -539,  -539,   -80,  -539,   -42,  -224,  -539,
-    -539,  -237,  -539,  -539,  -539,  -539,   -49,  -539,   205,    -6,
-      78,  -255,   -74,  -539,  -225
+    -534,  -534,  -534,   226,  -534,  -534,  -534,  -534,  -534,   -97,
+    -534,  -383,     0,     9,   -27,  -534,     1,  -374,   -60,  -534,
+       6,  -244,   273,  -534,  -534,  -534,  -534,  -534,  -533,  -534,
+    -534,  -534,  -379,  -534,   -98,  -502,  -534,  -166,  -116,   -22,
+    -107,  -534,    -4,  -534,  -534,   -14,  -534,   -12,  -202,  -534,
+    -534,  -204,  -534,  -534,  -534,  -534,   -24,  -534,   172,    -6,
+     105,  -139,  -113,  -534,  -225
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
@@ -963,11 +964,11 @@ static const yytype_int16 yydefgoto[] =
 {
        0,    72,    73,    74,    75,    76,   398,   399,   400,   401,
       77,   113,   114,   150,   127,   128,   405,    80,    81,    82,
-     151,   261,   152,    83,   284,    84,    85,    86,   521,    87,
-      88,    89,   406,   407,   408,   474,   475,   476,   153,   154,
-     386,   177,   155,   311,   156,   198,   157,   434,   435,   158,
-     159,   421,   178,   489,   160,   234,   235,   161,   162,   236,
-     263,   530,   164,   237,   238
+     151,   261,   152,    83,   284,    84,    85,    86,   522,    87,
+      88,    89,   406,   407,   408,   475,   476,   477,   153,   154,
+     386,   177,   155,   311,   156,   198,   157,   435,   436,   158,
+     159,   421,   178,   490,   160,   234,   235,   161,   162,   236,
+     263,   531,   164,   237,   238
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -975,105 +976,102 @@ static const yytype_int16 yydefgoto[] =
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      78,    79,   176,   123,   190,   185,   163,   473,   167,   165,
-     478,   115,   492,   519,   342,   395,   171,   582,   124,   484,
-     126,   380,   555,   315,   182,   163,   168,   179,   390,   189,
-     239,   316,   282,   175,   336,   361,   498,   200,   180,   170,
-     187,   126,   283,   606,   262,   116,   117,   181,   183,   391,
-     317,   581,   262,   319,   200,   210,   211,   321,   318,   270,
-     186,   320,   307,   262,   308,   322,   309,   169,   310,   206,
-      78,   323,   194,    78,    79,   262,   126,   188,   270,   324,
-     419,   250,   337,   520,   125,   420,   338,   172,   173,   264,
-     118,   396,   119,   262,   120,   193,   121,   264,   191,   270,
-     451,   473,   205,   397,   441,   258,   259,   239,   264,   207,
-     122,   208,   201,   202,   203,   204,   195,   196,   565,   453,
-     264,   255,   256,   257,   258,   259,   565,   240,   565,   566,
-     209,   212,   213,   325,   201,   202,   203,   204,   264,   223,
-     241,   273,   227,   256,   257,   258,   259,   388,   389,   473,
-     535,   196,   556,   222,   471,   578,   604,   196,   233,   265,
-     266,   294,   572,   573,   574,   575,   326,   280,   274,   571,
-     572,   573,   574,   575,   574,   575,   331,   126,   473,   275,
-     285,   279,   286,   281,   288,   500,   507,   508,   509,   510,
-     289,   298,   290,   513,   293,   332,   295,   126,   335,   516,
-     340,   343,   393,   333,   603,   296,   334,   383,   339,   409,
-     422,   450,   609,   477,   479,   480,   481,   496,   312,   528,
-     517,   537,   538,   548,   549,   403,   551,   554,   557,   518,
-     559,   532,   533,   534,   577,   611,   579,   344,   345,   346,
+      78,    79,   176,   123,   479,   185,   163,   474,   167,   165,
+     190,   115,   493,   485,   342,   520,   171,   395,   124,   380,
+     126,   169,   556,   583,   182,   163,   168,   239,   170,   282,
+     499,   336,   179,   175,   189,   361,   181,   183,   180,   283,
+     187,   126,   116,   117,   390,   195,   196,   262,   315,   607,
+     264,   582,   191,   270,   205,   262,   316,   419,   264,   317,
+     186,   206,   420,   270,   337,   391,   262,   318,   338,   264,
+      78,   566,   194,    78,    79,   319,   126,   188,   262,   270,
+     321,   264,   250,   320,   193,   125,   521,   118,   322,   119,
+     207,   120,   209,   121,   396,   208,   262,   323,   452,   264,
+     258,   259,   474,   200,   442,   324,   397,   122,   256,   257,
+     258,   259,   201,   202,   203,   204,   239,   454,   575,   576,
+     200,   210,   211,   255,   256,   257,   258,   259,   172,   173,
+     325,   212,   213,   240,   201,   202,   203,   204,   241,   223,
+     265,   273,   227,   536,   196,   605,   196,   557,   566,   274,
+     474,   567,   275,   222,   472,   566,   579,   285,   233,   286,
+     266,   294,   243,   244,   245,   246,   288,   280,   289,   270,
+     388,   389,   250,   271,   272,   290,   307,   126,   308,   474,
+     309,   279,   310,   281,   293,   501,   295,   326,   331,   332,
+     335,   298,   572,   573,   574,   575,   576,   126,   517,   604,
+     573,   574,   575,   576,   333,   296,   339,   610,   334,   340,
+     343,   253,   254,   255,   256,   257,   258,   259,   312,   508,
+     509,   510,   511,   383,   393,   409,   514,   422,   519,   451,
+     612,   403,   478,   480,   481,   482,   497,   344,   345,   346,
      347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,   359,   360,   385,   385,   385,   580,   539,   520,
-     602,   607,   348,   349,   350,   352,   353,    78,   382,   583,
-     612,   192,   387,   387,   387,   613,   614,   615,   394,   494,
-     184,   402,   497,   522,   437,   175,   175,   175,   447,   550,
-     314,    78,    78,     0,   412,     0,   414,     0,   416,     0,
-     418,     0,     0,     0,     0,   586,   587,   588,   589,   590,
-     591,   592,   593,   594,   595,   596,   597,   598,   599,   600,
-     601,   199,   199,     0,     0,   442,   443,   444,   445,     0,
-     446,   448,     0,     0,   449,     0,     0,   452,   199,   199,
-     199,   199,     0,     0,   214,     0,   233,   610,     0,     0,
-       0,   224,   225,     0,     0,     0,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,   464,   465,   466,   467,
-     468,   469,   470,     0,     0,     0,     0,     0,     0,     0,
-       0,    78,     0,    78,   482,   483,     0,     0,     0,     0,
+     357,   358,   359,   360,   385,   385,   385,   540,   518,   529,
+     538,   539,   348,   349,   350,   352,   353,    78,   382,   549,
+     550,   552,   387,   387,   387,   555,   558,   560,   394,   578,
+     581,   402,   521,   580,   603,   175,   175,   175,   199,   199,
+     584,    78,    78,   613,   412,   608,   414,   614,   416,   192,
+     418,   615,   616,   495,   184,   199,   199,   199,   199,   498,
+     523,   214,   551,   448,   438,     0,     0,   314,   224,   225,
+       0,     0,     0,     0,     0,   443,   444,   445,   446,     0,
+     447,   449,     0,     0,   450,     0,     0,   453,     0,     0,
+       0,     0,     0,     0,     0,     0,   233,     0,   533,   534,
+     535,     0,     0,     0,     0,     0,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,   471,   532,   532,   532,   532,     0,     0,     0,
+       0,    78,     0,    78,   483,   484,     0,     0,     0,     0,
        0,     0,    78,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   115,   493,     0,    78,     0,    78,
-       0,   531,   531,   531,   531,     0,   506,   299,     0,     0,
-       0,     0,     0,   300,     0,     0,     0,     0,     0,     0,
-       0,   243,   244,   245,   246,   268,   269,     0,   270,     0,
-       0,   250,   271,   272,   449,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   536,     0,     0,     0,
-       0,     0,     0,     0,     0,    78,     0,    78,   524,   253,
-     254,   255,   256,   257,   258,   259,   531,   531,   531,   531,
-     531,   531,   531,   531,   531,   531,   531,   531,   531,   531,
-     531,   531,   126,     0,   411,     0,   413,     0,   415,     0,
-     417,     0,     0,     0,     0,     0,     0,     0,     0,    78,
-     553,   558,     0,    78,     0,    78,   526,     0,   531,     0,
-     436,   436,   438,   439,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   527,     0,   115,     0,     0,
-       0,   584,    78,   243,   244,   245,   246,   268,   269,     0,
-     270,   291,     0,   250,   271,   272,     0,     0,     0,   243,
-     244,   245,   246,   268,   269,     0,   270,    78,     0,   250,
-     271,   272,     0,     0,     0,    78,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   490,     0,
-       0,   253,   254,   255,   256,   257,   258,   259,    78,     0,
-       0,     0,     0,     0,     0,     0,     0,   253,   254,   255,
-     256,   257,   258,   259,   292,     0,   505,     0,     0,     0,
-       0,     0,   511,   301,   512,     0,     0,   514,   515,   302,
-       0,     0,     0,     0,     0,     0,     0,   243,   244,   245,
-     246,   268,   269,     0,   270,   303,     0,   250,   271,   272,
+       0,     0,     0,     0,   115,   494,     0,    78,     0,    78,
+       0,     0,     0,     0,     0,     0,   507,     0,     0,     0,
+       0,     0,   587,   588,   589,   590,   591,   592,   593,   594,
+     595,   596,   597,   598,   599,   600,   601,   602,     0,     0,
+       0,     0,     0,     0,     0,   450,     0,     0,   532,   532,
+     532,   532,   532,   532,   532,   532,   532,   532,   532,   532,
+     532,   532,   532,   532,   611,     0,     0,   537,   299,     0,
+       0,   411,     0,   413,   300,   415,    78,   417,    78,   525,
+       0,     0,   243,   244,   245,   246,   268,   269,     0,   270,
+     532,   502,   250,   271,   272,     0,     0,   437,   437,   439,
+     440,     0,     0,   126,     0,   243,   244,   245,   246,   268,
+     269,     0,   270,     0,     0,   250,   271,   272,     0,     0,
+      78,   554,   559,     0,    78,     0,    78,     0,     0,     0,
+       0,   253,   254,   255,   256,   257,   258,   259,     0,     0,
+       0,     0,   527,     0,     0,     0,     0,     0,   115,     0,
+       0,     0,   585,    78,   253,   254,   255,   256,   257,   258,
+     259,   528,     0,     0,     0,   491,     0,     0,     0,   243,
+     244,   245,   246,   268,   269,     0,   270,     0,    78,   250,
+     271,   272,     0,     0,     0,     0,    78,     0,     0,     0,
+       0,     0,     0,   506,     0,     0,     0,     0,     0,   512,
+       0,   513,     0,     0,     0,   515,   516,     0,     0,    78,
+       0,     0,     0,     0,     0,     0,     0,     0,   253,   254,
+     255,   256,   257,   258,   259,   301,     0,     0,     0,     0,
+       0,   302,     0,     0,     0,     0,     0,     0,     0,   243,
+     244,   245,   246,   268,   269,     0,   270,     0,     0,   250,
+     271,   272,     0,     0,     0,     0,     0,     0,   530,   530,
+     530,   530,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   541,   542,   543,   544,     0,     0,
+     545,   546,   547,   548,     0,     0,     0,     0,   253,   254,
+     255,   256,   257,   258,   259,   303,     0,     0,     0,     0,
        0,   304,     0,     0,     0,     0,     0,     0,     0,   243,
      244,   245,   246,   268,   269,     0,   270,     0,     0,   250,
-     271,   272,     0,     0,     0,     0,     0,     0,     0,     0,
-     529,   529,   529,   529,     0,   253,   254,   255,   256,   257,
-     258,   259,     0,     0,     0,     0,   540,   541,   542,   543,
-       0,     0,   544,   545,   546,   547,     0,   253,   254,   255,
-     256,   257,   258,   259,   305,     0,     0,     0,     0,     0,
-     306,     0,     0,     0,     0,     0,     0,     0,   243,   244,
-     245,   246,   268,   269,     0,   270,     0,     0,   250,   271,
-     272,     0,   560,   561,   511,   562,   563,   564,     0,   565,
-       0,     0,   566,   567,   568,   529,   529,   529,   529,   529,
-     529,   529,   529,   529,   529,   529,   529,   529,   529,   529,
-     529,     0,     0,     0,     0,   605,   253,   254,   255,   256,
-     257,   258,   259,     0,     0,     0,     0,     0,     0,     0,
-     569,   570,   571,   572,   573,   574,   575,   529,   228,   229,
-       1,   230,   231,    90,   133,   134,   135,   136,    91,     8,
-      92,    93,    10,    94,    95,    96,    97,    15,    16,    98,
-      18,    99,    20,    21,   100,   101,   102,   103,    25,     0,
-      27,    28,   104,   105,   106,   107,     0,     0,     0,     0,
-      33,    34,   139,    36,    37,    38,     0,    39,    40,   140,
-      42,   141,    44,   142,    46,   143,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,     0,    57,    58,    59,   144,
-      61,     0,    62,   145,    64,    65,   108,   109,   110,   111,
-       0,     0,     0,   112,     0,     0,     0,   146,   147,     0,
-       0,     0,     0,   166,     0,   149,     0,   232,   129,   130,
-       1,   131,   132,    90,   133,   134,   135,   136,    91,     8,
-      92,    93,    10,    94,    95,    96,    97,    15,    16,    98,
-      18,    99,   242,    21,   100,   101,   102,   103,    25,     0,
-      27,    28,   104,   105,   106,   107,   243,   244,   245,   246,
-     247,   248,   139,   249,    37,    38,   250,   251,   252,   140,
-      42,   141,    44,   142,    46,   143,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,     0,    57,    58,    59,   144,
-      61,     0,    62,   145,    64,    65,   108,   109,   110,   111,
+     271,   272,   512,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   530,   530,   530,   530,   530,   530,   530,
+     530,   530,   530,   530,   530,   530,   530,   530,   530,     0,
+       0,     0,     0,   606,     0,     0,     0,     0,   253,   254,
+     255,   256,   257,   258,   259,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   530,   228,   229,     1,   230,
+     231,    90,   133,   134,   135,   136,    91,     8,    92,    93,
+      10,    94,    95,    96,    97,    15,    16,    98,    18,    99,
+      20,    21,   100,   101,   102,   103,    25,     0,    27,    28,
+     104,   105,   106,   107,     0,     0,     0,     0,    33,    34,
+     139,    36,    37,    38,     0,    39,    40,   140,    42,   141,
+      44,   142,    46,   143,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,     0,    57,    58,    59,   144,    61,     0,
+       0,    62,   145,    64,    65,   108,   109,   110,   111,     0,
+       0,     0,   112,     0,     0,     0,   146,   147,     0,     0,
+       0,     0,   166,     0,   149,     0,   232,   129,   130,     1,
+     131,   132,    90,   133,   134,   135,   136,    91,     8,    92,
+      93,    10,    94,    95,    96,    97,    15,    16,    98,    18,
+      99,   242,    21,   100,   101,   102,   103,    25,     0,    27,
+      28,   104,   105,   106,   107,   243,   244,   245,   246,   247,
+     248,   139,   249,    37,    38,   250,   251,   252,   140,    42,
+     141,    44,   142,    46,   143,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,     0,    57,    58,    59,   144,    61,
+       0,     0,    62,   145,    64,    65,   108,   109,   110,   111,
        0,     0,     0,   112,   253,   254,   255,   256,   257,   258,
      259,     0,   260,   166,     0,   149,   129,   130,     1,   131,
      132,    90,   133,   134,   135,   136,    91,     8,    92,    93,
@@ -1083,77 +1081,58 @@ static const yytype_int16 yytable[] =
      139,   249,   277,   278,   250,   251,   252,   140,    42,   141,
       44,   142,    46,   143,    48,    49,    50,    51,    52,    53,
       54,    55,    56,     0,    57,    58,    59,   144,    61,     0,
+       0,    62,   145,    64,    65,   108,   109,   110,   111,     0,
+       0,     0,   112,   253,   254,   255,   256,   257,   258,   259,
+       0,   260,   166,     0,   149,   129,   130,     1,   131,   132,
+      90,   133,   134,   135,   136,    91,     8,    92,    93,    10,
+      94,    95,    96,    97,    15,    16,    98,    18,    99,    20,
+      21,   100,   101,   102,   103,    25,     0,   287,    28,   104,
+     105,   106,   107,   243,   244,   245,   246,   247,   248,   139,
+     249,    37,    38,   250,   251,   252,   140,    42,   141,    44,
+     142,    46,   143,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,     0,    57,    58,    59,   144,    61,     0,     0,
       62,   145,    64,    65,   108,   109,   110,   111,     0,     0,
        0,   112,   253,   254,   255,   256,   257,   258,   259,     0,
      260,   166,     0,   149,   129,   130,     1,   131,   132,    90,
      133,   134,   135,   136,    91,     8,    92,    93,    10,    94,
       95,    96,    97,    15,    16,    98,    18,    99,    20,    21,
-     100,   101,   102,   103,    25,     0,   287,    28,   104,   105,
+     100,   101,   102,   103,    25,     0,    27,    28,   104,   105,
      106,   107,   243,   244,   245,   246,   247,   248,   139,   249,
       37,    38,   250,   251,   252,   140,    42,   141,    44,   142,
       46,   143,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,     0,    57,    58,    59,   144,    61,     0,    62,   145,
+      56,     0,    57,    58,    59,   144,    61,     0,     0,    62,
+     145,    64,    65,   108,   109,   110,   111,     0,     0,     0,
+     112,   253,   254,   255,   256,   257,   258,   259,     0,   260,
+     166,     0,   149,   129,   130,     1,   131,   132,    90,   133,
+     134,   135,   136,    91,     8,    92,    93,    10,    94,    95,
+      96,    97,    15,    16,    98,    18,    99,   313,    21,   100,
+     101,   102,   103,    25,     0,    27,    28,   104,   105,   106,
+     107,   243,   244,   245,   246,   247,   248,   139,   249,    37,
+      38,   250,   251,   252,   140,    42,   141,    44,   142,    46,
+     143,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+       0,    57,    58,    59,   144,    61,     0,     0,    62,   145,
       64,    65,   108,   109,   110,   111,     0,     0,     0,   112,
-     253,   254,   255,   256,   257,   258,   259,     0,   260,   166,
+     253,   254,   255,   256,   257,   258,   259,     0,     0,   166,
        0,   149,   129,   130,     1,   131,   132,    90,   133,   134,
-     135,   136,    91,     8,    92,    93,    10,    94,    95,    96,
-      97,    15,    16,    98,    18,    99,    20,    21,   100,   101,
-     102,   103,    25,     0,    27,    28,   104,   105,   106,   107,
-     243,   244,   245,   246,   247,   248,   139,   249,    37,    38,
-     250,   251,   252,   140,    42,   141,    44,   142,    46,   143,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,     0,
-      57,    58,    59,   144,    61,     0,    62,   145,    64,    65,
-     108,   109,   110,   111,     0,     0,     0,   112,   253,   254,
-     255,   256,   257,   258,   259,     0,   260,   166,     0,   149,
-     129,   130,     1,   131,   132,    90,   133,   134,   135,   136,
-      91,     8,    92,    93,    10,    94,    95,    96,    97,    15,
-      16,    98,    18,    99,   313,    21,   100,   101,   102,   103,
-      25,     0,    27,    28,   104,   105,   106,   107,   243,   244,
-     245,   246,   247,   248,   139,   249,    37,    38,   250,   251,
-     252,   140,    42,   141,    44,   142,    46,   143,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,     0,    57,    58,
-      59,   144,    61,     0,    62,   145,    64,    65,   108,   109,
-     110,   111,     0,     0,     0,   112,   253,   254,   255,   256,
-     257,   258,   259,     0,     0,   166,     0,   149,   129,   130,
-       1,   131,   132,    90,   133,   134,   135,   136,    91,     8,
-      92,    93,    10,    94,    95,    96,    97,    15,    16,    98,
-      18,    99,    20,    21,   100,   101,   102,   103,    25,     0,
-      27,    28,   104,   105,   106,   107,     0,     0,     0,     0,
-      33,    34,   139,    36,    37,    38,     0,    39,    40,   140,
-     423,   141,   424,   142,   425,   143,   426,    49,    50,    51,
-      52,    53,    54,    55,   427,   428,   429,   430,    59,   144,
-      61,   431,   432,   433,    64,    65,   108,   109,   110,   111,
-       0,     0,     0,   112,     0,     0,     0,   146,   147,     0,
-       0,     0,     0,   166,     0,   149,   129,   130,     1,   131,
-     132,    90,   133,   134,   135,   136,    91,     8,    92,    93,
-      10,    94,    95,    96,    97,    15,    16,    98,    18,    99,
-      20,    21,   100,   101,   102,   103,    25,     0,    27,    28,
-     104,   105,   106,   107,     0,     0,     0,     0,    33,    34,
-     139,    36,    37,    38,     0,    39,    40,   140,    42,   141,
-      44,   142,    46,   143,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,     0,    57,    58,    59,   144,    61,     0,
-      62,   145,    64,    65,   108,   109,   110,   111,     0,     0,
-       0,   112,     0,     0,     0,   146,   147,     0,     0,     0,
-       0,   166,   226,   149,   129,   130,     1,   131,   132,    90,
-     133,   134,   135,   136,    91,     8,    92,    93,    10,    94,
-      95,    96,    97,    15,    16,    98,    18,    99,    20,    21,
-     100,   101,   102,   103,    25,     0,    27,    28,   104,   105,
-     106,   107,     0,     0,     0,     0,    33,    34,   139,    36,
-      37,    38,     0,    39,    40,   140,    42,   141,    44,   142,
-      46,   143,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,     0,    57,    58,    59,   144,    61,     0,    62,   145,
-      64,    65,   108,   109,   110,   111,     0,     0,     0,   112,
-       0,     0,     0,   146,   147,     0,     0,     0,     0,   166,
-     297,   149,   129,   130,     1,   131,   132,    90,   133,   134,
      135,   136,    91,     8,    92,    93,    10,    94,    95,    96,
       97,    15,    16,    98,    18,    99,    20,    21,   100,   101,
      102,   103,    25,     0,    27,    28,   104,   105,   106,   107,
        0,     0,     0,     0,    33,    34,   139,    36,    37,    38,
-       0,    39,    40,   140,    42,   141,    44,   142,    46,   143,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,     0,
-      57,    58,    59,   144,    61,     0,    62,   145,    64,    65,
+       0,    39,    40,   140,   423,   141,   424,   142,   425,   143,
+     426,    49,    50,    51,    52,    53,    54,    55,   427,   428,
+     429,   430,    59,   144,    61,   431,   432,   433,   434,    64,
+      65,   108,   109,   110,   111,     0,     0,     0,   112,     0,
+       0,     0,   146,   147,     0,     0,     0,     0,   166,     0,
+     149,   129,   130,     1,   131,   132,    90,   133,   134,   135,
+     136,    91,     8,    92,    93,    10,    94,    95,    96,    97,
+      15,    16,    98,    18,    99,    20,    21,   100,   101,   102,
+     103,    25,     0,    27,    28,   104,   105,   106,   107,     0,
+       0,     0,     0,    33,    34,   139,    36,    37,    38,     0,
+      39,    40,   140,    42,   141,    44,   142,    46,   143,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,     0,    57,
+      58,    59,   144,    61,     0,     0,    62,   145,    64,    65,
      108,   109,   110,   111,     0,     0,     0,   112,     0,     0,
-       0,   146,   147,     0,     0,     0,     0,   166,   341,   149,
+       0,   146,   147,     0,     0,     0,     0,   166,   226,   149,
      129,   130,     1,   131,   132,    90,   133,   134,   135,   136,
       91,     8,    92,    93,    10,    94,    95,    96,    97,    15,
       16,    98,    18,    99,    20,    21,   100,   101,   102,   103,
@@ -1161,9 +1140,19 @@ static const yytype_int16 yytable[] =
        0,     0,    33,    34,   139,    36,    37,    38,     0,    39,
       40,   140,    42,   141,    44,   142,    46,   143,    48,    49,
       50,    51,    52,    53,    54,    55,    56,     0,    57,    58,
-      59,   144,    61,     0,    62,   145,    64,    65,   108,   109,
+      59,   144,    61,     0,     0,    62,   145,    64,    65,   108,
+     109,   110,   111,     0,     0,     0,   112,     0,     0,     0,
+     146,   147,     0,     0,     0,     0,   166,   297,   149,   129,
+     130,     1,   131,   132,    90,   133,   134,   135,   136,    91,
+       8,    92,    93,    10,    94,    95,    96,    97,    15,    16,
+      98,    18,    99,    20,    21,   100,   101,   102,   103,    25,
+       0,    27,    28,   104,   105,   106,   107,     0,     0,     0,
+       0,    33,    34,   139,    36,    37,    38,     0,    39,    40,
+     140,    42,   141,    44,   142,    46,   143,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,     0,    57,    58,    59,
+     144,    61,     0,     0,    62,   145,    64,    65,   108,   109,
      110,   111,     0,     0,     0,   112,     0,     0,     0,   146,
-     147,     0,     0,     0,     0,   166,   440,   149,   129,   130,
+     147,     0,     0,     0,     0,   166,   341,   149,   129,   130,
        1,   131,   132,    90,   133,   134,   135,   136,    91,     8,
       92,    93,    10,    94,    95,    96,    97,    15,    16,    98,
       18,    99,    20,    21,   100,   101,   102,   103,    25,     0,
@@ -1171,9 +1160,19 @@ static const yytype_int16 yytable[] =
       33,    34,   139,    36,    37,    38,     0,    39,    40,   140,
       42,   141,    44,   142,    46,   143,    48,    49,    50,    51,
       52,    53,    54,    55,    56,     0,    57,    58,    59,   144,
-      61,     0,    62,   145,    64,    65,   108,   109,   110,   111,
+      61,     0,     0,    62,   145,    64,    65,   108,   109,   110,
+     111,     0,     0,     0,   112,     0,     0,     0,   146,   147,
+       0,     0,     0,     0,   166,   441,   149,   129,   130,     1,
+     131,   132,    90,   133,   134,   135,   136,    91,     8,    92,
+      93,    10,    94,    95,    96,    97,    15,    16,    98,    18,
+      99,    20,    21,   100,   101,   102,   103,    25,     0,    27,
+      28,   104,   105,   106,   107,     0,     0,     0,     0,    33,
+      34,   139,    36,    37,    38,     0,    39,    40,   140,    42,
+     141,    44,   142,    46,   143,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,     0,    57,    58,    59,   144,    61,
+       0,     0,    62,   145,    64,    65,   108,   109,   110,   111,
        0,     0,     0,   112,     0,     0,     0,   146,   147,     0,
-       0,     0,     0,   166,   499,   149,   129,   130,     1,   131,
+       0,     0,     0,   166,   500,   149,   129,   130,     1,   131,
      132,    90,   133,   134,   135,   136,    91,     8,    92,    93,
      137,    94,    95,    96,    97,    15,    16,    98,   138,    99,
       20,    21,   100,   101,   102,   103,    25,     0,    27,    28,
@@ -1181,18 +1180,38 @@ static const yytype_int16 yytable[] =
      139,    36,    37,    38,     0,    39,    40,   140,    42,   141,
       44,   142,    46,   143,    48,    49,    50,    51,    52,    53,
       54,    55,    56,     0,    57,    58,    59,   144,    61,     0,
+       0,    62,   145,    64,    65,   108,   109,   110,   111,     0,
+       0,     0,   112,     0,     0,     0,   146,   147,     0,     0,
+       0,     0,   148,     0,   149,   129,   130,     1,   131,   132,
+      90,   133,   134,   135,   136,    91,     8,    92,    93,    10,
+      94,    95,    96,    97,    15,    16,    98,    18,    99,    20,
+      21,   100,   101,   102,   103,    25,     0,    27,    28,   104,
+     105,   106,   107,     0,     0,     0,     0,    33,    34,   139,
+      36,    37,    38,     0,    39,    40,   140,    42,   141,    44,
+     142,    46,   143,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,     0,    57,    58,    59,   144,    61,     0,     0,
       62,   145,    64,    65,   108,   109,   110,   111,     0,     0,
        0,   112,     0,     0,     0,   146,   147,     0,     0,     0,
-       0,   148,     0,   149,   129,   130,     1,   131,   132,    90,
+       0,   166,     0,   149,   129,   130,     1,   131,   132,    90,
      133,   134,   135,   136,    91,     8,    92,    93,    10,    94,
       95,    96,    97,    15,    16,    98,    18,    99,    20,    21,
      100,   101,   102,   103,    25,     0,    27,    28,   104,   105,
      106,   107,     0,     0,     0,     0,    33,    34,   139,    36,
       37,    38,     0,    39,    40,   140,    42,   141,    44,   142,
       46,   143,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,     0,    57,    58,    59,   144,    61,     0,    62,   145,
+      56,     0,    57,    58,    59,   144,    61,     0,     0,    62,
+     145,    64,    65,   108,   109,   110,   111,     0,     0,     0,
+     112,     0,     0,     0,   146,   147,     0,     0,     0,     0,
+     148,     0,   149,   129,   130,     1,   131,   132,    90,   133,
+     134,   135,   136,    91,     8,    92,    93,    10,    94,    95,
+      96,    97,    15,    16,    98,    18,    99,    20,    21,   100,
+     101,   102,   103,    25,     0,    27,    28,   104,   105,   106,
+     107,     0,     0,     0,     0,    33,    34,   139,    36,    37,
+      38,     0,    39,    40,   140,    42,   141,    44,   142,    46,
+     143,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+       0,    57,    58,    59,   144,    61,     0,     0,    62,    63,
       64,    65,   108,   109,   110,   111,     0,     0,     0,   112,
-       0,     0,     0,   146,   147,     0,     0,     0,     0,   166,
+       0,     0,     0,   146,   147,     0,     0,     0,     0,   197,
        0,   149,   129,   130,     1,   131,   132,    90,   133,   134,
      135,   136,    91,     8,    92,    93,    10,    94,    95,    96,
       97,    15,    16,    98,    18,    99,    20,    21,   100,   101,
@@ -1200,76 +1219,57 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,    33,    34,   139,    36,    37,    38,
        0,    39,    40,   140,    42,   141,    44,   142,    46,   143,
       48,    49,    50,    51,    52,    53,    54,    55,    56,     0,
-      57,    58,    59,   144,    61,     0,    62,   145,    64,    65,
-     108,   109,   110,   111,     0,     0,     0,   112,     0,     0,
-       0,   146,   147,     0,     0,     0,     0,   148,     0,   149,
-     129,   130,     1,   131,   132,    90,   133,   134,   135,   136,
-      91,     8,    92,    93,    10,    94,    95,    96,    97,    15,
-      16,    98,    18,    99,    20,    21,   100,   101,   102,   103,
-      25,     0,    27,    28,   104,   105,   106,   107,     0,     0,
-       0,     0,    33,    34,   139,    36,    37,    38,     0,    39,
-      40,   140,    42,   141,    44,   142,    46,   143,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,     0,    57,    58,
-      59,   144,    61,     0,    62,    63,    64,    65,   108,   109,
-     110,   111,     0,     0,     0,   112,     0,     0,     0,   146,
-     147,     0,     0,     0,     0,   197,     0,   149,   129,   130,
-       1,   131,   132,    90,   133,   134,   135,   136,    91,     8,
-      92,    93,    10,    94,    95,    96,    97,    15,    16,    98,
-      18,    99,    20,    21,   100,   101,   102,   103,    25,     0,
-      27,    28,   104,   105,   106,   107,     0,     0,     0,     0,
-      33,    34,   139,    36,    37,    38,     0,    39,    40,   140,
-      42,   141,    44,   142,    46,   143,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,     0,    57,    58,    59,   144,
-      61,     0,    62,    63,    64,    65,   108,   109,   110,   111,
-       0,     0,     0,   112,     0,     0,     0,   146,   147,     0,
-       0,     0,     0,   166,     0,   149,   129,   130,     1,   131,
-     132,    90,   133,   134,   135,   136,    91,     8,    92,    93,
-      10,    94,    95,    96,    97,    15,    16,    98,    18,    99,
-      20,    21,   100,   101,   102,   103,    25,     0,    27,    28,
-     104,   105,   106,   107,     0,     0,     0,     0,    33,    34,
-     139,    36,    37,    38,     0,    39,    40,   140,    42,   141,
-      44,   142,    46,   143,    48,    49,    50,    51,    52,    53,
-      54,    55,   427,     0,   429,    58,    59,   144,    61,     0,
-     432,   433,    64,    65,   108,   109,   110,   111,     0,     0,
-       0,   112,     0,     0,     0,   146,   147,     0,     0,     0,
-       0,   166,     0,   149,   228,   229,     1,   230,   231,    90,
-     133,   134,   135,   136,    91,     8,    92,    93,    10,    94,
-      95,    96,    97,    15,    16,    98,    18,    99,    20,    21,
-     100,   101,   102,   103,    25,     0,    27,    28,   104,   105,
-     106,   107,     0,     0,     0,     0,    33,    34,   139,    36,
-      37,    38,     0,    39,    40,   140,    42,   141,    44,   142,
-      46,   143,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,     0,    57,    58,    59,   144,    61,     0,    62,   145,
-      64,    65,   108,   109,   110,   111,     0,     0,     0,   112,
-       0,     0,     0,   146,   147,     0,     0,     0,     0,   166,
-       0,   149,   129,   130,     1,   131,   132,    90,   133,   134,
-     135,   136,    91,     8,    92,    93,    10,    94,    95,    96,
-      97,    15,    16,    98,    18,    99,    20,    21,   100,   101,
-     102,   103,    25,     0,    27,    28,   104,   105,   106,   107,
-       0,     0,     0,     0,    33,    34,   139,    36,    37,    38,
-       0,    39,    40,   140,    42,   141,    44,   142,    46,   143,
-      48,    49,    50,    51,    52,    53,    54,    55,   485,     0,
-     486,    58,    59,   144,    61,     0,   487,   488,    64,    65,
+      57,    58,    59,   144,    61,     0,     0,    62,    63,    64,
+      65,   108,   109,   110,   111,     0,     0,     0,   112,     0,
+       0,     0,   146,   147,     0,     0,     0,     0,   166,     0,
+     149,   129,   130,     1,   131,   132,    90,   133,   134,   135,
+     136,    91,     8,    92,    93,    10,    94,    95,    96,    97,
+      15,    16,    98,    18,    99,    20,    21,   100,   101,   102,
+     103,    25,     0,    27,    28,   104,   105,   106,   107,     0,
+       0,     0,     0,    33,    34,   139,    36,    37,    38,     0,
+      39,    40,   140,    42,   141,    44,   142,    46,   143,    48,
+      49,    50,    51,    52,    53,    54,    55,   427,     0,   429,
+      58,    59,   144,    61,     0,     0,   433,   434,    64,    65,
      108,   109,   110,   111,     0,     0,     0,   112,     0,     0,
        0,   146,   147,     0,     0,     0,     0,   166,     0,   149,
-     129,   130,     1,   131,   132,    90,   133,   134,   135,   136,
+     228,   229,     1,   230,   231,    90,   133,   134,   135,   136,
       91,     8,    92,    93,    10,    94,    95,    96,    97,    15,
       16,    98,    18,    99,    20,    21,   100,   101,   102,   103,
       25,     0,    27,    28,   104,   105,   106,   107,     0,     0,
-       0,     0,     0,     0,   139,    36,    37,    38,     0,    39,
+       0,     0,    33,    34,   139,    36,    37,    38,     0,    39,
       40,   140,    42,   141,    44,   142,    46,   143,    48,    49,
       50,    51,    52,    53,    54,    55,    56,     0,    57,    58,
-      59,   144,    61,     0,    62,   145,    64,    65,   108,   109,
+      59,   144,    61,     0,     0,    62,   145,    64,    65,   108,
+     109,   110,   111,     0,     0,     0,   112,     0,     0,     0,
+     146,   147,     0,     0,     0,     0,   166,     0,   149,   129,
+     130,     1,   131,   132,    90,   133,   134,   135,   136,    91,
+       8,    92,    93,    10,    94,    95,    96,    97,    15,    16,
+      98,    18,    99,    20,    21,   100,   101,   102,   103,    25,
+       0,    27,    28,   104,   105,   106,   107,     0,     0,     0,
+       0,    33,    34,   139,    36,    37,    38,     0,    39,    40,
+     140,    42,   141,    44,   142,    46,   143,    48,    49,    50,
+      51,    52,    53,    54,    55,   486,     0,   487,    58,    59,
+     144,    61,     0,     0,   488,   489,    64,    65,   108,   109,
      110,   111,     0,     0,     0,   112,     0,     0,     0,   146,
      147,     0,     0,     0,     0,   166,     0,   149,   129,   130,
        1,   131,   132,    90,   133,   134,   135,   136,    91,     8,
       92,    93,    10,    94,    95,    96,    97,    15,    16,    98,
       18,    99,    20,    21,   100,   101,   102,   103,    25,     0,
       27,    28,   104,   105,   106,   107,     0,     0,     0,     0,
-       0,     0,   139,    36,    37,    38,     0,     0,     0,   140,
+       0,     0,   139,    36,    37,    38,     0,    39,    40,   140,
       42,   141,    44,   142,    46,   143,    48,    49,    50,    51,
       52,    53,    54,    55,    56,     0,    57,    58,    59,   144,
-      61,     0,    62,   145,    64,    65,   108,   109,   110,   111,
+      61,     0,     0,    62,   145,    64,    65,   108,   109,   110,
+     111,     0,     0,     0,   112,     0,     0,     0,   146,   147,
+       0,     0,     0,     0,   166,     0,   149,   129,   130,     1,
+     131,   132,    90,   133,   134,   135,   136,    91,     8,    92,
+      93,    10,    94,    95,    96,    97,    15,    16,    98,    18,
+      99,    20,    21,   100,   101,   102,   103,    25,     0,    27,
+      28,   104,   105,   106,   107,     0,     0,     0,     0,     0,
+       0,   139,    36,    37,    38,     0,     0,     0,   140,    42,
+     141,    44,   142,    46,   143,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,     0,    57,    58,    59,   144,    61,
+       0,     0,    62,   145,    64,    65,   108,   109,   110,   111,
        0,     0,     0,   112,     0,     0,     0,   146,   147,     0,
        0,     0,     0,   166,     0,   149,   129,   130,     1,   131,
      132,    90,   133,   134,   135,   136,    91,     8,    92,    93,
@@ -1279,81 +1279,82 @@ static const yytype_int16 yytable[] =
      139,     0,    37,    38,     0,     0,     0,   140,    42,   141,
       44,   142,    46,   143,    48,    49,    50,    51,    52,    53,
       54,    55,    56,     0,    57,    58,    59,   144,    61,     0,
-      62,   145,    64,    65,   108,   109,   110,   111,     0,     0,
-       0,   112,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   166,     1,   149,     0,     2,     3,     4,     5,     6,
-       7,     8,     0,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,     0,
-      25,    26,    27,    28,    29,    30,    31,    32,     0,     0,
-       0,     0,    33,    34,    35,    36,    37,    38,     0,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,     0,    57,    58,
-      59,    60,    61,     0,    62,    63,    64,    65,    66,    67,
-      68,     0,    69,     1,     0,    70,     0,     3,     4,     5,
-       6,     7,     8,    71,     9,    10,    11,    12,    13,    14,
-      15,    16,     0,    18,    19,    20,    21,    22,    23,    24,
-       0,    25,    26,    27,    28,     0,    30,    31,    32,     0,
+       0,    62,   145,    64,    65,   108,   109,   110,   111,     0,
+       0,     0,   112,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   166,     1,   149,     0,     2,     3,     4,     5,
+       6,     7,     8,     0,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+       0,    25,    26,    27,    28,    29,    30,    31,    32,     0,
        0,     0,     0,    33,    34,    35,    36,    37,    38,     0,
       39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
       49,    50,    51,    52,    53,    54,    55,    56,     0,    57,
-      58,    59,    60,    61,     0,    62,    63,    64,    65,    66,
-      67,     0,     0,    69,     1,     0,    70,     0,     3,     4,
-       5,     6,     7,     8,   381,     9,    10,    11,    12,    13,
-      14,    15,    16,     0,    18,    19,    20,    21,    22,    23,
-      24,     0,    25,    26,    27,    28,     0,    30,    31,    32,
-       0,     0,     0,     0,    33,    34,    35,    36,    37,    38,
-       0,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,     0,
-      57,    58,    59,    60,    61,     0,    62,    63,    64,    65,
-      66,    67,     0,     0,    69,     1,     0,    70,     0,     3,
-       4,     5,     6,     7,     8,   404,     9,    10,    11,    12,
+      58,    59,    60,    61,     0,     0,    62,    63,    64,    65,
+      66,    67,    68,     0,    69,     1,     0,    70,     0,     3,
+       4,     5,     6,     7,     8,    71,     9,    10,    11,    12,
       13,    14,    15,    16,     0,    18,    19,    20,    21,    22,
       23,    24,     0,    25,    26,    27,    28,     0,    30,    31,
       32,     0,     0,     0,     0,    33,    34,    35,    36,    37,
       38,     0,    39,    40,    41,    42,    43,    44,    45,    46,
       47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-       0,    57,    58,    59,    60,    61,     0,    62,    63,    64,
-      65,    66,    67,     0,     0,    69,     1,     0,    70,     0,
-       3,     4,     5,     6,     7,     8,   523,     9,    10,    11,
-      12,    13,    14,    15,    16,     0,    18,    19,    20,    21,
-      22,    23,    24,     0,    25,    26,    27,    28,     0,    30,
-      31,    32,     0,     0,     0,     0,    33,    34,    35,    36,
-      37,    38,     0,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,     0,    57,    58,    59,    60,    61,     0,    62,    63,
+       0,    57,    58,    59,    60,    61,     0,     0,    62,    63,
       64,    65,    66,    67,     0,     0,    69,     1,     0,    70,
-       0,     3,     4,     5,     6,     7,     8,   552,     9,    10,
+       0,     3,     4,     5,     6,     7,     8,   381,     9,    10,
       11,    12,    13,    14,    15,    16,     0,    18,    19,    20,
       21,    22,    23,    24,     0,    25,    26,    27,    28,     0,
       30,    31,    32,     0,     0,     0,     0,    33,    34,    35,
       36,    37,    38,     0,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,     0,    57,    58,    59,    60,    61,     0,    62,
-      63,    64,    65,    66,    67,     0,     0,     0,     0,     0,
-      70,     0,     0,     0,     0,     0,     1,     0,   472,    90,
-       3,     4,     5,     6,    91,     8,    92,    93,    10,    94,
-      95,    96,    97,    15,    16,    98,    18,    99,    20,    21,
-     100,   101,   102,   103,    25,     0,    27,    28,   104,   105,
-     106,   107,     0,     0,     0,     0,    33,    34,    35,    36,
-      37,    38,     0,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,     0,    57,    58,    59,    60,    61,     0,    62,    63,
+      55,    56,     0,    57,    58,    59,    60,    61,     0,     0,
+      62,    63,    64,    65,    66,    67,     0,     0,    69,     1,
+       0,    70,     0,     3,     4,     5,     6,     7,     8,   404,
+       9,    10,    11,    12,    13,    14,    15,    16,     0,    18,
+      19,    20,    21,    22,    23,    24,     0,    25,    26,    27,
+      28,     0,    30,    31,    32,     0,     0,     0,     0,    33,
+      34,    35,    36,    37,    38,     0,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,     0,    57,    58,    59,    60,    61,
+       0,     0,    62,    63,    64,    65,    66,    67,     0,     0,
+      69,     1,     0,    70,     0,     3,     4,     5,     6,     7,
+       8,   524,     9,    10,    11,    12,    13,    14,    15,    16,
+       0,    18,    19,    20,    21,    22,    23,    24,     0,    25,
+      26,    27,    28,     0,    30,    31,    32,     0,     0,     0,
+       0,    33,    34,    35,    36,    37,    38,     0,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,     0,    57,    58,    59,
+      60,    61,     0,     0,    62,    63,    64,    65,    66,    67,
+       0,     0,    69,     1,     0,    70,     0,     3,     4,     5,
+       6,     7,     8,   553,     9,    10,    11,    12,    13,    14,
+      15,    16,     0,    18,    19,    20,    21,    22,    23,    24,
+       0,    25,    26,    27,    28,     0,    30,    31,    32,     0,
+       0,     0,     0,    33,    34,    35,    36,    37,    38,     0,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,     0,    57,
+      58,    59,    60,    61,     0,     0,    62,    63,    64,    65,
+      66,    67,     0,     0,     0,     0,     0,    70,     0,     0,
+       0,     0,     0,     1,     0,   473,    90,     3,     4,     5,
+       6,    91,     8,    92,    93,    10,    94,    95,    96,    97,
+      15,    16,    98,    18,    99,    20,    21,   100,   101,   102,
+     103,    25,     0,    27,    28,   104,   105,   106,   107,     0,
+       0,     0,     0,    33,    34,    35,    36,    37,    38,     0,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,     0,    57,
+      58,    59,    60,    61,     0,     0,    62,    63,    64,    65,
+     108,   109,   110,   111,     0,     1,     0,   112,    90,     3,
+       4,     5,     6,    91,     8,    92,    93,    10,    94,    95,
+      96,    97,    15,    16,    98,    18,    99,    20,    21,   100,
+     101,   102,   103,    25,     0,    27,    28,   104,   105,   106,
+     107,     0,     0,     0,     0,    33,    34,    35,    36,    37,
+      38,     0,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+       0,    57,    58,    59,   174,    61,     0,     0,    62,    63,
       64,    65,   108,   109,   110,   111,     0,     1,     0,   112,
       90,     3,     4,     5,     6,    91,     8,    92,    93,    10,
       94,    95,    96,    97,    15,    16,    98,    18,    99,    20,
       21,   100,   101,   102,   103,    25,     0,    27,    28,   104,
      105,   106,   107,     0,     0,     0,     0,    33,    34,    35,
       36,    37,    38,     0,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,     0,    57,    58,    59,   174,    61,     0,    62,
-      63,    64,    65,   108,   109,   110,   111,     0,     1,     0,
-     112,    90,     3,     4,     5,     6,    91,     8,    92,    93,
-      10,    94,    95,    96,    97,    15,    16,    98,    18,    99,
-      20,    21,   100,   101,   102,   103,    25,     0,    27,    28,
-     104,   105,   106,   107,     0,     0,     0,     0,    33,    34,
-      35,    36,    37,    38,     0,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,   215,   216,   217,   218,   219,
-      54,   220,    56,     0,    57,    58,   221,    60,    61,     0,
+      45,    46,    47,    48,   215,   216,   217,   218,   219,    54,
+     220,    56,     0,    57,    58,   221,    60,    61,     0,     0,
       62,    63,    64,    65,   108,   109,   110,   111,     0,     1,
        0,   112,    90,   133,   134,     5,     6,    91,     8,    92,
       93,    10,    94,    95,    96,    97,    15,    16,    98,    18,
@@ -1362,227 +1363,158 @@ static const yytype_int16 yytable[] =
       34,    35,    36,    37,    38,     0,    39,    40,   140,    42,
      141,    44,   142,    46,   143,    48,    49,    50,    51,    52,
       53,    54,    55,    56,     0,    57,    58,    59,   384,    61,
-       0,    62,    63,    64,    65,   108,   109,   110,   111,     1,
-       0,     0,   112,     3,     4,     5,     6,     7,     8,     0,
-       9,    10,    11,    12,    13,     0,    15,    16,     0,    18,
-      19,    20,    21,    22,   101,    24,     0,    25,     0,    27,
-      28,     0,    30,    31,    32,     0,     0,     0,     0,    33,
-      34,    35,    36,    37,    38,     0,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,     0,    57,    58,    59,    60,    61,
-     501,    62,    63,    64,    65,     0,    67,     0,     0,     0,
-       0,     0,    70,   502,   243,   244,   245,   246,   268,   269,
-       0,   270,     0,     0,   250,   271,   272,   243,   244,   245,
-     246,   268,   269,   503,   270,     0,     0,   250,   271,   272,
-       0,     0,     0,     0,     0,     0,     0,   243,   244,   245,
+       0,     0,    62,    63,    64,    65,   108,   109,   110,   111,
+       1,     0,     0,   112,     3,     4,     5,     6,     7,     8,
+       0,     9,    10,    11,    12,    13,     0,    15,    16,     0,
+      18,    19,    20,    21,    22,   101,    24,     0,    25,     0,
+      27,    28,     0,    30,    31,    32,     0,     0,     0,     0,
+      33,    34,    35,    36,    37,    38,     0,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,     0,    57,    58,    59,    60,
+      61,   305,     0,    62,    63,    64,    65,   306,    67,     0,
+       0,     0,     0,     0,    70,   243,   244,   245,   246,   268,
+     269,   503,   270,     0,     0,   250,   271,   272,     0,     0,
+       0,     0,     0,     0,   504,   243,   244,   245,   246,   268,
+     269,     0,   270,     0,     0,   250,   271,   272,   243,   244,
+     245,   246,   268,   269,     0,   270,     0,   505,   250,   271,
+     272,     0,     0,     0,   253,   254,   255,   256,   257,   258,
+     259,   243,   244,   245,   246,   268,   269,     0,   270,     0,
+       0,   250,   271,   272,   253,   254,   255,   256,   257,   258,
+     259,   577,     0,     0,     0,     0,     0,   253,   254,   255,
+     256,   257,   258,   259,     0,   561,   562,     0,   563,   564,
+     565,     0,   566,     0,     0,   567,   568,   569,     0,   291,
+     253,   254,   255,   256,   257,   258,   259,   243,   244,   245,
      246,   268,   269,     0,   270,     0,     0,   250,   271,   272,
-       0,     0,   253,   254,   255,   256,   257,   258,   259,     0,
-       0,     0,     0,     0,     0,   253,   254,   255,   256,   257,
-     258,   259,     0,     0,     0,     0,     0,     0,   504,     0,
-       0,     0,     0,     0,     0,   253,   254,   255,   256,   257,
-     258,   259,   243,   244,   245,   246,   268,   269,   576,   270,
-       0,     0,   250,   271,   272,     0,     0,     0,     0,     0,
-       0,     0,   560,   561,     0,   562,   563,   564,   267,   565,
-       0,     0,   566,   567,   568,     0,     0,   243,   244,   245,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   267,     0,   570,   571,   572,   573,   574,   575,
+     576,   243,   244,   245,   246,   268,   269,     0,   270,     0,
+       0,   250,   271,   272,     0,     0,   253,   254,   255,   256,
+     257,   258,   259,   292,   243,   244,   245,   246,   268,   269,
+       0,   270,     0,     0,   250,   271,   272,   243,   244,   245,
      246,   268,   269,     0,   270,     0,     0,   250,   271,   272,
      253,   254,   255,   256,   257,   258,   259,   243,   244,   245,
      246,   268,   269,     0,   270,     0,     0,   250,   271,   272,
-     569,   570,   571,   572,   573,   574,   575,     0,     0,     0,
-       0,     0,     0,     0,     0,   253,   254,   255,   256,   257,
-     258,   259,   243,   244,   245,   246,   268,   269,     0,   270,
-       0,     0,   250,   271,   272,   253,   254,   255,   256,   257,
-     258,   259,     0,   329,     0,   330,   243,   244,   245,   246,
-     268,   269,     0,   270,     0,     0,   250,   271,   272,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     253,   254,   255,   256,   257,   258,   259,     0,   410,     0,
-     330,   362,   363,   364,   365,   366,   367,     0,   368,     0,
-       0,   369,   370,   371,   253,   254,   255,   256,   257,   258,
-     259,     0,     0,     0,   330,   243,   244,   245,   246,   268,
-     269,     0,   270,     0,     0,   250,   271,   272,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   372,
-     373,   374,   375,   376,   377,   378,     0,   379,   243,   244,
-     245,   246,   268,   269,     0,   270,     0,     0,   250,   271,
-     272,     0,     0,   253,   254,   255,   256,   257,   258,   259,
-     392,   243,   244,   245,   246,   268,   269,     0,   270,     0,
-       0,   250,   271,   272,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   253,   254,   255,   256,   257,   258,   259,
+       0,   329,     0,   330,     0,     0,   253,   254,   255,   256,
+     257,   258,   259,     0,   410,     0,   330,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   253,   254,   255,   256,
-     257,   258,   259,   491,   243,   244,   245,   246,   268,   269,
-       0,   270,     0,     0,   250,   271,   272,     0,     0,   253,
-     254,   255,   256,   257,   258,   259,   495,   243,   244,   245,
-     246,   268,   269,     0,   270,     0,     0,   250,   271,   272,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   253,   254,   255,   256,   257,   258,   259,   525,
+     257,   258,   259,     0,     0,     0,   330,   362,   363,   364,
+     365,   366,   367,     0,   368,     0,     0,   369,   370,   371,
      243,   244,   245,   246,   268,   269,     0,   270,     0,     0,
-     250,   271,   272,     0,     0,   253,   254,   255,   256,   257,
-     258,   259,   585,   243,   244,   245,   246,   268,   269,     0,
+     250,   271,   272,   243,   244,   245,   246,   268,   269,     0,
      270,     0,     0,   250,   271,   272,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   253,   254,
-     255,   256,   257,   258,   259,   608,   243,   244,   245,   246,
-       0,   327,   328,   270,     0,     0,   250,   271,   272,     0,
-       0,   253,   254,   255,   256,   257,   258,   259,   243,   244,
-     245,   246,   268,   269,     0,   270,     0,     0,   250,   271,
-     272,   362,   363,   364,   365,   366,   367,     0,   368,     0,
-       0,   369,   370,   371,   253,   254,   255,   256,   257,   258,
-     259,   560,   561,     0,   562,     0,     0,     0,   565,     0,
-       0,   566,   567,   568,     0,     0,   253,   254,   255,   256,
-     257,   258,   259,     0,     0,     0,     0,     0,     0,   372,
+       0,     0,     0,     0,     0,     0,   372,   373,   374,   375,
+     376,   377,   378,     0,   379,     0,     0,     0,     0,   253,
+     254,   255,   256,   257,   258,   259,   392,     0,     0,     0,
+       0,     0,   253,   254,   255,   256,   257,   258,   259,   492,
+     243,   244,   245,   246,   268,   269,     0,   270,     0,     0,
+     250,   271,   272,   243,   244,   245,   246,   268,   269,     0,
+     270,     0,     0,   250,   271,   272,   243,   244,   245,   246,
+     268,   269,     0,   270,     0,     0,   250,   271,   272,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   253,
+     254,   255,   256,   257,   258,   259,   496,     0,     0,     0,
+       0,     0,   253,   254,   255,   256,   257,   258,   259,   526,
+       0,     0,     0,     0,     0,   253,   254,   255,   256,   257,
+     258,   259,   586,   243,   244,   245,   246,   268,   269,     0,
+     270,     0,     0,   250,   271,   272,     0,     0,     0,     0,
+       0,   243,   244,   245,   246,   268,   269,     0,   270,     0,
+       0,   250,   271,   272,   243,   244,   245,   246,   268,   269,
+       0,   270,     0,     0,   250,   271,   272,     0,     0,     0,
+       0,     0,   253,   254,   255,   256,   257,   258,   259,   609,
+     327,   328,     0,     0,     0,     0,     0,     0,     0,     0,
+     253,   254,   255,   256,   257,   258,   259,     0,     0,     0,
+       0,     0,     0,   253,   254,   255,   256,   257,   258,   259,
+     362,   363,   364,   365,   366,   367,     0,   368,     0,     0,
+     369,   370,   371,   561,   562,     0,   563,   564,   565,     0,
+     566,     0,     0,   567,   568,   569,   561,   562,     0,   563,
+       0,     0,     0,   566,     0,     0,   567,   568,   569,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   372,
      373,   374,   375,   376,   377,   378,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   569,
-     570,   571,   572,   573,   574,   575
+       0,     0,   570,   571,   572,   573,   574,   575,   576,     0,
+       0,     0,     0,     0,     0,   570,   571,   572,   573,   574,
+     575,   576
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,     0,    24,     7,    70,    32,    12,   381,    14,    13,
-     383,     2,   395,    16,   239,     9,    22,   555,    31,   392,
-      11,   263,   523,    68,    30,    31,    17,    97,    23,    97,
-      99,    76,    34,    24,   103,   260,   409,   117,    29,    22,
-      67,    32,    44,   581,   163,    10,    11,    30,    31,    44,
-      68,   552,   171,    68,   134,   135,   136,    68,    76,    49,
-      66,    76,    55,   182,    57,    76,    59,    31,    61,    97,
-      70,    68,    78,    73,    73,   194,    67,    68,    49,    76,
-      23,    52,    98,    86,    97,    28,   102,    36,    37,   163,
-      55,    85,    57,   212,    59,    78,    61,   171,     0,    49,
-     342,   475,    69,    97,   329,    95,    96,    99,   182,    97,
-      75,    97,   118,   119,   120,   121,    97,    98,    49,   361,
-     194,    92,    93,    94,    95,    96,    49,    97,    49,    52,
-      98,   137,   138,    28,   140,   141,   142,   143,   212,   145,
-      97,   168,   148,    93,    94,    95,    96,   277,   278,   523,
-      97,    98,   525,   144,   379,   538,    97,    98,   149,    97,
-     166,   188,    93,    94,    95,    96,    28,   173,    97,    92,
-      93,    94,    95,    96,    95,    96,   103,   168,   552,    97,
-      97,   172,    97,   174,    97,   410,   423,   424,   425,   426,
-      97,   197,    97,   430,    97,   103,    97,   188,   102,   441,
-      98,    26,    28,   103,   577,   196,   103,    97,   102,    97,
-      26,    98,   585,    16,    97,    97,    97,    88,   209,    87,
-     100,    97,     9,    28,    70,   291,   100,    97,    34,   471,
-      97,   486,   487,   488,    97,   608,   100,   243,   244,   245,
+       0,     0,    24,     7,   383,    32,    12,   381,    14,    13,
+      70,     2,   395,   392,   239,    16,    22,     9,    31,   263,
+      11,    31,   524,   556,    30,    31,    17,   100,    22,    34,
+     409,   104,    98,    24,    98,   260,    30,    31,    29,    44,
+      67,    32,    10,    11,    23,    98,    99,   163,    68,   582,
+     163,   553,     0,    49,    69,   171,    76,    23,   171,    68,
+      66,    98,    28,    49,    99,    44,   182,    76,   103,   182,
+      70,    49,    78,    73,    73,    68,    67,    68,   194,    49,
+      68,   194,    52,    76,    78,    98,    87,    55,    76,    57,
+      98,    59,    99,    61,    86,    98,   212,    68,   342,   212,
+      96,    97,   476,   117,   329,    76,    98,    75,    94,    95,
+      96,    97,   118,   119,   120,   121,   100,   361,    96,    97,
+     134,   135,   136,    93,    94,    95,    96,    97,    36,    37,
+      28,   137,   138,    98,   140,   141,   142,   143,    98,   145,
+      98,   168,   148,    98,    99,    98,    99,   526,    49,    98,
+     524,    52,    98,   144,   379,    49,   539,    98,   149,    98,
+     166,   188,    42,    43,    44,    45,    98,   173,    98,    49,
+     277,   278,    52,    53,    54,    98,    55,   168,    57,   553,
+      59,   172,    61,   174,    98,   410,    98,    28,   104,   104,
+     103,   197,    93,    94,    95,    96,    97,   188,   442,   578,
+      94,    95,    96,    97,   104,   196,   103,   586,   104,    99,
+      26,    91,    92,    93,    94,    95,    96,    97,   209,   423,
+     424,   425,   426,    98,    28,    98,   430,    26,   472,    99,
+     609,   291,    16,    98,    98,    98,    89,   243,   244,   245,
      246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   276,   277,   278,    70,   500,    86,
-      70,    97,   268,   269,   270,   271,   272,   267,   267,    87,
-      87,    73,   276,   277,   278,    87,    97,    97,   284,   400,
-      31,   287,   407,   475,   326,   276,   277,   278,   337,   513,
-     212,   291,   292,    -1,   300,    -1,   302,    -1,   304,    -1,
-     306,    -1,    -1,    -1,    -1,   560,   561,   562,   563,   564,
-     565,   566,   567,   568,   569,   570,   571,   572,   573,   574,
-     575,   116,   117,    -1,    -1,   331,   332,   333,   334,    -1,
-     336,   337,    -1,    -1,   340,    -1,    -1,   343,   133,   134,
-     135,   136,    -1,    -1,   139,    -1,   337,   602,    -1,    -1,
-      -1,   146,   147,    -1,    -1,    -1,   362,   363,   364,   365,
+     256,   257,   258,   259,   276,   277,   278,   501,   101,    88,
+      98,     9,   268,   269,   270,   271,   272,   267,   267,    28,
+      70,   101,   276,   277,   278,    98,    34,    98,   284,    98,
+      70,   287,    87,   101,    70,   276,   277,   278,   116,   117,
+      88,   291,   292,    88,   300,    98,   302,    88,   304,    73,
+     306,    98,    98,   400,    31,   133,   134,   135,   136,   407,
+     476,   139,   514,   337,   326,    -1,    -1,   212,   146,   147,
+      -1,    -1,    -1,    -1,    -1,   331,   332,   333,   334,    -1,
+     336,   337,    -1,    -1,   340,    -1,    -1,   343,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   337,    -1,   487,   488,
+     489,    -1,    -1,    -1,    -1,    -1,   362,   363,   364,   365,
      366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     376,   377,   378,   486,   487,   488,   489,    -1,    -1,    -1,
       -1,   381,    -1,   383,   390,   391,    -1,    -1,    -1,    -1,
       -1,    -1,   392,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,   395,   396,    -1,   407,    -1,   409,
-      -1,   485,   486,   487,   488,    -1,   422,    28,    -1,    -1,
-      -1,    -1,    -1,    34,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    42,    43,    44,    45,    46,    47,    -1,    49,    -1,
-      -1,    52,    53,    54,   450,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   493,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   475,    -1,   477,   477,    90,
-      91,    92,    93,    94,    95,    96,   560,   561,   562,   563,
-     564,   565,   566,   567,   568,   569,   570,   571,   572,   573,
-     574,   575,   493,    -1,   299,    -1,   301,    -1,   303,    -1,
-     305,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   519,
-     519,   527,    -1,   523,    -1,   525,    15,    -1,   602,    -1,
-     325,   326,   327,   328,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    34,    -1,   538,    -1,    -1,
-      -1,   557,   552,    42,    43,    44,    45,    46,    47,    -1,
-      49,    34,    -1,    52,    53,    54,    -1,    -1,    -1,    42,
-      43,    44,    45,    46,    47,    -1,    49,   577,    -1,    52,
-      53,    54,    -1,    -1,    -1,   585,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   393,    -1,
-      -1,    90,    91,    92,    93,    94,    95,    96,   608,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,
-      93,    94,    95,    96,    97,    -1,   421,    -1,    -1,    -1,
-      -1,    -1,   427,    28,   429,    -1,    -1,   432,   433,    34,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,
-      45,    46,    47,    -1,    49,    28,    -1,    52,    53,    54,
+      -1,    -1,    -1,    -1,    -1,    -1,   422,    -1,    -1,    -1,
+      -1,    -1,   561,   562,   563,   564,   565,   566,   567,   568,
+     569,   570,   571,   572,   573,   574,   575,   576,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   451,    -1,    -1,   561,   562,
+     563,   564,   565,   566,   567,   568,   569,   570,   571,   572,
+     573,   574,   575,   576,   603,    -1,    -1,   494,    28,    -1,
+      -1,   299,    -1,   301,    34,   303,   476,   305,   478,   478,
+      -1,    -1,    42,    43,    44,    45,    46,    47,    -1,    49,
+     603,    28,    52,    53,    54,    -1,    -1,   325,   326,   327,
+     328,    -1,    -1,   494,    -1,    42,    43,    44,    45,    46,
+      47,    -1,    49,    -1,    -1,    52,    53,    54,    -1,    -1,
+     520,   520,   528,    -1,   524,    -1,   526,    -1,    -1,    -1,
+      -1,    91,    92,    93,    94,    95,    96,    97,    -1,    -1,
+      -1,    -1,    15,    -1,    -1,    -1,    -1,    -1,   539,    -1,
+      -1,    -1,   558,   553,    91,    92,    93,    94,    95,    96,
+      97,    34,    -1,    -1,    -1,   393,    -1,    -1,    -1,    42,
+      43,    44,    45,    46,    47,    -1,    49,    -1,   578,    52,
+      53,    54,    -1,    -1,    -1,    -1,   586,    -1,    -1,    -1,
+      -1,    -1,    -1,   421,    -1,    -1,    -1,    -1,    -1,   427,
+      -1,   429,    -1,    -1,    -1,   433,   434,    -1,    -1,   609,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    28,    -1,    -1,    -1,    -1,
       -1,    34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,
       43,    44,    45,    46,    47,    -1,    49,    -1,    -1,    52,
-      53,    54,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     485,   486,   487,   488,    -1,    90,    91,    92,    93,    94,
-      95,    96,    -1,    -1,    -1,    -1,   501,   502,   503,   504,
-      -1,    -1,   507,   508,   509,   510,    -1,    90,    91,    92,
-      93,    94,    95,    96,    28,    -1,    -1,    -1,    -1,    -1,
-      34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    43,
-      44,    45,    46,    47,    -1,    49,    -1,    -1,    52,    53,
-      54,    -1,    42,    43,   549,    45,    46,    47,    -1,    49,
-      -1,    -1,    52,    53,    54,   560,   561,   562,   563,   564,
-     565,   566,   567,   568,   569,   570,   571,   572,   573,   574,
-     575,    -1,    -1,    -1,    -1,   580,    90,    91,    92,    93,
-      94,    95,    96,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      90,    91,    92,    93,    94,    95,    96,   602,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    -1,
-      36,    37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,
-      46,    47,    48,    49,    50,    51,    -1,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    -1,    72,    73,    74,    75,
-      76,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    94,    -1,
-      -1,    -1,    -1,    99,    -1,   101,    -1,   103,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    -1,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    -1,    72,    73,    74,    75,
-      76,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    -1,    -1,    89,    90,    91,    92,    93,    94,    95,
-      96,    -1,    98,    99,    -1,   101,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    -1,
-      -1,    89,    90,    91,    92,    93,    94,    95,    96,    -1,
-      98,    99,    -1,   101,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    -1,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,    -1,    -1,    89,
-      90,    91,    92,    93,    94,    95,    96,    -1,    98,    99,
-      -1,   101,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    74,    75,    76,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    -1,    -1,    -1,    89,    90,    91,
-      92,    93,    94,    95,    96,    -1,    98,    99,    -1,   101,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    -1,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      74,    75,    76,    -1,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    -1,    -1,    89,    90,    91,    92,    93,
-      94,    95,    96,    -1,    -1,    99,    -1,   101,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    -1,
-      36,    37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,
-      46,    47,    48,    49,    50,    51,    -1,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    94,    -1,
-      -1,    -1,    -1,    99,    -1,   101,     4,     5,     6,     7,
+      53,    54,    -1,    -1,    -1,    -1,    -1,    -1,   486,   487,
+     488,   489,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   502,   503,   504,   505,    -1,    -1,
+     508,   509,   510,   511,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    28,    -1,    -1,    -1,    -1,
+      -1,    34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,
+      43,    44,    45,    46,    47,    -1,    49,    -1,    -1,    52,
+      53,    54,   550,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   561,   562,   563,   564,   565,   566,   567,
+     568,   569,   570,   571,   572,   573,   574,   575,   576,    -1,
+      -1,    -1,    -1,   581,    -1,    -1,    -1,    -1,    91,    92,
+      93,    94,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   603,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,
@@ -1590,77 +1522,78 @@ static const yytype_int16 yycheck[] =
       48,    49,    50,    51,    -1,    53,    54,    55,    56,    57,
       58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
       68,    69,    70,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    -1,
-      -1,    89,    -1,    -1,    -1,    93,    94,    -1,    -1,    -1,
-      -1,    99,   100,   101,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    -1,    36,    37,    38,    39,
-      40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,
-      50,    51,    -1,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,    -1,    -1,    89,
-      -1,    -1,    -1,    93,    94,    -1,    -1,    -1,    -1,    99,
-     100,   101,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,
-      -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,    51,
-      -1,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    74,    75,    76,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    -1,    -1,    -1,    89,    -1,    -1,
-      -1,    93,    94,    -1,    -1,    -1,    -1,    99,   100,   101,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    -1,    36,    37,    38,    39,    40,    41,    -1,    -1,
-      -1,    -1,    46,    47,    48,    49,    50,    51,    -1,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      74,    75,    76,    -1,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    -1,    -1,    89,    -1,    -1,    -1,    93,
-      94,    -1,    -1,    -1,    -1,    99,   100,   101,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    -1,
-      36,    37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,
-      46,    47,    48,    49,    50,    51,    -1,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    -1,    72,    73,    74,    75,
-      76,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    94,    -1,
-      -1,    -1,    -1,    99,   100,   101,     4,     5,     6,     7,
+      -1,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
+      -1,    -1,    90,    -1,    -1,    -1,    94,    95,    -1,    -1,
+      -1,    -1,   100,    -1,   102,    -1,   104,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    -1,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    90,    91,    92,    93,    94,    95,    96,
+      97,    -1,    99,   100,    -1,   102,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,
-      38,    39,    40,    41,    -1,    -1,    -1,    -1,    46,    47,
-      48,    49,    50,    51,    -1,    53,    54,    55,    56,    57,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
       58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
       68,    69,    70,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    -1,
-      -1,    89,    -1,    -1,    -1,    93,    94,    -1,    -1,    -1,
-      -1,    99,    -1,   101,     4,     5,     6,     7,     8,     9,
+      -1,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
+      -1,    -1,    90,    91,    92,    93,    94,    95,    96,    97,
+      -1,    99,   100,    -1,   102,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    -1,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    74,    75,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
+      -1,    90,    91,    92,    93,    94,    95,    96,    97,    -1,
+      99,   100,    -1,   102,     4,     5,     6,     7,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       30,    31,    32,    33,    34,    -1,    36,    37,    38,    39,
-      40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,
-      50,    51,    -1,    53,    54,    55,    56,    57,    58,    59,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,    -1,    -1,    89,
-      -1,    -1,    -1,    93,    94,    -1,    -1,    -1,    -1,    99,
-      -1,   101,     4,     5,     6,     7,     8,     9,    10,    11,
+      70,    -1,    72,    73,    74,    75,    76,    -1,    -1,    79,
+      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
+      90,    91,    92,    93,    94,    95,    96,    97,    -1,    99,
+     100,    -1,   102,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    74,    75,    76,    -1,    -1,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    90,
+      91,    92,    93,    94,    95,    96,    97,    -1,    -1,   100,
+      -1,   102,     4,     5,     6,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,
       -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,    51,
       -1,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    74,    75,    76,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    -1,    -1,    -1,    89,    -1,    -1,
-      -1,    93,    94,    -1,    -1,    -1,    -1,    99,    -1,   101,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    -1,    -1,    -1,    90,    -1,
+      -1,    -1,    94,    95,    -1,    -1,    -1,    -1,   100,    -1,
+     102,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    -1,    36,    37,    38,    39,    40,    41,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    90,    -1,    -1,
+      -1,    94,    95,    -1,    -1,    -1,    -1,   100,   101,   102,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
@@ -1668,9 +1601,19 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    46,    47,    48,    49,    50,    51,    -1,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      74,    75,    76,    -1,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    -1,    -1,    89,    -1,    -1,    -1,    93,
-      94,    -1,    -1,    -1,    -1,    99,    -1,   101,     4,     5,
+      74,    75,    76,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    85,    86,    -1,    -1,    -1,    90,    -1,    -1,    -1,
+      94,    95,    -1,    -1,    -1,    -1,   100,   101,   102,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      -1,    36,    37,    38,    39,    40,    41,    -1,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    -1,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    74,
+      75,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
+      85,    86,    -1,    -1,    -1,    90,    -1,    -1,    -1,    94,
+      95,    -1,    -1,    -1,    -1,   100,   101,   102,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
       26,    27,    28,    29,    30,    31,    32,    33,    34,    -1,
@@ -1678,9 +1621,19 @@ static const yytype_int16 yycheck[] =
       46,    47,    48,    49,    50,    51,    -1,    53,    54,    55,
       56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
       66,    67,    68,    69,    70,    -1,    72,    73,    74,    75,
-      76,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    94,    -1,
-      -1,    -1,    -1,    99,    -1,   101,     4,     5,     6,     7,
+      76,    -1,    -1,    79,    80,    81,    82,    83,    84,    85,
+      86,    -1,    -1,    -1,    90,    -1,    -1,    -1,    94,    95,
+      -1,    -1,    -1,    -1,   100,   101,   102,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    -1,    36,
+      37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,    46,
+      47,    48,    49,    50,    51,    -1,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    90,    -1,    -1,    -1,    94,    95,    -1,
+      -1,    -1,    -1,   100,   101,   102,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,
@@ -1688,48 +1641,98 @@ static const yytype_int16 yycheck[] =
       48,    49,    50,    51,    -1,    53,    54,    55,    56,    57,
       58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
       68,    69,    70,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    -1,
-      -1,    89,    -1,    -1,    -1,    93,    94,    -1,    -1,    -1,
-      -1,    99,    -1,   101,     4,     5,     6,     7,     8,     9,
+      -1,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
+      -1,    -1,    90,    -1,    -1,    -1,    94,    95,    -1,    -1,
+      -1,    -1,   100,    -1,   102,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    -1,    36,    37,    38,
+      39,    40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,
+      49,    50,    51,    -1,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    -1,    72,    73,    74,    75,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
+      -1,    90,    -1,    -1,    -1,    94,    95,    -1,    -1,    -1,
+      -1,   100,    -1,   102,     4,     5,     6,     7,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       30,    31,    32,    33,    34,    -1,    36,    37,    38,    39,
       40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,
       50,    51,    -1,    53,    54,    55,    56,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,    -1,    -1,    89,
-      -1,    -1,    -1,    93,    94,    -1,    -1,    -1,    -1,    99,
-      -1,   101,     4,     5,     6,     7,     8,     9,    10,    11,
+      70,    -1,    72,    73,    74,    75,    76,    -1,    -1,    79,
+      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
+      90,    -1,    -1,    -1,    94,    95,    -1,    -1,    -1,    -1,
+     100,    -1,   102,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,
+      41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
+      51,    -1,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    74,    75,    76,    -1,    -1,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    90,
+      -1,    -1,    -1,    94,    95,    -1,    -1,    -1,    -1,   100,
+      -1,   102,     4,     5,     6,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,    33,    34,    -1,    36,    37,    38,    39,    40,    41,
       -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,    51,
       -1,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    74,    75,    76,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    -1,    -1,    -1,    89,    -1,    -1,
-      -1,    93,    94,    -1,    -1,    -1,    -1,    99,    -1,   101,
+      72,    73,    74,    75,    76,    -1,    -1,    79,    80,    81,
+      82,    83,    84,    85,    86,    -1,    -1,    -1,    90,    -1,
+      -1,    -1,    94,    95,    -1,    -1,    -1,    -1,   100,    -1,
+     102,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    -1,    36,    37,    38,    39,    40,    41,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    90,    -1,    -1,
+      -1,    94,    95,    -1,    -1,    -1,    -1,   100,    -1,   102,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    -1,    36,    37,    38,    39,    40,    41,    -1,    -1,
-      -1,    -1,    -1,    -1,    48,    49,    50,    51,    -1,    53,
+      -1,    -1,    46,    47,    48,    49,    50,    51,    -1,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      74,    75,    76,    -1,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    -1,    -1,    89,    -1,    -1,    -1,    93,
-      94,    -1,    -1,    -1,    -1,    99,    -1,   101,     4,     5,
+      74,    75,    76,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    85,    86,    -1,    -1,    -1,    90,    -1,    -1,    -1,
+      94,    95,    -1,    -1,    -1,    -1,   100,    -1,   102,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      -1,    36,    37,    38,    39,    40,    41,    -1,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    -1,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    74,
+      75,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
+      85,    86,    -1,    -1,    -1,    90,    -1,    -1,    -1,    94,
+      95,    -1,    -1,    -1,    -1,   100,    -1,   102,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
       26,    27,    28,    29,    30,    31,    32,    33,    34,    -1,
       36,    37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,
-      -1,    -1,    48,    49,    50,    51,    -1,    -1,    -1,    55,
+      -1,    -1,    48,    49,    50,    51,    -1,    53,    54,    55,
       56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
       66,    67,    68,    69,    70,    -1,    72,    73,    74,    75,
-      76,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    94,    -1,
-      -1,    -1,    -1,    99,    -1,   101,     4,     5,     6,     7,
+      76,    -1,    -1,    79,    80,    81,    82,    83,    84,    85,
+      86,    -1,    -1,    -1,    90,    -1,    -1,    -1,    94,    95,
+      -1,    -1,    -1,    -1,   100,    -1,   102,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    -1,    36,
+      37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    48,    49,    50,    51,    -1,    -1,    -1,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    85,    86,
+      -1,    -1,    -1,    90,    -1,    -1,    -1,    94,    95,    -1,
+      -1,    -1,    -1,   100,    -1,   102,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,
@@ -1737,156 +1740,160 @@ static const yytype_int16 yycheck[] =
       48,    -1,    50,    51,    -1,    -1,    -1,    55,    56,    57,
       58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
       68,    69,    70,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,    -1,
-      -1,    89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,     6,   101,    -1,     9,    10,    11,    12,    13,
-      14,    15,    -1,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    -1,
-      34,    35,    36,    37,    38,    39,    40,    41,    -1,    -1,
-      -1,    -1,    46,    47,    48,    49,    50,    51,    -1,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      74,    75,    76,    -1,    78,    79,    80,    81,    82,    83,
-      84,    -1,    86,     6,    -1,    89,    -1,    10,    11,    12,
-      13,    14,    15,    97,    17,    18,    19,    20,    21,    22,
-      23,    24,    -1,    26,    27,    28,    29,    30,    31,    32,
-      -1,    34,    35,    36,    37,    -1,    39,    40,    41,    -1,
+      -1,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
+      -1,    -1,    90,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   100,     6,   102,    -1,     9,    10,    11,    12,
+      13,    14,    15,    -1,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      -1,    34,    35,    36,    37,    38,    39,    40,    41,    -1,
       -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
       53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
       63,    64,    65,    66,    67,    68,    69,    70,    -1,    72,
-      73,    74,    75,    76,    -1,    78,    79,    80,    81,    82,
-      83,    -1,    -1,    86,     6,    -1,    89,    -1,    10,    11,
-      12,    13,    14,    15,    97,    17,    18,    19,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
-      32,    -1,    34,    35,    36,    37,    -1,    39,    40,    41,
-      -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,    51,
-      -1,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    -1,
-      72,    73,    74,    75,    76,    -1,    78,    79,    80,    81,
-      82,    83,    -1,    -1,    86,     6,    -1,    89,    -1,    10,
-      11,    12,    13,    14,    15,    97,    17,    18,    19,    20,
+      73,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,     6,    -1,    90,    -1,    10,
+      11,    12,    13,    14,    15,    98,    17,    18,    19,    20,
       21,    22,    23,    24,    -1,    26,    27,    28,    29,    30,
       31,    32,    -1,    34,    35,    36,    37,    -1,    39,    40,
       41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
       51,    -1,    53,    54,    55,    56,    57,    58,    59,    60,
       61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      -1,    72,    73,    74,    75,    76,    -1,    78,    79,    80,
-      81,    82,    83,    -1,    -1,    86,     6,    -1,    89,    -1,
-      10,    11,    12,    13,    14,    15,    97,    17,    18,    19,
-      20,    21,    22,    23,    24,    -1,    26,    27,    28,    29,
-      30,    31,    32,    -1,    34,    35,    36,    37,    -1,    39,
-      40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,
-      50,    51,    -1,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    78,    79,
-      80,    81,    82,    83,    -1,    -1,    86,     6,    -1,    89,
-      -1,    10,    11,    12,    13,    14,    15,    97,    17,    18,
+      -1,    72,    73,    74,    75,    76,    -1,    -1,    79,    80,
+      81,    82,    83,    84,    -1,    -1,    87,     6,    -1,    90,
+      -1,    10,    11,    12,    13,    14,    15,    98,    17,    18,
       19,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
       29,    30,    31,    32,    -1,    34,    35,    36,    37,    -1,
       39,    40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,
       49,    50,    51,    -1,    53,    54,    55,    56,    57,    58,
       59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    74,    75,    76,    -1,    78,
-      79,    80,    81,    82,    83,    -1,    -1,    -1,    -1,    -1,
-      89,    -1,    -1,    -1,    -1,    -1,     6,    -1,    97,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    -1,    36,    37,    38,    39,
-      40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,
-      50,    51,    -1,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    78,    79,
-      80,    81,    82,    83,    84,    85,    -1,     6,    -1,    89,
+      69,    70,    -1,    72,    73,    74,    75,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    -1,    -1,    87,     6,
+      -1,    90,    -1,    10,    11,    12,    13,    14,    15,    98,
+      17,    18,    19,    20,    21,    22,    23,    24,    -1,    26,
+      27,    28,    29,    30,    31,    32,    -1,    34,    35,    36,
+      37,    -1,    39,    40,    41,    -1,    -1,    -1,    -1,    46,
+      47,    48,    49,    50,    51,    -1,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    -1,    72,    73,    74,    75,    76,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    -1,    -1,
+      87,     6,    -1,    90,    -1,    10,    11,    12,    13,    14,
+      15,    98,    17,    18,    19,    20,    21,    22,    23,    24,
+      -1,    26,    27,    28,    29,    30,    31,    32,    -1,    34,
+      35,    36,    37,    -1,    39,    40,    41,    -1,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    -1,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    -1,    72,    73,    74,
+      75,    76,    -1,    -1,    79,    80,    81,    82,    83,    84,
+      -1,    -1,    87,     6,    -1,    90,    -1,    10,    11,    12,
+      13,    14,    15,    98,    17,    18,    19,    20,    21,    22,
+      23,    24,    -1,    26,    27,    28,    29,    30,    31,    32,
+      -1,    34,    35,    36,    37,    -1,    39,    40,    41,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    -1,    -1,    -1,    -1,    -1,    90,    -1,    -1,
+      -1,    -1,    -1,     6,    -1,    98,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    -1,    36,    37,    38,    39,    40,    41,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    -1,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,     6,    -1,    90,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    -1,    36,    37,    38,    39,    40,
+      41,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
+      51,    -1,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      -1,    72,    73,    74,    75,    76,    -1,    -1,    79,    80,
+      81,    82,    83,    84,    85,    86,    -1,     6,    -1,    90,
        9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
       29,    30,    31,    32,    33,    34,    -1,    36,    37,    38,
       39,    40,    41,    -1,    -1,    -1,    -1,    46,    47,    48,
       49,    50,    51,    -1,    53,    54,    55,    56,    57,    58,
       59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    74,    75,    76,    -1,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,     6,    -1,
-      89,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    -1,    36,    37,
-      38,    39,    40,    41,    -1,    -1,    -1,    -1,    46,    47,
-      48,    49,    50,    51,    -1,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    -1,    72,    73,    74,    75,    76,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    -1,     6,
-      -1,    89,     9,    10,    11,    12,    13,    14,    15,    16,
+      69,    70,    -1,    72,    73,    74,    75,    76,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    85,    86,    -1,     6,
+      -1,    90,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,    29,    30,    31,    32,    33,    34,    -1,    36,
       37,    38,    39,    40,    41,    -1,    -1,    -1,    -1,    46,
       47,    48,    49,    50,    51,    -1,    53,    54,    55,    56,
       57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
       67,    68,    69,    70,    -1,    72,    73,    74,    75,    76,
-      -1,    78,    79,    80,    81,    82,    83,    84,    85,     6,
-      -1,    -1,    89,    10,    11,    12,    13,    14,    15,    -1,
-      17,    18,    19,    20,    21,    -1,    23,    24,    -1,    26,
-      27,    28,    29,    30,    31,    32,    -1,    34,    -1,    36,
-      37,    -1,    39,    40,    41,    -1,    -1,    -1,    -1,    46,
-      47,    48,    49,    50,    51,    -1,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    -1,    72,    73,    74,    75,    76,
-      28,    78,    79,    80,    81,    -1,    83,    -1,    -1,    -1,
-      -1,    -1,    89,    28,    42,    43,    44,    45,    46,    47,
-      -1,    49,    -1,    -1,    52,    53,    54,    42,    43,    44,
-      45,    46,    47,    28,    49,    -1,    -1,    52,    53,    54,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,
-      45,    46,    47,    -1,    49,    -1,    -1,    52,    53,    54,
-      -1,    -1,    90,    91,    92,    93,    94,    95,    96,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    93,    94,
-      95,    96,    -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    93,    94,
-      95,    96,    42,    43,    44,    45,    46,    47,    28,    49,
-      -1,    -1,    52,    53,    54,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    42,    43,    -1,    45,    46,    47,    33,    49,
-      -1,    -1,    52,    53,    54,    -1,    -1,    42,    43,    44,
-      45,    46,    47,    -1,    49,    -1,    -1,    52,    53,    54,
-      90,    91,    92,    93,    94,    95,    96,    42,    43,    44,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    85,    86,
+       6,    -1,    -1,    90,    10,    11,    12,    13,    14,    15,
+      -1,    17,    18,    19,    20,    21,    -1,    23,    24,    -1,
+      26,    27,    28,    29,    30,    31,    32,    -1,    34,    -1,
+      36,    37,    -1,    39,    40,    41,    -1,    -1,    -1,    -1,
+      46,    47,    48,    49,    50,    51,    -1,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    -1,    72,    73,    74,    75,
+      76,    28,    -1,    79,    80,    81,    82,    34,    84,    -1,
+      -1,    -1,    -1,    -1,    90,    42,    43,    44,    45,    46,
+      47,    28,    49,    -1,    -1,    52,    53,    54,    -1,    -1,
+      -1,    -1,    -1,    -1,    28,    42,    43,    44,    45,    46,
+      47,    -1,    49,    -1,    -1,    52,    53,    54,    42,    43,
+      44,    45,    46,    47,    -1,    49,    -1,    28,    52,    53,
+      54,    -1,    -1,    -1,    91,    92,    93,    94,    95,    96,
+      97,    42,    43,    44,    45,    46,    47,    -1,    49,    -1,
+      -1,    52,    53,    54,    91,    92,    93,    94,    95,    96,
+      97,    28,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,
+      94,    95,    96,    97,    -1,    42,    43,    -1,    45,    46,
+      47,    -1,    49,    -1,    -1,    52,    53,    54,    -1,    34,
+      91,    92,    93,    94,    95,    96,    97,    42,    43,    44,
       45,    46,    47,    -1,    49,    -1,    -1,    52,    53,    54,
-      90,    91,    92,    93,    94,    95,    96,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    93,    94,
-      95,    96,    42,    43,    44,    45,    46,    47,    -1,    49,
-      -1,    -1,    52,    53,    54,    90,    91,    92,    93,    94,
-      95,    96,    -1,    98,    -1,   100,    42,    43,    44,    45,
-      46,    47,    -1,    49,    -1,    -1,    52,    53,    54,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      90,    91,    92,    93,    94,    95,    96,    -1,    98,    -1,
-     100,    42,    43,    44,    45,    46,    47,    -1,    49,    -1,
-      -1,    52,    53,    54,    90,    91,    92,    93,    94,    95,
-      96,    -1,    -1,    -1,   100,    42,    43,    44,    45,    46,
-      47,    -1,    49,    -1,    -1,    52,    53,    54,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    93,    94,    95,    96,    -1,    98,    42,    43,
-      44,    45,    46,    47,    -1,    49,    -1,    -1,    52,    53,
-      54,    -1,    -1,    90,    91,    92,    93,    94,    95,    96,
+      -1,    -1,    33,    -1,    91,    92,    93,    94,    95,    96,
       97,    42,    43,    44,    45,    46,    47,    -1,    49,    -1,
-      -1,    52,    53,    54,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,    93,
-      94,    95,    96,    97,    42,    43,    44,    45,    46,    47,
-      -1,    49,    -1,    -1,    52,    53,    54,    -1,    -1,    90,
+      -1,    52,    53,    54,    -1,    -1,    91,    92,    93,    94,
+      95,    96,    97,    98,    42,    43,    44,    45,    46,    47,
+      -1,    49,    -1,    -1,    52,    53,    54,    42,    43,    44,
+      45,    46,    47,    -1,    49,    -1,    -1,    52,    53,    54,
       91,    92,    93,    94,    95,    96,    97,    42,    43,    44,
       45,    46,    47,    -1,    49,    -1,    -1,    52,    53,    54,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    90,    91,    92,    93,    94,    95,    96,    97,
+      -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
+      -1,    99,    -1,   101,    -1,    -1,    91,    92,    93,    94,
+      95,    96,    97,    -1,    99,    -1,   101,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,
+      95,    96,    97,    -1,    -1,    -1,   101,    42,    43,    44,
+      45,    46,    47,    -1,    49,    -1,    -1,    52,    53,    54,
+      42,    43,    44,    45,    46,    47,    -1,    49,    -1,    -1,
+      52,    53,    54,    42,    43,    44,    45,    46,    47,    -1,
+      49,    -1,    -1,    52,    53,    54,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,
+      95,    96,    97,    -1,    99,    -1,    -1,    -1,    -1,    91,
+      92,    93,    94,    95,    96,    97,    98,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    98,
       42,    43,    44,    45,    46,    47,    -1,    49,    -1,    -1,
-      52,    53,    54,    -1,    -1,    90,    91,    92,    93,    94,
-      95,    96,    97,    42,    43,    44,    45,    46,    47,    -1,
+      52,    53,    54,    42,    43,    44,    45,    46,    47,    -1,
+      49,    -1,    -1,    52,    53,    54,    42,    43,    44,    45,
+      46,    47,    -1,    49,    -1,    -1,    52,    53,    54,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,
+      92,    93,    94,    95,    96,    97,    98,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    98,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,
+      96,    97,    98,    42,    43,    44,    45,    46,    47,    -1,
       49,    -1,    -1,    52,    53,    54,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,
-      92,    93,    94,    95,    96,    97,    42,    43,    44,    45,
-      -1,    80,    81,    49,    -1,    -1,    52,    53,    54,    -1,
-      -1,    90,    91,    92,    93,    94,    95,    96,    42,    43,
-      44,    45,    46,    47,    -1,    49,    -1,    -1,    52,    53,
-      54,    42,    43,    44,    45,    46,    47,    -1,    49,    -1,
-      -1,    52,    53,    54,    90,    91,    92,    93,    94,    95,
-      96,    42,    43,    -1,    45,    -1,    -1,    -1,    49,    -1,
-      -1,    52,    53,    54,    -1,    -1,    90,    91,    92,    93,
-      94,    95,    96,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    93,    94,    95,    96,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    93,    94,    95,    96
+      -1,    42,    43,    44,    45,    46,    47,    -1,    49,    -1,
+      -1,    52,    53,    54,    42,    43,    44,    45,    46,    47,
+      -1,    49,    -1,    -1,    52,    53,    54,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    98,
+      81,    82,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      91,    92,    93,    94,    95,    96,    97,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    94,    95,    96,    97,
+      42,    43,    44,    45,    46,    47,    -1,    49,    -1,    -1,
+      52,    53,    54,    42,    43,    -1,    45,    46,    47,    -1,
+      49,    -1,    -1,    52,    53,    54,    42,    43,    -1,    45,
+      -1,    -1,    -1,    49,    -1,    -1,    52,    53,    54,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,
+      92,    93,    94,    95,    96,    97,    -1,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    -1,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    93,    94,    95,
+      96,    97
 };
 
 /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
@@ -1899,101 +1906,101 @@ static const yytype_uint8 yystos[] =
       39,    40,    41,    46,    47,    48,    49,    50,    51,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    70,    72,    73,    74,
-      75,    76,    78,    79,    80,    81,    82,    83,    84,    86,
-      89,    97,   105,   106,   107,   108,   109,   114,   116,   120,
-     121,   122,   123,   127,   129,   130,   131,   133,   134,   135,
+      75,    76,    79,    80,    81,    82,    83,    84,    85,    87,
+      90,    98,   106,   107,   108,   109,   110,   115,   117,   121,
+     122,   123,   124,   128,   130,   131,   132,   134,   135,   136,
        9,    14,    16,    17,    19,    20,    21,    22,    25,    27,
-      30,    31,    32,    33,    38,    39,    40,    41,    82,    83,
-      84,    85,    89,   115,   116,   117,    10,    11,    55,    57,
-      59,    61,    75,   146,    31,    97,   117,   118,   119,     4,
+      30,    31,    32,    33,    38,    39,    40,    41,    83,    84,
+      85,    86,    90,   116,   117,   118,    10,    11,    55,    57,
+      59,    61,    75,   147,    31,    98,   118,   119,   120,     4,
        5,     7,     8,    10,    11,    12,    13,    18,    26,    48,
-      55,    57,    59,    61,    75,    79,    93,    94,    99,   101,
-     117,   124,   126,   142,   143,   146,   148,   150,   153,   154,
-     158,   161,   162,   163,   166,   146,    99,   163,   117,    31,
-     124,   163,    36,    37,    75,   117,   143,   145,   156,    97,
-     117,   124,   163,   124,   126,   118,   163,   118,   117,    97,
-     122,     0,   107,   124,   163,    97,    98,    99,   149,   162,
-     149,   163,   163,   163,   163,    69,    97,    97,    97,    98,
-     149,   149,   163,   163,   162,    63,    64,    65,    66,    67,
-      69,    74,   117,   163,   162,   162,   100,   163,     4,     5,
-       7,     8,   103,   117,   159,   160,   163,   167,   168,    99,
-      97,    97,    28,    42,    43,    44,    45,    46,    47,    49,
-      52,    53,    54,    90,    91,    92,    93,    94,    95,    96,
-      98,   125,   142,   164,   166,    97,   163,    33,    46,    47,
-      49,    53,    54,   118,    97,    97,    24,    50,    51,   117,
-     163,   117,    34,    44,   128,    97,    97,    36,    97,    97,
-      97,    34,    97,    97,   118,    97,   117,   100,   163,    28,
+      55,    57,    59,    61,    75,    80,    94,    95,   100,   102,
+     118,   125,   127,   143,   144,   147,   149,   151,   154,   155,
+     159,   162,   163,   164,   167,   147,   100,   164,   118,    31,
+     125,   164,    36,    37,    75,   118,   144,   146,   157,    98,
+     118,   125,   164,   125,   127,   119,   164,   119,   118,    98,
+     123,     0,   108,   125,   164,    98,    99,   100,   150,   163,
+     150,   164,   164,   164,   164,    69,    98,    98,    98,    99,
+     150,   150,   164,   164,   163,    63,    64,    65,    66,    67,
+      69,    74,   118,   164,   163,   163,   101,   164,     4,     5,
+       7,     8,   104,   118,   160,   161,   164,   168,   169,   100,
+      98,    98,    28,    42,    43,    44,    45,    46,    47,    49,
+      52,    53,    54,    91,    92,    93,    94,    95,    96,    97,
+      99,   126,   143,   165,   167,    98,   164,    33,    46,    47,
+      49,    53,    54,   119,    98,    98,    24,    50,    51,   118,
+     164,   118,    34,    44,   129,    98,    98,    36,    98,    98,
+      98,    34,    98,    98,   119,    98,   118,   101,   164,    28,
       34,    28,    34,    28,    34,    28,    34,    55,    57,    59,
-      61,   147,   117,    28,   164,    68,    76,    68,    76,    68,
-      76,    68,    76,    68,    76,    28,    28,    80,    81,    98,
-     100,   103,   103,   103,   103,   102,   103,    98,   102,   102,
-      98,   100,   168,    26,   163,   163,   163,   163,   163,   163,
-     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
-     163,   168,    42,    43,    44,    45,    46,    47,    49,    52,
-      53,    54,    90,    91,    92,    93,    94,    95,    96,    98,
-     125,    97,   120,    97,    75,   143,   144,   146,   144,   144,
-      23,    44,    97,    28,   163,     9,    85,    97,   110,   111,
-     112,   113,   163,   122,    97,   120,   136,   137,   138,    97,
-      98,   162,   163,   162,   163,   162,   163,   162,   163,    23,
-      28,   155,    26,    56,    58,    60,    62,    70,    71,    72,
-      73,    77,    78,    79,   151,   152,   162,   151,   162,   162,
-     100,   168,   163,   163,   163,   163,   163,   160,   163,   163,
-      98,   125,   163,   125,   163,   163,   163,   163,   163,   163,
-     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
-     163,   168,    97,   121,   139,   140,   141,    16,   136,    97,
-      97,    97,   163,   163,   136,    70,    72,    78,    79,   157,
-     162,    97,   115,   117,   113,    97,    88,   138,   136,   100,
-     168,    28,    28,    28,    28,   162,   163,   155,   155,   155,
-     155,   162,   162,   155,   162,   162,   125,   100,   125,    16,
-      86,   132,   141,    97,   120,    97,    15,    34,    87,   162,
-     165,   166,   165,   165,   165,    97,   118,    97,     9,   125,
-     162,   162,   162,   162,   162,   162,   162,   162,    28,    70,
-     152,   100,    97,   120,    97,   139,   136,    34,   163,    97,
-      42,    43,    45,    46,    47,    49,    52,    53,    54,    90,
-      91,    92,    93,    94,    95,    96,    28,    97,   115,   100,
-      70,   139,   132,    87,   163,    97,   165,   165,   165,   165,
-     165,   165,   165,   165,   165,   165,   165,   165,   165,   165,
-     165,   165,    70,   136,    97,   162,   132,    97,    97,   136,
-     165,   136,    87,    87,    97,    97
+      61,   148,   118,    28,   165,    68,    76,    68,    76,    68,
+      76,    68,    76,    68,    76,    28,    28,    81,    82,    99,
+     101,   104,   104,   104,   104,   103,   104,    99,   103,   103,
+      99,   101,   169,    26,   164,   164,   164,   164,   164,   164,
+     164,   164,   164,   164,   164,   164,   164,   164,   164,   164,
+     164,   169,    42,    43,    44,    45,    46,    47,    49,    52,
+      53,    54,    91,    92,    93,    94,    95,    96,    97,    99,
+     126,    98,   121,    98,    75,   144,   145,   147,   145,   145,
+      23,    44,    98,    28,   164,     9,    86,    98,   111,   112,
+     113,   114,   164,   123,    98,   121,   137,   138,   139,    98,
+      99,   163,   164,   163,   164,   163,   164,   163,   164,    23,
+      28,   156,    26,    56,    58,    60,    62,    70,    71,    72,
+      73,    77,    78,    79,    80,   152,   153,   163,   152,   163,
+     163,   101,   169,   164,   164,   164,   164,   164,   161,   164,
+     164,    99,   126,   164,   126,   164,   164,   164,   164,   164,
+     164,   164,   164,   164,   164,   164,   164,   164,   164,   164,
+     164,   164,   169,    98,   122,   140,   141,   142,    16,   137,
+      98,    98,    98,   164,   164,   137,    70,    72,    79,    80,
+     158,   163,    98,   116,   118,   114,    98,    89,   139,   137,
+     101,   169,    28,    28,    28,    28,   163,   164,   156,   156,
+     156,   156,   163,   163,   156,   163,   163,   126,   101,   126,
+      16,    87,   133,   142,    98,   121,    98,    15,    34,    88,
+     163,   166,   167,   166,   166,   166,    98,   119,    98,     9,
+     126,   163,   163,   163,   163,   163,   163,   163,   163,    28,
+      70,   153,   101,    98,   121,    98,   140,   137,    34,   164,
+      98,    42,    43,    45,    46,    47,    49,    52,    53,    54,
+      91,    92,    93,    94,    95,    96,    97,    28,    98,   116,
+     101,    70,   140,   133,    88,   164,    98,   166,   166,   166,
+     166,   166,   166,   166,   166,   166,   166,   166,   166,   166,
+     166,   166,   166,    70,   137,    98,   163,   133,    98,    98,
+     137,   166,   137,    88,    88,    98,    98
 };
 
 /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   104,   105,   106,   106,   107,   107,   107,   107,   107,
-     107,   108,   109,   110,   111,   111,   112,   112,   113,   113,
-     113,   114,   114,   115,   115,   115,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   117,
+       0,   105,   106,   107,   107,   108,   108,   108,   108,   108,
+     108,   109,   110,   111,   112,   112,   113,   113,   114,   114,
+     114,   115,   115,   116,   116,   116,   117,   117,   117,   117,
+     117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
+     117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
      117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
-     117,   117,   117,   117,   117,   117,   117,   117,   118,   118,
-     118,   119,   119,   120,   120,   121,   121,   121,   121,   121,
-     121,   122,   122,   122,   123,   123,   123,   123,   123,   123,
-     123,   123,   123,   123,   123,   123,   123,   123,   124,   124,
-     124,   124,   124,   124,   124,   124,   125,   125,   126,   126,
-     126,   126,   126,   127,   127,   127,   127,   128,   128,   129,
-     129,   129,   130,   130,   131,   131,   131,   131,   132,   132,
-     133,   133,   133,   133,   134,   134,   135,   136,   136,   137,
-     137,   138,   138,   139,   139,   140,   140,   141,   141,   142,
-     142,   142,   142,   142,   142,   142,   142,   142,   142,   142,
-     142,   142,   143,   144,   144,   145,   145,   146,   146,   146,
-     146,   146,   146,   146,   146,   146,   146,   146,   147,   147,
-     147,   147,   148,   148,   149,   149,   149,   149,   150,   150,
-     150,   150,   150,   151,   151,   151,   151,   151,   152,   153,
-     153,   153,   153,   153,   153,   153,   153,   153,   153,   154,
-     154,   154,   154,   154,   154,   154,   155,   155,   156,   156,
-     157,   157,   157,   157,   157,   158,   158,   158,   159,   159,
-     159,   160,   160,   160,   160,   160,   161,   161,   162,   162,
-     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
-     163,   163,   163,   163,   163,   163,   163,   163,   163,   164,
+     117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
+     117,   117,   117,   117,   117,   117,   117,   117,   117,   118,
+     118,   118,   118,   118,   118,   118,   118,   118,   118,   118,
+     118,   118,   118,   118,   118,   118,   118,   118,   119,   119,
+     119,   120,   120,   121,   121,   122,   122,   122,   122,   122,
+     122,   123,   123,   123,   124,   124,   124,   124,   124,   124,
+     124,   124,   124,   124,   124,   124,   124,   124,   125,   125,
+     125,   125,   125,   125,   125,   125,   126,   126,   127,   127,
+     127,   127,   127,   128,   128,   128,   128,   129,   129,   130,
+     130,   130,   131,   131,   132,   132,   132,   132,   133,   133,
+     134,   134,   134,   134,   135,   135,   136,   137,   137,   138,
+     138,   139,   139,   140,   140,   141,   141,   142,   142,   143,
+     143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
+     143,   143,   144,   145,   145,   146,   146,   147,   147,   147,
+     147,   147,   147,   147,   147,   147,   147,   147,   148,   148,
+     148,   148,   149,   149,   150,   150,   150,   150,   151,   151,
+     151,   151,   151,   152,   152,   152,   152,   152,   153,   154,
+     154,   154,   154,   154,   154,   154,   154,   154,   154,   155,
+     155,   155,   155,   155,   155,   155,   155,   156,   156,   157,
+     157,   158,   158,   158,   158,   158,   159,   159,   159,   160,
+     160,   160,   161,   161,   161,   161,   161,   162,   162,   163,
+     163,   164,   164,   164,   164,   164,   164,   164,   164,   164,
      164,   164,   164,   164,   164,   164,   164,   164,   164,   164,
-     164,   164,   164,   164,   164,   164,   164,   164,   165,   165,
      165,   165,   165,   165,   165,   165,   165,   165,   165,   165,
-     165,   165,   165,   165,   165,   165,   166,   166,   167,   167,
-     168,   168
+     165,   165,   165,   165,   165,   165,   165,   165,   165,   166,
+     166,   166,   166,   166,   166,   166,   166,   166,   166,   166,
+     166,   166,   166,   166,   166,   166,   166,   167,   167,   168,
+     168,   169,   169
 };
 
 /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
@@ -2023,16 +2030,16 @@ static const yytype_int8 yyr2[] =
        1,     1,     2,     2,     1,     2,     4,     6,     2,     4,
        4,     1,     1,     1,     1,     5,     2,     2,     2,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     6,
-       6,     6,     6,     6,     4,     4,     1,     1,     2,     4,
-       1,     2,     5,     2,     2,     3,     3,     3,     1,     3,
-       3,     3,     3,     3,     3,     3,     2,     2,     1,     1,
+       6,     6,     6,     6,     4,     4,     4,     1,     1,     2,
+       4,     1,     2,     5,     2,     2,     3,     3,     3,     1,
+       3,     3,     3,     3,     3,     3,     3,     2,     2,     1,
+       1,     1,     1,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
        1,     1,     3,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     1,
        1,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     1,     1,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     4,     4,     0,     1,
-       1,     3
+       3,     3,     3,     3,     3,     3,     3,     4,     4,     0,
+       1,     1,     3
 };
 
 
@@ -2300,37 +2307,37 @@ yydestruct (const char *yymsg,
     case YYSYMBOL_tVARID: /* tVARID  */
 #line 194 "engines/director/lingo/lingo-gr.y"
             { delete ((*yyvaluep).s); }
-#line 2304 "engines/director/lingo/lingo-gr.cpp"
+#line 2311 "engines/director/lingo/lingo-gr.cpp"
         break;
 
     case YYSYMBOL_tSTRING: /* tSTRING  */
 #line 194 "engines/director/lingo/lingo-gr.y"
             { delete ((*yyvaluep).s); }
-#line 2310 "engines/director/lingo/lingo-gr.cpp"
+#line 2317 "engines/director/lingo/lingo-gr.cpp"
         break;
 
     case YYSYMBOL_tSYMBOL: /* tSYMBOL  */
 #line 194 "engines/director/lingo/lingo-gr.y"
             { delete ((*yyvaluep).s); }
-#line 2316 "engines/director/lingo/lingo-gr.cpp"
+#line 2323 "engines/director/lingo/lingo-gr.cpp"
         break;
 
     case YYSYMBOL_tENDCLAUSE: /* tENDCLAUSE  */
 #line 194 "engines/director/lingo/lingo-gr.y"
             { delete ((*yyvaluep).s); }
-#line 2322 "engines/director/lingo/lingo-gr.cpp"
+#line 2329 "engines/director/lingo/lingo-gr.cpp"
         break;
 
     case YYSYMBOL_CMDID: /* CMDID  */
 #line 194 "engines/director/lingo/lingo-gr.y"
             { delete ((*yyvaluep).s); }
-#line 2328 "engines/director/lingo/lingo-gr.cpp"
+#line 2335 "engines/director/lingo/lingo-gr.cpp"
         break;
 
     case YYSYMBOL_ID: /* ID  */
 #line 194 "engines/director/lingo/lingo-gr.y"
             { delete ((*yyvaluep).s); }
-#line 2334 "engines/director/lingo/lingo-gr.cpp"
+#line 2341 "engines/director/lingo/lingo-gr.cpp"
         break;
 
       default:
@@ -2600,7 +2607,7 @@ yyreduce:
   case 2: /* script: scriptpartlist  */
 #line 200 "engines/director/lingo/lingo-gr.y"
                                                         { g_lingo->_compiler->_assemblyAST = new ScriptNode((yyvsp[0].nodelist)); }
-#line 2604 "engines/director/lingo/lingo-gr.cpp"
+#line 2611 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 3: /* scriptpartlist: scriptpart  */
@@ -2611,7 +2618,7 @@ yyreduce:
 			list->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = list; }
-#line 2615 "engines/director/lingo/lingo-gr.cpp"
+#line 2622 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 4: /* scriptpartlist: scriptpartlist scriptpart  */
@@ -2621,43 +2628,43 @@ yyreduce:
 			(yyvsp[-1].nodelist)->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = (yyvsp[-1].nodelist); }
-#line 2625 "engines/director/lingo/lingo-gr.cpp"
+#line 2632 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 5: /* scriptpart: '\n'  */
 #line 215 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = nullptr; }
-#line 2631 "engines/director/lingo/lingo-gr.cpp"
+#line 2638 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 10: /* scriptpart: tENDCLAUSE endargdef '\n'  */
 #line 220 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = nullptr; delete (yyvsp[-2].s); }
-#line 2637 "engines/director/lingo/lingo-gr.cpp"
+#line 2644 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 11: /* macro: tMACRO ID idlist '\n' stmtlist  */
 #line 249 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new HandlerNode((yyvsp[-3].s), (yyvsp[-2].idlist), (yyvsp[0].nodelist)); }
-#line 2643 "engines/director/lingo/lingo-gr.cpp"
+#line 2650 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 12: /* factory: tFACTORY ID '\n' methodlist  */
 #line 253 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new FactoryNode((yyvsp[-2].s), (yyvsp[0].nodelist)); }
-#line 2649 "engines/director/lingo/lingo-gr.cpp"
+#line 2656 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 13: /* method: tMETHOD ID idlist '\n' stmtlist  */
 #line 255 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new HandlerNode((yyvsp[-3].s), (yyvsp[-2].idlist), (yyvsp[0].nodelist)); }
-#line 2655 "engines/director/lingo/lingo-gr.cpp"
+#line 2662 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 14: /* methodlist: %empty  */
 #line 257 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.nodelist) = new NodeList; }
-#line 2661 "engines/director/lingo/lingo-gr.cpp"
+#line 2668 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 16: /* nonemptymethodlist: methodlistline  */
@@ -2668,7 +2675,7 @@ yyreduce:
 			list->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = list; }
-#line 2672 "engines/director/lingo/lingo-gr.cpp"
+#line 2679 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 17: /* nonemptymethodlist: nonemptymethodlist methodlistline  */
@@ -2678,19 +2685,19 @@ yyreduce:
 			(yyvsp[-1].nodelist)->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = (yyvsp[-1].nodelist); }
-#line 2682 "engines/director/lingo/lingo-gr.cpp"
+#line 2689 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 18: /* methodlistline: '\n'  */
 #line 274 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = nullptr; }
-#line 2688 "engines/director/lingo/lingo-gr.cpp"
+#line 2695 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 20: /* methodlistline: tENDCLAUSE endargdef '\n'  */
 #line 276 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = nullptr; delete (yyvsp[-2].s); }
-#line 2694 "engines/director/lingo/lingo-gr.cpp"
+#line 2701 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 21: /* handler: tON ID idlist '\n' stmtlist tENDCLAUSE endargdef '\n'  */
@@ -2699,452 +2706,452 @@ yyreduce:
 		(yyval.node) = new HandlerNode((yyvsp[-6].s), (yyvsp[-5].idlist), (yyvsp[-3].nodelist));
 		checkEnd((yyvsp[-2].s), (yyvsp[-6].s), false);
 		delete (yyvsp[-2].s); }
-#line 2703 "engines/director/lingo/lingo-gr.cpp"
+#line 2710 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 22: /* handler: tON ID idlist '\n' stmtlist  */
 #line 285 "engines/director/lingo/lingo-gr.y"
                                       {	// D4. No 'end' clause
 		(yyval.node) = new HandlerNode((yyvsp[-3].s), (yyvsp[-2].idlist), (yyvsp[0].nodelist)); }
-#line 2710 "engines/director/lingo/lingo-gr.cpp"
+#line 2717 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 24: /* endargdef: ID  */
 #line 290 "engines/director/lingo/lingo-gr.y"
                                                         { delete (yyvsp[0].s); }
-#line 2716 "engines/director/lingo/lingo-gr.cpp"
+#line 2723 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 25: /* endargdef: endargdef ',' ID  */
 #line 291 "engines/director/lingo/lingo-gr.y"
                                                 { delete (yyvsp[0].s); }
-#line 2722 "engines/director/lingo/lingo-gr.cpp"
+#line 2729 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 27: /* CMDID: tABBREVIATED  */
 #line 299 "engines/director/lingo/lingo-gr.y"
                         { (yyval.s) = new Common::String("abbreviated"); }
-#line 2728 "engines/director/lingo/lingo-gr.cpp"
+#line 2735 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 28: /* CMDID: tABBREV  */
 #line 300 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("abbrev"); }
-#line 2734 "engines/director/lingo/lingo-gr.cpp"
+#line 2741 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 29: /* CMDID: tABBR  */
 #line 301 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("abbr"); }
-#line 2740 "engines/director/lingo/lingo-gr.cpp"
+#line 2747 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 30: /* CMDID: tAFTER  */
 #line 302 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("after"); }
-#line 2746 "engines/director/lingo/lingo-gr.cpp"
+#line 2753 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 31: /* CMDID: tAND  */
 #line 303 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("and"); }
-#line 2752 "engines/director/lingo/lingo-gr.cpp"
+#line 2759 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 32: /* CMDID: tBEFORE  */
 #line 304 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("before"); }
-#line 2758 "engines/director/lingo/lingo-gr.cpp"
+#line 2765 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 33: /* CMDID: tCAST  */
 #line 305 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("cast"); }
-#line 2764 "engines/director/lingo/lingo-gr.cpp"
+#line 2771 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 34: /* CMDID: tCHAR  */
 #line 306 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("char"); }
-#line 2770 "engines/director/lingo/lingo-gr.cpp"
+#line 2777 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 35: /* CMDID: tCHARS  */
 #line 307 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("chars"); }
-#line 2776 "engines/director/lingo/lingo-gr.cpp"
+#line 2783 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 36: /* CMDID: tCONTAINS  */
 #line 308 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("contains"); }
-#line 2782 "engines/director/lingo/lingo-gr.cpp"
+#line 2789 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 37: /* CMDID: tDATE  */
 #line 309 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("date"); }
-#line 2788 "engines/director/lingo/lingo-gr.cpp"
+#line 2795 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 38: /* CMDID: tDELETE  */
 #line 310 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("delete"); }
-#line 2794 "engines/director/lingo/lingo-gr.cpp"
+#line 2801 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 39: /* CMDID: tDOWN  */
 #line 311 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("down"); }
-#line 2800 "engines/director/lingo/lingo-gr.cpp"
+#line 2807 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 40: /* CMDID: tFIELD  */
 #line 312 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("field"); }
-#line 2806 "engines/director/lingo/lingo-gr.cpp"
+#line 2813 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 41: /* CMDID: tFRAME  */
 #line 313 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("frame"); }
-#line 2812 "engines/director/lingo/lingo-gr.cpp"
+#line 2819 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 42: /* CMDID: tHILITE  */
 #line 314 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("hilite"); }
-#line 2818 "engines/director/lingo/lingo-gr.cpp"
+#line 2825 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 43: /* CMDID: tIN  */
 #line 315 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("in"); }
-#line 2824 "engines/director/lingo/lingo-gr.cpp"
+#line 2831 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 44: /* CMDID: tINTERSECTS  */
 #line 316 "engines/director/lingo/lingo-gr.y"
                         { (yyval.s) = new Common::String("intersects"); }
-#line 2830 "engines/director/lingo/lingo-gr.cpp"
+#line 2837 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 45: /* CMDID: tINTO  */
 #line 317 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("into"); }
-#line 2836 "engines/director/lingo/lingo-gr.cpp"
+#line 2843 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 46: /* CMDID: tITEM  */
 #line 318 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("item"); }
-#line 2842 "engines/director/lingo/lingo-gr.cpp"
+#line 2849 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 47: /* CMDID: tITEMS  */
 #line 319 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("items"); }
-#line 2848 "engines/director/lingo/lingo-gr.cpp"
+#line 2855 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 48: /* CMDID: tLAST  */
 #line 320 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("last"); }
-#line 2854 "engines/director/lingo/lingo-gr.cpp"
+#line 2861 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 49: /* CMDID: tLINE  */
 #line 321 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("line"); }
-#line 2860 "engines/director/lingo/lingo-gr.cpp"
+#line 2867 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 50: /* CMDID: tLINES  */
 #line 322 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("lines"); }
-#line 2866 "engines/director/lingo/lingo-gr.cpp"
+#line 2873 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 51: /* CMDID: tLONG  */
 #line 323 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("long"); }
-#line 2872 "engines/director/lingo/lingo-gr.cpp"
+#line 2879 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 52: /* CMDID: tMENU  */
 #line 324 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("menu"); }
-#line 2878 "engines/director/lingo/lingo-gr.cpp"
+#line 2885 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 53: /* CMDID: tMENUITEM  */
 #line 325 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("menuItem"); }
-#line 2884 "engines/director/lingo/lingo-gr.cpp"
+#line 2891 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 54: /* CMDID: tMENUITEMS  */
 #line 326 "engines/director/lingo/lingo-gr.y"
                         { (yyval.s) = new Common::String("menuItems"); }
-#line 2890 "engines/director/lingo/lingo-gr.cpp"
+#line 2897 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 55: /* CMDID: tMOD  */
 #line 327 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("mod"); }
-#line 2896 "engines/director/lingo/lingo-gr.cpp"
+#line 2903 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 56: /* CMDID: tMOVIE  */
 #line 328 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("movie"); }
-#line 2902 "engines/director/lingo/lingo-gr.cpp"
+#line 2909 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 57: /* CMDID: tNEXT  */
 #line 329 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("next"); }
-#line 2908 "engines/director/lingo/lingo-gr.cpp"
+#line 2915 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 58: /* CMDID: tNOT  */
 #line 330 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("not"); }
-#line 2914 "engines/director/lingo/lingo-gr.cpp"
+#line 2921 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 59: /* CMDID: tNUMBER  */
 #line 331 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("number"); }
-#line 2920 "engines/director/lingo/lingo-gr.cpp"
+#line 2927 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 60: /* CMDID: tOF  */
 #line 332 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("of"); }
-#line 2926 "engines/director/lingo/lingo-gr.cpp"
+#line 2933 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 61: /* CMDID: tOR  */
 #line 333 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("or"); }
-#line 2932 "engines/director/lingo/lingo-gr.cpp"
+#line 2939 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 62: /* CMDID: tPREVIOUS  */
 #line 334 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("previous"); }
-#line 2938 "engines/director/lingo/lingo-gr.cpp"
+#line 2945 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 63: /* CMDID: tREPEAT  */
 #line 335 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("repeat"); }
-#line 2944 "engines/director/lingo/lingo-gr.cpp"
+#line 2951 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 64: /* CMDID: tSCRIPT  */
 #line 336 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("script"); }
-#line 2950 "engines/director/lingo/lingo-gr.cpp"
+#line 2957 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 65: /* CMDID: tASSERTERROR  */
 #line 337 "engines/director/lingo/lingo-gr.y"
                         { (yyval.s) = new Common::String("scummvmAssertError"); }
-#line 2956 "engines/director/lingo/lingo-gr.cpp"
+#line 2963 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 66: /* CMDID: tSHORT  */
 #line 338 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("short"); }
-#line 2962 "engines/director/lingo/lingo-gr.cpp"
+#line 2969 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 67: /* CMDID: tSOUND  */
 #line 339 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("sound"); }
-#line 2968 "engines/director/lingo/lingo-gr.cpp"
+#line 2975 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 68: /* CMDID: tSPRITE  */
 #line 340 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("sprite"); }
-#line 2974 "engines/director/lingo/lingo-gr.cpp"
+#line 2981 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 69: /* CMDID: tSTARTS  */
 #line 341 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("starts"); }
-#line 2980 "engines/director/lingo/lingo-gr.cpp"
+#line 2987 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 70: /* CMDID: tTHE  */
 #line 342 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("the"); }
-#line 2986 "engines/director/lingo/lingo-gr.cpp"
+#line 2993 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 71: /* CMDID: tTIME  */
 #line 343 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("time"); }
-#line 2992 "engines/director/lingo/lingo-gr.cpp"
+#line 2999 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 72: /* CMDID: tTO  */
 #line 344 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("to"); }
-#line 2998 "engines/director/lingo/lingo-gr.cpp"
+#line 3005 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 73: /* CMDID: tWHILE  */
 #line 345 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("while"); }
-#line 3004 "engines/director/lingo/lingo-gr.cpp"
+#line 3011 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 74: /* CMDID: tWINDOW  */
 #line 346 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("window"); }
-#line 3010 "engines/director/lingo/lingo-gr.cpp"
+#line 3017 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 75: /* CMDID: tWITH  */
 #line 347 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("with"); }
-#line 3016 "engines/director/lingo/lingo-gr.cpp"
+#line 3023 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 76: /* CMDID: tWITHIN  */
 #line 348 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("within"); }
-#line 3022 "engines/director/lingo/lingo-gr.cpp"
+#line 3029 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 77: /* CMDID: tWORD  */
 #line 349 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("word"); }
-#line 3028 "engines/director/lingo/lingo-gr.cpp"
+#line 3035 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 78: /* CMDID: tWORDS  */
 #line 350 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("words"); }
-#line 3034 "engines/director/lingo/lingo-gr.cpp"
+#line 3041 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 80: /* ID: tELSE  */
 #line 354 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("else"); }
-#line 3040 "engines/director/lingo/lingo-gr.cpp"
+#line 3047 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 81: /* ID: tENDCLAUSE  */
 #line 355 "engines/director/lingo/lingo-gr.y"
                         { (yyval.s) = new Common::String("end"); delete (yyvsp[0].s); }
-#line 3046 "engines/director/lingo/lingo-gr.cpp"
+#line 3053 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 82: /* ID: tEXIT  */
 #line 356 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("exit"); }
-#line 3052 "engines/director/lingo/lingo-gr.cpp"
+#line 3059 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 83: /* ID: tFACTORY  */
 #line 357 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("factory"); }
-#line 3058 "engines/director/lingo/lingo-gr.cpp"
+#line 3065 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 84: /* ID: tGLOBAL  */
 #line 358 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("global"); }
-#line 3064 "engines/director/lingo/lingo-gr.cpp"
+#line 3071 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 85: /* ID: tGO  */
 #line 359 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("go"); }
-#line 3070 "engines/director/lingo/lingo-gr.cpp"
+#line 3077 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 86: /* ID: tIF  */
 #line 360 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("if"); }
-#line 3076 "engines/director/lingo/lingo-gr.cpp"
+#line 3083 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 87: /* ID: tINSTANCE  */
 #line 361 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("instance"); }
-#line 3082 "engines/director/lingo/lingo-gr.cpp"
+#line 3089 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 88: /* ID: tMACRO  */
 #line 362 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("macro"); }
-#line 3088 "engines/director/lingo/lingo-gr.cpp"
+#line 3095 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 89: /* ID: tMETHOD  */
 #line 363 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("method"); }
-#line 3094 "engines/director/lingo/lingo-gr.cpp"
+#line 3101 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 90: /* ID: tON  */
 #line 364 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("on"); }
-#line 3100 "engines/director/lingo/lingo-gr.cpp"
+#line 3107 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 91: /* ID: tOPEN  */
 #line 365 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("open"); }
-#line 3106 "engines/director/lingo/lingo-gr.cpp"
+#line 3113 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 92: /* ID: tPLAY  */
 #line 366 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("play"); }
-#line 3112 "engines/director/lingo/lingo-gr.cpp"
+#line 3119 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 93: /* ID: tPROPERTY  */
 #line 367 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("property"); }
-#line 3118 "engines/director/lingo/lingo-gr.cpp"
+#line 3125 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 94: /* ID: tPUT  */
 #line 368 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("put"); }
-#line 3124 "engines/director/lingo/lingo-gr.cpp"
+#line 3131 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 95: /* ID: tSET  */
 #line 369 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("set"); }
-#line 3130 "engines/director/lingo/lingo-gr.cpp"
+#line 3137 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 96: /* ID: tTELL  */
 #line 370 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("tell"); }
-#line 3136 "engines/director/lingo/lingo-gr.cpp"
+#line 3143 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 97: /* ID: tTHEN  */
 #line 371 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.s) = new Common::String("then"); }
-#line 3142 "engines/director/lingo/lingo-gr.cpp"
+#line 3149 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 98: /* idlist: %empty  */
 #line 374 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.idlist) = new IDList; }
-#line 3148 "engines/director/lingo/lingo-gr.cpp"
+#line 3155 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 101: /* nonemptyidlist: ID  */
@@ -3153,7 +3160,7 @@ yyreduce:
 		Common::Array<Common::String *> *list = new IDList;
 		list->push_back((yyvsp[0].s));
 		(yyval.idlist) = list; }
-#line 3157 "engines/director/lingo/lingo-gr.cpp"
+#line 3164 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 102: /* nonemptyidlist: nonemptyidlist ',' ID  */
@@ -3161,55 +3168,55 @@ yyreduce:
                                                         {
 		(yyvsp[-2].idlist)->push_back((yyvsp[0].s));
 		(yyval.idlist) = (yyvsp[-2].idlist); }
-#line 3165 "engines/director/lingo/lingo-gr.cpp"
+#line 3172 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 104: /* stmt: tENDIF '\n'  */
 #line 394 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = nullptr; }
-#line 3171 "engines/director/lingo/lingo-gr.cpp"
+#line 3178 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 114: /* proc: CMDID cmdargs '\n'  */
 #line 410 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new CmdNode((yyvsp[-2].s), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3177 "engines/director/lingo/lingo-gr.cpp"
+#line 3184 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 115: /* proc: tPUT cmdargs '\n'  */
 #line 411 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new CmdNode(new Common::String("put"), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3183 "engines/director/lingo/lingo-gr.cpp"
+#line 3190 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 116: /* proc: tGO cmdargs '\n'  */
 #line 412 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new CmdNode(new Common::String("go"), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3189 "engines/director/lingo/lingo-gr.cpp"
+#line 3196 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 117: /* proc: tGO frameargs '\n'  */
 #line 413 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new CmdNode(new Common::String("go"), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3195 "engines/director/lingo/lingo-gr.cpp"
+#line 3202 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 118: /* proc: tPLAY cmdargs '\n'  */
 #line 414 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new CmdNode(new Common::String("play"), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3201 "engines/director/lingo/lingo-gr.cpp"
+#line 3208 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 119: /* proc: tPLAY frameargs '\n'  */
 #line 415 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new CmdNode(new Common::String("play"), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3207 "engines/director/lingo/lingo-gr.cpp"
+#line 3214 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 120: /* proc: tOPEN cmdargs '\n'  */
 #line 416 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new CmdNode(new Common::String("open"), (yyvsp[-1].nodelist), g_lingo->_compiler->_linenumber - 1); }
-#line 3213 "engines/director/lingo/lingo-gr.cpp"
+#line 3220 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 121: /* proc: tOPEN expr tWITH expr '\n'  */
@@ -3219,43 +3226,43 @@ yyreduce:
 		args->push_back((yyvsp[-3].node));
 		args->push_back((yyvsp[-1].node));
 		(yyval.node) = new CmdNode(new Common::String("open"), args, g_lingo->_compiler->_linenumber - 1); }
-#line 3223 "engines/director/lingo/lingo-gr.cpp"
+#line 3230 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 122: /* proc: tNEXT tREPEAT '\n'  */
 #line 422 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new NextRepeatNode(); }
-#line 3229 "engines/director/lingo/lingo-gr.cpp"
+#line 3236 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 123: /* proc: tEXIT tREPEAT '\n'  */
 #line 423 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new ExitRepeatNode(); }
-#line 3235 "engines/director/lingo/lingo-gr.cpp"
+#line 3242 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 124: /* proc: tEXIT '\n'  */
 #line 424 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new ExitNode(); }
-#line 3241 "engines/director/lingo/lingo-gr.cpp"
+#line 3248 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 125: /* proc: tDELETE chunk '\n'  */
 #line 425 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new DeleteNode((yyvsp[-1].node)); }
-#line 3247 "engines/director/lingo/lingo-gr.cpp"
+#line 3254 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 126: /* proc: tHILITE chunk '\n'  */
 #line 426 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new HiliteNode((yyvsp[-1].node)); }
-#line 3253 "engines/director/lingo/lingo-gr.cpp"
+#line 3260 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 127: /* proc: tASSERTERROR stmtoneliner  */
 #line 427 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new AssertErrorNode((yyvsp[0].node)); }
-#line 3259 "engines/director/lingo/lingo-gr.cpp"
+#line 3266 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 128: /* cmdargs: %empty  */
@@ -3263,7 +3270,7 @@ yyreduce:
                                                                                         {
 		// This matches `cmd`
 		(yyval.nodelist) = new NodeList; }
-#line 3267 "engines/director/lingo/lingo-gr.cpp"
+#line 3274 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 129: /* cmdargs: expr trailingcomma  */
@@ -3273,7 +3280,7 @@ yyreduce:
 		NodeList *args = new NodeList;
 		args->push_back((yyvsp[-1].node));
 		(yyval.nodelist) = args; }
-#line 3277 "engines/director/lingo/lingo-gr.cpp"
+#line 3284 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 130: /* cmdargs: expr ',' nonemptyexprlist trailingcomma  */
@@ -3282,7 +3289,7 @@ yyreduce:
 		// This matches `cmd args, ...)
 		(yyvsp[-1].nodelist)->insert_at(0, (yyvsp[-3].node));
 		(yyval.nodelist) = (yyvsp[-1].nodelist); }
-#line 3286 "engines/director/lingo/lingo-gr.cpp"
+#line 3293 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 131: /* cmdargs: expr expr_nounarymath trailingcomma  */
@@ -3293,7 +3300,7 @@ yyreduce:
 		args->push_back((yyvsp[-2].node));
 		args->push_back((yyvsp[-1].node));
 		(yyval.nodelist) = args; }
-#line 3297 "engines/director/lingo/lingo-gr.cpp"
+#line 3304 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 132: /* cmdargs: expr expr_nounarymath ',' nonemptyexprlist trailingcomma  */
@@ -3303,7 +3310,7 @@ yyreduce:
 		(yyvsp[-1].nodelist)->insert_at(0, (yyvsp[-3].node));
 		(yyvsp[-1].nodelist)->insert_at(0, (yyvsp[-4].node));
 		(yyval.nodelist) = (yyvsp[-1].nodelist); }
-#line 3307 "engines/director/lingo/lingo-gr.cpp"
+#line 3314 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 133: /* cmdargs: '(' ')'  */
@@ -3311,7 +3318,7 @@ yyreduce:
                                                                         {
 		// This matches `cmd()`
 		(yyval.nodelist) = new NodeList; }
-#line 3315 "engines/director/lingo/lingo-gr.cpp"
+#line 3322 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 134: /* cmdargs: '(' expr ',' ')'  */
@@ -3321,7 +3328,7 @@ yyreduce:
 		NodeList *args = new NodeList;
 		args->push_back((yyvsp[-2].node));
 		(yyval.nodelist) = args; }
-#line 3325 "engines/director/lingo/lingo-gr.cpp"
+#line 3332 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 135: /* cmdargs: '(' expr ',' nonemptyexprlist trailingcomma ')'  */
@@ -3330,7 +3337,7 @@ yyreduce:
 		// This matches `cmd(args, ...)`
 		(yyvsp[-2].nodelist)->insert_at(0, (yyvsp[-4].node));
 		(yyval.nodelist) = (yyvsp[-2].nodelist); }
-#line 3334 "engines/director/lingo/lingo-gr.cpp"
+#line 3341 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 138: /* frameargs: tFRAME expr  */
@@ -3340,7 +3347,7 @@ yyreduce:
 		NodeList *args = new NodeList;
 		args->push_back(new FrameNode((yyvsp[0].node)));
 		(yyval.nodelist) = args; }
-#line 3344 "engines/director/lingo/lingo-gr.cpp"
+#line 3351 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 139: /* frameargs: tMOVIE expr  */
@@ -3351,7 +3358,7 @@ yyreduce:
 		args->push_back(new IntNode(1));
 		args->push_back(new MovieNode((yyvsp[0].node)));
 		(yyval.nodelist) = args; }
-#line 3355 "engines/director/lingo/lingo-gr.cpp"
+#line 3362 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 140: /* frameargs: tFRAME expr tOF tMOVIE expr  */
@@ -3362,7 +3369,7 @@ yyreduce:
 		args->push_back(new FrameNode((yyvsp[-3].node)));
 		args->push_back(new MovieNode((yyvsp[0].node)));
 		(yyval.nodelist) = args; }
-#line 3366 "engines/director/lingo/lingo-gr.cpp"
+#line 3373 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 141: /* frameargs: expr tOF tMOVIE expr  */
@@ -3373,7 +3380,7 @@ yyreduce:
 		args->push_back((yyvsp[-3].node));
 		args->push_back(new MovieNode((yyvsp[0].node)));
 		(yyval.nodelist) = args; }
-#line 3377 "engines/director/lingo/lingo-gr.cpp"
+#line 3384 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 142: /* frameargs: tFRAME expr expr_nounarymath  */
@@ -3384,49 +3391,49 @@ yyreduce:
 		args->push_back(new FrameNode((yyvsp[-1].node)));
 		args->push_back((yyvsp[0].node));
 		(yyval.nodelist) = args; }
-#line 3388 "engines/director/lingo/lingo-gr.cpp"
+#line 3395 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 143: /* asgn: tPUT expr tINTO varorchunk '\n'  */
 #line 504 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new PutIntoNode((yyvsp[-3].node), (yyvsp[-1].node)); }
-#line 3394 "engines/director/lingo/lingo-gr.cpp"
+#line 3401 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 144: /* asgn: tPUT expr tAFTER varorchunk '\n'  */
 #line 505 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new PutAfterNode((yyvsp[-3].node), (yyvsp[-1].node)); }
-#line 3400 "engines/director/lingo/lingo-gr.cpp"
+#line 3407 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 145: /* asgn: tPUT expr tBEFORE varorchunk '\n'  */
 #line 506 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new PutBeforeNode((yyvsp[-3].node), (yyvsp[-1].node)); }
-#line 3406 "engines/director/lingo/lingo-gr.cpp"
+#line 3413 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 146: /* asgn: tSET varorthe to expr '\n'  */
 #line 507 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new SetNode((yyvsp[-3].node), (yyvsp[-1].node)); }
-#line 3412 "engines/director/lingo/lingo-gr.cpp"
+#line 3419 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 149: /* definevars: tGLOBAL idlist '\n'  */
 #line 512 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new GlobalNode((yyvsp[-1].idlist)); }
-#line 3418 "engines/director/lingo/lingo-gr.cpp"
+#line 3425 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 150: /* definevars: tPROPERTY idlist '\n'  */
 #line 513 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new PropertyNode((yyvsp[-1].idlist)); }
-#line 3424 "engines/director/lingo/lingo-gr.cpp"
+#line 3431 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 151: /* definevars: tINSTANCE idlist '\n'  */
 #line 514 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new InstanceNode((yyvsp[-1].idlist)); }
-#line 3430 "engines/director/lingo/lingo-gr.cpp"
+#line 3437 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 152: /* ifstmt: tIF expr tTHEN stmt  */
@@ -3435,14 +3442,14 @@ yyreduce:
 		NodeList *stmtlist = new NodeList;
 		stmtlist->push_back((yyvsp[0].node));
 		(yyval.node) = new IfStmtNode((yyvsp[-2].node), stmtlist); }
-#line 3439 "engines/director/lingo/lingo-gr.cpp"
+#line 3446 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 153: /* ifstmt: tIF expr tTHEN '\n' stmtlist_insideif endif  */
 #line 521 "engines/director/lingo/lingo-gr.y"
                                                       {
 		(yyval.node) = new IfStmtNode((yyvsp[-4].node), (yyvsp[-1].nodelist)); }
-#line 3446 "engines/director/lingo/lingo-gr.cpp"
+#line 3453 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 154: /* ifelsestmt: tIF expr tTHEN stmt tELSE stmt  */
@@ -3453,7 +3460,7 @@ yyreduce:
 		NodeList *stmtlist2 = new NodeList;
 		stmtlist2->push_back((yyvsp[0].node));
 		(yyval.node) = new IfElseStmtNode((yyvsp[-4].node), stmtlist1, stmtlist2); }
-#line 3457 "engines/director/lingo/lingo-gr.cpp"
+#line 3464 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 155: /* ifelsestmt: tIF expr tTHEN stmt tELSE '\n' stmtlist_insideif endif  */
@@ -3462,7 +3469,7 @@ yyreduce:
 		NodeList *stmtlist1 = new NodeList;
 		stmtlist1->push_back((yyvsp[-4].node));
 		(yyval.node) = new IfElseStmtNode((yyvsp[-6].node), stmtlist1, (yyvsp[-1].nodelist)); }
-#line 3466 "engines/director/lingo/lingo-gr.cpp"
+#line 3473 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 156: /* ifelsestmt: tIF expr tTHEN '\n' stmtlist_insideif tELSE stmt  */
@@ -3471,48 +3478,48 @@ yyreduce:
 		NodeList *stmtlist2 = new NodeList;
 		stmtlist2->push_back((yyvsp[0].node));
 		(yyval.node) = new IfElseStmtNode((yyvsp[-5].node), (yyvsp[-2].nodelist), stmtlist2); }
-#line 3475 "engines/director/lingo/lingo-gr.cpp"
+#line 3482 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 157: /* ifelsestmt: tIF expr tTHEN '\n' stmtlist_insideif tELSE '\n' stmtlist_insideif endif  */
 #line 539 "engines/director/lingo/lingo-gr.y"
                                                                                                          {
 		(yyval.node) = new IfElseStmtNode((yyvsp[-7].node), (yyvsp[-4].nodelist), (yyvsp[-1].nodelist)); }
-#line 3482 "engines/director/lingo/lingo-gr.cpp"
+#line 3489 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 158: /* endif: %empty  */
 #line 543 "engines/director/lingo/lingo-gr.y"
                         { warning("LingoCompiler::parse: no end if"); }
-#line 3488 "engines/director/lingo/lingo-gr.cpp"
+#line 3495 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 160: /* loop: tREPEAT tWHILE expr '\n' stmtlist tENDREPEAT '\n'  */
 #line 546 "engines/director/lingo/lingo-gr.y"
                                                         {
 		(yyval.node) = new RepeatWhileNode((yyvsp[-4].node), (yyvsp[-2].nodelist)); }
-#line 3495 "engines/director/lingo/lingo-gr.cpp"
+#line 3502 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 161: /* loop: tREPEAT tWITH ID tEQ expr tTO expr '\n' stmtlist tENDREPEAT '\n'  */
 #line 548 "engines/director/lingo/lingo-gr.y"
                                                                                        {
 		(yyval.node) = new RepeatWithToNode((yyvsp[-8].s), (yyvsp[-6].node), false, (yyvsp[-4].node), (yyvsp[-2].nodelist)); }
-#line 3502 "engines/director/lingo/lingo-gr.cpp"
+#line 3509 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 162: /* loop: tREPEAT tWITH ID tEQ expr tDOWN tTO expr '\n' stmtlist tENDREPEAT '\n'  */
 #line 550 "engines/director/lingo/lingo-gr.y"
                                                                                              {
 		(yyval.node) = new RepeatWithToNode((yyvsp[-9].s), (yyvsp[-7].node), true, (yyvsp[-4].node), (yyvsp[-2].nodelist)); }
-#line 3509 "engines/director/lingo/lingo-gr.cpp"
+#line 3516 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 163: /* loop: tREPEAT tWITH ID tIN expr '\n' stmtlist tENDREPEAT '\n'  */
 #line 552 "engines/director/lingo/lingo-gr.y"
                                                                   {
 		(yyval.node) = new RepeatWithInNode((yyvsp[-6].s), (yyvsp[-4].node), (yyvsp[-2].nodelist)); }
-#line 3516 "engines/director/lingo/lingo-gr.cpp"
+#line 3523 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 164: /* tell: tTELL expr tTO stmtoneliner  */
@@ -3521,26 +3528,26 @@ yyreduce:
 		NodeList *stmtlist = new NodeList;
 		stmtlist->push_back((yyvsp[0].node));
 		(yyval.node) = new TellNode((yyvsp[-2].node), stmtlist); }
-#line 3525 "engines/director/lingo/lingo-gr.cpp"
+#line 3532 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 165: /* tell: tTELL expr '\n' stmtlist tENDTELL '\n'  */
 #line 560 "engines/director/lingo/lingo-gr.y"
                                                         {
 		(yyval.node) = new TellNode((yyvsp[-4].node), (yyvsp[-2].nodelist)); }
-#line 3532 "engines/director/lingo/lingo-gr.cpp"
+#line 3539 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 166: /* when: tWHEN '\n'  */
 #line 564 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new WhenNode((yyvsp[-1].w).eventName, (yyvsp[-1].w).stmt); }
-#line 3538 "engines/director/lingo/lingo-gr.cpp"
+#line 3545 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 167: /* stmtlist: %empty  */
 #line 566 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.nodelist) = new NodeList; }
-#line 3544 "engines/director/lingo/lingo-gr.cpp"
+#line 3551 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 169: /* nonemptystmtlist: stmtlistline  */
@@ -3551,7 +3558,7 @@ yyreduce:
 			list->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = list; }
-#line 3555 "engines/director/lingo/lingo-gr.cpp"
+#line 3562 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 170: /* nonemptystmtlist: nonemptystmtlist stmtlistline  */
@@ -3561,19 +3568,19 @@ yyreduce:
 			(yyvsp[-1].nodelist)->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = (yyvsp[-1].nodelist); }
-#line 3565 "engines/director/lingo/lingo-gr.cpp"
+#line 3572 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 171: /* stmtlistline: '\n'  */
 #line 584 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = nullptr; }
-#line 3571 "engines/director/lingo/lingo-gr.cpp"
+#line 3578 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 173: /* stmtlist_insideif: %empty  */
 #line 588 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.nodelist) = new NodeList; }
-#line 3577 "engines/director/lingo/lingo-gr.cpp"
+#line 3584 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 175: /* nonemptystmtlist_insideif: stmtlistline_insideif  */
@@ -3584,7 +3591,7 @@ yyreduce:
 			list->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = list; }
-#line 3588 "engines/director/lingo/lingo-gr.cpp"
+#line 3595 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 176: /* nonemptystmtlist_insideif: nonemptystmtlist_insideif stmtlistline_insideif  */
@@ -3594,177 +3601,177 @@ yyreduce:
 			(yyvsp[-1].nodelist)->push_back((yyvsp[0].node));
 		}
 		(yyval.nodelist) = (yyvsp[-1].nodelist); }
-#line 3598 "engines/director/lingo/lingo-gr.cpp"
+#line 3605 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 177: /* stmtlistline_insideif: '\n'  */
 #line 606 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = nullptr; }
-#line 3604 "engines/director/lingo/lingo-gr.cpp"
+#line 3611 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 179: /* simpleexpr_nounarymath: tINT  */
 #line 613 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new IntNode((yyvsp[0].i)); }
-#line 3610 "engines/director/lingo/lingo-gr.cpp"
+#line 3617 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 180: /* simpleexpr_nounarymath: tFLOAT  */
 #line 614 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new FloatNode((yyvsp[0].f)); }
-#line 3616 "engines/director/lingo/lingo-gr.cpp"
+#line 3623 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 181: /* simpleexpr_nounarymath: tSYMBOL  */
 #line 615 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new SymbolNode((yyvsp[0].s)); }
-#line 3622 "engines/director/lingo/lingo-gr.cpp"
+#line 3629 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 182: /* simpleexpr_nounarymath: tSTRING  */
 #line 616 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new StringNode((yyvsp[0].s)); }
-#line 3628 "engines/director/lingo/lingo-gr.cpp"
+#line 3635 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 183: /* simpleexpr_nounarymath: tNOT simpleexpr  */
 #line 617 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new UnaryOpNode(LC::c_not, (yyvsp[0].node)); }
-#line 3634 "engines/director/lingo/lingo-gr.cpp"
+#line 3641 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 184: /* simpleexpr_nounarymath: ID '(' ')'  */
 #line 618 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new FuncNode((yyvsp[-2].s), new NodeList); }
-#line 3640 "engines/director/lingo/lingo-gr.cpp"
+#line 3647 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 185: /* simpleexpr_nounarymath: ID '(' nonemptyexprlist trailingcomma ')'  */
 #line 619 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new FuncNode((yyvsp[-4].s), (yyvsp[-2].nodelist)); }
-#line 3646 "engines/director/lingo/lingo-gr.cpp"
+#line 3653 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 186: /* simpleexpr_nounarymath: '(' expr ')'  */
 #line 620 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = (yyvsp[-1].node); }
-#line 3652 "engines/director/lingo/lingo-gr.cpp"
+#line 3659 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 192: /* var: ID  */
 #line 628 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new VarNode((yyvsp[0].s)); }
-#line 3658 "engines/director/lingo/lingo-gr.cpp"
+#line 3665 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 197: /* chunk: tFIELD refargs  */
 #line 638 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.node) = new FuncNode(new Common::String("field"), (yyvsp[0].nodelist)); }
-#line 3664 "engines/director/lingo/lingo-gr.cpp"
+#line 3671 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 198: /* chunk: tCAST refargs  */
 #line 639 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new FuncNode(new Common::String("cast"), (yyvsp[0].nodelist)); }
-#line 3670 "engines/director/lingo/lingo-gr.cpp"
+#line 3677 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 199: /* chunk: tCHAR expr tOF simpleexpr  */
 #line 640 "engines/director/lingo/lingo-gr.y"
                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkChar, (yyvsp[-2].node), nullptr, (yyvsp[0].node)); }
-#line 3677 "engines/director/lingo/lingo-gr.cpp"
+#line 3684 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 200: /* chunk: tCHAR expr tTO expr tOF simpleexpr  */
 #line 642 "engines/director/lingo/lingo-gr.y"
                                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkChar, (yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 3684 "engines/director/lingo/lingo-gr.cpp"
+#line 3691 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 201: /* chunk: tWORD expr tOF simpleexpr  */
 #line 644 "engines/director/lingo/lingo-gr.y"
                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkWord, (yyvsp[-2].node), nullptr, (yyvsp[0].node)); }
-#line 3691 "engines/director/lingo/lingo-gr.cpp"
+#line 3698 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 202: /* chunk: tWORD expr tTO expr tOF simpleexpr  */
 #line 646 "engines/director/lingo/lingo-gr.y"
                                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkWord, (yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 3698 "engines/director/lingo/lingo-gr.cpp"
+#line 3705 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 203: /* chunk: tITEM expr tOF simpleexpr  */
 #line 648 "engines/director/lingo/lingo-gr.y"
                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkItem, (yyvsp[-2].node), nullptr, (yyvsp[0].node)); }
-#line 3705 "engines/director/lingo/lingo-gr.cpp"
+#line 3712 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 204: /* chunk: tITEM expr tTO expr tOF simpleexpr  */
 #line 650 "engines/director/lingo/lingo-gr.y"
                                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkItem, (yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 3712 "engines/director/lingo/lingo-gr.cpp"
+#line 3719 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 205: /* chunk: tLINE expr tOF simpleexpr  */
 #line 652 "engines/director/lingo/lingo-gr.y"
                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkLine, (yyvsp[-2].node), nullptr, (yyvsp[0].node)); }
-#line 3719 "engines/director/lingo/lingo-gr.cpp"
+#line 3726 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 206: /* chunk: tLINE expr tTO expr tOF simpleexpr  */
 #line 654 "engines/director/lingo/lingo-gr.y"
                                                                 {
 		(yyval.node) = new ChunkExprNode(kChunkLine, (yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 3726 "engines/director/lingo/lingo-gr.cpp"
+#line 3733 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 207: /* chunk: tTHE tLAST chunktype inof simpleexpr  */
 #line 656 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new TheLastNode((yyvsp[-2].chunktype), (yyvsp[0].node)); }
-#line 3732 "engines/director/lingo/lingo-gr.cpp"
+#line 3739 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 208: /* chunktype: tCHAR  */
 #line 659 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.chunktype) = kChunkChar; }
-#line 3738 "engines/director/lingo/lingo-gr.cpp"
+#line 3745 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 209: /* chunktype: tWORD  */
 #line 660 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.chunktype) = kChunkWord; }
-#line 3744 "engines/director/lingo/lingo-gr.cpp"
+#line 3751 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 210: /* chunktype: tITEM  */
 #line 661 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.chunktype) = kChunkItem; }
-#line 3750 "engines/director/lingo/lingo-gr.cpp"
+#line 3757 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 211: /* chunktype: tLINE  */
 #line 662 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.chunktype) = kChunkLine; }
-#line 3756 "engines/director/lingo/lingo-gr.cpp"
+#line 3763 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 212: /* object: tSCRIPT refargs  */
 #line 665 "engines/director/lingo/lingo-gr.y"
                                 { (yyval.node) = new FuncNode(new Common::String("script"), (yyvsp[0].nodelist)); }
-#line 3762 "engines/director/lingo/lingo-gr.cpp"
+#line 3769 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 213: /* object: tWINDOW refargs  */
 #line 666 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new FuncNode(new Common::String("window"), (yyvsp[0].nodelist)); }
-#line 3768 "engines/director/lingo/lingo-gr.cpp"
+#line 3775 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 214: /* refargs: simpleexpr  */
@@ -3774,7 +3781,7 @@ yyreduce:
 		NodeList *args = new NodeList;
 		args->push_back((yyvsp[0].node));
 		(yyval.nodelist) = args; }
-#line 3778 "engines/director/lingo/lingo-gr.cpp"
+#line 3785 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 215: /* refargs: '(' ')'  */
@@ -3782,7 +3789,7 @@ yyreduce:
                                                                                         {
 		// This matches `ref()`
 		(yyval.nodelist) = new NodeList; }
-#line 3786 "engines/director/lingo/lingo-gr.cpp"
+#line 3793 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 216: /* refargs: '(' expr ',' ')'  */
@@ -3792,7 +3799,7 @@ yyreduce:
 		NodeList *args = new NodeList;
 		args->push_back((yyvsp[-2].node));
 		(yyval.nodelist) = args; }
-#line 3796 "engines/director/lingo/lingo-gr.cpp"
+#line 3803 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 217: /* refargs: '(' expr ',' nonemptyexprlist trailingcomma ')'  */
@@ -3801,611 +3808,617 @@ yyreduce:
 		// This matches `ref(args, ...)`
 		(yyvsp[-2].nodelist)->insert_at(0, (yyvsp[-4].node));
 		(yyval.nodelist) = (yyvsp[-2].nodelist); }
-#line 3805 "engines/director/lingo/lingo-gr.cpp"
+#line 3812 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 218: /* the: tTHE ID  */
 #line 688 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheNode((yyvsp[0].s)); }
-#line 3811 "engines/director/lingo/lingo-gr.cpp"
+#line 3818 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 219: /* the: tTHE ID tOF theobj  */
 #line 689 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheOfNode((yyvsp[-2].s), (yyvsp[0].node)); }
-#line 3817 "engines/director/lingo/lingo-gr.cpp"
+#line 3824 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 220: /* the: tTHE tNUMBER tOF theobj  */
 #line 690 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheOfNode(new Common::String("number"), (yyvsp[0].node)); }
-#line 3823 "engines/director/lingo/lingo-gr.cpp"
+#line 3830 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 225: /* theobj: tMENUITEM simpleexpr tOF tMENU simpleexpr  */
 #line 697 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new MenuItemNode((yyvsp[-3].node), (yyvsp[0].node)); }
-#line 3829 "engines/director/lingo/lingo-gr.cpp"
+#line 3836 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 226: /* theobj: tSOUND simpleexpr  */
 #line 698 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new SoundNode((yyvsp[0].node)); }
-#line 3835 "engines/director/lingo/lingo-gr.cpp"
+#line 3842 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 227: /* theobj: tSPRITE simpleexpr  */
 #line 699 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new SpriteNode((yyvsp[0].node)); }
-#line 3841 "engines/director/lingo/lingo-gr.cpp"
+#line 3848 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 228: /* menu: tMENU simpleexpr  */
 #line 702 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new MenuNode((yyvsp[0].node)); }
-#line 3847 "engines/director/lingo/lingo-gr.cpp"
+#line 3854 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 229: /* thedatetime: tTHE tABBREVIATED tDATE  */
 #line 704 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new TheDateTimeNode(kTheAbbr, kTheDate); }
-#line 3853 "engines/director/lingo/lingo-gr.cpp"
+#line 3860 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 230: /* thedatetime: tTHE tABBREVIATED tTIME  */
 #line 705 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheDateTimeNode(kTheAbbr, kTheTime); }
-#line 3859 "engines/director/lingo/lingo-gr.cpp"
+#line 3866 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 231: /* thedatetime: tTHE tABBREV tDATE  */
 #line 706 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheDateTimeNode(kTheAbbr, kTheDate); }
-#line 3865 "engines/director/lingo/lingo-gr.cpp"
+#line 3872 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 232: /* thedatetime: tTHE tABBREV tTIME  */
 #line 707 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheDateTimeNode(kTheAbbr, kTheTime); }
-#line 3871 "engines/director/lingo/lingo-gr.cpp"
+#line 3878 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 233: /* thedatetime: tTHE tABBR tDATE  */
 #line 708 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheDateTimeNode(kTheAbbr, kTheDate); }
-#line 3877 "engines/director/lingo/lingo-gr.cpp"
+#line 3884 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 234: /* thedatetime: tTHE tABBR tTIME  */
 #line 709 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheDateTimeNode(kTheAbbr, kTheTime); }
-#line 3883 "engines/director/lingo/lingo-gr.cpp"
+#line 3890 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 235: /* thedatetime: tTHE tLONG tDATE  */
 #line 710 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheDateTimeNode(kTheLong, kTheDate); }
-#line 3889 "engines/director/lingo/lingo-gr.cpp"
+#line 3896 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 236: /* thedatetime: tTHE tLONG tTIME  */
 #line 711 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheDateTimeNode(kTheLong, kTheTime); }
-#line 3895 "engines/director/lingo/lingo-gr.cpp"
+#line 3902 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 237: /* thedatetime: tTHE tSHORT tDATE  */
 #line 712 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheDateTimeNode(kTheShort, kTheDate); }
-#line 3901 "engines/director/lingo/lingo-gr.cpp"
+#line 3908 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 238: /* thedatetime: tTHE tSHORT tTIME  */
 #line 713 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new TheDateTimeNode(kTheShort, kTheTime); }
-#line 3907 "engines/director/lingo/lingo-gr.cpp"
+#line 3914 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 239: /* thenumberof: tTHE tNUMBER tOF tCHARS inof simpleexpr  */
 #line 717 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfChars, (yyvsp[0].node)); }
-#line 3913 "engines/director/lingo/lingo-gr.cpp"
+#line 3920 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 240: /* thenumberof: tTHE tNUMBER tOF tWORDS inof simpleexpr  */
 #line 718 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfWords, (yyvsp[0].node)); }
-#line 3919 "engines/director/lingo/lingo-gr.cpp"
+#line 3926 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 241: /* thenumberof: tTHE tNUMBER tOF tITEMS inof simpleexpr  */
 #line 719 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfItems, (yyvsp[0].node)); }
-#line 3925 "engines/director/lingo/lingo-gr.cpp"
+#line 3932 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 242: /* thenumberof: tTHE tNUMBER tOF tLINES inof simpleexpr  */
 #line 720 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfLines, (yyvsp[0].node)); }
-#line 3931 "engines/director/lingo/lingo-gr.cpp"
+#line 3938 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 243: /* thenumberof: tTHE tNUMBER tOF tMENUITEMS inof menu  */
 #line 721 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfMenuItems, (yyvsp[0].node)); }
-#line 3937 "engines/director/lingo/lingo-gr.cpp"
+#line 3944 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 244: /* thenumberof: tTHE tNUMBER tOF tMENUS  */
 #line 722 "engines/director/lingo/lingo-gr.y"
                                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfMenus, nullptr); }
-#line 3943 "engines/director/lingo/lingo-gr.cpp"
+#line 3950 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 245: /* thenumberof: tTHE tNUMBER tOF tXTRAS  */
 #line 723 "engines/director/lingo/lingo-gr.y"
                                                                         { (yyval.node) = new TheNumberOfNode(kNumberOfXtras, nullptr); }
-#line 3949 "engines/director/lingo/lingo-gr.cpp"
+#line 3956 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 248: /* writablethe: tTHE ID  */
-#line 728 "engines/director/lingo/lingo-gr.y"
-                                                        { (yyval.node) = new TheNode((yyvsp[0].s)); }
-#line 3955 "engines/director/lingo/lingo-gr.cpp"
+  case 246: /* thenumberof: tTHE tNUMBER tOF tCASTLIBS  */
+#line 724 "engines/director/lingo/lingo-gr.y"
+                                                                { (yyval.node) = new TheNumberOfNode(kNumberOfCastlibs, nullptr); }
+#line 3962 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 249: /* writablethe: tTHE ID tOF writabletheobj  */
+  case 249: /* writablethe: tTHE ID  */
 #line 729 "engines/director/lingo/lingo-gr.y"
+                                                        { (yyval.node) = new TheNode((yyvsp[0].s)); }
+#line 3968 "engines/director/lingo/lingo-gr.cpp"
+    break;
+
+  case 250: /* writablethe: tTHE ID tOF writabletheobj  */
+#line 730 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new TheOfNode((yyvsp[-2].s), (yyvsp[0].node)); }
-#line 3961 "engines/director/lingo/lingo-gr.cpp"
+#line 3974 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 251: /* writabletheobj: tMENU expr_noeq  */
-#line 733 "engines/director/lingo/lingo-gr.y"
+  case 252: /* writabletheobj: tMENU expr_noeq  */
+#line 734 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new MenuNode((yyvsp[0].node)); }
-#line 3967 "engines/director/lingo/lingo-gr.cpp"
+#line 3980 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 252: /* writabletheobj: tMENUITEM expr_noeq tOF tMENU expr_noeq  */
-#line 734 "engines/director/lingo/lingo-gr.y"
+  case 253: /* writabletheobj: tMENUITEM expr_noeq tOF tMENU expr_noeq  */
+#line 735 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new MenuItemNode((yyvsp[-3].node), (yyvsp[0].node)); }
-#line 3973 "engines/director/lingo/lingo-gr.cpp"
+#line 3986 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 253: /* writabletheobj: tSOUND expr_noeq  */
-#line 735 "engines/director/lingo/lingo-gr.y"
+  case 254: /* writabletheobj: tSOUND expr_noeq  */
+#line 736 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new SoundNode((yyvsp[0].node)); }
-#line 3979 "engines/director/lingo/lingo-gr.cpp"
+#line 3992 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 254: /* writabletheobj: tSPRITE expr_noeq  */
-#line 736 "engines/director/lingo/lingo-gr.y"
+  case 255: /* writabletheobj: tSPRITE expr_noeq  */
+#line 737 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new SpriteNode((yyvsp[0].node)); }
-#line 3985 "engines/director/lingo/lingo-gr.cpp"
+#line 3998 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 255: /* list: '[' exprlist ']'  */
-#line 739 "engines/director/lingo/lingo-gr.y"
+  case 256: /* list: '[' exprlist ']'  */
+#line 740 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new ListNode((yyvsp[-1].nodelist)); }
-#line 3991 "engines/director/lingo/lingo-gr.cpp"
+#line 4004 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 256: /* list: '[' ':' ']'  */
-#line 740 "engines/director/lingo/lingo-gr.y"
+  case 257: /* list: '[' ':' ']'  */
+#line 741 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new PropListNode(new NodeList); }
-#line 3997 "engines/director/lingo/lingo-gr.cpp"
+#line 4010 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 257: /* list: '[' proplist ']'  */
-#line 741 "engines/director/lingo/lingo-gr.y"
+  case 258: /* list: '[' proplist ']'  */
+#line 742 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new PropListNode((yyvsp[-1].nodelist)); }
-#line 4003 "engines/director/lingo/lingo-gr.cpp"
+#line 4016 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 258: /* proplist: proppair  */
-#line 747 "engines/director/lingo/lingo-gr.y"
+  case 259: /* proplist: proppair  */
+#line 748 "engines/director/lingo/lingo-gr.y"
                                                         {
 		NodeList *list = new NodeList;
 		list->push_back((yyvsp[0].node));
 		(yyval.nodelist) = list; }
-#line 4012 "engines/director/lingo/lingo-gr.cpp"
+#line 4025 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 259: /* proplist: proplist ',' proppair  */
-#line 751 "engines/director/lingo/lingo-gr.y"
+  case 260: /* proplist: proplist ',' proppair  */
+#line 752 "engines/director/lingo/lingo-gr.y"
                                                 {
 		(yyvsp[-2].nodelist)->push_back((yyvsp[0].node));
 		(yyval.nodelist) = (yyvsp[-2].nodelist); }
-#line 4020 "engines/director/lingo/lingo-gr.cpp"
+#line 4033 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 260: /* proplist: proplist ',' expr  */
-#line 754 "engines/director/lingo/lingo-gr.y"
+  case 261: /* proplist: proplist ',' expr  */
+#line 755 "engines/director/lingo/lingo-gr.y"
                                         {
 		(yyvsp[-2].nodelist)->push_back((yyvsp[0].node));
 		(yyval.nodelist) = (yyvsp[-2].nodelist); }
-#line 4028 "engines/director/lingo/lingo-gr.cpp"
+#line 4041 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 261: /* proppair: tSYMBOL ':' expr  */
-#line 759 "engines/director/lingo/lingo-gr.y"
+  case 262: /* proppair: tSYMBOL ':' expr  */
+#line 760 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new PropPairNode(new SymbolNode((yyvsp[-2].s)), (yyvsp[0].node)); }
-#line 4034 "engines/director/lingo/lingo-gr.cpp"
+#line 4047 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 262: /* proppair: ID ':' expr  */
-#line 760 "engines/director/lingo/lingo-gr.y"
+  case 263: /* proppair: ID ':' expr  */
+#line 761 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new PropPairNode(new SymbolNode((yyvsp[-2].s)), (yyvsp[0].node)); }
-#line 4040 "engines/director/lingo/lingo-gr.cpp"
+#line 4053 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 263: /* proppair: tSTRING ':' expr  */
-#line 761 "engines/director/lingo/lingo-gr.y"
+  case 264: /* proppair: tSTRING ':' expr  */
+#line 762 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new PropPairNode(new StringNode((yyvsp[-2].s)), (yyvsp[0].node)); }
-#line 4046 "engines/director/lingo/lingo-gr.cpp"
+#line 4059 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 264: /* proppair: tINT ':' expr  */
-#line 762 "engines/director/lingo/lingo-gr.y"
+  case 265: /* proppair: tINT ':' expr  */
+#line 763 "engines/director/lingo/lingo-gr.y"
                                     { (yyval.node) = new PropPairNode(new IntNode((yyvsp[-2].i)), (yyvsp[0].node)); }
-#line 4052 "engines/director/lingo/lingo-gr.cpp"
+#line 4065 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 265: /* proppair: tFLOAT ':' expr  */
-#line 763 "engines/director/lingo/lingo-gr.y"
+  case 266: /* proppair: tFLOAT ':' expr  */
+#line 764 "engines/director/lingo/lingo-gr.y"
                                     { (yyval.node) = new PropPairNode(new FloatNode((yyvsp[-2].f)), (yyvsp[0].node)); }
-#line 4058 "engines/director/lingo/lingo-gr.cpp"
+#line 4071 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 266: /* unarymath: '+' simpleexpr  */
-#line 766 "engines/director/lingo/lingo-gr.y"
+  case 267: /* unarymath: '+' simpleexpr  */
+#line 767 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = (yyvsp[0].node); }
-#line 4064 "engines/director/lingo/lingo-gr.cpp"
+#line 4077 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 267: /* unarymath: '-' simpleexpr  */
-#line 767 "engines/director/lingo/lingo-gr.y"
+  case 268: /* unarymath: '-' simpleexpr  */
+#line 768 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.node) = new UnaryOpNode(LC::c_negate, (yyvsp[0].node)); }
-#line 4070 "engines/director/lingo/lingo-gr.cpp"
+#line 4083 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 272: /* expr: expr '+' expr  */
-#line 777 "engines/director/lingo/lingo-gr.y"
+  case 273: /* expr: expr '+' expr  */
+#line 778 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_add, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4076 "engines/director/lingo/lingo-gr.cpp"
+#line 4089 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 273: /* expr: expr '-' expr  */
-#line 778 "engines/director/lingo/lingo-gr.y"
+  case 274: /* expr: expr '-' expr  */
+#line 779 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_sub, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4082 "engines/director/lingo/lingo-gr.cpp"
+#line 4095 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 274: /* expr: expr '*' expr  */
-#line 779 "engines/director/lingo/lingo-gr.y"
+  case 275: /* expr: expr '*' expr  */
+#line 780 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_mul, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4088 "engines/director/lingo/lingo-gr.cpp"
+#line 4101 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 275: /* expr: expr '/' expr  */
-#line 780 "engines/director/lingo/lingo-gr.y"
+  case 276: /* expr: expr '/' expr  */
+#line 781 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_div, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4094 "engines/director/lingo/lingo-gr.cpp"
+#line 4107 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 276: /* expr: expr tMOD expr  */
-#line 781 "engines/director/lingo/lingo-gr.y"
+  case 277: /* expr: expr tMOD expr  */
+#line 782 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_mod, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4100 "engines/director/lingo/lingo-gr.cpp"
+#line 4113 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 277: /* expr: expr '>' expr  */
-#line 782 "engines/director/lingo/lingo-gr.y"
+  case 278: /* expr: expr '>' expr  */
+#line 783 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_gt, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4106 "engines/director/lingo/lingo-gr.cpp"
+#line 4119 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 278: /* expr: expr '<' expr  */
-#line 783 "engines/director/lingo/lingo-gr.y"
+  case 279: /* expr: expr '<' expr  */
+#line 784 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_lt, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4112 "engines/director/lingo/lingo-gr.cpp"
+#line 4125 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 279: /* expr: expr tEQ expr  */
-#line 784 "engines/director/lingo/lingo-gr.y"
+  case 280: /* expr: expr tEQ expr  */
+#line 785 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_eq, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4118 "engines/director/lingo/lingo-gr.cpp"
+#line 4131 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 280: /* expr: expr tNEQ expr  */
-#line 785 "engines/director/lingo/lingo-gr.y"
+  case 281: /* expr: expr tNEQ expr  */
+#line 786 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_neq, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4124 "engines/director/lingo/lingo-gr.cpp"
+#line 4137 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 281: /* expr: expr tGE expr  */
-#line 786 "engines/director/lingo/lingo-gr.y"
+  case 282: /* expr: expr tGE expr  */
+#line 787 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_ge, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4130 "engines/director/lingo/lingo-gr.cpp"
+#line 4143 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 282: /* expr: expr tLE expr  */
-#line 787 "engines/director/lingo/lingo-gr.y"
+  case 283: /* expr: expr tLE expr  */
+#line 788 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_le, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4136 "engines/director/lingo/lingo-gr.cpp"
+#line 4149 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 283: /* expr: expr tAND expr  */
-#line 788 "engines/director/lingo/lingo-gr.y"
+  case 284: /* expr: expr tAND expr  */
+#line 789 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_and, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4142 "engines/director/lingo/lingo-gr.cpp"
+#line 4155 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 284: /* expr: expr tOR expr  */
-#line 789 "engines/director/lingo/lingo-gr.y"
+  case 285: /* expr: expr tOR expr  */
+#line 790 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_or, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4148 "engines/director/lingo/lingo-gr.cpp"
+#line 4161 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 285: /* expr: expr '&' expr  */
-#line 790 "engines/director/lingo/lingo-gr.y"
+  case 286: /* expr: expr '&' expr  */
+#line 791 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_ampersand, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4154 "engines/director/lingo/lingo-gr.cpp"
+#line 4167 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 286: /* expr: expr tCONCAT expr  */
-#line 791 "engines/director/lingo/lingo-gr.y"
+  case 287: /* expr: expr tCONCAT expr  */
+#line 792 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_concat, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4160 "engines/director/lingo/lingo-gr.cpp"
+#line 4173 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 287: /* expr: expr tCONTAINS expr  */
-#line 792 "engines/director/lingo/lingo-gr.y"
+  case 288: /* expr: expr tCONTAINS expr  */
+#line 793 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_contains, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4166 "engines/director/lingo/lingo-gr.cpp"
+#line 4179 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 288: /* expr: expr tSTARTS expr  */
-#line 793 "engines/director/lingo/lingo-gr.y"
+  case 289: /* expr: expr tSTARTS expr  */
+#line 794 "engines/director/lingo/lingo-gr.y"
                                         { (yyval.node) = new BinaryOpNode(LC::c_starts, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4172 "engines/director/lingo/lingo-gr.cpp"
+#line 4185 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 291: /* expr_nounarymath: expr_nounarymath '+' expr  */
-#line 802 "engines/director/lingo/lingo-gr.y"
+  case 292: /* expr_nounarymath: expr_nounarymath '+' expr  */
+#line 803 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_add, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4178 "engines/director/lingo/lingo-gr.cpp"
+#line 4191 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 292: /* expr_nounarymath: expr_nounarymath '-' expr  */
-#line 803 "engines/director/lingo/lingo-gr.y"
+  case 293: /* expr_nounarymath: expr_nounarymath '-' expr  */
+#line 804 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_sub, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4184 "engines/director/lingo/lingo-gr.cpp"
+#line 4197 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 293: /* expr_nounarymath: expr_nounarymath '*' expr  */
-#line 804 "engines/director/lingo/lingo-gr.y"
+  case 294: /* expr_nounarymath: expr_nounarymath '*' expr  */
+#line 805 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_mul, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4190 "engines/director/lingo/lingo-gr.cpp"
+#line 4203 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 294: /* expr_nounarymath: expr_nounarymath '/' expr  */
-#line 805 "engines/director/lingo/lingo-gr.y"
+  case 295: /* expr_nounarymath: expr_nounarymath '/' expr  */
+#line 806 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_div, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4196 "engines/director/lingo/lingo-gr.cpp"
+#line 4209 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 295: /* expr_nounarymath: expr_nounarymath tMOD expr  */
-#line 806 "engines/director/lingo/lingo-gr.y"
+  case 296: /* expr_nounarymath: expr_nounarymath tMOD expr  */
+#line 807 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_mod, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4202 "engines/director/lingo/lingo-gr.cpp"
+#line 4215 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 296: /* expr_nounarymath: expr_nounarymath '>' expr  */
-#line 807 "engines/director/lingo/lingo-gr.y"
+  case 297: /* expr_nounarymath: expr_nounarymath '>' expr  */
+#line 808 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_gt, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4208 "engines/director/lingo/lingo-gr.cpp"
+#line 4221 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 297: /* expr_nounarymath: expr_nounarymath '<' expr  */
-#line 808 "engines/director/lingo/lingo-gr.y"
+  case 298: /* expr_nounarymath: expr_nounarymath '<' expr  */
+#line 809 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_lt, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4214 "engines/director/lingo/lingo-gr.cpp"
+#line 4227 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 298: /* expr_nounarymath: expr_nounarymath tEQ expr  */
-#line 809 "engines/director/lingo/lingo-gr.y"
+  case 299: /* expr_nounarymath: expr_nounarymath tEQ expr  */
+#line 810 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_eq, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4220 "engines/director/lingo/lingo-gr.cpp"
+#line 4233 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 299: /* expr_nounarymath: expr_nounarymath tNEQ expr  */
-#line 810 "engines/director/lingo/lingo-gr.y"
+  case 300: /* expr_nounarymath: expr_nounarymath tNEQ expr  */
+#line 811 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_neq, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4226 "engines/director/lingo/lingo-gr.cpp"
+#line 4239 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 300: /* expr_nounarymath: expr_nounarymath tGE expr  */
-#line 811 "engines/director/lingo/lingo-gr.y"
+  case 301: /* expr_nounarymath: expr_nounarymath tGE expr  */
+#line 812 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_ge, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4232 "engines/director/lingo/lingo-gr.cpp"
+#line 4245 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 301: /* expr_nounarymath: expr_nounarymath tLE expr  */
-#line 812 "engines/director/lingo/lingo-gr.y"
+  case 302: /* expr_nounarymath: expr_nounarymath tLE expr  */
+#line 813 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_le, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4238 "engines/director/lingo/lingo-gr.cpp"
+#line 4251 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 302: /* expr_nounarymath: expr_nounarymath tAND expr  */
-#line 813 "engines/director/lingo/lingo-gr.y"
+  case 303: /* expr_nounarymath: expr_nounarymath tAND expr  */
+#line 814 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_and, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4244 "engines/director/lingo/lingo-gr.cpp"
+#line 4257 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 303: /* expr_nounarymath: expr_nounarymath tOR expr  */
-#line 814 "engines/director/lingo/lingo-gr.y"
+  case 304: /* expr_nounarymath: expr_nounarymath tOR expr  */
+#line 815 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_or, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4250 "engines/director/lingo/lingo-gr.cpp"
+#line 4263 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 304: /* expr_nounarymath: expr_nounarymath '&' expr  */
-#line 815 "engines/director/lingo/lingo-gr.y"
+  case 305: /* expr_nounarymath: expr_nounarymath '&' expr  */
+#line 816 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_ampersand, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4256 "engines/director/lingo/lingo-gr.cpp"
+#line 4269 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 305: /* expr_nounarymath: expr_nounarymath tCONCAT expr  */
-#line 816 "engines/director/lingo/lingo-gr.y"
+  case 306: /* expr_nounarymath: expr_nounarymath tCONCAT expr  */
+#line 817 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new BinaryOpNode(LC::c_concat, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4262 "engines/director/lingo/lingo-gr.cpp"
+#line 4275 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 306: /* expr_nounarymath: expr_nounarymath tCONTAINS expr  */
-#line 817 "engines/director/lingo/lingo-gr.y"
+  case 307: /* expr_nounarymath: expr_nounarymath tCONTAINS expr  */
+#line 818 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new BinaryOpNode(LC::c_contains, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4268 "engines/director/lingo/lingo-gr.cpp"
+#line 4281 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 307: /* expr_nounarymath: expr_nounarymath tSTARTS expr  */
-#line 818 "engines/director/lingo/lingo-gr.y"
+  case 308: /* expr_nounarymath: expr_nounarymath tSTARTS expr  */
+#line 819 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new BinaryOpNode(LC::c_starts, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4274 "engines/director/lingo/lingo-gr.cpp"
+#line 4287 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 310: /* expr_noeq: expr_noeq '+' expr_noeq  */
-#line 823 "engines/director/lingo/lingo-gr.y"
+  case 311: /* expr_noeq: expr_noeq '+' expr_noeq  */
+#line 824 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_add, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4280 "engines/director/lingo/lingo-gr.cpp"
+#line 4293 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 311: /* expr_noeq: expr_noeq '-' expr_noeq  */
-#line 824 "engines/director/lingo/lingo-gr.y"
+  case 312: /* expr_noeq: expr_noeq '-' expr_noeq  */
+#line 825 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_sub, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4286 "engines/director/lingo/lingo-gr.cpp"
+#line 4299 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 312: /* expr_noeq: expr_noeq '*' expr_noeq  */
-#line 825 "engines/director/lingo/lingo-gr.y"
+  case 313: /* expr_noeq: expr_noeq '*' expr_noeq  */
+#line 826 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_mul, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4292 "engines/director/lingo/lingo-gr.cpp"
+#line 4305 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 313: /* expr_noeq: expr_noeq '/' expr_noeq  */
-#line 826 "engines/director/lingo/lingo-gr.y"
+  case 314: /* expr_noeq: expr_noeq '/' expr_noeq  */
+#line 827 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_div, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4298 "engines/director/lingo/lingo-gr.cpp"
+#line 4311 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 314: /* expr_noeq: expr_noeq tMOD expr_noeq  */
-#line 827 "engines/director/lingo/lingo-gr.y"
+  case 315: /* expr_noeq: expr_noeq tMOD expr_noeq  */
+#line 828 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_mod, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4304 "engines/director/lingo/lingo-gr.cpp"
+#line 4317 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 315: /* expr_noeq: expr_noeq '>' expr_noeq  */
-#line 828 "engines/director/lingo/lingo-gr.y"
+  case 316: /* expr_noeq: expr_noeq '>' expr_noeq  */
+#line 829 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_gt, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4310 "engines/director/lingo/lingo-gr.cpp"
+#line 4323 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 316: /* expr_noeq: expr_noeq '<' expr_noeq  */
-#line 829 "engines/director/lingo/lingo-gr.y"
+  case 317: /* expr_noeq: expr_noeq '<' expr_noeq  */
+#line 830 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_lt, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4316 "engines/director/lingo/lingo-gr.cpp"
+#line 4329 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 317: /* expr_noeq: expr_noeq tNEQ expr_noeq  */
-#line 830 "engines/director/lingo/lingo-gr.y"
+  case 318: /* expr_noeq: expr_noeq tNEQ expr_noeq  */
+#line 831 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_neq, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4322 "engines/director/lingo/lingo-gr.cpp"
+#line 4335 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 318: /* expr_noeq: expr_noeq tGE expr_noeq  */
-#line 831 "engines/director/lingo/lingo-gr.y"
+  case 319: /* expr_noeq: expr_noeq tGE expr_noeq  */
+#line 832 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_ge, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4328 "engines/director/lingo/lingo-gr.cpp"
+#line 4341 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 319: /* expr_noeq: expr_noeq tLE expr_noeq  */
-#line 832 "engines/director/lingo/lingo-gr.y"
+  case 320: /* expr_noeq: expr_noeq tLE expr_noeq  */
+#line 833 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_le, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4334 "engines/director/lingo/lingo-gr.cpp"
+#line 4347 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 320: /* expr_noeq: expr_noeq tAND expr_noeq  */
-#line 833 "engines/director/lingo/lingo-gr.y"
+  case 321: /* expr_noeq: expr_noeq tAND expr_noeq  */
+#line 834 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_and, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4340 "engines/director/lingo/lingo-gr.cpp"
+#line 4353 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 321: /* expr_noeq: expr_noeq tOR expr_noeq  */
-#line 834 "engines/director/lingo/lingo-gr.y"
+  case 322: /* expr_noeq: expr_noeq tOR expr_noeq  */
+#line 835 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_or, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4346 "engines/director/lingo/lingo-gr.cpp"
+#line 4359 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 322: /* expr_noeq: expr_noeq '&' expr_noeq  */
-#line 835 "engines/director/lingo/lingo-gr.y"
+  case 323: /* expr_noeq: expr_noeq '&' expr_noeq  */
+#line 836 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_ampersand, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4352 "engines/director/lingo/lingo-gr.cpp"
+#line 4365 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 323: /* expr_noeq: expr_noeq tCONCAT expr_noeq  */
-#line 836 "engines/director/lingo/lingo-gr.y"
+  case 324: /* expr_noeq: expr_noeq tCONCAT expr_noeq  */
+#line 837 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_concat, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4358 "engines/director/lingo/lingo-gr.cpp"
+#line 4371 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 324: /* expr_noeq: expr_noeq tCONTAINS expr_noeq  */
-#line 837 "engines/director/lingo/lingo-gr.y"
+  case 325: /* expr_noeq: expr_noeq tCONTAINS expr_noeq  */
+#line 838 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new BinaryOpNode(LC::c_contains, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4364 "engines/director/lingo/lingo-gr.cpp"
+#line 4377 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 325: /* expr_noeq: expr_noeq tSTARTS expr_noeq  */
-#line 838 "engines/director/lingo/lingo-gr.y"
+  case 326: /* expr_noeq: expr_noeq tSTARTS expr_noeq  */
+#line 839 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new BinaryOpNode(LC::c_starts, (yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4370 "engines/director/lingo/lingo-gr.cpp"
+#line 4383 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 326: /* sprite: tSPRITE expr tINTERSECTS simpleexpr  */
-#line 841 "engines/director/lingo/lingo-gr.y"
+  case 327: /* sprite: tSPRITE expr tINTERSECTS simpleexpr  */
+#line 842 "engines/director/lingo/lingo-gr.y"
                                                 { (yyval.node) = new IntersectsNode((yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4376 "engines/director/lingo/lingo-gr.cpp"
+#line 4389 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 327: /* sprite: tSPRITE expr tWITHIN simpleexpr  */
-#line 842 "engines/director/lingo/lingo-gr.y"
+  case 328: /* sprite: tSPRITE expr tWITHIN simpleexpr  */
+#line 843 "engines/director/lingo/lingo-gr.y"
                                                         { (yyval.node) = new WithinNode((yyvsp[-2].node), (yyvsp[0].node)); }
-#line 4382 "engines/director/lingo/lingo-gr.cpp"
+#line 4395 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 328: /* exprlist: %empty  */
-#line 845 "engines/director/lingo/lingo-gr.y"
+  case 329: /* exprlist: %empty  */
+#line 846 "engines/director/lingo/lingo-gr.y"
                                                                 { (yyval.nodelist) = new NodeList; }
-#line 4388 "engines/director/lingo/lingo-gr.cpp"
+#line 4401 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 330: /* nonemptyexprlist: expr  */
-#line 849 "engines/director/lingo/lingo-gr.y"
+  case 331: /* nonemptyexprlist: expr  */
+#line 850 "engines/director/lingo/lingo-gr.y"
                                                         {
 		NodeList *list = new NodeList;
 		list->push_back((yyvsp[0].node));
 		(yyval.nodelist) = list; }
-#line 4397 "engines/director/lingo/lingo-gr.cpp"
+#line 4410 "engines/director/lingo/lingo-gr.cpp"
     break;
 
-  case 331: /* nonemptyexprlist: nonemptyexprlist ',' expr  */
-#line 853 "engines/director/lingo/lingo-gr.y"
+  case 332: /* nonemptyexprlist: nonemptyexprlist ',' expr  */
+#line 854 "engines/director/lingo/lingo-gr.y"
                                                 {
 		(yyvsp[-2].nodelist)->push_back((yyvsp[0].node));
 		(yyval.nodelist) = (yyvsp[-2].nodelist); }
-#line 4405 "engines/director/lingo/lingo-gr.cpp"
+#line 4418 "engines/director/lingo/lingo-gr.cpp"
     break;
 
 
-#line 4409 "engines/director/lingo/lingo-gr.cpp"
+#line 4422 "engines/director/lingo/lingo-gr.cpp"
 
       default: break;
     }
@@ -4603,7 +4616,7 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 858 "engines/director/lingo/lingo-gr.y"
+#line 859 "engines/director/lingo/lingo-gr.y"
 
 
 int yyreport_syntax_error(const yypcontext_t *ctx) {
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index f9ca97f0859..3e37d468e29 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -129,18 +129,19 @@ extern int yydebug;
     tTHE = 330,                    /* tTHE  */
     tTIME = 331,                   /* tTIME  */
     tXTRAS = 332,                  /* tXTRAS  */
-    tSOUND = 333,                  /* tSOUND  */
-    tSPRITE = 334,                 /* tSPRITE  */
-    tINTERSECTS = 335,             /* tINTERSECTS  */
-    tWITHIN = 336,                 /* tWITHIN  */
-    tTELL = 337,                   /* tTELL  */
-    tPROPERTY = 338,               /* tPROPERTY  */
-    tON = 339,                     /* tON  */
-    tMETHOD = 340,                 /* tMETHOD  */
-    tENDIF = 341,                  /* tENDIF  */
-    tENDREPEAT = 342,              /* tENDREPEAT  */
-    tENDTELL = 343,                /* tENDTELL  */
-    tASSERTERROR = 344             /* tASSERTERROR  */
+    tCASTLIBS = 333,               /* tCASTLIBS  */
+    tSOUND = 334,                  /* tSOUND  */
+    tSPRITE = 335,                 /* tSPRITE  */
+    tINTERSECTS = 336,             /* tINTERSECTS  */
+    tWITHIN = 337,                 /* tWITHIN  */
+    tTELL = 338,                   /* tTELL  */
+    tPROPERTY = 339,               /* tPROPERTY  */
+    tON = 340,                     /* tON  */
+    tMETHOD = 341,                 /* tMETHOD  */
+    tENDIF = 342,                  /* tENDIF  */
+    tENDREPEAT = 343,              /* tENDREPEAT  */
+    tENDTELL = 344,                /* tENDTELL  */
+    tASSERTERROR = 345             /* tASSERTERROR  */
   };
   typedef enum yytokentype yytoken_kind_t;
 #endif
@@ -164,7 +165,7 @@ union YYSTYPE
 	Director::Node *node;
 	Director::NodeList *nodelist;
 
-#line 168 "engines/director/lingo/lingo-gr.h"
+#line 169 "engines/director/lingo/lingo-gr.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index cef7799959d..0357479f7f2 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -137,7 +137,7 @@ static void checkEnd(Common::String *token, Common::String *expect, bool require
 %token tAFTER tBEFORE tCONCAT tCONTAINS tSTARTS
 %token tCHAR tCHARS tITEM tITEMS tLINE tLINES tWORD tWORDS
 %token tABBREVIATED tABBREV tABBR tLONG tSHORT
-%token tDATE tLAST tMENU tMENUS tMENUITEM tMENUITEMS tNUMBER tTHE tTIME tXTRAS
+%token tDATE tLAST tMENU tMENUS tMENUITEM tMENUITEMS tNUMBER tTHE tTIME tXTRAS tCASTLIBS
 %token tSOUND tSPRITE tINTERSECTS tWITHIN tTELL tPROPERTY
 %token tON tMETHOD tENDIF tENDREPEAT tENDTELL
 %token tASSERTERROR
@@ -720,7 +720,8 @@ thenumberof:
 	| tTHE tNUMBER tOF tLINES inof simpleexpr	{ $$ = new TheNumberOfNode(kNumberOfLines, $simpleexpr); }
 	| tTHE tNUMBER tOF tMENUITEMS inof menu		{ $$ = new TheNumberOfNode(kNumberOfMenuItems, $menu); }
 	| tTHE tNUMBER tOF tMENUS					{ $$ = new TheNumberOfNode(kNumberOfMenus, nullptr); }
-	| tTHE tNUMBER tOF tXTRAS					{ $$ = new TheNumberOfNode(kNumberOfXtras, nullptr); }
+	| tTHE tNUMBER tOF tXTRAS					{ $$ = new TheNumberOfNode(kNumberOfXtras, nullptr); } // D5
+	| tTHE tNUMBER tOF tCASTLIBS				{ $$ = new TheNumberOfNode(kNumberOfCastlibs, nullptr); } // D5
 	;
 
 inof: tIN | tOF ;
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 964e9ab9468..33057d7febd 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -355,8 +355,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 88
-#define YY_END_OF_BUFFER 89
+#define YY_NUM_RULES 89
+#define YY_END_OF_BUFFER 90
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -364,47 +364,48 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[358] =
+static const flex_int16_t yy_accept[362] =
     {   0,
-        0,    0,   89,   87,    1,   85,   85,   87,   87,   84,
-       84,   83,   84,   80,   84,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   87,    1,   81,   87,    1,
-       85,    0,    0,   86,    2,   79,   82,   83,   78,   76,
-       77,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   23,   81,
-       25,   29,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   47,   48,   81,   50,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   67,
-
-       81,   81,   81,   81,    1,    0,    0,   81,    2,   82,
-       81,   81,    7,   81,   81,   81,   81,   81,   81,   81,
-       81,   17,   81,   81,   81,   81,    0,    0,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   42,   81,
-       81,   45,   81,   81,   81,   81,   81,   54,   81,   81,
-       81,   58,   81,   81,   81,   81,   81,   64,   81,   81,
-       81,   81,   81,   81,   81,    0,   81,    5,   81,   81,
-        9,   10,   81,   13,   81,   15,   16,    0,    0,   18,
-       81,   81,   81,    0,   81,   81,   81,   28,   30,   32,
-       33,   35,   81,   37,   81,   81,   44,   81,   49,   51,
-
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   63,
-       65,   66,   81,   81,   81,   71,   73,   81,    0,   81,
-       81,    6,   81,   11,   81,   81,   17,   20,   21,   81,
-       23,   81,   81,   81,   31,   34,   36,   81,   38,   81,
-       43,   81,   81,   81,   81,   81,   81,   59,   60,   81,
-       81,    0,    0,   69,   81,   81,   74,   75,    0,   81,
-        4,    8,   81,   14,   17,   22,   24,   81,   81,   81,
-       41,   46,   81,   81,   55,   56,   81,   61,   62,    0,
-        0,    0,   70,   72,    0,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,    0,    0,    0,    0,   19,   81,
-
-       12,   26,   81,   39,   52,   53,   81,    0,    0,    0,
-       19,   81,   81,   40,   81,    0,    0,    0,    0,   81,
-       27,   81,    0,    0,    0,    0,    3,   81,    0,    0,
-        0,    0,    0,    0,   81,    0,    0,    0,    0,    0,
-       81,    0,    0,   81,    0,    0,   81,    0,   81,   68,
-        0,   81,   68,   68,   68,   57,    0
+        0,    0,   90,   88,    1,   86,   86,   88,   88,   85,
+       85,   84,   85,   81,   85,   82,   82,   82,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
+       82,   82,   82,   82,   82,   88,    1,   82,   88,    1,
+       86,    0,    0,   87,    2,   80,   83,   84,   79,   77,
+       78,   82,   82,   82,   82,   82,   82,   82,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,   82,   24,   82,
+       26,   30,   82,   82,   82,   82,   82,   82,   82,   82,
+       82,   82,   48,   49,   82,   51,   82,   82,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,   82,   82,   68,
+
+       82,   82,   82,   82,    1,    0,    0,   82,    2,   83,
+       82,   82,    7,   82,   82,   82,   82,   82,   82,   82,
+       82,   18,   82,   82,   82,   82,    0,    0,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,   82,   43,   82,
+       82,   46,   82,   82,   82,   82,   82,   55,   82,   82,
+       82,   59,   82,   82,   82,   82,   82,   65,   82,   82,
+       82,   82,   82,   82,   82,    0,   82,    5,   82,   82,
+        9,   11,   82,   14,   82,   16,   17,    0,    0,   19,
+       82,   82,   82,    0,   82,   82,   82,   29,   31,   33,
+       34,   36,   82,   38,   82,   82,   45,   82,   50,   52,
+
+       82,   82,   82,   82,   82,   82,   82,   82,   82,   64,
+       66,   67,   82,   82,   82,   72,   74,   82,    0,   82,
+       82,    6,   82,   82,   12,   82,   82,   18,   21,   22,
+       82,   24,   82,   82,   82,   32,   35,   37,   82,   39,
+       82,   44,   82,   82,   82,   82,   82,   82,   60,   61,
+       82,   82,    0,    0,   70,   82,   82,   75,   76,    0,
+       82,    4,    8,   82,   82,   15,   18,   23,   25,   82,
+       82,   82,   42,   47,   82,   82,   56,   57,   82,   62,
+       63,    0,    0,    0,   71,   73,    0,   82,   82,   82,
+       82,   82,   82,   82,   82,   82,   82,    0,    0,    0,
+
+        0,   20,   82,   10,   13,   27,   82,   40,   53,   54,
+       82,    0,    0,    0,   20,   82,   82,   41,   82,    0,
+        0,    0,    0,   82,   28,   82,    0,    0,    0,    0,
+        3,   82,    0,    0,    0,    0,    0,    0,   82,    0,
+        0,    0,    0,    0,   82,    0,    0,   82,    0,    0,
+       82,    0,   82,   69,    0,   82,   69,   69,   69,   58,
+        0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -450,14 +451,14 @@ static const YY_CHAR yy_meta[65] =
         5,    1,    2,    2
     } ;
 
-static const flex_int16_t yy_base[365] =
+static const flex_int16_t yy_base[369] =
     {   0,
-        0,   63,  223,  850,   67,  850,  850,  211,    0,  850,
-      202,   56,   60,  850,  177,   59,   57,   62,   63,   60,
+        0,   63,  223,  849,   67,  849,  849,  211,    0,  849,
+      202,   56,   60,  849,  177,   59,   57,   62,   63,   60,
        58,   64,   57,  101,    0,  109,  120,  117,  134,  142,
        75,  183,  175,  185,   63,  127,  238,  215,  122,  245,
-      850,  120,  169,  850,    0,  850,  139,  112,  850,  850,
-      850,    0,  101,  110,  129,  133,  112,  140,  130,  137,
+      849,  120,  169,  849,    0,  849,  139,  112,  849,  849,
+      849,    0,  101,  110,  129,  133,  112,  140,  130,  137,
       154,  147,  154,  177,  178,  191,  205,  163,  250,  202,
         0,  224,  234,  213,  232,  233,  246,  237,  254,  230,
       238,  247,    0,    0,  256,    0,  261,  276,  248,  262,
@@ -470,75 +471,75 @@ static const flex_int16_t yy_base[365] =
       377,    0,  399,  384,  380,  390,  396,    0,  408,  408,
       407,    0,  406,  410,  409,  409,  416,  417,  427,  422,
       426,  429,  431,  436,  443,  442,  429,  445,  435,  436,
-        0,  437,  457,    0,  441,    0,    0,  474,   71,    0,
-      462,  462,  469,  457,  454,  476,  462,    0,  462,    0,
-      463,    0,  469,  479,  470,  481,    0,  482,    0,    0,
-
-      480,  487,  492,  482,  486,  486,  502,  490,  495,    0,
-        0,    0,  527,  514,  510,  517,  511,  513,  514,  519,
-      514,    0,  522,    0,  527,  533,    0,    0,    0,  528,
-      850,  536,  530,  527,    0,    0,    0,  527,    0,  538,
-        0,  530,  534,  538,  540,  542,  543,    0,    0,  566,
-      555,  609,   66,    0,  553,  565,    0,    0,  565,  564,
-      574,    0,  571,    0,    0,    0,    0,  583,  583,  584,
-        0,    0,  571,  573,    0,    0,  580,    0,    0,  589,
-      586,  590,    0,    0,  589,  585,  610,  599,  620,  623,
-      606,  603,  606,  630,  609,  614,  624,  614,    0,  620,
-
-        0,    0,  622,  628,    0,    0,  629,  648,  630,  649,
-      850,  658,  647,    0,  648,  652,  656,  668,  660,  673,
-        0,  674,  659,  692,  680,  662,    0,  669,  678,  705,
-       63,  679,  683,  683,  687,  719,  703,  691,  728,  730,
-      709,  715,  712,  710,  714,  742,  717,  749,  724,  755,
-       36,  731,    0,  765,   33,    0,  850,  829,   80,  831,
-      833,  837,  839,  844
+      443,  440,  459,    0,  443,    0,    0,  479,   71,    0,
+      461,  461,  471,  462,  460,  472,  463,    0,  464,    0,
+      465,    0,  471,  483,  472,  483,    0,  486,    0,    0,
+
+      484,  489,  494,  482,  486,  485,  503,  492,  494,    0,
+        0,    0,  532,  503,  499,  516,  512,  515,  516,  523,
+      518,    0,  521,  531,    0,  532,  537,    0,    0,    0,
+      532,  849,  540,  533,  530,    0,    0,    0,  532,    0,
+      548,    0,  537,  540,  540,  541,  544,  547,    0,    0,
+      567,  557,  611,   66,    0,  562,  571,    0,    0,  572,
+      571,  564,    0,  577,  575,    0,    0,    0,    0,  587,
+      587,  588,    0,    0,  575,  581,    0,    0,  591,    0,
+        0,  596,  590,  600,    0,    0,  589,  589,  614,  601,
+      602,  621,  628,  608,  616,  611,  631,  616,  621,  633,
+
+      624,    0,  630,    0,    0,    0,  632,  634,    0,    0,
+      636,  658,  641,  660,  849,  661,  650,    0,  652,  658,
+      660,  674,  666,  679,    0,  679,  665,  697,  691,  672,
+        0,  677,  683,  714,   63,  683,  684,  687,  690,  725,
+      704,  692,  734,  736,  713,  721,  714,  713,  717,  747,
+      722,  752,  729,  757,   36,  732,    0,  764,   33,    0,
+      849,  828,   80,  830,  832,  836,  838,  843
     } ;
 
-static const flex_int16_t yy_def[365] =
+static const flex_int16_t yy_def[369] =
     {   0,
-      357,    1,  357,  357,  357,  357,  357,  358,  359,  357,
-      357,  357,  357,  357,  357,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  357,  357,  360,  357,  357,
-      357,  357,  358,  357,  361,  357,  357,  357,  357,  357,
-      357,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  357,  357,  357,  360,  361,  357,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  357,  357,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  357,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  362,  357,  360,
-      360,  360,  360,  357,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  357,  360,
-      360,  360,  360,  360,  360,  360,  363,  360,  360,  360,
-      357,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  360,
-      360,  357,  357,  360,  360,  360,  360,  360,  357,  360,
-      360,  360,  360,  360,  363,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  360,  360,  360,  360,  360,  357,
-      357,  357,  360,  360,  357,  360,  360,  360,  360,  360,
-      360,  360,  360,  360,  357,  357,  357,  357,  360,  360,
-
-      360,  360,  360,  360,  360,  360,  360,  357,  357,  357,
-      357,  360,  360,  360,  360,  357,  357,  357,  357,  360,
-      360,  360,  357,  357,  357,  357,  360,  360,  357,  357,
-      357,  357,  357,  357,  360,  357,  357,  357,  357,  357,
-      360,  357,  357,  360,  357,  357,  360,  357,  360,  364,
-      357,  360,  364,  364,  364,  360,    0,  357,  357,  357,
-      357,  357,  357,  357
+      361,    1,  361,  361,  361,  361,  361,  362,  363,  361,
+      361,  361,  361,  361,  361,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  361,  361,  364,  361,  361,
+      361,  361,  362,  361,  365,  361,  361,  361,  361,  361,
+      361,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+
+      364,  364,  364,  364,  361,  361,  361,  364,  365,  361,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  361,  361,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  361,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  366,  361,  364,
+      364,  364,  364,  361,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  361,  364,
+      364,  364,  364,  364,  364,  364,  364,  367,  364,  364,
+      364,  361,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  364,  361,  361,  364,  364,  364,  364,  364,  361,
+      364,  364,  364,  364,  364,  364,  367,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  361,  361,  361,  364,  364,  361,  364,  364,  364,
+      364,  364,  364,  364,  364,  364,  364,  361,  361,  361,
+
+      361,  364,  364,  364,  364,  364,  364,  364,  364,  364,
+      364,  361,  361,  361,  361,  364,  364,  364,  364,  361,
+      361,  361,  361,  364,  364,  364,  361,  361,  361,  361,
+      364,  364,  361,  361,  361,  361,  361,  361,  364,  361,
+      361,  361,  361,  361,  364,  361,  361,  364,  361,  361,
+      364,  361,  364,  368,  361,  364,  368,  368,  368,  364,
+        0,  361,  361,  361,  361,  361,  361,  361
     } ;
 
-static const flex_int16_t yy_nxt[915] =
+static const flex_int16_t yy_nxt[914] =
     {   0,
         4,    5,    6,    7,    5,    8,    9,   10,   11,    4,
        12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
@@ -549,11 +550,11 @@ static const flex_int16_t yy_nxt[915] =
        25,    4,   36,   36,   37,   47,   48,   37,   40,   41,
        41,   40,   49,   50,   53,   56,   57,   60,   54,   70,
        66,   61,   38,   58,   45,   63,   55,   64,   67,   68,
-       59,   62,   69,   90,  354,  104,   65,  350,   53,   56,
+       59,   62,   69,   90,  358,  104,   65,  354,   53,   56,
 
        57,   60,   54,   70,   66,   61,   38,   58,   63,   55,
        64,   67,   68,   59,   62,   69,  111,   90,  104,   65,
-       71,   47,   48,   74,  330,   39,   39,  252,   72,   42,
+       71,   47,   48,   74,  334,   39,   39,  253,   72,   42,
        42,   75,  178,   73,   77,   80,  127,   76,   78,  110,
       111,  105,  112,  115,   71,   81,  113,   74,   79,  110,
        82,   72,  114,   83,  116,   75,   73,  117,   77,   80,
@@ -564,86 +565,86 @@ static const flex_int16_t yy_nxt[915] =
 
       123,   92,  119,  100,   93,  120,  101,  102,  121,  124,
        46,   94,   95,  103,  126,   96,   44,   97,  122,  125,
-       98,   99,  357,   91,  123,   92,  100,  129,   93,  108,
-      101,  102,  357,  124,   94,   95,  103,   66,   96,  105,
+       98,   99,  361,   91,  123,   92,  100,  129,   93,  108,
+      101,  102,  361,  124,   94,   95,  103,   66,   96,  105,
        41,   41,  105,  125,  133,   67,   40,   41,   41,   40,
-      129,  127,  132,  108,  127,  130,  131,  106,  357,  134,
-      135,   66,  136,  357,  137,  357,  141,  133,   67,  138,
-      142,  139,  357,  143,  144,  145,  132,  357,  130,  131,
-      148,  106,  134,  135,  357,  357,  136,  137,  140,  141,
-      357,  149,  138,  142,  146,  139,  143,  152,  144,  145,
+      129,  127,  132,  108,  127,  130,  131,  106,  361,  134,
+      135,   66,  136,  361,  137,  361,  141,  133,   67,  138,
+      142,  139,  361,  143,  144,  145,  132,  361,  130,  131,
+      148,  106,  134,  135,  361,  361,  136,  137,  140,  141,
+      361,  149,  138,  142,  146,  139,  143,  152,  144,  145,
 
       107,  107,  150,  148,  147,  151,  153,   42,   42,  154,
-      155,  140,  128,  128,  149,  156,  357,  157,  146,  158,
-      152,  159,  160,  357,  164,  150,  161,  147,  151,  153,
-      162,  165,  154,  155,  168,  163,  357,  357,  357,  156,
+      155,  140,  128,  128,  149,  156,  361,  157,  146,  158,
+      152,  159,  160,  361,  164,  150,  161,  147,  151,  153,
+      162,  165,  154,  155,  168,  163,  361,  361,  361,  156,
       157,  166,  167,  158,  159,  169,  160,  164,  170,  171,
       161,  172,  173,  162,  165,  174,  175,  168,  163,  105,
        41,   41,  105,  176,  177,  166,  167,  178,  180,  169,
       178,  170,  171,  181,  172,  173,  182,  106,  183,  174,
-      175,  127,  185,  187,  127,  186,  176,  189,  177,  357,
-      190,  180,  193,  188,  191,  192,  181,  357,  195,  182,
+      175,  127,  185,  187,  127,  186,  176,  189,  177,  361,
+      190,  180,  193,  188,  191,  192,  181,  361,  195,  182,
 
-      194,  106,  183,  196,  357,  357,  185,  187,  186,  197,
+      194,  106,  183,  196,  361,  361,  185,  187,  186,  197,
       189,  199,  184,  190,  198,  193,  188,  200,  191,  192,
       107,  107,  195,  194,  201,  202,  203,  196,  179,  179,
       204,  208,  197,  205,  199,  184,  206,  207,  198,  209,
       200,  210,  128,  128,  211,  212,  215,  201,  202,  213,
       203,  214,  216,  217,  204,  208,  205,  218,  219,  206,
       207,  220,  209,  221,  210,  222,  223,  211,  224,  212,
-      215,  225,  213,  226,  214,  178,  216,  217,  178,  228,
-      229,  218,  219,  230,  220,  231,  232,  221,  222,  223,
-      233,  224,  234,  235,  236,  225,  226,  237,  240,  241,
-
-      242,  238,  243,  228,  229,  244,  245,  230,  231,  232,
-      239,  246,  247,  357,  233,  234,  235,  236,  248,  249,
-      237,  240,  250,  241,  242,  238,  243,  251,  252,  244,
-      245,  252,  254,  239,  246,  247,  179,  179,  255,  256,
-      262,  248,  257,  249,  258,  250,  259,  260,  261,  263,
-      251,  264,  357,  266,  267,  271,  254,  268,  269,  270,
-      272,  255,  273,  256,  262,  257,  357,  258,  274,  259,
-      260,  261,  275,  263,  276,  264,  266,  277,  267,  271,
-      268,  269,  270,  272,  278,  273,  279,  357,  283,  253,
-      253,  274,  284,  285,  286,  275,  287,  276,  288,  289,
-
-      277,  290,  291,  357,  292,  293,  294,  295,  278,  279,
-      252,  283,  297,  252,  296,  284,  285,  286,  357,  298,
-      287,  288,  299,  289,  300,  290,  291,  292,  293,  294,
-      301,  295,  304,  280,  305,  281,  297,  296,  302,  303,
-      357,  282,  298,  306,  307,  299,  308,  309,  300,  357,
-      310,  311,  312,  301,  313,  304,  280,  305,  281,  314,
-      315,  318,  302,  303,  282,  316,  306,  319,  307,  308,
-      309,  253,  253,  310,  311,  312,  320,  313,  321,  322,
-      323,  317,  314,  315,  318,  324,  325,  357,  326,  316,
-      327,  319,  328,  330,  329,  334,  330,  332,  357,  335,
-
-      320,  321,  322,  323,  317,  336,  330,  338,  324,  330,
-      325,  326,  339,  333,  327,  340,  328,  329,  334,  341,
-      330,  332,  335,  330,  342,  357,  343,  344,  336,  330,
-      338,  330,  330,  345,  330,  339,  333,  337,  340,  346,
-      347,  348,  341,  330,  357,  357,  330,  349,  342,  343,
-      350,  344,  352,  350,  331,  331,  354,  345,  357,  354,
-      337,  356,  346,  347,  348,  357,  354,  331,  331,  354,
-      349,  357,  357,  357,  357,  352,  357,  357,  357,  357,
-      357,  331,  331,  357,  356,  357,  357,  357,  357,  357,
-      331,  331,  331,  331,  357,  357,  357,  357,  357,  357,
-
-      357,  357,  357,  357,  331,  331,  357,  357,  357,  357,
-      357,  351,  351,  357,  357,  357,  357,  355,  355,  357,
-      357,  357,  357,  357,  357,  357,  357,  355,  355,   43,
-       43,  357,   43,   43,   52,   52,  109,  109,  227,  357,
-      357,  227,  265,  265,  353,  353,  357,  353,  353,    3,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357
+      215,  225,  213,  226,  214,  227,  216,  217,  229,  230,
+      178,  218,  219,  178,  220,  231,  234,  221,  222,  223,
+      232,  224,  233,  235,  225,  236,  237,  226,  227,  238,
+
+      241,  242,  229,  230,  243,  239,  244,  245,  246,  231,
+      234,  247,  248,  232,  240,  233,  235,  249,  236,  237,
+      250,  255,  238,  241,  251,  242,  252,  256,  243,  239,
+      244,  245,  246,  253,  247,  248,  253,  240,  257,  263,
+      249,  179,  179,  258,  250,  255,  259,  251,  260,  252,
+      256,  261,  262,  264,  265,  266,  361,  268,  269,  361,
+      270,  271,  257,  263,  272,  273,  258,  274,  275,  259,
+      276,  260,  361,  277,  261,  262,  278,  264,  265,  266,
+      268,  279,  269,  270,  271,  280,  289,  272,  281,  273,
+      274,  275,  290,  276,  254,  254,  277,  285,  286,  278,
+
+      287,  288,  291,  292,  279,  293,  294,  361,  295,  280,
+      289,  281,  253,  296,  298,  253,  290,  297,  299,  301,
+      285,  286,  300,  287,  288,  291,  302,  292,  303,  293,
+      294,  295,  304,  305,  308,  282,  296,  283,  298,  306,
+      297,  299,  301,  284,  307,  311,  300,  309,  310,  302,
+      361,  361,  303,  312,  313,  304,  305,  308,  282,  314,
+      283,  315,  316,  306,  317,  318,  284,  319,  307,  311,
+      309,  310,  322,  254,  254,  320,  312,  313,  323,  324,
+      361,  325,  314,  326,  315,  316,  327,  317,  318,  328,
+      319,  321,  329,  361,  330,  322,  331,  332,  334,  320,
+
+      333,  334,  323,  324,  325,  338,  326,  339,  336,  327,
+      340,  342,  328,  343,  321,  334,  329,  330,  334,  344,
+      331,  332,  345,  333,  337,  346,  334,  347,  338,  334,
+      339,  348,  336,  340,  342,  334,  343,  334,  334,  349,
+      334,  350,  344,  351,  352,  345,  341,  337,  334,  346,
+      347,  334,  353,  354,  361,  348,  354,  356,  358,  335,
+      335,  358,  360,  349,  350,  358,  351,  352,  358,  341,
+      361,  361,  361,  361,  361,  353,  335,  335,  361,  361,
+      356,  361,  361,  361,  361,  360,  361,  335,  335,  361,
+      361,  361,  361,  361,  361,  361,  335,  335,  335,  335,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  335,
+      335,  361,  361,  361,  355,  355,  361,  361,  361,  359,
+      359,  361,  361,  361,  361,  361,  359,  359,   43,   43,
+      361,   43,   43,   52,   52,  109,  109,  228,  361,  361,
+      228,  267,  267,  357,  357,  361,  357,  357,    3,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361
     } ;
 
-static const flex_int16_t yy_chk[915] =
+static const flex_int16_t yy_chk[914] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -653,12 +654,12 @@ static const flex_int16_t yy_chk[915] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    2,   12,   12,    2,    5,    5,
         5,    5,   13,   13,   16,   17,   18,   19,   16,   23,
-       21,   19,    2,   18,  359,   20,   16,   20,   21,   22,
-       18,   19,   22,   31,  355,   35,   20,  351,   16,   17,
+       21,   19,    2,   18,  363,   20,   16,   20,   21,   22,
+       18,   19,   22,   31,  359,   35,   20,  355,   16,   17,
 
        18,   19,   16,   23,   21,   19,    2,   18,   20,   16,
        20,   21,   22,   18,   19,   22,   53,   31,   35,   20,
-       24,   48,   48,   26,  331,    2,    2,  253,   24,    5,
+       24,   48,   48,   26,  335,    2,    2,  254,   24,    5,
         5,   26,  179,   24,   27,   28,  128,   26,   27,  110,
        53,  107,   54,   57,   24,   28,   55,   26,   27,   47,
        28,   24,   56,   29,   58,   26,   24,   59,   27,   28,
@@ -695,57 +696,57 @@ static const flex_int16_t yy_chk[915] =
       150,  155,  141,  151,  144,  127,  153,  154,  143,  156,
       145,  157,  127,  127,  158,  159,  162,  146,  147,  160,
       149,  161,  163,  164,  150,  155,  151,  165,  166,  153,
-      154,  167,  156,  168,  157,  169,  170,  158,  172,  159,
-      162,  173,  160,  175,  161,  178,  163,  164,  178,  181,
-      182,  165,  166,  183,  167,  184,  185,  168,  169,  170,
-      186,  172,  187,  189,  191,  173,  175,  193,  195,  196,
-
-      198,  194,  201,  181,  182,  202,  203,  183,  184,  185,
-      194,  204,  205,    0,  186,  187,  189,  191,  206,  207,
-      193,  195,  208,  196,  198,  194,  201,  209,  213,  202,
-      203,  213,  214,  194,  204,  205,  178,  178,  215,  216,
-      223,  206,  217,  207,  218,  208,  219,  220,  221,  225,
-      209,  226,    0,  230,  232,  240,  214,  233,  234,  238,
-      242,  215,  243,  216,  223,  217,    0,  218,  244,  219,
-      220,  221,  245,  225,  246,  226,  230,  247,  232,  240,
-      233,  234,  238,  242,  250,  243,  251,    0,  255,  213,
-      213,  244,  256,  259,  260,  245,  261,  246,  263,  268,
-
-      247,  269,  270,    0,  273,  274,  277,  280,  250,  251,
-      252,  255,  282,  252,  281,  256,  259,  260,    0,  285,
-      261,  263,  286,  268,  287,  269,  270,  273,  274,  277,
-      288,  280,  291,  252,  292,  252,  282,  281,  289,  290,
-        0,  252,  285,  293,  294,  286,  295,  296,  287,    0,
-      297,  298,  300,  288,  303,  291,  252,  292,  252,  304,
-      307,  309,  289,  290,  252,  308,  293,  310,  294,  295,
-      296,  252,  252,  297,  298,  300,  312,  303,  313,  315,
-      316,  308,  304,  307,  309,  317,  318,    0,  319,  308,
-      320,  310,  322,  324,  323,  326,  324,  325,    0,  328,
-
-      312,  313,  315,  316,  308,  329,  330,  332,  317,  330,
-      318,  319,  333,  325,  320,  334,  322,  323,  326,  335,
-      336,  325,  328,  336,  337,    0,  338,  341,  329,  339,
-      332,  340,  339,  342,  340,  333,  325,  330,  334,  343,
-      344,  345,  335,  346,    0,    0,  346,  347,  337,  338,
-      348,  341,  349,  348,  324,  324,  350,  342,    0,  350,
-      330,  352,  343,  344,  345,    0,  354,  330,  330,  354,
-      347,    0,    0,    0,    0,  349,    0,    0,    0,    0,
-        0,  336,  336,    0,  352,    0,    0,    0,    0,    0,
-      339,  339,  340,  340,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,  346,  346,    0,    0,    0,    0,
-        0,  348,  348,    0,    0,    0,    0,  350,  350,    0,
-        0,    0,    0,    0,    0,    0,    0,  354,  354,  358,
-      358,    0,  358,  358,  360,  360,  361,  361,  362,    0,
-        0,  362,  363,  363,  364,  364,    0,  364,  364,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-
-      357,  357,  357,  357,  357,  357,  357,  357,  357,  357,
-      357,  357,  357,  357
+      154,  167,  156,  168,  157,  169,  170,  158,  171,  159,
+      162,  172,  160,  173,  161,  175,  163,  164,  181,  182,
+      178,  165,  166,  178,  167,  183,  186,  168,  169,  170,
+      184,  171,  185,  187,  172,  189,  191,  173,  175,  193,
+
+      195,  196,  181,  182,  198,  194,  201,  202,  203,  183,
+      186,  204,  205,  184,  194,  185,  187,  206,  189,  191,
+      207,  214,  193,  195,  208,  196,  209,  215,  198,  194,
+      201,  202,  203,  213,  204,  205,  213,  194,  216,  223,
+      206,  178,  178,  217,  207,  214,  218,  208,  219,  209,
+      215,  220,  221,  224,  226,  227,    0,  231,  233,    0,
+      234,  235,  216,  223,  239,  241,  217,  243,  244,  218,
+      245,  219,    0,  246,  220,  221,  247,  224,  226,  227,
+      231,  248,  233,  234,  235,  251,  262,  239,  252,  241,
+      243,  244,  264,  245,  213,  213,  246,  256,  257,  247,
+
+      260,  261,  265,  270,  248,  271,  272,    0,  275,  251,
+      262,  252,  253,  276,  282,  253,  264,  279,  283,  287,
+      256,  257,  284,  260,  261,  265,  288,  270,  289,  271,
+      272,  275,  290,  291,  294,  253,  276,  253,  282,  292,
+      279,  283,  287,  253,  293,  297,  284,  295,  296,  288,
+        0,    0,  289,  298,  299,  290,  291,  294,  253,  300,
+      253,  301,  303,  292,  307,  308,  253,  311,  293,  297,
+      295,  296,  313,  253,  253,  312,  298,  299,  314,  316,
+        0,  317,  300,  319,  301,  303,  320,  307,  308,  321,
+      311,  312,  322,    0,  323,  313,  324,  326,  328,  312,
+
+      327,  328,  314,  316,  317,  330,  319,  332,  329,  320,
+      333,  336,  321,  337,  312,  334,  322,  323,  334,  338,
+      324,  326,  339,  327,  329,  341,  340,  342,  330,  340,
+      332,  345,  329,  333,  336,  343,  337,  344,  343,  346,
+      344,  347,  338,  348,  349,  339,  334,  329,  350,  341,
+      342,  350,  351,  352,    0,  345,  352,  353,  354,  328,
+      328,  354,  356,  346,  347,  358,  348,  349,  358,  334,
+        0,    0,    0,    0,    0,  351,  334,  334,    0,    0,
+      353,    0,    0,    0,    0,  356,    0,  340,  340,    0,
+        0,    0,    0,    0,    0,    0,  343,  343,  344,  344,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  350,
+      350,    0,    0,    0,  352,  352,    0,    0,    0,  354,
+      354,    0,    0,    0,    0,    0,  358,  358,  362,  362,
+        0,  362,  362,  364,  364,  365,  365,  366,    0,    0,
+      366,  367,  367,  368,  368,    0,  368,  368,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+
+      361,  361,  361,  361,  361,  361,  361,  361,  361,  361,
+      361,  361,  361
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -901,8 +902,8 @@ static Common::String *readUntilNull(const char **ptr) {
 	return res;
 }
 
-#line 904 "engines/director/lingo/lingo-lex.cpp"
 #line 905 "engines/director/lingo/lingo-lex.cpp"
+#line 906 "engines/director/lingo/lingo-lex.cpp"
 
 #define INITIAL 0
 
@@ -1123,7 +1124,7 @@ YY_DECL
 #line 159 "engines/director/lingo/lingo-lex.l"
 
 
-#line 1126 "engines/director/lingo/lingo-lex.cpp"
+#line 1127 "engines/director/lingo/lingo-lex.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1151,13 +1152,13 @@ yy_match:
 			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 >= 358 )
+				if ( yy_current_state >= 362 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 357 );
+		while ( yy_current_state != 361 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -1225,41 +1226,46 @@ YY_RULE_SETUP
 case 10:
 YY_RULE_SETUP
 #line 172 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCHAR; }		// D3
+{ count(); return tCASTLIBS; }	// D5
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
 #line 173 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCHARS; }
+{ count(); return tCHAR; }		// D3
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
 #line 174 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCONTAINS; }
+{ count(); return tCHARS; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
 #line 175 "engines/director/lingo/lingo-lex.l"
-{ count(); return tDATE; }
+{ count(); return tCONTAINS; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
 #line 176 "engines/director/lingo/lingo-lex.l"
-{ count(); return tDELETE; }
+{ count(); return tDATE; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
 #line 177 "engines/director/lingo/lingo-lex.l"
-{ count(); return tDOWN; }
+{ count(); return tDELETE; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
 #line 178 "engines/director/lingo/lingo-lex.l"
-{ count(); return tELSE; }
+{ count(); return tDOWN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
 #line 179 "engines/director/lingo/lingo-lex.l"
+{ count(); return tELSE; }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 180 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1278,259 +1284,259 @@ YY_RULE_SETUP
 		return tENDCLAUSE;
 	}
 	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 196 "engines/director/lingo/lingo-lex.l"
-{ count(); return tEXIT; }
-	YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 197 "engines/director/lingo/lingo-lex.l"
-{ count(); return tFACTORY; }
+{ count(); return tEXIT; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 198 "engines/director/lingo/lingo-lex.l"
-{ count(); return tFIELD; }
+{ count(); return tFACTORY; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 199 "engines/director/lingo/lingo-lex.l"
-{ count(); return tFRAME; }
+{ count(); return tFIELD; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 200 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGLOBAL; }
+{ count(); return tFRAME; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 201 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGO; }
+{ count(); return tGLOBAL; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 202 "engines/director/lingo/lingo-lex.l"
-{ count(); return tHILITE; }
+{ count(); return tGO; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 203 "engines/director/lingo/lingo-lex.l"
-{ count(); return tIF; }
+{ count(); return tHILITE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 204 "engines/director/lingo/lingo-lex.l"
-{ count(); return tINSTANCE; }
+{ count(); return tIF; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 205 "engines/director/lingo/lingo-lex.l"
-{ count(); return tINTERSECTS;}
+{ count(); return tINSTANCE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 206 "engines/director/lingo/lingo-lex.l"
-{ count(); return tINTO; }
+{ count(); return tINTERSECTS;}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 207 "engines/director/lingo/lingo-lex.l"
-{ count(); return tIN; }
+{ count(); return tINTO; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 208 "engines/director/lingo/lingo-lex.l"
-{ count(); return tITEM; }
+{ count(); return tIN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 209 "engines/director/lingo/lingo-lex.l"
-{ count(); return tITEMS; }
+{ count(); return tITEM; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 210 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLAST; }
+{ count(); return tITEMS; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 211 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLINE; }
+{ count(); return tLAST; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 212 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLINES; }
+{ count(); return tLINE; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 213 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLONG; }
+{ count(); return tLINES; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 214 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMACRO; }
+{ count(); return tLONG; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 215 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMENU; }
+{ count(); return tMACRO; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 216 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMENUS; }
+{ count(); return tMENU; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 217 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMENUITEM;}
+{ count(); return tMENUS; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 218 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMENUITEMS; }
+{ count(); return tMENUITEM;}
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 219 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMETHOD; }
+{ count(); return tMENUITEMS; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 220 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMOD;}
+{ count(); return tMETHOD; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 221 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMOVIE; }
+{ count(); return tMOD;}
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 222 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEXT; }
+{ count(); return tMOVIE; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 223 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNOT; }
+{ count(); return tNEXT; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 224 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNUMBER; }
+{ count(); return tNOT; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 225 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOF; }
+{ count(); return tNUMBER; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 226 "engines/director/lingo/lingo-lex.l"
-{ count(); return tON; }		// D3
+{ count(); return tOF; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 227 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOPEN; }
+{ count(); return tON; }		// D3
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 228 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOR; }
+{ count(); return tOPEN; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 229 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPLAY; }
+{ count(); return tOR; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 230 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPREVIOUS; }
+{ count(); return tPLAY; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 231 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPROPERTY; }	// D4
+{ count(); return tPREVIOUS; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 232 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPUT; }
+{ count(); return tPROPERTY; }	// D4
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 233 "engines/director/lingo/lingo-lex.l"
-{ count(); return tREPEAT; }
+{ count(); return tPUT; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 234 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSCRIPT; }
+{ count(); return tREPEAT; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 235 "engines/director/lingo/lingo-lex.l"
-{ count(); return tASSERTERROR; }
+{ count(); return tSCRIPT; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 236 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSET; }
+{ count(); return tASSERTERROR; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 237 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSHORT; }
+{ count(); return tSET; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 238 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSOUND; }
+{ count(); return tSHORT; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 239 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSPRITE; }
+{ count(); return tSOUND; }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 240 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSTARTS; }
+{ count(); return tSPRITE; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 241 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTELL; }
+{ count(); return tSTARTS; }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 242 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTHE; }
+{ count(); return tTELL; }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 243 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTHEN; }
+{ count(); return tTHE; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 244 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTIME; }
+{ count(); return tTHEN; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 245 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTO; }
+{ count(); return tTIME; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 246 "engines/director/lingo/lingo-lex.l"
+{ count(); return tTO; }
+	YY_BREAK
+case 69:
+YY_RULE_SETUP
+#line 247 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1550,69 +1556,69 @@ YY_RULE_SETUP
 		return tWHEN;
 	}
 	YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 264 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHILE; }
-	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 265 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWINDOW; }
+{ count(); return tWHILE; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 266 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITH; }
+{ count(); return tWINDOW; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 267 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITHIN; }
+{ count(); return tWITH; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 268 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWORD; }
+{ count(); return tWITHIN; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 269 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWORDS; }
+{ count(); return tWORD; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 270 "engines/director/lingo/lingo-lex.l"
-{ count(); return tXTRAS; } // D5
+{ count(); return tWORDS; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 272 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEQ; }
+#line 271 "engines/director/lingo/lingo-lex.l"
+{ count(); return tXTRAS; } // D5
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 273 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGE; }
+{ count(); return tNEQ; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 274 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLE; }
+{ count(); return tGE; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 275 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCONCAT; }
+{ count(); return tLE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 276 "engines/director/lingo/lingo-lex.l"
-{ count(); return tEQ; }
+{ count(); return tCONCAT; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 278 "engines/director/lingo/lingo-lex.l"
+#line 277 "engines/director/lingo/lingo-lex.l"
+{ count(); return tEQ; }
+	YY_BREAK
+case 82:
+YY_RULE_SETUP
+#line 279 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 		yylval.s = new Common::String(yytext);
@@ -1620,43 +1626,43 @@ YY_RULE_SETUP
 		return tVARID;
 	}
 	YY_BREAK
-case 82:
-YY_RULE_SETUP
-#line 284 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.f = atof(yytext); return tFLOAT; }
-	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 285 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.i = strtol(yytext, NULL, 10); return tINT; }
+{ count(); yylval.f = atof(yytext); return tFLOAT; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 286 "engines/director/lingo/lingo-lex.l"
-{ count(); return *yytext; }
+{ count(); yylval.i = strtol(yytext, NULL, 10); return tINT; }
 	YY_BREAK
 case 85:
-/* rule 85 can match eol */
 YY_RULE_SETUP
 #line 287 "engines/director/lingo/lingo-lex.l"
-{ count(); return '\n'; }
+{ count(); return *yytext; }
 	YY_BREAK
 case 86:
+/* rule 86 can match eol */
 YY_RULE_SETUP
 #line 288 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.s = cleanupString(&yytext[1]); yylval.s->deleteLastChar(); return tSTRING; }
+{ count(); return '\n'; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 289 "engines/director/lingo/lingo-lex.l"
-{ count(); }
+{ count(); yylval.s = cleanupString(&yytext[1]); yylval.s->deleteLastChar(); return tSTRING; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 291 "engines/director/lingo/lingo-lex.l"
+#line 290 "engines/director/lingo/lingo-lex.l"
+{ count(); }
+	YY_BREAK
+case 89:
+YY_RULE_SETUP
+#line 292 "engines/director/lingo/lingo-lex.l"
 ECHO;
 	YY_BREAK
-#line 1659 "engines/director/lingo/lingo-lex.cpp"
+#line 1665 "engines/director/lingo/lingo-lex.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1955,7 +1961,7 @@ static int yy_get_next_buffer (void)
 		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 >= 358 )
+			if ( yy_current_state >= 362 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1983,11 +1989,11 @@ static int yy_get_next_buffer (void)
 	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 >= 358 )
+		if ( yy_current_state >= 362 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 357);
+	yy_is_jam = (yy_current_state == 361);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2628,7 +2634,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 291 "engines/director/lingo/lingo-lex.l"
+#line 292 "engines/director/lingo/lingo-lex.l"
 
 
 extern int yydebug;
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 92df5f4977c..3fd1f669d91 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -169,6 +169,7 @@ after		{ count(); return tAFTER; }		// D3
 and			{ count(); return tAND; }
 before		{ count(); return tBEFORE; }	// D3
 cast		{ count(); return tCAST; }
+castlibs	{ count(); return tCASTLIBS; }	// D5
 char		{ count(); return tCHAR; }		// D3
 chars		{ count(); return tCHARS; }
 contains	{ count(); return tCONTAINS; }
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 361398edb0d..44d33a6d9cb 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -393,6 +393,9 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	case kTheCast:
 		d = getTheCast(id, field);
 		break;
+	case kTheCastlibs: // D5
+		d = getCastlibsNum();
+		break;
 	case kTheCastMembers:
 		d = (int)(movie->getCast()->getCastSize() + (movie->_sharedCast ? movie->_sharedCast->getCastSize() : 0));
 		break;
@@ -898,7 +901,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 	case kTheWindowList:
 		d = g_lingo->_windowList;
 		break;
-	case kTheXtras:
+	case kTheXtras: // D5
 		d = getXtrasNum();
 		break;
 	default:
@@ -1228,6 +1231,10 @@ int Lingo::getMenuNum() {
 	return g_director->_wm->getMenu()->numberOfMenus();
 }
 
+int Lingo::getCastlibsNum() {
+	return _vm->getCurrentMovie()->getCasts()->size();
+}
+
 int Lingo::getXtrasNum() {
 	return _openXLibs.size();
 }
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index c0c7d66f16c..74c45d1c4c2 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -31,6 +31,7 @@ enum TheEntityType {
 	kTheBeepOn,
 	kTheButtonStyle,
 	kTheCast,
+	kTheCastlibs,
 	kTheCastMembers,
 	kTheCenterStage,
 	kTheChars,
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 2475935f151..fca4f4841ee 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -330,6 +330,7 @@ public:
 	int getMenuNum();
 	int getMenuItemsNum(Datum &d);
 	int getXtrasNum();
+	int getCastlibsNum();
 
 	void executeHandler(const Common::String &name);
 	void executeScript(ScriptType type, CastMemberID id);




More information about the Scummvm-git-logs mailing list