DIRECTOR: Recompile Lingo parser

3 files changed, 1366 insertions, 1487 deletions

diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 64353521d6..81fad9b4c6 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -87,7 +87,7 @@ static struct FuncDescr {
 	{ Lingo::c_intersects,	"c_intersects",	"" },
 	{ Lingo::c_within,		"c_within",		"" },
 	{ Lingo::c_field,       "c_field",      "" },
-	{ Lingo::c_of,		    "c_of",		    "" },	// D9
+	{ Lingo::c_of,		    "c_of",		    "" },
 	{ Lingo::c_charOf,		"c_charOf",		"" },	// D3
 	{ Lingo::c_charToOf,	"c_charToOf",	"" },	// D3
 	{ Lingo::c_itemOf,		"c_itemOf",		"" },	// D3
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index d375518c16..a84693c830 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.4.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -43,11 +41,14 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "3.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,201 +56,16 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+/* Push parsers.  */
+#define YYPUSH 0
 
+/* Pull parsers.  */
+#define YYPULL 1
 
 
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     UNARY = 258,
-     CASTREF = 259,
-     VOID = 260,
-     VAR = 261,
-     POINT = 262,
-     RECT = 263,
-     ARRAY = 264,
-     OBJECT = 265,
-     REFERENCE = 266,
-     INT = 267,
-     THEENTITY = 268,
-     THEENTITYWITHID = 269,
-     FLOAT = 270,
-     BLTIN = 271,
-     BLTINNOARGS = 272,
-     BLTINNOARGSORONE = 273,
-     BLTINONEARG = 274,
-     BLTINARGLIST = 275,
-     TWOWORDBUILTIN = 276,
-     FBLTIN = 277,
-     FBLTINNOARGS = 278,
-     FBLTINONEARG = 279,
-     FBLTINARGLIST = 280,
-     RBLTIN = 281,
-     RBLTINONEARG = 282,
-     ID = 283,
-     STRING = 284,
-     HANDLER = 285,
-     SYMBOL = 286,
-     ENDCLAUSE = 287,
-     tPLAYACCEL = 288,
-     tDOWN = 289,
-     tELSE = 290,
-     tNLELSIF = 291,
-     tEXIT = 292,
-     tFRAME = 293,
-     tGLOBAL = 294,
-     tGO = 295,
-     tIF = 296,
-     tINTO = 297,
-     tLOOP = 298,
-     tMACRO = 299,
-     tMOVIE = 300,
-     tNEXT = 301,
-     tOF = 302,
-     tPREVIOUS = 303,
-     tPUT = 304,
-     tREPEAT = 305,
-     tSET = 306,
-     tTHEN = 307,
-     tTHENNL = 308,
-     tTO = 309,
-     tWHEN = 310,
-     tWITH = 311,
-     tWHILE = 312,
-     tNLELSE = 313,
-     tFACTORY = 314,
-     tMETHOD = 315,
-     tOPEN = 316,
-     tPLAY = 317,
-     tDONE = 318,
-     tINSTANCE = 319,
-     tGE = 320,
-     tLE = 321,
-     tGT = 322,
-     tLT = 323,
-     tEQ = 324,
-     tNEQ = 325,
-     tAND = 326,
-     tOR = 327,
-     tNOT = 328,
-     tMOD = 329,
-     tAFTER = 330,
-     tBEFORE = 331,
-     tCONCAT = 332,
-     tCONTAINS = 333,
-     tSTARTS = 334,
-     tCHAR = 335,
-     tITEM = 336,
-     tLINE = 337,
-     tWORD = 338,
-     tSPRITE = 339,
-     tINTERSECTS = 340,
-     tWITHIN = 341,
-     tTELL = 342,
-     tPROPERTY = 343,
-     tON = 344,
-     tME = 345
-   };
-#endif
-/* Tokens.  */
-#define UNARY 258
-#define CASTREF 259
-#define VOID 260
-#define VAR 261
-#define POINT 262
-#define RECT 263
-#define ARRAY 264
-#define OBJECT 265
-#define REFERENCE 266
-#define INT 267
-#define THEENTITY 268
-#define THEENTITYWITHID 269
-#define FLOAT 270
-#define BLTIN 271
-#define BLTINNOARGS 272
-#define BLTINNOARGSORONE 273
-#define BLTINONEARG 274
-#define BLTINARGLIST 275
-#define TWOWORDBUILTIN 276
-#define FBLTIN 277
-#define FBLTINNOARGS 278
-#define FBLTINONEARG 279
-#define FBLTINARGLIST 280
-#define RBLTIN 281
-#define RBLTINONEARG 282
-#define ID 283
-#define STRING 284
-#define HANDLER 285
-#define SYMBOL 286
-#define ENDCLAUSE 287
-#define tPLAYACCEL 288
-#define tDOWN 289
-#define tELSE 290
-#define tNLELSIF 291
-#define tEXIT 292
-#define tFRAME 293
-#define tGLOBAL 294
-#define tGO 295
-#define tIF 296
-#define tINTO 297
-#define tLOOP 298
-#define tMACRO 299
-#define tMOVIE 300
-#define tNEXT 301
-#define tOF 302
-#define tPREVIOUS 303
-#define tPUT 304
-#define tREPEAT 305
-#define tSET 306
-#define tTHEN 307
-#define tTHENNL 308
-#define tTO 309
-#define tWHEN 310
-#define tWITH 311
-#define tWHILE 312
-#define tNLELSE 313
-#define tFACTORY 314
-#define tMETHOD 315
-#define tOPEN 316
-#define tPLAY 317
-#define tDONE 318
-#define tINSTANCE 319
-#define tGE 320
-#define tLE 321
-#define tGT 322
-#define tLT 323
-#define tEQ 324
-#define tNEQ 325
-#define tAND 326
-#define tOR 327
-#define tNOT 328
-#define tMOD 329
-#define tAFTER 330
-#define tBEFORE 331
-#define tCONCAT 332
-#define tCONTAINS 333
-#define tSTARTS 334
-#define tCHAR 335
-#define tITEM 336
-#define tLINE 337
-#define tWORD 338
-#define tSPRITE 339
-#define tINTERSECTS 340
-#define tWITHIN 341
-#define tTELL 342
-#define tPROPERTY 343
-#define tON 344
-#define tME 345
-
-
-
-
-/* Copy the first part of user declarations.  */
+
+
+/* First part of user prologue.  */
 #line 49 "engines/director/lingo/lingo-gr.y"
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
@@ -280,11 +96,19 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
 }
 
 
+#line 100 "engines/director/lingo/lingo-gr.cpp"
 
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
+#  else
+#   define YY_NULLPTR ((void*)0)
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -294,15 +118,120 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* Use api.header.include to #include this header
+   instead of duplicating it here.  */
+#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    UNARY = 258,
+    CASTREF = 259,
+    VOID = 260,
+    VAR = 261,
+    POINT = 262,
+    RECT = 263,
+    ARRAY = 264,
+    OBJECT = 265,
+    REFERENCE = 266,
+    INT = 267,
+    THEENTITY = 268,
+    THEENTITYWITHID = 269,
+    FLOAT = 270,
+    BLTIN = 271,
+    BLTINNOARGS = 272,
+    BLTINNOARGSORONE = 273,
+    BLTINONEARG = 274,
+    BLTINARGLIST = 275,
+    TWOWORDBUILTIN = 276,
+    FBLTIN = 277,
+    FBLTINNOARGS = 278,
+    FBLTINONEARG = 279,
+    FBLTINARGLIST = 280,
+    RBLTIN = 281,
+    RBLTINONEARG = 282,
+    ID = 283,
+    STRING = 284,
+    HANDLER = 285,
+    SYMBOL = 286,
+    ENDCLAUSE = 287,
+    tPLAYACCEL = 288,
+    tDOWN = 289,
+    tELSE = 290,
+    tNLELSIF = 291,
+    tEXIT = 292,
+    tFRAME = 293,
+    tGLOBAL = 294,
+    tGO = 295,
+    tIF = 296,
+    tINTO = 297,
+    tLOOP = 298,
+    tMACRO = 299,
+    tMOVIE = 300,
+    tNEXT = 301,
+    tOF = 302,
+    tPREVIOUS = 303,
+    tPUT = 304,
+    tREPEAT = 305,
+    tSET = 306,
+    tTHEN = 307,
+    tTHENNL = 308,
+    tTO = 309,
+    tWHEN = 310,
+    tWITH = 311,
+    tWHILE = 312,
+    tNLELSE = 313,
+    tFACTORY = 314,
+    tMETHOD = 315,
+    tOPEN = 316,
+    tPLAY = 317,
+    tDONE = 318,
+    tINSTANCE = 319,
+    tGE = 320,
+    tLE = 321,
+    tGT = 322,
+    tLT = 323,
+    tEQ = 324,
+    tNEQ = 325,
+    tAND = 326,
+    tOR = 327,
+    tNOT = 328,
+    tMOD = 329,
+    tAFTER = 330,
+    tBEFORE = 331,
+    tCONCAT = 332,
+    tCONTAINS = 333,
+    tSTARTS = 334,
+    tCHAR = 335,
+    tITEM = 336,
+    tLINE = 337,
+    tWORD = 338,
+    tSPRITE = 339,
+    tINTERSECTS = 340,
+    tWITHIN = 341,
+    tTELL = 342,
+    tPROPERTY = 343,
+    tON = 344,
+    tME = 345
+  };
 #endif
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 79 "engines/director/lingo/lingo-gr.y"
+union YYSTYPE
 {
+#line 79 "engines/director/lingo/lingo-gr.y"
+
 	Common::String *s;
 	int i;
 	double f;
@@ -310,22 +239,23 @@ typedef union YYSTYPE
 	int code;
 	int narg;	/* number of arguments */
 	Common::Array<double> *arr;
-}
-/* Line 193 of yacc.c.  */
-#line 316 "engines/director/lingo/lingo-gr.cpp"
-	YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 244 "engines/director/lingo/lingo-gr.cpp"
+
+};
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
 
+extern YYSTYPE yylval;
+
+int yyparse (void);
 
-/* Copy the second part of user declarations.  */
+#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED  */
 
 
-/* Line 216 of yacc.c.  */
-#line 329 "engines/director/lingo/lingo-gr.cpp"
 
 #ifdef short
 # undef short
@@ -339,23 +269,20 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short int yytype_int16;
+typedef short yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -363,12 +290,11 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned int
+#  define YYSIZE_T unsigned
 # endif
 #endif
 
@@ -378,39 +304,61 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-static int
-YYID (i)
-    int i;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return i;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -428,11 +376,11 @@ YYID (i)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -440,8 +388,8 @@ YYID (i)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -455,25 +403,23 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -483,14 +429,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -501,42 +447,46 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  124
 /* YYLAST -- Last index in YYTABLE.  */
@@ -548,17 +498,19 @@ union yyalloc
 #define YYNNTS  43
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  164
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  360
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   345
 
-#define YYTRANSLATE(YYX)						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, with out-of-bounds checking.  */
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -599,122 +551,30 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     7,     9,    12,    14,    15,    17,    19,
-      21,    26,    31,    36,    41,    46,    51,    57,    62,    67,
-      73,    75,    77,    79,    81,    89,   100,   112,   116,   123,
-     128,   135,   145,   155,   165,   172,   183,   194,   195,   199,
-     202,   204,   207,   209,   216,   218,   225,   227,   231,   235,
-     238,   242,   244,   246,   247,   248,   249,   252,   255,   259,
-     261,   263,   265,   267,   269,   271,   274,   277,   282,   287,
-     289,   291,   294,   296,   300,   304,   308,   312,   316,   320,
-     324,   328,   332,   336,   340,   344,   347,   351,   355,   359,
-     363,   366,   369,   373,   377,   382,   387,   392,   399,   404,
-     411,   416,   423,   428,   435,   438,   441,   443,   445,   448,
-     450,   453,   456,   459,   461,   464,   467,   469,   472,   477,
-     482,   489,   494,   497,   501,   503,   507,   509,   513,   515,
-     519,   522,   525,   528,   531,   535,   538,   541,   543,   547,
-     550,   553,   556,   560,   563,   564,   568,   569,   578,   581,
-     582,   591,   599,   606,   609,   610,   612,   616,   621,   622,
-     625,   626,   628,   632,   634
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     107,     0,    -1,   107,   108,   109,    -1,   109,    -1,     1,
-     108,    -1,    98,    -1,    -1,   140,    -1,   146,    -1,   112,
-      -1,    49,   129,    42,    28,    -1,    49,   129,    42,   130,
-      -1,    49,   129,    75,   129,    -1,    49,   129,    76,   129,
-      -1,    51,    28,    91,   129,    -1,    51,    13,    91,   129,
-      -1,    51,    14,   129,    91,   129,    -1,    51,    28,    54,
-     129,    -1,    51,    13,    54,   129,    -1,    51,    14,   129,
-      54,   129,    -1,   129,    -1,   131,    -1,   111,    -1,   113,
-      -1,   120,    99,   119,   100,   126,   125,    32,    -1,   121,
-      91,   129,   125,    54,   129,   125,   126,   125,    32,    -1,
-     121,    91,   129,   125,    34,    54,   129,   125,   126,   125,
-      32,    -1,   127,   111,   125,    -1,   128,   129,   108,   126,
-     125,    32,    -1,   128,   129,    54,   129,    -1,   122,   119,
-      53,   126,   125,    32,    -1,   122,   119,    53,   126,   125,
-      58,   126,   125,    32,    -1,   122,   119,    53,   126,   125,
-     124,   115,   125,    32,    -1,   122,   119,    53,   126,   125,
-      58,   124,   111,   125,    -1,   122,   119,    52,   124,   111,
-     125,    -1,   122,   119,    52,   124,   111,   125,    58,   124,
-     111,   125,    -1,   122,   119,    52,   124,   111,   125,   116,
-     125,   114,   125,    -1,    -1,    58,   124,   111,    -1,   115,
-     118,    -1,   118,    -1,   116,   117,    -1,   117,    -1,   123,
-     119,    52,   124,   112,   125,    -1,   116,    -1,   123,   119,
-      52,   124,   126,   125,    -1,   129,    -1,   129,    91,   129,
-      -1,    99,   119,   100,    -1,    50,    57,    -1,    50,    56,
-      28,    -1,    41,    -1,    36,    -1,    -1,    -1,    -1,   126,
-     108,    -1,   126,   112,    -1,    55,    28,    52,    -1,    87,
-      -1,    12,    -1,    15,    -1,    31,    -1,    29,    -1,    23,
-      -1,    24,   129,    -1,    25,   148,    -1,    25,    99,   148,
-     100,    -1,    28,    99,   147,   100,    -1,    28,    -1,    13,
-      -1,    14,   129,    -1,   110,    -1,   129,    93,   129,    -1,
-     129,    94,   129,    -1,   129,    95,   129,    -1,   129,    96,
-     129,    -1,   129,    74,   129,    -1,   129,   101,   129,    -1,
-     129,   102,   129,    -1,   129,    70,   129,    -1,   129,    65,
-     129,    -1,   129,    66,   129,    -1,   129,    71,   129,    -1,
-     129,    72,   129,    -1,    73,   129,    -1,   129,    92,   129,
-      -1,   129,    77,   129,    -1,   129,    78,   129,    -1,   129,
-      79,   129,    -1,    93,   129,    -1,    94,   129,    -1,    99,
-     129,   100,    -1,   103,   147,   104,    -1,    84,   129,    85,
-     129,    -1,    84,   129,    86,   129,    -1,    80,   129,    47,
-     129,    -1,    80,   129,    54,   129,    47,   129,    -1,    81,
-     129,    47,   129,    -1,    81,   129,    54,   129,    47,   129,
-      -1,    82,   129,    47,   129,    -1,    82,   129,    54,   129,
-      47,   129,    -1,    83,   129,    47,   129,    -1,    83,   129,
-      54,   129,    47,   129,    -1,    27,   129,    -1,    49,   129,
-      -1,   135,    -1,   138,    -1,    37,    50,    -1,    37,    -1,
-      39,   132,    -1,    88,   133,    -1,    64,   134,    -1,    17,
-      -1,    19,   129,    -1,    18,   129,    -1,    18,    -1,    20,
-     148,    -1,    20,    99,   148,   100,    -1,    90,    99,    28,
-     100,    -1,    90,    99,    28,   105,   147,   100,    -1,    61,
-     129,    56,   129,    -1,    61,   129,    -1,    21,    28,   147,
-      -1,    28,    -1,   132,   105,    28,    -1,    28,    -1,   133,
-     105,    28,    -1,    28,    -1,   134,   105,    28,    -1,    40,
-      43,    -1,    40,    46,    -1,    40,    48,    -1,    40,   136,
-      -1,    40,   136,   137,    -1,    40,   137,    -1,    38,   129,
-      -1,   129,    -1,    47,    45,   129,    -1,    45,   129,    -1,
-      62,    63,    -1,    62,   136,    -1,    62,   136,   137,    -1,
-      62,   137,    -1,    -1,    33,   139,   147,    -1,    -1,    44,
-      28,   141,   124,   144,   108,   145,   126,    -1,    59,    28,
-      -1,    -1,    60,    28,   142,   124,   144,   108,   145,   126,
-      -1,   143,   124,   144,   108,   145,   126,    32,    -1,   143,
-     124,   144,   108,   145,   126,    -1,    89,    28,    -1,    -1,
-      28,    -1,   144,   105,    28,    -1,   144,   108,   105,    28,
-      -1,    -1,    28,   148,    -1,    -1,   129,    -1,   147,   105,
-     129,    -1,   129,    -1,   148,   105,   129,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   119,   119,   120,   121,   124,   129,   130,   131,   132,
-     135,   141,   144,   145,   146,   152,   160,   168,   174,   182,
-     192,   193,   196,   197,   202,   215,   233,   247,   253,   256,
-     261,   271,   283,   295,   305,   315,   325,   337,   338,   341,
-     342,   345,   346,   349,   357,   358,   366,   367,   368,   371,
-     374,   381,   388,   396,   399,   402,   403,   404,   407,   413,
-     417,   418,   421,   424,   427,   430,   433,   434,   435,   438,
-     442,   449,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,   466,   467,   468,   469,   470,   471,   472,
-     473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
-     483,   484,   485,   486,   489,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   505,   508,   511,   515,   516,   517,
-     518,   519,   520,   521,   524,   525,   528,   529,   532,   533,
-     544,   545,   546,   547,   550,   553,   558,   559,   562,   563,
-     566,   567,   570,   573,   576,   576,   606,   606,   611,   614,
-     614,   619,   627,   634,   636,   637,   638,   639,   642,   646,
-     654,   655,   656,   659,   660
+     135,   141,   144,   145,   146,   152,   159,   165,   171,   178,
+     186,   187,   190,   191,   196,   209,   227,   241,   247,   250,
+     255,   265,   277,   289,   299,   309,   319,   331,   332,   335,
+     336,   339,   340,   343,   351,   352,   360,   361,   362,   365,
+     368,   375,   382,   390,   393,   396,   397,   398,   401,   407,
+     411,   414,   417,   420,   423,   426,   429,   430,   431,   434,
+     438,   446,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,   465,   466,   467,   468,   469,
+     470,   471,   472,   473,   474,   475,   476,   477,   478,   479,
+     480,   481,   482,   483,   486,   491,   492,   493,   494,   495,
+     496,   497,   498,   499,   502,   505,   508,   512,   513,   514,
+     515,   516,   517,   518,   521,   522,   525,   526,   529,   530,
+     541,   542,   543,   544,   548,   552,   558,   559,   562,   563,
+     566,   567,   571,   575,   579,   579,   609,   609,   614,   617,
+     617,   622,   630,   637,   639,   640,   641,   642,   645,   649,
+     657,   658,   659,   662,   663
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -740,14 +600,14 @@ static const char *const yytname[] =
   "cond", "repeatwhile", "repeatwith", "if", "elseif", "begin", "end",
   "stmtlist", "when", "tell", "expr", "reference", "proc", "globallist",
   "propertylist", "instancelist", "gotofunc", "gotoframe", "gotomovie",
-  "playfunc", "@1", "defn", "@2", "@3", "on", "argdef", "argstore",
-  "macro", "arglist", "nonemptyarglist", 0
+  "playfunc", "$@1", "defn", "$@2", "$@3", "on", "argdef", "argstore",
+  "macro", "arglist", "nonemptyarglist", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -764,106 +624,18 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,   106,   107,   107,   107,   108,   109,   109,   109,   109,
-     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
-     111,   111,   112,   112,   112,   112,   112,   112,   112,   112,
-     113,   113,   113,   113,   113,   113,   113,   114,   114,   115,
-     115,   116,   116,   117,   118,   118,   119,   119,   119,   120,
-     121,   122,   123,   124,   125,   126,   126,   126,   127,   128,
-     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
-     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
-     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
-     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
-     129,   129,   129,   129,   130,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   132,   132,   133,   133,   134,   134,
-     135,   135,   135,   135,   135,   135,   136,   136,   137,   137,
-     138,   138,   138,   138,   139,   138,   141,   140,   140,   142,
-     140,   140,   140,   143,   144,   144,   144,   144,   145,   146,
-     147,   147,   147,   148,   148
-};
+#define YYPACT_NINF -281
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     3,     1,     2,     1,     0,     1,     1,     1,
-       4,     4,     4,     4,     4,     4,     5,     4,     4,     5,
-       1,     1,     1,     1,     7,    10,    11,     3,     6,     4,
-       6,     9,     9,     9,     6,    10,    10,     0,     3,     2,
-       1,     2,     1,     6,     1,     6,     1,     3,     3,     2,
-       3,     1,     1,     0,     0,     0,     2,     2,     3,     1,
-       1,     1,     1,     1,     1,     2,     2,     4,     4,     1,
-       1,     2,     1,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     2,     3,     3,     3,     3,
-       2,     2,     3,     3,     4,     4,     4,     6,     4,     6,
-       4,     6,     4,     6,     2,     2,     1,     1,     2,     1,
-       2,     2,     2,     1,     2,     2,     1,     2,     4,     4,
-       6,     4,     2,     3,     1,     3,     1,     3,     1,     3,
-       2,     2,     2,     2,     3,     2,     2,     1,     3,     2,
-       2,     2,     3,     2,     0,     3,     0,     8,     2,     0,
-       8,     7,     6,     2,     0,     1,     3,     4,     0,     2,
-       0,     1,     3,     1,     3
-};
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-281)))
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       0,     0,    60,    70,     0,    61,   113,   116,     0,     0,
-       0,    64,     0,     0,    69,    63,    62,   144,   109,     0,
-       0,    51,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    59,     0,
-       0,     0,     0,     0,     0,   160,     0,     3,    72,    22,
-       9,    23,     0,     0,     0,     0,     0,    20,    21,   106,
-     107,     7,    53,     8,     5,     4,    69,     0,    71,   115,
-     114,     0,   163,   117,   160,    65,     0,    66,   160,   159,
-     160,   108,   124,   110,     0,   130,     0,   131,     0,   132,
-     137,   133,   135,   146,   105,     0,    49,     0,     0,     0,
-       0,   148,   149,   122,   140,   141,   143,   128,   112,    85,
-       0,     0,     0,     0,     0,   126,   111,   153,     0,    90,
-      91,     0,   161,     0,     1,     6,     0,     0,     0,     0,
-      46,    54,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   154,
-     160,     0,   163,     0,     0,   123,     0,   161,     0,   145,
-       0,   136,   139,     0,   134,    53,     0,     0,     0,    50,
-       0,     0,     0,     0,     0,    58,    53,     0,   142,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    92,    93,     0,     2,     0,    54,     0,     0,
-      53,    55,     0,    27,     0,    55,    81,    82,    80,    83,
-      84,    77,    87,    88,    89,    86,    73,    74,    75,    76,
-      78,    79,   155,     0,   118,   164,    67,    68,   125,   138,
-     154,     0,    10,    11,    12,    13,    18,    15,     0,     0,
-      17,    14,   154,   121,   129,    96,     0,    98,     0,   100,
-       0,   102,     0,    94,    95,   127,   119,   160,   162,    55,
-       0,    48,     0,    54,    47,    29,    54,     0,   158,     0,
-     104,    19,    16,     0,     0,     0,     0,     0,     0,    54,
-       0,     0,    54,    56,    57,    53,     0,   156,     0,    55,
-     158,   158,    97,    99,   101,   103,   120,     0,     0,    54,
-      34,    30,    53,     0,    28,   157,   152,    55,    55,    24,
-      54,    55,    52,    53,    54,    42,     0,     0,    54,    54,
-      44,    40,     0,   151,   147,   150,    55,    54,     0,    41,
-      37,     0,    54,     0,    39,     0,     0,    54,     0,    54,
-      53,    54,    53,    33,    31,    32,    53,     0,    25,    35,
-       0,    36,     0,    55,    26,    38,    54,    54,    43,    45
-};
+#define YYTABLE_NINF -56
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,    46,   283,    47,    48,    49,   284,    51,   341,   319,
-     320,   315,   321,   129,    52,    53,    54,   316,   149,   203,
-     263,    55,    56,    57,   233,    58,    83,   116,   108,    59,
-      91,    92,    60,    80,    61,   165,   176,    62,   223,   289,
-      63,   158,    73
-};
+#define yytable_value_is_error(Yytable_value) \
+  0
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -281
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
      348,   -80,  -281,  -281,  1005,  -281,  -281,  1005,  1005,  1045,
@@ -904,7 +676,50 @@ static const yytype_int16 yypact[] =
      808,  -281,   716,   716,  -281,  -281,  -281,   624,  -281,  -281
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     0,    60,    70,     0,    61,   113,   116,     0,     0,
+       0,    64,     0,     0,    69,    63,    62,   144,   109,     0,
+       0,    51,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    59,     0,
+       0,     0,     0,     0,     0,   160,     0,     3,    72,    22,
+       9,    23,     0,     0,     0,     0,     0,    20,    21,   106,
+     107,     7,    53,     8,     5,     4,    69,     0,    71,   115,
+     114,     0,   163,   117,   160,    65,     0,    66,   160,   159,
+     160,   108,   124,   110,     0,   130,     0,   131,     0,   132,
+     137,   133,   135,   146,   105,     0,    49,     0,     0,     0,
+       0,   148,   149,   122,   140,   141,   143,   128,   112,    85,
+       0,     0,     0,     0,     0,   126,   111,   153,     0,    90,
+      91,     0,   161,     0,     1,     6,     0,     0,     0,     0,
+      46,    54,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   154,
+     160,     0,   163,     0,     0,   123,     0,   161,     0,   145,
+       0,   136,   139,     0,   134,    53,     0,     0,     0,    50,
+       0,     0,     0,     0,     0,    58,    53,     0,   142,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    92,    93,     0,     2,     0,    54,     0,     0,
+      53,    55,     0,    27,     0,    55,    81,    82,    80,    83,
+      84,    77,    87,    88,    89,    86,    73,    74,    75,    76,
+      78,    79,   155,     0,   118,   164,    67,    68,   125,   138,
+     154,     0,    10,    11,    12,    13,    18,    15,     0,     0,
+      17,    14,   154,   121,   129,    96,     0,    98,     0,   100,
+       0,   102,     0,    94,    95,   127,   119,   160,   162,    55,
+       0,    48,     0,    54,    47,    29,    54,     0,   158,     0,
+     104,    19,    16,     0,     0,     0,     0,     0,     0,    54,
+       0,     0,    54,    56,    57,    53,     0,   156,     0,    55,
+     158,   158,    97,    99,   101,   103,   120,     0,     0,    54,
+      34,    30,    53,     0,    28,   157,   152,    55,    55,    24,
+      54,    55,    52,    53,    54,    42,     0,     0,    54,    54,
+      44,    40,     0,   151,   147,   150,    55,    54,     0,    41,
+      37,     0,    54,     0,    39,     0,     0,    54,     0,    54,
+      53,    54,    53,    33,    31,    32,    53,     0,    25,    35,
+       0,    36,     0,    55,    26,    38,    54,    54,    43,    45
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
     -281,  -281,    18,    85,  -281,   -54,     0,  -281,  -281,  -281,
@@ -914,11 +729,19 @@ static const yytype_int16 yypgoto[] =
     -281,   -33,    12
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -56
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    46,   283,    47,    48,    49,   284,    51,   341,   319,
+     320,   315,   321,   129,    52,    53,    54,   316,   149,   203,
+     263,    55,    56,    57,   233,    58,    83,   116,   108,    59,
+      91,    92,    60,    80,    61,   165,   176,    62,   223,   289,
+      63,   158,    73
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
       50,   131,   196,   124,   198,    68,   301,   312,    69,    70,
@@ -1287,8 +1110,8 @@ static const yytype_int16 yycheck[] =
       -1,   101,   102
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
        0,     1,    12,    13,    14,    15,    17,    18,    19,    20,
@@ -1329,95 +1152,85 @@ static const yytype_uint8 yystos[] =
      124,   125,   124,   124,    32,   111,   112,   126,   125,   125
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   106,   107,   107,   107,   108,   109,   109,   109,   109,
+     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
+     111,   111,   112,   112,   112,   112,   112,   112,   112,   112,
+     113,   113,   113,   113,   113,   113,   113,   114,   114,   115,
+     115,   116,   116,   117,   118,   118,   119,   119,   119,   120,
+     121,   122,   123,   124,   125,   126,   126,   126,   127,   128,
+     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
+     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
+     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
+     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
+     129,   129,   129,   129,   130,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   132,   132,   133,   133,   134,   134,
+     135,   135,   135,   135,   135,   135,   136,   136,   137,   137,
+     138,   138,   138,   138,   139,   138,   141,   140,   140,   142,
+     140,   140,   140,   143,   144,   144,   144,   144,   145,   146,
+     147,   147,   147,   148,   148
+};
 
-#define YYFAIL		goto yyerrlab
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     3,     1,     2,     1,     0,     1,     1,     1,
+       4,     4,     4,     4,     4,     4,     5,     4,     4,     5,
+       1,     1,     1,     1,     7,    10,    11,     3,     6,     4,
+       6,     9,     9,     9,     6,    10,    10,     0,     3,     2,
+       1,     2,     1,     6,     1,     6,     1,     3,     3,     2,
+       3,     1,     1,     0,     0,     0,     2,     2,     3,     1,
+       1,     1,     1,     1,     1,     2,     2,     4,     4,     1,
+       1,     2,     1,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     2,     3,     3,     3,     3,
+       2,     2,     3,     3,     4,     4,     4,     6,     4,     6,
+       4,     6,     4,     6,     2,     2,     1,     1,     2,     1,
+       2,     2,     2,     1,     2,     2,     1,     2,     4,     4,
+       6,     4,     2,     3,     1,     3,     1,     3,     1,     3,
+       2,     2,     2,     2,     3,     2,     2,     1,     3,     2,
+       2,     2,     3,     2,     0,     3,     0,     8,     2,     0,
+       8,     7,     6,     2,     0,     1,     3,     4,     0,     2,
+       0,     1,     3,     1,     3
+};
 
-#define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
 
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
 
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
+#define YYRECOVERING()  (!!yyerrstatus)
 
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
 
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -1427,82 +1240,61 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*-----------------------------------.
+| Print this symbol's value on YYO.  |
+`-----------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
+  FILE *yyoutput = yyo;
+  YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
+    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
-/*
-  switch (yytype)
-    {
-      default:
-	break;
-    }
-*/
+  YYUSE (yytype);
 }
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO.  |
+`---------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
 static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyo, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
+  yy_symbol_value_print (yyo, yytype, yyvaluep);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -1510,66 +1302,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
-#endif
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &yyvsp[(yyi + 1) - (yynrhs)]
+                                              );
+      YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1583,7 +1363,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1599,7 +1379,6 @@ int yydebug;
 #endif
 
 
-
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
@@ -1607,15 +1386,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -1631,16 +1403,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -1670,244 +1434,245 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            else
+              goto append;
+
+          append:
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
   if (! yyres)
     return yystrlen (yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
-  int yyn = yypact[yystate];
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+                    yysize = yysize1;
+                  else
+                    return 2;
+                }
+              }
+        }
+    }
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+    default: /* Avoid compiler warnings. */
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
       yysize = yysize1;
+    else
+      return 2;
+  }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
 
-
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-/*
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
-*/
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
 
 
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 
-
 /*----------.
 | yyparse.  |
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
 
-  int yystate;
   int yyn;
   int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1915,156 +1680,127 @@ yyparse ()
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
-
-
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
+
 /*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
+| yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
- yynewstate:
+yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate.  |
+`--------------------------------------------------------------------*/
+yysetstate:
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+    goto yyexhaustedlab;
+#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
-#ifdef yyoverflow
+# if defined yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+# undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
-#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  if (yystate == YYFINAL)
+    YYACCEPT;
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
@@ -2086,30 +1822,27 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
   goto yynewstate;
 
 
@@ -2124,14 +1857,14 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- Do a reduction.  |
+| yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -2144,9 +1877,10 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 4:
+  case 4:
 #line 121 "engines/director/lingo/lingo-gr.y"
-    { yyerrok; ;}
+    { yyerrok; }
+#line 1884 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 5:
@@ -2154,938 +1888,1086 @@ yyreduce:
     {
 		g_lingo->_linenumber++;
 		g_lingo->_colnumber = 1;
-	;}
+	}
+#line 1893 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 10:
 #line 135 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_varpush);
-		g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str());
+		g_lingo->codeString((yyvsp[0].s)->c_str());
 		g_lingo->code1(g_lingo->c_assign);
-		(yyval.code) = (yyvsp[(2) - (4)].code);
-		delete (yyvsp[(4) - (4)].s); ;}
+		(yyval.code) = (yyvsp[-2].code);
+		delete (yyvsp[0].s); }
+#line 1904 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 11:
 #line 141 "engines/director/lingo/lingo-gr.y"
     {
 			g_lingo->code1(g_lingo->c_assign);
-			(yyval.code) = (yyvsp[(2) - (4)].code); ;}
+			(yyval.code) = (yyvsp[-2].code); }
+#line 1912 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 12:
 #line 144 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->code1(g_lingo->c_after); ;}
+    { (yyval.code) = g_lingo->code1(g_lingo->c_after); }
+#line 1918 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 13:
 #line 145 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->code1(g_lingo->c_before); ;}
+    { (yyval.code) = g_lingo->code1(g_lingo->c_before); }
+#line 1924 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 14:
 #line 146 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_varpush);
-		g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
+		g_lingo->codeString((yyvsp[-2].s)->c_str());
 		g_lingo->code1(g_lingo->c_assign);
-		(yyval.code) = (yyvsp[(4) - (4)].code);
-		delete (yyvsp[(2) - (4)].s); ;}
+		(yyval.code) = (yyvsp[0].code);
+		delete (yyvsp[-2].s); }
+#line 1935 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 15:
 #line 152 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(0); // Put dummy id
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, (yyvsp[(2) - (4)].e)[0]);
-		WRITE_UINT32(&f, (yyvsp[(2) - (4)].e)[1]);
-		g_lingo->code2(e, f);
-		(yyval.code) = (yyvsp[(4) - (4)].code); ;}
+		g_lingo->codeInt((yyvsp[-2].e)[0]);
+		g_lingo->codeInt((yyvsp[-2].e)[1]);
+		(yyval.code) = (yyvsp[0].code); }
+#line 1947 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 16:
-#line 160 "engines/director/lingo/lingo-gr.y"
+#line 159 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_swap);
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, (yyvsp[(2) - (5)].e)[0]);
-		WRITE_UINT32(&f, (yyvsp[(2) - (5)].e)[1]);
-		g_lingo->code2(e, f);
-		(yyval.code) = (yyvsp[(5) - (5)].code); ;}
+		g_lingo->codeInt((yyvsp[-3].e)[0]);
+		g_lingo->codeInt((yyvsp[-3].e)[1]);
+		(yyval.code) = (yyvsp[0].code); }
+#line 1958 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 17:
-#line 168 "engines/director/lingo/lingo-gr.y"
+#line 165 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_varpush);
-		g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
+		g_lingo->codeString((yyvsp[-2].s)->c_str());
 		g_lingo->code1(g_lingo->c_assign);
-		(yyval.code) = (yyvsp[(4) - (4)].code);
-		delete (yyvsp[(2) - (4)].s); ;}
+		(yyval.code) = (yyvsp[0].code);
+		delete (yyvsp[-2].s); }
+#line 1969 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 18:
-#line 174 "engines/director/lingo/lingo-gr.y"
+#line 171 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(0); // Put dummy id
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, (yyvsp[(2) - (4)].e)[0]);
-		WRITE_UINT32(&f, (yyvsp[(2) - (4)].e)[1]);
-		g_lingo->code2(e, f);
-		(yyval.code) = (yyvsp[(4) - (4)].code); ;}
+		g_lingo->codeInt((yyvsp[-2].e)[0]);
+		g_lingo->codeInt((yyvsp[-2].e)[1]);
+		(yyval.code) = (yyvsp[0].code); }
+#line 1981 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 19:
-#line 182 "engines/director/lingo/lingo-gr.y"
+#line 178 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_swap);
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, (yyvsp[(2) - (5)].e)[0]);
-		WRITE_UINT32(&f, (yyvsp[(2) - (5)].e)[1]);
-		g_lingo->code2(e, f);
-		(yyval.code) = (yyvsp[(5) - (5)].code); ;}
+		g_lingo->codeInt((yyvsp[-3].e)[0]);
+		g_lingo->codeInt((yyvsp[-3].e)[1]);
+		(yyval.code) = (yyvsp[0].code); }
+#line 1992 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 24:
-#line 202 "engines/director/lingo/lingo-gr.y"
+#line 196 "engines/director/lingo/lingo-gr.y"
     {
 		inst body = 0, end = 0;
-		WRITE_UINT32(&body, (yyvsp[(5) - (7)].code) - (yyvsp[(1) - (7)].code));
-		WRITE_UINT32(&end, (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 1] = body;	/* body of loop */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 2] = end;	/* end, if cond fails */
+		WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-6].code));
+		WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-6].code));
+		(*g_lingo->_currentScript)[(yyvsp[-6].code) + 1] = body;	/* body of loop */
+		(*g_lingo->_currentScript)[(yyvsp[-6].code) + 2] = end;	/* end, if cond fails */
 
-		checkEnd((yyvsp[(7) - (7)].s), "repeat", true); ;}
+		checkEnd((yyvsp[0].s), "repeat", true); }
+#line 2005 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 25:
-#line 215 "engines/director/lingo/lingo-gr.y"
+#line 209 "engines/director/lingo/lingo-gr.y"
     {
 		inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
-		WRITE_UINT32(&init, (yyvsp[(3) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&finish, (yyvsp[(6) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&body, (yyvsp[(8) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&end, (yyvsp[(9) - (10)].code) - (yyvsp[(1) - (10)].code));
+		WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&finish, (yyvsp[-4].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-9].code));
 		WRITE_UINT32(&inc, 1);
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 1] = init;	/* initial count value */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 2] = finish;/* final count value */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 3] = body;	/* body of loop */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 4] = inc;	/* increment */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 5] = end;	/* end, if cond fails */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 1] = init;	/* initial count value */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 2] = finish;/* final count value */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body;	/* body of loop */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc;	/* increment */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end;	/* end, if cond fails */
 
-		checkEnd((yyvsp[(10) - (10)].s), "repeat", true); ;}
+		checkEnd((yyvsp[0].s), "repeat", true); }
+#line 2024 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 26:
-#line 233 "engines/director/lingo/lingo-gr.y"
+#line 227 "engines/director/lingo/lingo-gr.y"
     {
 		inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
-		WRITE_UINT32(&init, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code));
-		WRITE_UINT32(&finish, (yyvsp[(7) - (11)].code) - (yyvsp[(1) - (11)].code));
-		WRITE_UINT32(&body, (yyvsp[(9) - (11)].code) - (yyvsp[(1) - (11)].code));
-		WRITE_UINT32(&end, (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code));
+		WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
+		WRITE_UINT32(&finish, (yyvsp[-4].code) - (yyvsp[-10].code));
+		WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-10].code));
+		WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-10].code));
 		WRITE_UINT32(&inc, (uint32)-1);
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 1] = init;	/* initial count value */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 2] = finish;/* final count value */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 3] = body;	/* body of loop */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 4] = inc;	/* increment */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 5] = end;	/* end, if cond fails */
+		(*g_lingo->_currentScript)[(yyvsp[-10].code) + 1] = init;	/* initial count value */
+		(*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = finish;/* final count value */
+		(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body;	/* body of loop */
+		(*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc;	/* increment */
+		(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end;	/* end, if cond fails */
 
-		checkEnd((yyvsp[(11) - (11)].s), "repeat", true); ;}
+		checkEnd((yyvsp[0].s), "repeat", true); }
+#line 2043 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 27:
-#line 247 "engines/director/lingo/lingo-gr.y"
+#line 241 "engines/director/lingo/lingo-gr.y"
     {
 			inst end = 0;
-			WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code));
+			WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
 			g_lingo->code1(STOP);
-			(*g_lingo->_currentScript)[(yyvsp[(1) - (3)].code) + 1] = end;
-		;}
+			(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end;
+		}
+#line 2054 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 28:
-#line 253 "engines/director/lingo/lingo-gr.y"
+#line 247 "engines/director/lingo/lingo-gr.y"
     {
 			warning("STUB: TELL is not implemented");
-			checkEnd((yyvsp[(6) - (6)].s), "tell", true); ;}
+			checkEnd((yyvsp[0].s), "tell", true); }
+#line 2062 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 29:
-#line 256 "engines/director/lingo/lingo-gr.y"
+#line 250 "engines/director/lingo/lingo-gr.y"
     {
 			warning("STUB: TELL is not implemented");
-		;}
+		}
+#line 2070 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 30:
-#line 261 "engines/director/lingo/lingo-gr.y"
+#line 255 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
-		WRITE_UINT32(&end, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 3] = end;	/* end, if cond fails */
+		WRITE_UINT32(&then, (yyvsp[-2].code) - (yyvsp[-5].code));
+		WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 3] = end;	/* end, if cond fails */
 
-		checkEnd((yyvsp[(6) - (6)].s), "if", true);
+		checkEnd((yyvsp[0].s), "if", true);
 
-		g_lingo->processIf(0, 0); ;}
+		g_lingo->processIf(0, 0); }
+#line 2085 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 31:
-#line 271 "engines/director/lingo/lingo-gr.y"
+#line 265 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, else1 = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
-		WRITE_UINT32(&else1, (yyvsp[(7) - (9)].code) - (yyvsp[(1) - (9)].code));
-		WRITE_UINT32(&end, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 2] = else1;	/* elsepart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 3] = end;	/* end, if cond fails */
+		WRITE_UINT32(&then, (yyvsp[-5].code) - (yyvsp[-8].code));
+		WRITE_UINT32(&else1, (yyvsp[-2].code) - (yyvsp[-8].code));
+		WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-8].code));
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 2] = else1;	/* elsepart */
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end;	/* end, if cond fails */
 
-		checkEnd((yyvsp[(9) - (9)].s), "if", true);
+		checkEnd((yyvsp[0].s), "if", true);
 
-		g_lingo->processIf(0, 0); ;}
+		g_lingo->processIf(0, 0); }
+#line 2102 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 32:
-#line 283 "engines/director/lingo/lingo-gr.y"
+#line 277 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, else1 = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
-		WRITE_UINT32(&else1, (yyvsp[(6) - (9)].code) - (yyvsp[(1) - (9)].code));
-		WRITE_UINT32(&end, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 2] = else1;	/* elsepart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 3] = end;	/* end, if cond fails */
+		WRITE_UINT32(&then, (yyvsp[-5].code) - (yyvsp[-8].code));
+		WRITE_UINT32(&else1, (yyvsp[-3].code) - (yyvsp[-8].code));
+		WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-8].code));
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 2] = else1;	/* elsepart */
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end;	/* end, if cond fails */
 
-		checkEnd((yyvsp[(9) - (9)].s), "if", true);
+		checkEnd((yyvsp[0].s), "if", true);
 
-		g_lingo->processIf(0, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code)); ;}
+		g_lingo->processIf(0, (yyvsp[-1].code) - (yyvsp[-8].code)); }
+#line 2119 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 33:
-#line 295 "engines/director/lingo/lingo-gr.y"
+#line 289 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, else1 = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
-		WRITE_UINT32(&else1, (yyvsp[(7) - (9)].code) - (yyvsp[(1) - (9)].code));
-		WRITE_UINT32(&end, (yyvsp[(9) - (9)].code) - (yyvsp[(1) - (9)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 2] = else1;	/* elsepart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 3] = end;	/* end, if cond fails */
+		WRITE_UINT32(&then, (yyvsp[-5].code) - (yyvsp[-8].code));
+		WRITE_UINT32(&else1, (yyvsp[-2].code) - (yyvsp[-8].code));
+		WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-8].code));
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 2] = else1;	/* elsepart */
+		(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end;	/* end, if cond fails */
 
-		g_lingo->processIf(0, (yyvsp[(9) - (9)].code) - (yyvsp[(1) - (9)].code)); ;}
+		g_lingo->processIf(0, (yyvsp[0].code) - (yyvsp[-8].code)); }
+#line 2134 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 34:
-#line 305 "engines/director/lingo/lingo-gr.y"
+#line 299 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, else1 = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
+		WRITE_UINT32(&then, (yyvsp[-2].code) - (yyvsp[-5].code));
 		WRITE_UINT32(&else1, 0);
-		WRITE_UINT32(&end, (yyvsp[(6) - (6)].code) - (yyvsp[(1) - (6)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 2] = else1;	/* elsepart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 3] = end; 	/* end, if cond fails */
+		WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-5].code));
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = else1;	/* elsepart */
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 3] = end; 	/* end, if cond fails */
 
-		g_lingo->processIf(0, 0); ;}
+		g_lingo->processIf(0, 0); }
+#line 2149 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 35:
-#line 315 "engines/director/lingo/lingo-gr.y"
+#line 309 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, else1 = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&else1, (yyvsp[(8) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&end, (yyvsp[(10) - (10)].code) - (yyvsp[(1) - (10)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 2] = else1;	/* elsepart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 3] = end; 	/* end, if cond fails */
+		WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&else1, (yyvsp[-2].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-9].code));
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 2] = else1;	/* elsepart */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = end; 	/* end, if cond fails */
 
-		g_lingo->processIf(0, 0); ;}
+		g_lingo->processIf(0, 0); }
+#line 2164 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 36:
-#line 325 "engines/director/lingo/lingo-gr.y"
+#line 319 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0, else1 = 0, end = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&else1, (yyvsp[(6) - (10)].code) - (yyvsp[(1) - (10)].code));
-		WRITE_UINT32(&end, (yyvsp[(10) - (10)].code) - (yyvsp[(1) - (10)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 1] = then;	/* thenpart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 2] = else1;	/* elsepart */
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 3] = end; 	/* end, if cond fails */
+		WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&else1, (yyvsp[-4].code) - (yyvsp[-9].code));
+		WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-9].code));
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 1] = then;	/* thenpart */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 2] = else1;	/* elsepart */
+		(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = end; 	/* end, if cond fails */
 
-		g_lingo->processIf(0, (yyvsp[(10) - (10)].code) - (yyvsp[(1) - (10)].code)); ;}
+		g_lingo->processIf(0, (yyvsp[0].code) - (yyvsp[-9].code)); }
+#line 2179 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 37:
-#line 337 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = 0; ;}
+#line 331 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = 0; }
+#line 2185 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 38:
-#line 338 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (3)].code); ;}
+#line 332 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[-1].code); }
+#line 2191 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 43:
-#line 349 "engines/director/lingo/lingo-gr.y"
+#line 343 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = then;	/* thenpart */
+		WRITE_UINT32(&then, (yyvsp[-2].code) - (yyvsp[-5].code));
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then;	/* thenpart */
 
-		g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
+		g_lingo->codeLabel((yyvsp[-5].code)); }
+#line 2202 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 45:
-#line 358 "engines/director/lingo/lingo-gr.y"
+#line 352 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0;
-		WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = then;	/* thenpart */
+		WRITE_UINT32(&then, (yyvsp[-1].code) - (yyvsp[-5].code));
+		(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then;	/* thenpart */
 
-		g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
+		g_lingo->codeLabel((yyvsp[-5].code)); }
+#line 2213 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 46:
-#line 366 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(STOP); ;}
+#line 360 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(STOP); }
+#line 2219 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 47:
-#line 367 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code2(g_lingo->c_eq, STOP); ;}
+#line 361 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code2(g_lingo->c_eq, STOP); }
+#line 2225 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 49:
-#line 371 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;}
+#line 365 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); }
+#line 2231 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 50:
-#line 374 "engines/director/lingo/lingo-gr.y"
+#line 368 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP);
 		g_lingo->code3(STOP, STOP, STOP);
-		g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str());
-		delete (yyvsp[(3) - (3)].s); ;}
+		g_lingo->codeString((yyvsp[0].s)->c_str());
+		delete (yyvsp[0].s); }
+#line 2241 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 51:
-#line 381 "engines/director/lingo/lingo-gr.y"
+#line 375 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_ifcode);
 		g_lingo->code3(STOP, STOP, STOP);
 		g_lingo->code1(0);  // Do not skip end
-		g_lingo->codeLabel(0); ;}
+		g_lingo->codeLabel(0); }
+#line 2251 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 52:
-#line 388 "engines/director/lingo/lingo-gr.y"
+#line 382 "engines/director/lingo/lingo-gr.y"
     {
 		inst skipEnd;
 		WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
 		(yyval.code) = g_lingo->code1(g_lingo->c_ifcode);
 		g_lingo->code3(STOP, STOP, STOP);
-		g_lingo->code1(skipEnd); ;}
+		g_lingo->code1(skipEnd); }
+#line 2262 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 53:
-#line 396 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->_currentScript->size(); ;}
+#line 390 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = g_lingo->_currentScript->size(); }
+#line 2268 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 54:
-#line 399 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;}
+#line 393 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
+#line 2274 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 55:
-#line 402 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->_currentScript->size(); ;}
+#line 396 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = g_lingo->_currentScript->size(); }
+#line 2280 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 58:
-#line 407 "engines/director/lingo/lingo-gr.y"
+#line 401 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_whencode);
 		g_lingo->code1(STOP);
-		g_lingo->codeString((yyvsp[(2) - (3)].s)->c_str());
-		delete (yyvsp[(2) - (3)].s); ;}
+		g_lingo->codeString((yyvsp[-1].s)->c_str());
+		delete (yyvsp[-1].s); }
+#line 2290 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 59:
-#line 413 "engines/director/lingo/lingo-gr.y"
+#line 407 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_tellcode);
-		g_lingo->code1(STOP); ;}
+		g_lingo->code1(STOP); }
+#line 2298 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 60:
-#line 417 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;}
+#line 411 "engines/director/lingo/lingo-gr.y"
+    {
+		(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
+		g_lingo->codeInt((yyvsp[0].i)); }
+#line 2306 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 61:
-#line 418 "engines/director/lingo/lingo-gr.y"
+#line 414 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_floatpush);
-		g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;}
+		g_lingo->codeFloat((yyvsp[0].f)); }
+#line 2314 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 62:
-#line 421 "engines/director/lingo/lingo-gr.y"
+#line 417 "engines/director/lingo/lingo-gr.y"
     {											// D3
 		(yyval.code) = g_lingo->code1(g_lingo->c_symbolpush);
-		g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;}
+		g_lingo->codeString((yyvsp[0].s)->c_str()); }
+#line 2322 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 63:
-#line 424 "engines/director/lingo/lingo-gr.y"
+#line 420 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_stringpush);
-		g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;}
+		g_lingo->codeString((yyvsp[0].s)->c_str()); }
+#line 2330 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 64:
-#line 427 "engines/director/lingo/lingo-gr.y"
+#line 423 "engines/director/lingo/lingo-gr.y"
     {
-		g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
-		delete (yyvsp[(1) - (1)].s); ;}
+		g_lingo->codeFunc((yyvsp[0].s), 0);
+		delete (yyvsp[0].s); }
+#line 2338 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 65:
-#line 430 "engines/director/lingo/lingo-gr.y"
+#line 426 "engines/director/lingo/lingo-gr.y"
     {
-		g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
-		delete (yyvsp[(1) - (2)].s); ;}
+		g_lingo->codeFunc((yyvsp[-1].s), 1);
+		delete (yyvsp[-1].s); }
+#line 2346 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 66:
-#line 433 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
+#line 429 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
+#line 2352 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 67:
-#line 434 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
+#line 430 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg)); }
+#line 2358 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 68:
-#line 435 "engines/director/lingo/lingo-gr.y"
+#line 431 "engines/director/lingo/lingo-gr.y"
     {
-		(yyval.code) = g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg));
-		delete (yyvsp[(1) - (4)].s); ;}
+		(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
+		delete (yyvsp[-3].s); }
+#line 2366 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 69:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 434 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_eval);
-		g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str());
-		delete (yyvsp[(1) - (1)].s); ;}
+		g_lingo->codeString((yyvsp[0].s)->c_str());
+		delete (yyvsp[0].s); }
+#line 2375 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 70:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 438 "engines/director/lingo/lingo-gr.y"
     {
-		(yyval.code) = g_lingo->codeInt(0); // Put dummy id
+		(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
+		g_lingo->codeInt(0); // Put dummy id
 		g_lingo->code1(g_lingo->c_theentitypush);
 		inst e = 0, f = 0;
-		WRITE_UINT32(&e, (yyvsp[(1) - (1)].e)[0]);
-		WRITE_UINT32(&f, (yyvsp[(1) - (1)].e)[1]);
-		g_lingo->code2(e, f); ;}
+		WRITE_UINT32(&e, (yyvsp[0].e)[0]);
+		WRITE_UINT32(&f, (yyvsp[0].e)[1]);
+		g_lingo->code2(e, f); }
+#line 2388 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 71:
-#line 449 "engines/director/lingo/lingo-gr.y"
+#line 446 "engines/director/lingo/lingo-gr.y"
     {
 		(yyval.code) = g_lingo->code1(g_lingo->c_theentitypush);
 		inst e = 0, f = 0;
-		WRITE_UINT32(&e, (yyvsp[(1) - (2)].e)[0]);
-		WRITE_UINT32(&f, (yyvsp[(1) - (2)].e)[1]);
-		g_lingo->code2(e, f); ;}
+		WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
+		WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
+		g_lingo->code2(e, f); }
+#line 2399 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 73:
-#line 456 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_add); ;}
+#line 453 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_add); }
+#line 2405 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 74:
-#line 457 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_sub); ;}
+#line 454 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_sub); }
+#line 2411 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 75:
-#line 458 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_mul); ;}
+#line 455 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_mul); }
+#line 2417 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 76:
-#line 459 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_div); ;}
+#line 456 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_div); }
+#line 2423 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 77:
-#line 460 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_mod); ;}
+#line 457 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_mod); }
+#line 2429 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 78:
-#line 461 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_gt); ;}
+#line 458 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_gt); }
+#line 2435 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 79:
-#line 462 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_lt); ;}
+#line 459 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_lt); }
+#line 2441 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 80:
-#line 463 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_neq); ;}
+#line 460 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_neq); }
+#line 2447 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 81:
-#line 464 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_ge); ;}
+#line 461 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_ge); }
+#line 2453 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 82:
-#line 465 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_le); ;}
+#line 462 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_le); }
+#line 2459 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 83:
-#line 466 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_and); ;}
+#line 463 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_and); }
+#line 2465 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 84:
-#line 467 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_or); ;}
+#line 464 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_or); }
+#line 2471 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 85:
-#line 468 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_not); ;}
+#line 465 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_not); }
+#line 2477 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 86:
-#line 469 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_ampersand); ;}
+#line 466 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_ampersand); }
+#line 2483 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 87:
-#line 470 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_concat); ;}
+#line 467 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_concat); }
+#line 2489 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 88:
-#line 471 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_contains); ;}
+#line 468 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_contains); }
+#line 2495 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 89:
-#line 472 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_starts); ;}
+#line 469 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_starts); }
+#line 2501 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 90:
-#line 473 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (2)].code); ;}
+#line 470 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[0].code); }
+#line 2507 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 91:
-#line 474 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;}
+#line 471 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[0].code); g_lingo->code1(g_lingo->c_negate); }
+#line 2513 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 92:
-#line 475 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = (yyvsp[(2) - (3)].code); ;}
+#line 472 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = (yyvsp[-1].code); }
+#line 2519 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 93:
-#line 476 "engines/director/lingo/lingo-gr.y"
-    { (yyval.code) = g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;}
+#line 473 "engines/director/lingo/lingo-gr.y"
+    { (yyval.code) = g_lingo->code1(g_lingo->c_arraypush); g_lingo->codeArray((yyvsp[-1].narg)); }
+#line 2525 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 94:
-#line 477 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_intersects); ;}
+#line 474 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_intersects); }
+#line 2531 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 95:
-#line 478 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_within); ;}
+#line 475 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_within); }
+#line 2537 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 96:
-#line 479 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_charOf); ;}
+#line 476 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_charOf); }
+#line 2543 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 97:
-#line 480 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_charToOf); ;}
+#line 477 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_charToOf); }
+#line 2549 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 98:
-#line 481 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_itemOf); ;}
+#line 478 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_itemOf); }
+#line 2555 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 99:
-#line 482 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_itemToOf); ;}
+#line 479 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_itemToOf); }
+#line 2561 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 100:
-#line 483 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_lineOf); ;}
+#line 480 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_lineOf); }
+#line 2567 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 101:
-#line 484 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_lineToOf); ;}
+#line 481 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_lineToOf); }
+#line 2573 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 102:
-#line 485 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_wordOf); ;}
+#line 482 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_wordOf); }
+#line 2579 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 103:
-#line 486 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_wordToOf); ;}
+#line 483 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_wordToOf); }
+#line 2585 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 104:
-#line 489 "engines/director/lingo/lingo-gr.y"
+#line 486 "engines/director/lingo/lingo-gr.y"
     {
-		g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
-		delete (yyvsp[(1) - (2)].s); ;}
+		g_lingo->codeFunc((yyvsp[-1].s), 1);
+		delete (yyvsp[-1].s); }
+#line 2593 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 105:
-#line 494 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_printtop); ;}
+#line 491 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_printtop); }
+#line 2599 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 108:
-#line 497 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_exitRepeat); ;}
+#line 494 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_exitRepeat); }
+#line 2605 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 109:
-#line 498 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_procret); ;}
+#line 495 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_procret); }
+#line 2611 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 113:
-#line 502 "engines/director/lingo/lingo-gr.y"
+#line 499 "engines/director/lingo/lingo-gr.y"
     {
-		g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
-		delete (yyvsp[(1) - (1)].s); ;}
+		g_lingo->codeFunc((yyvsp[0].s), 0);
+		delete (yyvsp[0].s); }
+#line 2619 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 114:
-#line 505 "engines/director/lingo/lingo-gr.y"
+#line 502 "engines/director/lingo/lingo-gr.y"
     {
-		g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
-		delete (yyvsp[(1) - (2)].s); ;}
+		g_lingo->codeFunc((yyvsp[-1].s), 1);
+		delete (yyvsp[-1].s); }
+#line 2627 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 115:
-#line 508 "engines/director/lingo/lingo-gr.y"
+#line 505 "engines/director/lingo/lingo-gr.y"
     {
-		g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
-		delete (yyvsp[(1) - (2)].s); ;}
+		g_lingo->codeFunc((yyvsp[-1].s), 1);
+		delete (yyvsp[-1].s); }
+#line 2635 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 116:
-#line 511 "engines/director/lingo/lingo-gr.y"
+#line 508 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_voidpush);
-		g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1);
-		delete (yyvsp[(1) - (1)].s); ;}
+		g_lingo->codeFunc((yyvsp[0].s), 1);
+		delete (yyvsp[0].s); }
+#line 2644 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 117:
-#line 515 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
+#line 512 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
+#line 2650 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 118:
-#line 516 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
+#line 513 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg)); }
+#line 2656 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 119:
-#line 517 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
+#line 514 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeMe((yyvsp[-1].s), 0); }
+#line 2662 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 120:
-#line 518 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
+#line 515 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeMe((yyvsp[-3].s), (yyvsp[-1].narg)); }
+#line 2668 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 121:
-#line 519 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_open); ;}
+#line 516 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_open); }
+#line 2674 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 122:
-#line 520 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
+#line 517 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); }
+#line 2680 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 123:
-#line 521 "engines/director/lingo/lingo-gr.y"
-    { Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;}
+#line 518 "engines/director/lingo/lingo-gr.y"
+    { Common::String s(*(yyvsp[-2].s)); s += '-'; s += *(yyvsp[-1].s); g_lingo->codeFunc(&s, (yyvsp[0].narg)); }
+#line 2686 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 124:
-#line 524 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 521 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[0].s)->c_str()); delete (yyvsp[0].s); }
+#line 2692 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 125:
-#line 525 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+#line 522 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[0].s)->c_str()); delete (yyvsp[0].s); }
+#line 2698 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 126:
-#line 528 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 525 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[0].s)->c_str()); delete (yyvsp[0].s); }
+#line 2704 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 127:
-#line 529 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+#line 526 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[0].s)->c_str()); delete (yyvsp[0].s); }
+#line 2710 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 128:
-#line 532 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 529 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[0].s)->c_str()); delete (yyvsp[0].s); }
+#line 2716 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 129:
-#line 533 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+#line 530 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[0].s)->c_str()); delete (yyvsp[0].s); }
+#line 2722 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 130:
-#line 544 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_gotoloop); ;}
+#line 541 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_gotoloop); }
+#line 2728 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 131:
-#line 545 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_gotonext); ;}
+#line 542 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_gotonext); }
+#line 2734 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 132:
-#line 546 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_gotoprevious); ;}
+#line 543 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->code1(g_lingo->c_gotoprevious); }
+#line 2740 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 133:
-#line 547 "engines/director/lingo/lingo-gr.y"
+#line 544 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(1);
-		g_lingo->code1(g_lingo->c_goto); ;}
+		g_lingo->code1(g_lingo->c_goto); }
+#line 2749 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 134:
-#line 550 "engines/director/lingo/lingo-gr.y"
+#line 548 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(3);
-		g_lingo->code1(g_lingo->c_goto); ;}
+		g_lingo->code1(g_lingo->c_goto); }
+#line 2758 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 135:
-#line 553 "engines/director/lingo/lingo-gr.y"
+#line 552 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(2);
-		g_lingo->code1(g_lingo->c_goto); ;}
+		g_lingo->code1(g_lingo->c_goto); }
+#line 2767 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 140:
 #line 566 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->code1(g_lingo->c_playdone); ;}
+    { g_lingo->code1(g_lingo->c_playdone); }
+#line 2773 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 141:
 #line 567 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(1);
-		g_lingo->code1(g_lingo->c_play); ;}
+		g_lingo->code1(g_lingo->c_play); }
+#line 2782 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 142:
-#line 570 "engines/director/lingo/lingo-gr.y"
+#line 571 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(3);
-		g_lingo->code1(g_lingo->c_play); ;}
+		g_lingo->code1(g_lingo->c_play); }
+#line 2791 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 143:
-#line 573 "engines/director/lingo/lingo-gr.y"
+#line 575 "engines/director/lingo/lingo-gr.y"
     {
+		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(2);
-		g_lingo->code1(g_lingo->c_play); ;}
+		g_lingo->code1(g_lingo->c_play); }
+#line 2800 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 144:
-#line 576 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeSetImmediate(true); ;}
+#line 579 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeSetImmediate(true); }
+#line 2806 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 145:
-#line 576 "engines/director/lingo/lingo-gr.y"
+#line 579 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->codeSetImmediate(false);
-		g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;}
+		g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg)); }
+#line 2814 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 146:
-#line 606 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;}
+#line 609 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); }
+#line 2820 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 147:
-#line 607 "engines/director/lingo/lingo-gr.y"
+#line 610 "engines/director/lingo/lingo-gr.y"
     {
 			g_lingo->code1(g_lingo->c_procret);
-			g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg));
-			g_lingo->_indef = false; ;}
+			g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
+			g_lingo->_indef = false; }
+#line 2829 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 148:
-#line 611 "engines/director/lingo/lingo-gr.y"
+#line 614 "engines/director/lingo/lingo-gr.y"
     {
-			g_lingo->codeFactory(*(yyvsp[(2) - (2)].s));
-		;}
+			g_lingo->codeFactory(*(yyvsp[0].s));
+		}
+#line 2837 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 149:
-#line 614 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->_indef = true; ;}
+#line 617 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->_indef = true; }
+#line 2843 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 150:
-#line 615 "engines/director/lingo/lingo-gr.y"
+#line 618 "engines/director/lingo/lingo-gr.y"
     {
 			g_lingo->code1(g_lingo->c_procret);
-			g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg) + 1, &g_lingo->_currentFactory);
-			g_lingo->_indef = false; ;}
+			g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
+			g_lingo->_indef = false; }
+#line 2852 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 151:
-#line 619 "engines/director/lingo/lingo-gr.y"
+#line 622 "engines/director/lingo/lingo-gr.y"
     {	// D3
 				g_lingo->code1(g_lingo->c_procret);
-				g_lingo->define(*(yyvsp[(1) - (7)].s), (yyvsp[(2) - (7)].code), (yyvsp[(3) - (7)].narg));
+				g_lingo->define(*(yyvsp[-6].s), (yyvsp[-5].code), (yyvsp[-4].narg));
 				g_lingo->_indef = false;
 				g_lingo->_ignoreMe = false;
 
-				checkEnd((yyvsp[(7) - (7)].s), (yyvsp[(1) - (7)].s)->c_str(), false);
-			;}
+				checkEnd((yyvsp[0].s), (yyvsp[-6].s)->c_str(), false);
+			}
+#line 2865 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 152:
-#line 627 "engines/director/lingo/lingo-gr.y"
+#line 630 "engines/director/lingo/lingo-gr.y"
     {	// D4. No 'end' clause
 				g_lingo->code1(g_lingo->c_procret);
-				g_lingo->define(*(yyvsp[(1) - (6)].s), (yyvsp[(2) - (6)].code), (yyvsp[(3) - (6)].narg));
+				g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
 				g_lingo->_indef = false;
 				g_lingo->_ignoreMe = false;
-			;}
+			}
+#line 2876 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 153:
-#line 634 "engines/director/lingo/lingo-gr.y"
-    { (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = true; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;}
+#line 637 "engines/director/lingo/lingo-gr.y"
+    { (yyval.s) = (yyvsp[0].s); g_lingo->_indef = true; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
+#line 2882 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 154:
-#line 636 "engines/director/lingo/lingo-gr.y"
-    { (yyval.narg) = 0; ;}
+#line 639 "engines/director/lingo/lingo-gr.y"
+    { (yyval.narg) = 0; }
+#line 2888 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 155:
-#line 637 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
+#line 640 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; }
+#line 2894 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 156:
-#line 638 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 641 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2900 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 157:
-#line 639 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
+#line 642 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; }
+#line 2906 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 158:
-#line 642 "engines/director/lingo/lingo-gr.y"
-    { g_lingo->codeArgStore(); ;}
+#line 645 "engines/director/lingo/lingo-gr.y"
+    { g_lingo->codeArgStore(); }
+#line 2912 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 159:
-#line 646 "engines/director/lingo/lingo-gr.y"
+#line 649 "engines/director/lingo/lingo-gr.y"
     {
 		g_lingo->code1(g_lingo->c_call);
-		g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
+		g_lingo->codeString((yyvsp[-1].s)->c_str());
 		inst numpar = 0;
-		WRITE_UINT32(&numpar, (yyvsp[(2) - (2)].narg));
-		g_lingo->code1(numpar); ;}
+		WRITE_UINT32(&numpar, (yyvsp[0].narg));
+		g_lingo->code1(numpar); }
+#line 2923 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 160:
-#line 654 "engines/director/lingo/lingo-gr.y"
-    { (yyval.narg) = 0; ;}
+#line 657 "engines/director/lingo/lingo-gr.y"
+    { (yyval.narg) = 0; }
+#line 2929 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 161:
-#line 655 "engines/director/lingo/lingo-gr.y"
-    { (yyval.narg) = 1; ;}
+#line 658 "engines/director/lingo/lingo-gr.y"
+    { (yyval.narg) = 1; }
+#line 2935 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 162:
-#line 656 "engines/director/lingo/lingo-gr.y"
-    { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 659 "engines/director/lingo/lingo-gr.y"
+    { (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2941 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 163:
-#line 659 "engines/director/lingo/lingo-gr.y"
-    { (yyval.narg) = 1; ;}
+#line 662 "engines/director/lingo/lingo-gr.y"
+    { (yyval.narg) = 1; }
+#line 2947 "engines/director/lingo/lingo-gr.cpp"
     break;
 
   case 164:
-#line 660 "engines/director/lingo/lingo-gr.y"
-    { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 663 "engines/director/lingo/lingo-gr.y"
+    { (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2953 "engines/director/lingo/lingo-gr.cpp"
     break;
 
 
-/* Line 1267 of yacc.c.  */
-#line 3083 "engines/director/lingo/lingo-gr.cpp"
+#line 2957 "engines/director/lingo/lingo-gr.cpp"
+
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -3094,26 +2976,28 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+  {
+    const int yylhs = yyr1[yyn] - YYNTOKENS;
+    const int yyi = yypgoto[yylhs] + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+               ? yytable[yyi]
+               : yydefgoto[yylhs]);
+  }
 
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -3121,37 +3005,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -3159,24 +3042,24 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
-	 error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -3185,14 +3068,12 @@ yyerrlab:
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
+  /* Pacify compilers when the user code never invokes YYERROR and the
+     label yyerrorlab therefore never appears in user code.  */
+  if (0)
+    YYERROR;
 
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -3205,38 +3086,37 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -3253,6 +3133,7 @@ yyacceptlab:
   yyresult = 0;
   goto yyreturn;
 
+
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
@@ -3260,7 +3141,8 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -3270,18 +3152,27 @@ yyexhaustedlab:
   /* Fall through.  */
 #endif
 
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result.  |
+`-----------------------------------------------------*/
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -3292,11 +3183,7 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-#line 663 "engines/director/lingo/lingo-gr.y"
-
+#line 666 "engines/director/lingo/lingo-gr.y"
 
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 70e3edd911..6676efa2c9 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -153,18 +153,14 @@ asgn: tPUT expr tINTO ID 		{
 		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(0); // Put dummy id
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, $2[0]);
-		WRITE_UINT32(&f, $2[1]);
-		g_lingo->code2(e, f);
+		g_lingo->codeInt($2[0]);
+		g_lingo->codeInt($2[1]);
 		$$ = $4; }
 	| tSET THEENTITYWITHID expr '=' expr	{
 		g_lingo->code1(g_lingo->c_swap);
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, $2[0]);
-		WRITE_UINT32(&f, $2[1]);
-		g_lingo->code2(e, f);
+		g_lingo->codeInt($2[0]);
+		g_lingo->codeInt($2[1]);
 		$$ = $5; }
 	| tSET ID tTO expr			{
 		g_lingo->code1(g_lingo->c_varpush);
@@ -176,18 +172,14 @@ asgn: tPUT expr tINTO ID 		{
 		g_lingo->code1(g_lingo->c_intpush);
 		g_lingo->codeInt(0); // Put dummy id
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, $2[0]);
-		WRITE_UINT32(&f, $2[1]);
-		g_lingo->code2(e, f);
+		g_lingo->codeInt($2[0]);
+		g_lingo->codeInt($2[1]);
 		$$ = $4; }
 	| tSET THEENTITYWITHID expr tTO expr	{
 		g_lingo->code1(g_lingo->c_swap);
 		g_lingo->code1(g_lingo->c_theentityassign);
-		inst e = 0, f = 0;
-		WRITE_UINT32(&e, $2[0]);
-		WRITE_UINT32(&f, $2[1]);
-		g_lingo->code2(e, f);
+		g_lingo->codeInt($2[0]);
+		g_lingo->codeInt($2[1]);
 		$$ = $5; }
 	;