DIRECTOR: Lingo: Moved 'mci' and 'mciwait' to built-ins

1 files changed, 229 insertions, 245 deletions

diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 69c8745a86..5fbd8d8653 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 58
-#define YY_END_OF_BUFFER 59
+#define YY_NUM_RULES 56
+#define YY_END_OF_BUFFER 57
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -373,30 +373,28 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[197] =
+static yyconst flex_int16_t yy_accept[191] =
     {   0,
-        0,    0,   59,   57,    3,   55,   55,   57,   57,   54,
-       54,   54,   53,   54,   54,   51,   51,   51,   51,   51,
-       51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
-       51,   51,    2,    2,    3,   55,    0,    0,    0,    0,
-        0,   56,   50,    1,   52,   53,   49,   47,   48,   51,
-       51,   51,   51,   51,   51,   51,   51,   51,   51,   18,
-        8,   51,   51,   51,   51,   51,   51,   51,   51,   29,
-       51,   31,   51,   51,   51,   51,   51,   51,   51,   51,
-       41,   51,   51,    2,    2,    0,    1,   52,    4,   51,
-       51,   51,   51,   12,   51,   51,   51,   51,    0,   51,
-
-       51,   51,   23,   51,   51,   51,   28,   51,   51,   51,
-       34,   51,   36,   51,   51,   51,   51,   51,   51,    0,
-       51,    6,    7,   11,   14,   51,   51,   51,    0,   51,
-       20,   21,   51,   51,   51,   51,   27,   30,   32,   51,
-       51,   51,   51,    0,   40,   45,   51,   43,   10,   51,
-       51,   15,   51,   17,   51,   22,   51,   51,   26,   51,
-       51,   51,   51,   39,   46,   51,    0,   51,   51,   16,
-       51,   51,   25,   51,   35,   42,   37,    0,   44,    0,
-       51,   13,   51,   24,   51,    0,    9,    5,   51,   33,
-        0,   51,    0,   19,   38,    0
-
+        0,    0,   57,   55,    3,   53,   53,   55,   55,   52,
+       52,   52,   51,   52,   52,   49,   49,   49,   49,   49,
+       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
+       49,   49,    2,    2,    3,   53,    0,    0,    0,    0,
+        0,   54,   48,    1,   50,   51,   47,   45,   46,   49,
+       49,   49,   49,   49,   49,   49,   49,   49,   49,   18,
+        8,   49,   49,   49,   49,   49,   49,   49,   27,   49,
+       29,   49,   49,   49,   49,   49,   49,   49,   49,   39,
+       49,   49,    2,    2,    0,    1,   50,    4,   49,   49,
+       49,   49,   12,   49,   49,   49,   49,    0,   49,   49,
+
+       49,   49,   49,   49,   26,   49,   49,   49,   32,   49,
+       34,   49,   49,   49,   49,   49,   49,    0,   49,    6,
+        7,   11,   14,   49,   49,   49,    0,   49,   20,   21,
+       49,   49,   49,   25,   28,   30,   49,   49,   49,   49,
+        0,   38,   43,   49,   41,   10,   49,   49,   15,   49,
+       17,   49,   22,   49,   24,   49,   49,   49,   49,   37,
+       44,   49,    0,   49,   49,   16,   49,   23,   49,   33,
+       40,   35,    0,   42,    0,   49,   13,   49,   49,    0,
+        9,    5,   49,   31,    0,   49,    0,   19,   36,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -441,61 +439,59 @@ static yyconst flex_int32_t yy_meta[61] =
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5
     } ;
 
-static yyconst flex_int16_t yy_base[202] =
+static yyconst flex_int16_t yy_base[196] =
     {   0,
-        0,   59,  187,  465,   63,   67,   71,   75,  169,  465,
-      152,  140,   52,   68,  130,   56,    0,   56,   57,   67,
-       72,   68,   68,   69,  112,   70,  104,  111,   80,  118,
-      130,  143,  175,  180,  189,  465,  193,  167,  197,   80,
-      136,  465,  465,    0,   93,   90,  465,  465,  465,    0,
-      104,   82,  176,  108,  112,  165,  187,  190,  117,  133,
-        0,  175,  180,  192,  190,  183,  184,  183,  188,    0,
-      202,    0,  207,  204,  193,  198,  200,  205,  221,  220,
-        0,  230,  212,  266,  276,  220,    0,   80,    0,  220,
-      240,  234,  243,    0,  232,  233,  240,  256,  280,  271,
-
-      263,  263,  259,  254,  272,  265,    0,  271,  264,  268,
-        0,  284,    0,  281,  276,  303,  282,  285,  285,  294,
-      303,    0,    0,    0,    0,  283,  304,  311,  308,  308,
-        0,    0,  311,  325,  315,  322,    0,    0,    0,  321,
-      330,  316,  317,  169,    0,    0,  327,  328,  212,  329,
-      324,    0,  330,  465,  325,    0,  334,  340,    0,  332,
-      331,  348,  342,  252,    0,  347,  382,  353,  348,    0,
-      369,  358,    0,  359,    0,    0,    0,  393,    0,  373,
-      368,    0,  377,    0,  369,  381,  465,    0,  372,    0,
-      404,  376,  409,    0,  414,  465,  444,  446,  451,  455,
-
-      459
+        0,   59,  203,  452,   63,   67,   71,   75,  167,  452,
+      157,  154,   52,   68,  143,   56,    0,   56,   57,   67,
+       72,   68,   68,   69,   85,  102,  102,  104,   80,  119,
+      113,  120,  173,  177,  181,  452,  185,  189,  193,  102,
+       99,  452,  452,    0,   80,  129,  452,  452,  452,    0,
+       91,  120,  165,  118,  126,  146,  184,  187,  171,   96,
+        0,  172,  177,  189,  178,  177,  178,  184,    0,  188,
+        0,  202,  199,  188,  192,  192,  199,  220,  219,    0,
+      226,  208,  251,  262,  217,    0,   78,    0,  219,  227,
+      230,  239,    0,  228,  229,  242,  256,  273,  257,  250,
+
+      251,  255,  263,  256,    0,  262,  253,  258,    0,  274,
+        0,  271,  267,  304,  271,  274,  273,  284,  299,    0,
+        0,    0,    0,  279,  297,  308,  297,  296,    0,    0,
+      301,  304,  314,    0,    0,    0,  311,  320,  305,  307,
+      156,    0,    0,  322,  319,  341,  321,  320,    0,  326,
+      452,  322,    0,  327,    0,  328,  329,  344,  336,  370,
+        0,  343,  375,  344,  341,    0,  345,    0,  348,    0,
+        0,    0,  380,    0,  363,  355,    0,  372,  360,  372,
+      452,    0,  363,    0,  394,  366,  398,    0,  400,  452,
+      431,  433,  438,  442,  446
+
     } ;
 
-static yyconst flex_int16_t yy_def[202] =
+static yyconst flex_int16_t yy_def[196] =
     {   0,
-      196,    1,  196,  196,  196,  196,  196,  196,  197,  196,
-      196,  196,  196,  196,  196,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  196,  196,  196,  196,  196,  196,  196,  196,
-      197,  196,  196,  199,  196,  196,  196,  196,  196,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  196,  196,  196,  199,  196,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  196,  198,
-
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  196,
-      198,  198,  198,  198,  198,  198,  198,  198,  196,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  200,  198,  198,  198,  198,  196,  198,
-      198,  198,  198,  196,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  200,  198,  198,  196,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  196,  198,  196,
-      198,  198,  198,  198,  198,  196,  196,  198,  198,  198,
-      196,  198,  201,  198,  201,    0,  196,  196,  196,  196,
-
-      196
+      190,    1,  190,  190,  190,  190,  190,  190,  191,  190,
+      190,  190,  190,  190,  190,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  190,  190,  190,  190,  190,  190,  190,  190,
+      191,  190,  190,  193,  190,  190,  190,  190,  190,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  190,  190,  190,  193,  190,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  190,  192,  192,
+
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  190,  192,  192,
+      192,  192,  192,  192,  192,  192,  190,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      194,  192,  192,  192,  192,  190,  192,  192,  192,  192,
+      190,  192,  192,  192,  192,  192,  192,  192,  192,  194,
+      192,  192,  190,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  190,  192,  190,  192,  192,  192,  192,  190,
+      190,  192,  192,  192,  190,  192,  195,  192,  195,    0,
+      190,  190,  190,  190,  190
+
     } ;
 
-static yyconst flex_int16_t yy_nxt[526] =
+static yyconst flex_int16_t yy_nxt[513] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,    4,
        13,   14,   10,   15,   16,   17,   18,   19,   20,   21,
@@ -505,59 +501,58 @@ static yyconst flex_int16_t yy_nxt[526] =
        27,   28,   29,   30,   31,   17,   17,   32,   17,   17,
        33,   45,   46,   34,   35,   36,   36,   37,   38,   39,
        39,   38,   38,   39,   39,   38,   37,   36,   36,   37,
-       47,   48,   51,   52,   53,   40,   57,   61,   68,   40,
-       88,   54,   59,   55,   62,   60,   63,   69,   76,   45,
-
-       46,   58,   56,   88,   86,   51,   52,   53,   90,   40,
-       57,   61,   68,   40,   54,   59,   55,   62,   60,   63,
-       69,   89,   76,   70,   58,   56,   64,   86,   65,   94,
-       66,   90,   71,   72,   99,   73,   77,   99,   93,   67,
-       74,   42,   49,   75,   98,   89,   78,   70,   44,   79,
-       64,   80,   65,   94,   66,   71,   72,   81,   73,   43,
-       77,   93,   67,   74,   82,   83,   75,   98,   38,   78,
-      144,   38,   79,  144,   42,   80,   84,   36,   36,   85,
-       81,   85,   36,   36,   85,   40,  196,   95,   82,   83,
-       35,   36,   36,   37,   37,   36,   36,   37,   38,   39,
-
-       39,   38,   91,   96,   97,  196,  100,  101,  102,   40,
-       92,   95,  103,  167,  104,   40,  167,  105,  106,  107,
-      108,  109,  110,  196,  111,   91,  112,   96,   97,  100,
-      101,  113,  102,   92,  114,  115,  103,  104,  116,   40,
-      105,  106,  107,  119,  108,  109,  110,  111,  117,  112,
-      120,  121,  118,  178,  113,  196,  178,  114,  122,  115,
-      123,  124,  116,  125,  126,  127,  119,   84,   36,   36,
-       85,  128,  117,  120,  121,  135,  118,   85,   36,   36,
-       85,   99,  122,  123,   99,  124,  125,  126,  127,  130,
-      196,  132,  133,  134,  136,  128,  137,  138,  131,  135,
-
-      139,  140,  141,  142,  144,  143,  148,  144,  146,  147,
-      151,  129,  149,  130,  132,  133,  134,  150,  136,  137,
-      138,  131,  152,  139,  140,  153,  141,  142,  143,  145,
-      148,  146,  147,  151,  129,  154,  149,  155,  156,  157,
-      159,  150,  158,  160,  161,  165,  152,  162,  163,  153,
-      166,  168,  145,  169,  170,  171,  172,  173,  154,  174,
-      155,  156,  175,  157,  159,  158,  176,  160,  161,  165,
-      162,  163,  177,  179,  166,  168,  169,  170,  171,  181,
-      172,  173,  174,  167,  182,  175,  167,  183,  196,  184,
-      176,  185,  187,  189,  178,  177,  179,  178,  188,  190,
-
-      191,  196,  181,  192,  180,  193,  194,  182,  193,  196,
-      193,  183,  184,  193,  185,  196,  187,  189,  196,  196,
-      186,  188,  190,  196,  191,  196,  192,  196,  180,  194,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  186,   41,   41,  196,   41,   41,   50,
-       50,   87,   87,  196,   87,   87,  164,  196,  196,  164,
-      195,  196,  196,  195,    3,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196
+       47,   48,   51,   52,   53,   40,   57,   61,   87,   40,
+       87,   54,   59,   55,   62,   60,   63,   98,   75,   64,
+
+       98,   58,   56,   65,   42,   51,   52,   53,   88,   40,
+       57,   61,   66,   40,   54,   59,   55,   62,   60,   63,
+       67,   69,   75,   64,   58,   56,   85,   65,   72,   68,
+       70,   71,   88,   73,   79,   66,   74,   76,   45,   46,
+       80,   81,   82,   93,   67,   69,   89,   77,   92,   85,
+       78,   72,   68,   70,   71,   49,   73,  141,   79,   74,
+      141,   76,   44,   80,   43,   81,   82,   93,   94,   89,
+       77,   92,   42,   78,   83,   36,   36,   84,   84,   36,
+       36,   84,   35,   36,   36,   37,   37,   36,   36,   37,
+       38,   90,   94,   38,   38,   39,   39,   38,   97,   91,
+
+       95,   96,  190,   99,  100,  101,  106,   40,  190,  102,
+      103,   40,  190,  104,   90,  105,  107,  108,  190,  109,
+      110,   97,   91,  111,   95,   96,   99,  100,  112,  101,
+      106,   40,  102,  103,  113,   40,  104,  114,  105,  117,
+      107,  108,  109,  110,  115,  120,  111,  118,  116,  190,
+      119,  112,   83,   36,   36,   84,  121,  122,  113,  123,
+      124,  114,  117,   84,   36,   36,   84,  125,  115,  120,
+      118,  126,  116,  119,   98,  128,  132,   98,  130,  121,
+      131,  122,  123,  124,  129,  133,  190,  134,  135,  136,
+      125,  137,  138,  139,  145,  126,  140,  143,  144,  128,
+
+      132,  130,  146,  131,  127,  141,  148,  129,  141,  133,
+      134,  135,  136,  147,  137,  149,  138,  139,  145,  140,
+      143,  144,  150,  190,  151,  152,  146,  127,  153,  148,
+      142,  154,  155,  156,  157,  190,  158,  147,  159,  149,
+      161,  162,  163,  164,  168,  163,  150,  151,  152,  165,
+      166,  153,  167,  142,  154,  169,  155,  156,  157,  158,
+      170,  159,  171,  178,  161,  162,  172,  164,  168,  174,
+      176,  173,  165,  166,  173,  167,  163,  177,  169,  163,
+      179,  173,  181,  170,  173,  182,  171,  178,  183,  172,
+      184,  185,  174,  176,  186,  187,  188,  175,  187,  187,
+
+      177,  190,  187,  179,  190,  190,  181,  180,  182,  190,
+      190,  190,  183,  184,  190,  185,  190,  186,  190,  188,
+      190,  175,  190,  190,  190,  190,  190,  190,  190,  190,
+      180,   41,   41,  190,   41,   41,   50,   50,   86,   86,
+      190,   86,   86,  160,  190,  190,  160,  189,  190,  190,
+      189,    3,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190
     } ;
 
-static yyconst flex_int16_t yy_chk[526] =
+static yyconst flex_int16_t yy_chk[513] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -567,56 +562,55 @@ static yyconst flex_int16_t yy_chk[526] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         2,   13,   13,    2,    5,    5,    5,    5,    6,    6,
         6,    6,    7,    7,    7,    7,    8,    8,    8,    8,
-       14,   14,   16,   18,   19,    6,   21,   23,   26,    7,
-       88,   20,   22,   20,   23,   22,   24,   26,   29,   46,
-
-       46,   21,   20,   45,   40,   16,   18,   19,   52,    6,
-       21,   23,   26,    7,   20,   22,   20,   23,   22,   24,
-       26,   51,   29,   27,   21,   20,   25,   40,   25,   55,
-       25,   52,   27,   27,   60,   28,   30,   60,   54,   25,
-       28,   41,   15,   28,   59,   51,   30,   27,   12,   30,
-       25,   31,   25,   55,   25,   27,   27,   31,   28,   11,
-       30,   54,   25,   28,   32,   32,   28,   59,   38,   30,
-      144,   38,   30,  144,    9,   31,   33,   33,   33,   33,
-       31,   34,   34,   34,   34,   38,    3,   56,   32,   32,
-       35,   35,   35,   35,   37,   37,   37,   37,   39,   39,
-
-       39,   39,   53,   57,   58,    0,   62,   63,   64,   38,
-       53,   56,   65,  149,   66,   39,  149,   67,   68,   69,
-       71,   73,   74,    0,   75,   53,   76,   57,   58,   62,
-       63,   77,   64,   53,   78,   79,   65,   66,   80,   39,
-       67,   68,   69,   83,   71,   73,   74,   75,   82,   76,
-       86,   90,   82,  164,   77,    0,  164,   78,   91,   79,
-       92,   93,   80,   95,   96,   97,   83,   84,   84,   84,
-       84,   98,   82,   86,   90,  104,   82,   85,   85,   85,
-       85,   99,   91,   92,   99,   93,   95,   96,   97,  100,
-        0,  101,  102,  103,  105,   98,  106,  108,  100,  104,
-
-      109,  110,  112,  114,  116,  115,  119,  116,  117,  118,
-      126,   99,  120,  100,  101,  102,  103,  121,  105,  106,
-      108,  100,  127,  109,  110,  128,  112,  114,  115,  116,
-      119,  117,  118,  126,   99,  129,  120,  130,  133,  134,
-      136,  121,  135,  140,  141,  147,  127,  142,  143,  128,
-      148,  150,  116,  151,  153,  155,  157,  158,  129,  160,
-      130,  133,  161,  134,  136,  135,  162,  140,  141,  147,
-      142,  143,  163,  166,  148,  150,  151,  153,  155,  168,
-      157,  158,  160,  167,  169,  161,  167,  171,    0,  172,
-      162,  174,  180,  183,  178,  163,  166,  178,  181,  185,
-
-      186,    0,  168,  189,  167,  191,  192,  169,  191,    0,
-      193,  171,  172,  193,  174,  195,  180,  183,  195,    0,
-      178,  181,  185,    0,  186,    0,  189,    0,  167,  192,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  178,  197,  197,    0,  197,  197,  198,
-      198,  199,  199,    0,  199,  199,  200,    0,    0,  200,
-      201,    0,    0,  201,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  196,  196,  196,  196,  196,
-      196,  196,  196,  196,  196
+       14,   14,   16,   18,   19,    6,   21,   23,   87,    7,
+       45,   20,   22,   20,   23,   22,   24,   60,   29,   25,
+
+       60,   21,   20,   25,   41,   16,   18,   19,   51,    6,
+       21,   23,   25,    7,   20,   22,   20,   23,   22,   24,
+       26,   27,   29,   25,   21,   20,   40,   25,   28,   26,
+       27,   27,   51,   28,   31,   25,   28,   30,   46,   46,
+       31,   32,   32,   55,   26,   27,   52,   30,   54,   40,
+       30,   28,   26,   27,   27,   15,   28,  141,   31,   28,
+      141,   30,   12,   31,   11,   32,   32,   55,   56,   52,
+       30,   54,    9,   30,   33,   33,   33,   33,   34,   34,
+       34,   34,   35,   35,   35,   35,   37,   37,   37,   37,
+       38,   53,   56,   38,   39,   39,   39,   39,   59,   53,
+
+       57,   58,    3,   62,   63,   64,   70,   38,    0,   65,
+       66,   39,    0,   67,   53,   68,   72,   73,    0,   74,
+       75,   59,   53,   76,   57,   58,   62,   63,   77,   64,
+       70,   38,   65,   66,   78,   39,   67,   79,   68,   82,
+       72,   73,   74,   75,   81,   90,   76,   85,   81,    0,
+       89,   77,   83,   83,   83,   83,   91,   92,   78,   94,
+       95,   79,   82,   84,   84,   84,   84,   96,   81,   90,
+       85,   97,   81,   89,   98,   99,  102,   98,  100,   91,
+      101,   92,   94,   95,   99,  103,    0,  104,  106,  107,
+       96,  108,  110,  112,  117,   97,  113,  115,  116,   99,
+
+      102,  100,  118,  101,   98,  114,  124,   99,  114,  103,
+      104,  106,  107,  119,  108,  125,  110,  112,  117,  113,
+      115,  116,  126,    0,  127,  128,  118,   98,  131,  124,
+      114,  132,  133,  137,  138,    0,  139,  119,  140,  125,
+      144,  145,  146,  147,  154,  146,  126,  127,  128,  148,
+      150,  131,  152,  114,  132,  156,  133,  137,  138,  139,
+      157,  140,  158,  167,  144,  145,  159,  147,  154,  162,
+      164,  160,  148,  150,  160,  152,  163,  165,  156,  163,
+      169,  173,  175,  157,  173,  176,  158,  167,  178,  159,
+      179,  180,  162,  164,  183,  185,  186,  163,  185,  187,
+
+      165,  189,  187,  169,  189,    0,  175,  173,  176,    0,
+        0,    0,  178,  179,    0,  180,    0,  183,    0,  186,
+        0,  163,    0,    0,    0,    0,    0,    0,    0,    0,
+      173,  191,  191,    0,  191,  191,  192,  192,  193,  193,
+        0,  193,  193,  194,    0,    0,  194,  195,    0,    0,
+      195,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -690,7 +684,7 @@ static void countnl() {
 	g_lingo->_colnumber = strlen(p);
 }
 
-#line 694 "engines/director/lingo/lingo-lex.cpp"
+#line 688 "engines/director/lingo/lingo-lex.cpp"
 
 #define INITIAL 0
 
@@ -878,7 +872,7 @@ YY_DECL
 #line 69 "engines/director/lingo/lingo-lex.l"
 
 
-#line 882 "engines/director/lingo/lingo-lex.cpp"
+#line 876 "engines/director/lingo/lingo-lex.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -932,13 +926,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 >= 197 )
+				if ( yy_current_state >= 191 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 465 );
+		while ( yy_base[yy_current_state] != 452 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1077,81 +1071,71 @@ YY_RULE_SETUP
 case 23:
 YY_RULE_SETUP
 #line 94 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMCI; }
+{ count(); return tMETHOD; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 95 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMCIWAIT; }
+{ count(); return tMOVIE; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 96 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMETHOD; }
+{ count(); return tNEXT; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 97 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMOVIE; }
+{ count(); return tNOT; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 98 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEXT; }
+{ count(); return tOF; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 99 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNOT; }
+{ count(); return tOPEN; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 100 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOF; }
+{ count(); return tOR; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 101 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOPEN; }
+{ count(); return tPLAY; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 102 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOR; }
+{ count(); return tPREVIOUS; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 103 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPLAY; }
+{ count(); return tPUT; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 104 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPREVIOUS; }
+{ count(); return tREPEAT; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 105 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPUT; }
+{ count(); return tSET; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 106 "engines/director/lingo/lingo-lex.l"
-{ count(); return tREPEAT; }
+{ count(); return tSTARTS; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 107 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSET; }
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 108 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSTARTS; }
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 109 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1193,9 +1177,9 @@ YY_RULE_SETUP
 		warning("Unhandled the entity %s", ptr);
 	}
 	YY_BREAK
-case 39:
+case 37:
 YY_RULE_SETUP
-#line 149 "engines/director/lingo/lingo-lex.l"
+#line 147 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 
@@ -1216,64 +1200,64 @@ YY_RULE_SETUP
 		warning("Unhandled the entity %s", ptr);
 	}
 	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 166 "engines/director/lingo/lingo-lex.l"
+{ count(); return tTHEN; }
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 167 "engines/director/lingo/lingo-lex.l"
+{ count(); return tTO; }
+	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 168 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTHEN; }
+{ count(); return tSPRITE; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 169 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTO; }
+{ count(); return tWITH; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 170 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSPRITE; }
+{ count(); return tWITHIN; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 171 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITH; }
+{ count(); return tWHEN; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 172 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITHIN; }
+{ count(); return tWHILE; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 173 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHEN; }
+#line 174 "engines/director/lingo/lingo-lex.l"
+{ count(); return tNEQ; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 174 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHILE; }
+#line 175 "engines/director/lingo/lingo-lex.l"
+{ count(); return tGE; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 176 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEQ; }
+{ count(); return tLE; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 177 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGE; }
+{ count(); return tCONCAT; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 178 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLE; }
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
 #line 179 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCONCAT; }
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 181 "engines/director/lingo/lingo-lex.l"
 {
 		count();
 		yylval.s = new Common::String(yytext);
@@ -1301,43 +1285,43 @@ YY_RULE_SETUP
 		return ID;
 	}
 	YY_BREAK
-case 52:
+case 50:
 YY_RULE_SETUP
-#line 207 "engines/director/lingo/lingo-lex.l"
+#line 205 "engines/director/lingo/lingo-lex.l"
 { count(); yylval.f = atof(yytext); return FLOAT; }
 	YY_BREAK
-case 53:
+case 51:
 YY_RULE_SETUP
-#line 208 "engines/director/lingo/lingo-lex.l"
+#line 206 "engines/director/lingo/lingo-lex.l"
 { count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
 	YY_BREAK
-case 54:
+case 52:
 YY_RULE_SETUP
-#line 209 "engines/director/lingo/lingo-lex.l"
+#line 207 "engines/director/lingo/lingo-lex.l"
 { count(); return *yytext; }
 	YY_BREAK
-case 55:
-/* rule 55 can match eol */
+case 53:
+/* rule 53 can match eol */
 YY_RULE_SETUP
-#line 210 "engines/director/lingo/lingo-lex.l"
+#line 208 "engines/director/lingo/lingo-lex.l"
 { return '\n'; }
 	YY_BREAK
-case 56:
+case 54:
 YY_RULE_SETUP
-#line 211 "engines/director/lingo/lingo-lex.l"
+#line 209 "engines/director/lingo/lingo-lex.l"
 { count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
 	YY_BREAK
-case 57:
+case 55:
 YY_RULE_SETUP
-#line 212 "engines/director/lingo/lingo-lex.l"
+#line 210 "engines/director/lingo/lingo-lex.l"
 
 	YY_BREAK
-case 58:
+case 56:
 YY_RULE_SETUP
-#line 214 "engines/director/lingo/lingo-lex.l"
+#line 212 "engines/director/lingo/lingo-lex.l"
 ECHO;
 	YY_BREAK
-#line 1341 "engines/director/lingo/lingo-lex.cpp"
+#line 1325 "engines/director/lingo/lingo-lex.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1630,7 +1614,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 >= 197 )
+			if ( yy_current_state >= 191 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1658,11 +1642,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 >= 197 )
+		if ( yy_current_state >= 191 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 196);
+	yy_is_jam = (yy_current_state == 190);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2337,7 +2321,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 214 "engines/director/lingo/lingo-lex.l"
+#line 212 "engines/director/lingo/lingo-lex.l"