DIRECTOR: Lingo: Enable parse debug

6 files changed, 190 insertions, 161 deletions

diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 25a0e3fdf0..a347d22732 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -77,10 +77,13 @@ Common::Error DirectorEngine::run() {
 	mci \"play T005045a from 22710 to 32872\"", kMovieScript, 1);
 
 	_lingo->addCode("set x = 1 + 3\n\
-	set y to 2 -- this set y to 4\n\
+	set y to 2 + 3 * 2 -- this set y to 4\n\
 	put 5 into z\n\
 -- some more\n", kMovieScript, 2);
 
+	_lingo->addCode("2 + 3 * 2 / (5 - 2)", kMovieScript, 3);
+	_lingo->executeScript(kMovieScript, 3);
+
 	return Common::kNoError;
 
 	//FIXME
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index fcf3bd9b96..99b976d172 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -96,7 +96,9 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 23 "engines/director/lingo/lingo-gr.y"
+#line 25 "engines/director/lingo/lingo-gr.y"
+
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "common/hash-str.h"
 
@@ -115,7 +117,7 @@ using namespace Director;
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 
 /* Enabling verbose error messages.  */
@@ -133,7 +135,7 @@ using namespace Director;
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 39 "engines/director/lingo/lingo-gr.y"
+#line 43 "engines/director/lingo/lingo-gr.y"
 {
 	Common::String *s;
 	int	i;
@@ -141,7 +143,7 @@ typedef union YYSTYPE
 	int code;
 }
 /* Line 193 of yacc.c.  */
-#line 145 "engines/director/lingo/lingo-gr.cpp"
+#line 147 "engines/director/lingo/lingo-gr.cpp"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -154,7 +156,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 158 "engines/director/lingo/lingo-gr.cpp"
+#line 160 "engines/director/lingo/lingo-gr.cpp"
 
 #ifdef short
 # undef short
@@ -369,16 +371,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   59
+#define YYLAST   55
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  23
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  5
+#define YYNNTS  6
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  20
+#define YYNRULES  21
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  41
+#define YYNSTATES  42
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -425,28 +427,29 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     4,     7,    11,    15,    19,    24,    29,
-      34,    36,    38,    42,    46,    50,    54,    57,    60,    64,
-      67
+      34,    36,    38,    40,    44,    48,    52,    56,    59,    62,
+      66,    69
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      24,     0,    -1,    -1,    24,    20,    -1,    24,    27,    20,
+      24,     0,    -1,    -1,    24,    20,    -1,    24,    28,    20,
       -1,    24,    25,    20,    -1,    24,    26,    20,    -1,    12,
-      26,     8,     6,    -1,    13,     6,    14,    26,    -1,    13,
-       6,     9,    26,    -1,     4,    -1,     6,    -1,    26,    15,
-      26,    -1,    26,    16,    26,    -1,    26,    17,    26,    -1,
-      26,    18,    26,    -1,    15,    26,    -1,    16,    26,    -1,
-      21,    26,    22,    -1,    10,     7,    -1,    11,     6,    -1
+      27,     8,     6,    -1,    13,     6,    14,    27,    -1,    13,
+       6,     9,    27,    -1,    27,    -1,     4,    -1,     6,    -1,
+      27,    15,    27,    -1,    27,    16,    27,    -1,    27,    17,
+      27,    -1,    27,    18,    27,    -1,    15,    27,    -1,    16,
+      27,    -1,    21,    27,    22,    -1,    10,     7,    -1,    11,
+       6,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    66,    66,    67,    68,    69,    71,    74,    75,    76,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    93,
-      94
+       0,    70,    70,    71,    72,    73,    74,    78,    79,    80,
+      83,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      97,    98
 };
 #endif
 
@@ -458,7 +461,7 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "UNARY", "INT", "FLOAT", "VAR", "STRING",
   "OP_INTO", "OP_TO", "FUNC_MCI", "FUNC_MCIWAIT", "FUNC_PUT", "FUNC_SET",
   "'='", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'",
-  "$accept", "list", "assign", "expr", "func", 0
+  "$accept", "list", "assign", "statement", "expr", "func", 0
 };
 #endif
 
@@ -477,16 +480,16 @@ static const yytype_uint16 yytoknum[] =
 static const yytype_uint8 yyr1[] =
 {
        0,    23,    24,    24,    24,    24,    24,    25,    25,    25,
-      26,    26,    26,    26,    26,    26,    26,    26,    26,    27,
-      27
+      26,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+      28,    28
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     0,     2,     3,     3,     3,     4,     4,     4,
-       1,     1,     3,     3,     3,     3,     2,     2,     3,     2,
-       2
+       1,     1,     1,     3,     3,     3,     3,     2,     2,     3,
+       2,     2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -494,35 +497,35 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       2,     0,     1,    10,    11,     0,     0,     0,     0,     0,
-       0,     3,     0,     0,     0,     0,    19,    20,     0,     0,
-      16,    17,     0,     5,     0,     0,     0,     0,     6,     4,
-       0,     0,     0,    18,    12,    13,    14,    15,     7,     9,
-       8
+       2,     0,     1,    11,    12,     0,     0,     0,     0,     0,
+       0,     3,     0,     0,     0,    10,     0,    20,    21,     0,
+       0,    17,    18,     0,     5,     6,     0,     0,     0,     0,
+       4,     0,     0,     0,    19,    13,    14,    15,    16,     7,
+       9,     8
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     1,    13,    14,    15
+      -1,     1,    13,    14,    15,    16
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -9
+#define YYPACT_NINF -11
 static const yytype_int8 yypact[] =
 {
-      -9,    22,    -9,    -9,    -9,     6,    -5,     0,    17,     0,
-       0,    -9,     0,     7,    35,     9,    -9,    -9,    31,    27,
-      -9,    -9,    -8,    -9,     0,     0,     0,     0,    -9,    -9,
-      24,     0,     0,    -9,    -6,    -6,    -9,    -9,    -9,    41,
-      41
+     -11,    23,   -11,   -11,   -11,     2,     4,    26,    18,    26,
+      26,   -11,    26,     8,    11,     0,    17,   -11,   -11,    -4,
+      -8,   -11,   -11,    33,   -11,   -11,    26,    26,    26,    26,
+     -11,    34,    26,    26,   -11,   -10,   -10,   -11,   -11,   -11,
+       0,     0
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-      -9,    -9,    -9,    -7,    -9
+     -11,   -11,   -11,   -11,    -7,   -11
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -532,22 +535,22 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      18,    17,    20,    21,     3,    22,     4,    24,    25,    26,
-      27,    26,    27,    16,    33,     9,    10,    34,    35,    36,
-      37,    12,     2,    19,    39,    40,     3,    23,     4,    29,
-      38,     0,     5,     6,     7,     8,    31,     9,    10,    30,
-       0,    32,    11,    12,     0,     0,    24,    25,    26,    27,
-      24,    25,    26,    27,     0,    28,    24,    25,    26,    27
+      19,    32,    21,    22,    31,    23,    33,    28,    29,    17,
+      18,    26,    27,    28,    29,    26,    27,    28,    29,    35,
+      36,    37,    38,     2,    20,    40,    41,     3,    24,     4,
+       3,    25,     4,     5,     6,     7,     8,    30,     9,    10,
+      39,     9,    10,    11,    12,     0,     0,    12,    26,    27,
+      28,    29,     0,     0,     0,    34
 };
 
 static const yytype_int8 yycheck[] =
 {
-       7,     6,     9,    10,     4,    12,     6,    15,    16,    17,
-      18,    17,    18,     7,    22,    15,    16,    24,    25,    26,
-      27,    21,     0,     6,    31,    32,     4,    20,     6,    20,
-       6,    -1,    10,    11,    12,    13,     9,    15,    16,     8,
-      -1,    14,    20,    21,    -1,    -1,    15,    16,    17,    18,
-      15,    16,    17,    18,    -1,    20,    15,    16,    17,    18
+       7,     9,     9,    10,     8,    12,    14,    17,    18,     7,
+       6,    15,    16,    17,    18,    15,    16,    17,    18,    26,
+      27,    28,    29,     0,     6,    32,    33,     4,    20,     6,
+       4,    20,     6,    10,    11,    12,    13,    20,    15,    16,
+       6,    15,    16,    20,    21,    -1,    -1,    21,    15,    16,
+      17,    18,    -1,    -1,    -1,    22
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -555,10 +558,10 @@ static const yytype_int8 yycheck[] =
 static const yytype_uint8 yystos[] =
 {
        0,    24,     0,     4,     6,    10,    11,    12,    13,    15,
-      16,    20,    21,    25,    26,    27,     7,     6,    26,     6,
-      26,    26,    26,    20,    15,    16,    17,    18,    20,    20,
-       8,     9,    14,    22,    26,    26,    26,    26,     6,    26,
-      26
+      16,    20,    21,    25,    26,    27,    28,     7,     6,    27,
+       6,    27,    27,    27,    20,    20,    15,    16,    17,    18,
+      20,     8,     9,    14,    22,    27,    27,    27,    27,     6,
+      27,    27
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1373,88 +1376,93 @@ yyreduce:
   switch (yyn)
     {
         case 5:
-#line 69 "engines/director/lingo/lingo-gr.y"
+#line 73 "engines/director/lingo/lingo-gr.y"
     { g_lingo->code2(g_lingo->func_xpop, STOP); return 1; ;}
     break;
 
   case 6:
-#line 71 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code2(g_lingo->func_printtop, STOP); return 1; ;}
+#line 74 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(STOP); return 1; ;}
     break;
 
   case 7:
-#line 74 "engines/director/lingo/lingo-gr.y"
+#line 78 "engines/director/lingo/lingo-gr.y"
     { g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str()); g_lingo->code1(g_lingo->func_assign); (yyval.code) = (yyvsp[(2) - (4)].code); delete (yyvsp[(4) - (4)].s); ;}
     break;
 
   case 8:
-#line 75 "engines/director/lingo/lingo-gr.y"
+#line 79 "engines/director/lingo/lingo-gr.y"
     { g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); g_lingo->code1(g_lingo->func_assign); (yyval.code) = (yyvsp[(4) - (4)].code); delete (yyvsp[(2) - (4)].s); ;}
     break;
 
   case 9:
-#line 76 "engines/director/lingo/lingo-gr.y"
+#line 80 "engines/director/lingo/lingo-gr.y"
     { g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); g_lingo->code1(g_lingo->func_assign); (yyval.code) = (yyvsp[(4) - (4)].code); delete (yyvsp[(2) - (4)].s); ;}
     break;
 
   case 10:
-#line 82 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_constpush); inst i; WRITE_LE_UINT32(&i, (yyvsp[(1) - (1)].i)); (yyval.code) = g_lingo->code1(i); ;}
+#line 83 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_xpop); ;}
     break;
 
   case 11:
-#line 83 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); (yyval.code) = g_lingo->code1(g_lingo->func_eval); delete (yyvsp[(1) - (1)].s); ;}
+#line 86 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_constpush); inst i; WRITE_LE_UINT32(&i, (yyvsp[(1) - (1)].i)); (yyval.code) = g_lingo->code1(i); ;}
     break;
 
   case 12:
-#line 84 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_add); ;}
+#line 87 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); (yyval.code) = g_lingo->code1(g_lingo->func_eval); delete (yyvsp[(1) - (1)].s); ;}
     break;
 
   case 13:
-#line 85 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_sub); ;}
+#line 88 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_add); ;}
     break;
 
   case 14:
-#line 86 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_mul); ;}
+#line 89 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_sub); ;}
     break;
 
   case 15:
-#line 87 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_div); ;}
+#line 90 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_mul); ;}
     break;
 
   case 16:
-#line 88 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (2)].code); ;}
+#line 91 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_div); ;}
     break;
 
   case 17:
-#line 89 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->func_negate); ;}
+#line 92 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[(2) - (2)].code); ;}
     break;
 
   case 18:
-#line 90 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (3)].code); ;}
+#line 93 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->func_negate); ;}
     break;
 
   case 19:
-#line 93 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->func_mci); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); delete (yyvsp[(2) - (2)].s); ;}
+#line 94 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[(2) - (3)].code); ;}
     break;
 
   case 20:
-#line 94 "engines/director/lingo/lingo-gr.y"
+#line 97 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->func_mci); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); delete (yyvsp[(2) - (2)].s); ;}
+    break;
+
+  case 21:
+#line 98 "engines/director/lingo/lingo-gr.y"
     { g_lingo->code1(g_lingo->func_mciwait); g_lingo->codeString((yyvsp[(2) - (2)].s)->c_str()); delete (yyvsp[(2) - (2)].s); ;}
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 1458 "engines/director/lingo/lingo-gr.cpp"
+#line 1466 "engines/director/lingo/lingo-gr.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1668,6 +1676,6 @@ yyreturn:
 }
 
 
-#line 97 "engines/director/lingo/lingo-gr.y"
+#line 101 "engines/director/lingo/lingo-gr.y"
 
 
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 6da4c9f0f5..ddf0c48180 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -70,7 +70,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 39 "engines/director/lingo/lingo-gr.y"
+#line 43 "engines/director/lingo/lingo-gr.y"
 {
 	Common::String *s;
 	int	i;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index c8ccafd9f1..e0dc00f337 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -20,7 +20,11 @@
  *
  */
 
+%debug
+
 %{
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
 #include "common/hash-str.h"
 
 #include "director/lingo/lingo.h"
@@ -67,8 +71,8 @@ list: /* empty */
 	| list '\n'
 	| list func '\n'
 	| list assign '\n'			{ g_lingo->code2(g_lingo->func_xpop, STOP); return 1; }
-//	| list statement '\n'		{ g_lingo->code1(STOP); return 1; }
-	| list expr '\n'  			{ g_lingo->code2(g_lingo->func_printtop, STOP); return 1; }
+	| list statement '\n'		{ g_lingo->code1(STOP); return 1; }
+//	| list expr '\n'  			{ g_lingo->code2(g_lingo->func_printtop, STOP); return 1; }
 	;
 
 assign: FUNC_PUT expr OP_INTO VAR	{ g_lingo->code1(g_lingo->func_varpush); g_lingo->codeString($4->c_str()); g_lingo->code1(g_lingo->func_assign); $$ = $2; delete $4; }
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index e1130aa79b..20b84859f0 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 14
-#define YY_END_OF_BUFFER 15
+#define YY_NUM_RULES 15
+#define YY_END_OF_BUFFER 16
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -373,30 +373,30 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[40] =
+static yyconst flex_int16_t yy_accept[41] =
     {   0,
-        0,    0,   15,   14,   12,   14,   11,   11,   10,    8,
-        8,    8,    8,    8,    8,   12,    0,   13,    1,    9,
-       10,    8,    8,    8,    8,    8,    7,    1,    9,    8,
-        3,    5,    6,    2,    8,    8,    8,    4,    0
+        0,    0,   16,   15,    2,   13,   15,   12,   12,   11,
+        9,    9,    9,    9,    9,    9,   13,    0,   14,    1,
+       10,   11,    9,    9,    9,    9,    9,    8,    1,   10,
+        9,    4,    6,    7,    3,    9,    9,    9,    5,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
     {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        1,    1,    3,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    4,    1,    1,    5,    1,    1,    1,
-        1,    5,    5,    5,    6,    7,    5,    8,    8,    8,
-        8,    8,    8,    8,    8,    8,    8,    5,    1,    1,
-        5,    1,    1,    1,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        1,    1,    1,    5,    9,    1,   10,    9,   11,    9,
-
-       12,    9,    9,    9,   13,    9,    9,    9,   14,   15,
-       16,   17,    9,    9,   18,   19,   20,    9,   21,    9,
-        9,    9,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    5,    1,    1,    6,    1,    1,    6,
+        6,    6,    6,    6,    7,    8,    6,    9,    9,    9,
+        9,    9,    9,    9,    9,    9,    9,    6,    1,    1,
+        6,    1,    1,    1,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+        1,    1,    1,    6,   10,    1,   11,   10,   12,   10,
+
+       13,   10,   10,   10,   14,   10,   10,   10,   15,   16,
+       17,   18,   10,   10,   19,   20,   21,   10,   22,   10,
+       10,   10,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -413,53 +413,53 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[22] =
+static yyconst flex_int32_t yy_meta[23] =
     {   0,
-        1,    2,    3,    1,    1,    1,    1,    4,    4,    4,
+        1,    1,    2,    3,    1,    1,    1,    1,    4,    4,
         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4
+        4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[43] =
+static yyconst flex_int16_t yy_base[44] =
     {   0,
-        0,    0,   55,   56,   20,   50,   56,   47,   17,    0,
-       37,   40,   30,   37,   32,   24,   43,   56,    0,   38,
-       21,    0,   26,   31,   24,   23,    0,    0,   33,   24,
-       18,    0,    0,    0,   28,   23,   16,    0,   56,   29,
-       27,   33
+        0,    0,   56,   57,   57,   20,   50,   57,   47,   17,
+        0,   37,   40,   30,   37,   32,   24,   43,   57,    0,
+       38,   21,    0,   26,   31,   24,   23,    0,    0,   33,
+       24,   18,    0,    0,    0,   28,   23,   16,    0,   57,
+       30,   28,   34
     } ;
 
-static yyconst flex_int16_t yy_def[43] =
+static yyconst flex_int16_t yy_def[44] =
     {   0,
-       39,    1,   39,   39,   39,   40,   39,   39,   39,   41,
-       41,   41,   41,   41,   41,   39,   40,   39,   42,   39,
-       39,   41,   41,   41,   41,   41,   41,   42,   39,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,    0,   39,
-       39,   39
+       40,    1,   40,   40,   40,   40,   41,   40,   40,   40,
+       42,   42,   42,   42,   42,   42,   40,   41,   40,   43,
+       40,   40,   42,   42,   42,   42,   42,   42,   43,   40,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,    0,
+       40,   40,   40
     } ;
 
-static yyconst flex_int16_t yy_nxt[78] =
+static yyconst flex_int16_t yy_nxt[80] =
     {   0,
-        4,    5,    5,    6,    7,    8,    4,    9,   10,   10,
-       10,   10,   11,   12,   10,   10,   13,   14,   15,   10,
-       10,   16,   16,   20,   21,   16,   16,   20,   21,   17,
-       22,   17,   17,   28,   38,   37,   28,   36,   35,   34,
-       29,   33,   32,   31,   30,   29,   18,   27,   26,   25,
-       24,   23,   19,   18,   39,    3,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39
+        4,    5,    6,    6,    7,    8,    9,    4,   10,   11,
+       11,   11,   11,   12,   13,   11,   11,   14,   15,   16,
+       11,   11,   17,   17,   21,   22,   17,   17,   21,   22,
+       18,   23,   18,   18,   29,   39,   38,   29,   37,   36,
+       35,   30,   34,   33,   32,   31,   30,   19,   28,   27,
+       26,   25,   24,   20,   19,   40,    3,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40
     } ;
 
-static yyconst flex_int16_t yy_chk[78] =
+static yyconst flex_int16_t yy_chk[80] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    5,    5,    9,    9,   16,   16,   21,   21,   40,
-       41,   40,   40,   42,   37,   36,   42,   35,   31,   30,
-       29,   26,   25,   24,   23,   20,   17,   15,   14,   13,
-       12,   11,    8,    6,    3,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39
+        1,    1,    6,    6,   10,   10,   17,   17,   22,   22,
+       41,   42,   41,   41,   43,   38,   37,   43,   36,   32,
+       31,   30,   27,   26,   25,   24,   21,   18,   16,   15,
+       14,   13,   12,    9,    7,    3,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -747,13 +747,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 >= 40 )
+				if ( yy_current_state >= 41 )
 					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] != 56 );
+		while ( yy_base[yy_current_state] != 57 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -785,70 +785,75 @@ YY_RULE_SETUP
 case 2:
 YY_RULE_SETUP
 #line 47 "engines/director/lingo/lingo-lex.l"
-{ return OP_INTO; }
+{ return ' '; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
 #line 48 "engines/director/lingo/lingo-lex.l"
-{ return FUNC_MCI; }
+{ return OP_INTO; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
 #line 49 "engines/director/lingo/lingo-lex.l"
-{ return FUNC_MCIWAIT; }
+{ return FUNC_MCI; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
 #line 50 "engines/director/lingo/lingo-lex.l"
-{ return FUNC_PUT; }
+{ return FUNC_MCIWAIT; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
 #line 51 "engines/director/lingo/lingo-lex.l"
-{ return FUNC_SET; }
+{ return FUNC_PUT; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
 #line 52 "engines/director/lingo/lingo-lex.l"
-{ return OP_TO; }
+{ return FUNC_SET; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 54 "engines/director/lingo/lingo-lex.l"
-{ yylval.s = new Common::String(yytext);  return VAR; }
+#line 53 "engines/director/lingo/lingo-lex.l"
+{ return OP_TO; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
 #line 55 "engines/director/lingo/lingo-lex.l"
-{ yylval.f = atof(yytext); return FLOAT; }
+{ yylval.s = new Common::String(yytext);  return VAR; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
 #line 56 "engines/director/lingo/lingo-lex.l"
-{ yylval.i = strtol(yytext, NULL, 10); return INT; }
+{ yylval.f = atof(yytext); return FLOAT; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
 #line 57 "engines/director/lingo/lingo-lex.l"
-{ return *yytext; }
+{ yylval.i = strtol(yytext, NULL, 10); return INT; }
 	YY_BREAK
 case 12:
-/* rule 12 can match eol */
 YY_RULE_SETUP
 #line 58 "engines/director/lingo/lingo-lex.l"
-{ return '\n'; }
+{ return *yytext; }
 	YY_BREAK
 case 13:
+/* rule 13 can match eol */
 YY_RULE_SETUP
 #line 59 "engines/director/lingo/lingo-lex.l"
-{ yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
+{ return '\n'; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 61 "engines/director/lingo/lingo-lex.l"
+#line 60 "engines/director/lingo/lingo-lex.l"
+{ yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 62 "engines/director/lingo/lingo-lex.l"
 ECHO;
 	YY_BREAK
-#line 852 "engines/director/lingo/lingo-lex.cpp"
+#line 857 "engines/director/lingo/lingo-lex.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1140,7 +1145,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 >= 40 )
+			if ( yy_current_state >= 41 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1168,11 +1173,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 >= 40 )
+		if ( yy_current_state >= 41 )
 			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 == 39);
+	yy_is_jam = (yy_current_state == 40);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1845,15 +1850,19 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 61 "engines/director/lingo/lingo-lex.l"
+#line 62 "engines/director/lingo/lingo-lex.l"
+
 
 
+extern int yydebug;
 
 namespace Director {
 
 int Lingo::parse(const char *code) {
 	YY_BUFFER_STATE bp;
 
+	yydebug = 1;
+
 	yy_delete_buffer(YY_CURRENT_BUFFER);
 
 	bp = yy_scan_string(code);
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index e2a57d71b2..ed61cae867 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -38,12 +38,13 @@ variable [_[:alpha:]][_[:alnum:]]*
 constfloat [[:digit:]]+\.[[:digit:]]*
 constinteger [[:digit:]]+
 conststring \"[^\"\n]*\"
-operator [-+*/%=^:,]
+operator [-+*/%=^:,()]
 newline [\n\r]+
 
 %%
 
 --[^\r\n]*
+[\t]			{ return ' '; }
 into			{ return OP_INTO; }
 mci				{ return FUNC_MCI; }
 mciwait			{ return FUNC_MCIWAIT; }
@@ -60,11 +61,15 @@ to				{ return OP_TO; }
 
 %%
 
+extern int yydebug;
+
 namespace Director {
 
 int Lingo::parse(const char *code) {
 	YY_BUFFER_STATE bp;
 
+	yydebug = 1;
+
 	yy_delete_buffer(YY_CURRENT_BUFFER);
 
 	bp = yy_scan_string(code);