SCI: Regenerated said.cpp from said.y

svn-id: r38659

2 files changed, 995 insertions, 931 deletions

diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp
index fd55082072..f8a7ea75e8 100644
--- a/engines/sci/engine/said.cpp
+++ b/engines/sci/engine/said.cpp
@@ -63,25 +63,25 @@
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-/* Put the tokens into the symbol table, so that GDB and other debuggers
-   know about them.  */
-enum yytokentype {
-	WGROUP = 258,
-	YY_COMMA = 259,
-	YY_AMP = 260,
-	YY_SLASH = 261,
-	YY_PARENO = 262,
-	YY_PARENC = 263,
-	YY_BRACKETSO = 264,
-	YY_BRACKETSC = 265,
-	YY_HASH = 266,
-	YY_LT = 267,
-	YY_GT = 268,
-	YY_BRACKETSO_LT = 269,
-	YY_BRACKETSO_SLASH = 270,
-	YY_LT_BRACKETSO = 271,
-	YY_LT_PARENO = 272
-};
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     WGROUP = 258,
+     YY_COMMA = 259,
+     YY_AMP = 260,
+     YY_SLASH = 261,
+     YY_PARENO = 262,
+     YY_PARENC = 263,
+     YY_BRACKETSO = 264,
+     YY_BRACKETSC = 265,
+     YY_HASH = 266,
+     YY_LT = 267,
+     YY_GT = 268,
+     YY_BRACKETSO_LT = 269,
+     YY_BRACKETSO_SLASH = 270,
+     YY_LT_BRACKETSO = 271,
+     YY_LT_PARENO = 272
+   };
 #endif
 /* Tokens.  */
 #define WGROUP 258
@@ -104,8 +104,32 @@ enum yytokentype {
 
 
 /* Copy the first part of user declarations.  */
-#line 28 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-
+#line 1 "said.y"
+
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
 
 #include "sci/include/engine.h"
 
@@ -113,7 +137,7 @@ enum yytokentype {
 
 #define MAX_SAID_TOKENS 128
 
-/* Maximum number of words to be expected in a parsed sentence */
+// Maximum number of words to be expected in a parsed sentence
 #define AUGMENT_MAX_WORDS 64
 
 
@@ -125,7 +149,7 @@ enum yytokentype {
 
 #define AUGMENT_SENTENCE_PART_BRACKETS 0x152
 
-/* Minor numbers */
+// Minor numbers
 #define AUGMENT_SENTENCE_MINOR_MATCH_PHRASE 0x14c
 #define AUGMENT_SENTENCE_MINOR_MATCH_WORD 0x153
 #define AUGMENT_SENTENCE_MINOR_RECURSE 0x144
@@ -133,8 +157,8 @@ enum yytokentype {
 
 
 #undef YYDEBUG /*1*/
-/*#define SAID_DEBUG*/
-/*#define SCI_DEBUG_PARSE_TREE_AUGMENTATION*/ /* uncomment to debug parse tree augmentation*/
+//#define SAID_DEBUG*/
+//#define SCI_DEBUG_PARSE_TREE_AUGMENTATION // uncomment to debug parse tree augmentation
 
 
 #ifdef SCI_DEBUG_PARSE_TREE_AUGMENTATION
@@ -149,11 +173,10 @@ static char *said_parse_error;
 static int said_token;
 static int said_tokens_nr;
 static int said_tokens[MAX_SAID_TOKENS];
+static int said_blessed;  // increminated by said_top_branch
 
-static int said_blessed;  /* increminated by said_top_branch */
-
-static int said_tree_pos; /* Set to 0 if we're out of space */
-#define SAID_TREE_START 4; /* Reserve space for the 4 top nodes */
+static int said_tree_pos; // Set to 0 if we're out of space
+#define SAID_TREE_START 4; // Reserve space for the 4 top nodes
 
 #define VALUE_IGNORE -424242
 
@@ -163,33 +186,19 @@ typedef int wgroup_t;
 typedef int tree_t;
 typedef int said_spec_t;
 
-static tree_t
-said_aug_branch(int, int, tree_t, tree_t);
-
-static tree_t
-said_attach_branch(tree_t, tree_t);
+static tree_t said_aug_branch(int, int, tree_t, tree_t);
+static tree_t said_attach_branch(tree_t, tree_t);
 /*
-static tree_t
-said_wgroup_branch(wgroup_t);
+static tree_t said_wgroup_branch(wgroup_t);
 */
-static said_spec_t
-said_top_branch(tree_t);
-
-static tree_t
-said_paren(tree_t, tree_t);
-
-static tree_t
-said_value(int, tree_t);
+static said_spec_t said_top_branch(tree_t);
+static tree_t said_paren(tree_t, tree_t);
+static tree_t said_value(int, tree_t);
+static tree_t said_terminal(int);
 
-static tree_t
-said_terminal(int);
+static int yylex(void);
 
-
-static int
-yylex(void);
-
-static int
-yyerror(const char *s) {
+static int yyerror(const char *s) {
 	said_parse_error = sci_strdup(s);
 	return 1; /* Abort */
 }
@@ -227,7 +236,7 @@ typedef int YYSTYPE;
 
 
 /* Line 216 of yacc.c.  */
-#line 232 "y.tab.c"
+#line 240 "said.cpp"
 
 #ifdef short
 # undef short
@@ -302,14 +311,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID(int i)
+YYID (int i)
 #else
 static int
-YYID(i)
-int i;
+YYID (i)
+    int i;
 #endif
 {
-	return i;
+  return i;
 }
 #endif
 
@@ -342,13 +351,13 @@ int i;
 # endif
 
 # ifdef YYSTACK_ALLOC
-/* Pacify GCC's `empty if-body' warning.  */
+   /* Pacify GCC's `empty if-body' warning.  */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (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
-   invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-   to allow for a few compiler-allocated temporary stack slots.  */
+    /* 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
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
 #   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
 # else
@@ -369,14 +378,14 @@ int i;
 #   define YYMALLOC malloc
 #   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
-void *malloc(YYSIZE_T);  /* INFRINGES ON USER NAME SPACE */
+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)
-void free(void *);  /* INFRINGES ON USER NAME SPACE */
+void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 # endif
@@ -388,10 +397,11 @@ void free(void *);  /* INFRINGES ON USER NAME SPACE */
 	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
-union yyalloc {
-	yytype_int16 yyss;
-	YYSTYPE yyvs;
-};
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -460,146 +470,158 @@ union yyalloc {
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] = {
-	0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-	2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-	5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-	15,    16,    17
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const yytype_uint8 yyprhs[] = {
-	0,     0,     3,     6,    10,    15,    16,    18,    19,    21,
-	24,    29,    31,    34,    39,    41,    43,    45,    49,    51,
-	55,    59,    64,    70,    73,    75,    77,    79,    83,    88,
-	92,    97,   100,   105,   109,   112
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     6,    10,    15,    16,    18,    19,    21,
+      24,    29,    31,    34,    39,    41,    43,    45,    49,    51,
+      55,    59,    64,    70,    73,    75,    77,    79,    83,    88,
+      92,    97,   100,   105,   109,   112
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] = {
-	19,     0,    -1,    21,    20,    -1,    21,    22,    20,    -1,
-	21,    22,    23,    20,    -1,    -1,    13,    -1,    -1,    27,
-	-1,     6,    27,    -1,    15,     6,    27,    10,    -1,     6,
-	-1,     6,    27,    -1,    15,     6,    27,    10,    -1,     6,
-	-1,     3,    -1,    26,    -1,     9,    26,    10,    -1,    24,
-	-1,     7,    27,     8,    -1,    26,     4,    26,    -1,    26,
-	14,    29,    10,    -1,    26,     4,     9,    26,    10,    -1,
-	25,    28,    -1,    25,    -1,    28,    -1,    29,    -1,    14,
-	29,    10,    -1,    29,    14,    29,    10,    -1,    12,    24,
-	30,    -1,    17,     7,    27,     8,    -1,    12,    26,    -1,
-	16,     9,    26,    10,    -1,    12,    26,    30,    -1,    12,
-	26,    -1,    17,     7,    27,     8,    -1
+static const yytype_int8 yyrhs[] =
+{
+      19,     0,    -1,    21,    20,    -1,    21,    22,    20,    -1,
+      21,    22,    23,    20,    -1,    -1,    13,    -1,    -1,    27,
+      -1,     6,    27,    -1,    15,     6,    27,    10,    -1,     6,
+      -1,     6,    27,    -1,    15,     6,    27,    10,    -1,     6,
+      -1,     3,    -1,    26,    -1,     9,    26,    10,    -1,    24,
+      -1,     7,    27,     8,    -1,    26,     4,    26,    -1,    26,
+      14,    29,    10,    -1,    26,     4,     9,    26,    10,    -1,
+      25,    28,    -1,    25,    -1,    28,    -1,    29,    -1,    14,
+      29,    10,    -1,    29,    14,    29,    10,    -1,    12,    24,
+      30,    -1,    17,     7,    27,     8,    -1,    12,    26,    -1,
+      16,     9,    26,    10,    -1,    12,    26,    30,    -1,    12,
+      26,    -1,    17,     7,    27,     8,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint8 yyrline[] = {
-	0,   138,   138,   140,   142,   148,   149,   156,   157,   163,
-	165,   167,   173,   175,   177,   183,   188,   190,   195,   197,
-	199,   201,   203,   209,   211,   213,   219,   221,   223,   229,
-	231,   233,   235,   241,   243,   245
+static const yytype_uint8 yyrline[] =
+{
+       0,   119,   119,   121,   123,   129,   130,   137,   138,   144,
+     146,   148,   154,   156,   158,   163,   168,   170,   175,   177,
+     179,   181,   183,   188,   190,   192,   197,   199,   201,   206,
+     208,   210,   212,   217,   219,   221
 };
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] = {
-	"$end", "error", "$undefined", "WGROUP", "YY_COMMA", "YY_AMP",
-	"YY_SLASH", "YY_PARENO", "YY_PARENC", "YY_BRACKETSO", "YY_BRACKETSC",
-	"YY_HASH", "YY_LT", "YY_GT", "YY_BRACKETSO_LT", "YY_BRACKETSO_SLASH",
-	"YY_LT_BRACKETSO", "YY_LT_PARENO", "$accept", "saidspec", "optcont",
-	"leftspec", "midspec", "rightspec", "word", "cwordset", "wordset",
-	"expr", "cwordrefset", "wordrefset", "recref", 0
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "WGROUP", "YY_COMMA", "YY_AMP",
+  "YY_SLASH", "YY_PARENO", "YY_PARENC", "YY_BRACKETSO", "YY_BRACKETSC",
+  "YY_HASH", "YY_LT", "YY_GT", "YY_BRACKETSO_LT", "YY_BRACKETSO_SLASH",
+  "YY_LT_BRACKETSO", "YY_LT_PARENO", "$accept", "saidspec", "optcont",
+  "leftspec", "midspec", "rightspec", "word", "cwordset", "wordset",
+  "expr", "cwordrefset", "wordrefset", "recref", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] = {
-	0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-	265,   266,   267,   268,   269,   270,   271,   272
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] = {
-	0,    18,    19,    19,    19,    20,    20,    21,    21,    22,
-	22,    22,    23,    23,    23,    24,    25,    25,    26,    26,
-	26,    26,    26,    27,    27,    27,    28,    28,    28,    29,
-	29,    29,    29,    30,    30,    30
+static const yytype_uint8 yyr1[] =
+{
+       0,    18,    19,    19,    19,    20,    20,    21,    21,    22,
+      22,    22,    23,    23,    23,    24,    25,    25,    26,    26,
+      26,    26,    26,    27,    27,    27,    28,    28,    28,    29,
+      29,    29,    29,    30,    30,    30
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] = {
-	0,     2,     2,     3,     4,     0,     1,     0,     1,     2,
-	4,     1,     2,     4,     1,     1,     1,     3,     1,     3,
-	3,     4,     5,     2,     1,     1,     1,     3,     4,     3,
-	4,     2,     4,     3,     2,     4
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     2,     3,     4,     0,     1,     0,     1,     2,
+       4,     1,     2,     4,     1,     1,     1,     3,     1,     3,
+       3,     4,     5,     2,     1,     1,     1,     3,     4,     3,
+       4,     2,     4,     3,     2,     4
 };
 
 /* 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[] = {
-	7,    15,     0,     0,     0,     0,     0,     0,     0,     5,
-	18,    24,    16,     8,    25,    26,     0,     0,    18,    31,
-	0,     0,     0,     1,    11,     6,     0,     2,     5,    23,
-	0,     0,     0,    19,    17,     0,     0,    29,    27,     0,
-	0,     9,     0,    14,     0,     3,     5,     0,    20,     0,
-	0,    34,     0,    32,    30,     0,    12,     0,     4,     0,
-	21,    28,    33,     0,    10,     0,    22,    35,    13
+static const yytype_uint8 yydefact[] =
+{
+       7,    15,     0,     0,     0,     0,     0,     0,     0,     5,
+      18,    24,    16,     8,    25,    26,     0,     0,    18,    31,
+       0,     0,     0,     1,    11,     6,     0,     2,     5,    23,
+       0,     0,     0,    19,    17,     0,     0,    29,    27,     0,
+       0,     9,     0,    14,     0,     3,     5,     0,    20,     0,
+       0,    34,     0,    32,    30,     0,    12,     0,     4,     0,
+      21,    28,    33,     0,    10,     0,    22,    35,    13
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] = {
-	-1,     8,    27,     9,    28,    46,    10,    11,    12,    13,
-	14,    15,    37
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     8,    27,     9,    28,    46,    10,    11,    12,    13,
+      14,    15,    37
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -24
-static const yytype_int8 yypact[] = {
-	-1,   -24,    -1,    62,    62,    54,     1,     5,    18,    38,
-	-24,    47,     3,   -24,   -24,    12,    23,    15,    -3,     3,
-	28,    62,    -1,   -24,    -1,   -24,    42,   -24,    39,   -24,
-	53,    54,    54,   -24,   -24,    62,    50,   -24,   -24,    29,
-	41,   -24,    -1,    -1,    52,   -24,    55,    62,     3,    57,
-	63,    20,    -1,   -24,   -24,    64,   -24,    -1,   -24,    32,
-	-24,   -24,   -24,    67,   -24,    66,   -24,   -24,   -24
+static const yytype_int8 yypact[] =
+{
+      -1,   -24,    -1,    62,    62,    54,     1,     5,    18,    38,
+     -24,    47,     3,   -24,   -24,    12,    23,    15,    -3,     3,
+      28,    62,    -1,   -24,    -1,   -24,    42,   -24,    39,   -24,
+      53,    54,    54,   -24,   -24,    62,    50,   -24,   -24,    29,
+      41,   -24,    -1,    -1,    52,   -24,    55,    62,     3,    57,
+      63,    20,    -1,   -24,   -24,    64,   -24,    -1,   -24,    32,
+     -24,   -24,   -24,    67,   -24,    66,   -24,   -24,   -24
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] = {
-	-24,   -24,   -23,   -24,   -24,   -24,    68,   -24,     0,    -2,
-	69,    -4,    26
+static const yytype_int8 yypgoto[] =
+{
+     -24,   -24,   -23,   -24,   -24,   -24,    68,   -24,     0,    -2,
+      69,    -4,    26
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -607,40 +629,43 @@ static const yytype_int8 yypgoto[] = {
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
-static const yytype_uint8 yytable[] = {
-	16,    20,     1,    17,    19,    45,     2,    30,     3,    35,
-	21,     4,    22,     5,    36,     6,     7,    31,    23,    30,
-	40,    39,    41,    58,    30,    34,    32,    49,    50,    31,
-	48,    33,    35,    30,    31,    51,    30,    36,    38,    53,
-	55,    56,    66,    31,    24,    43,    31,    59,    42,    54,
-	63,    25,    25,    26,    44,    65,     1,    52,    57,     4,
-	2,     5,    47,     6,     7,     1,     4,    60,    25,     2,
-	6,     7,    18,    61,    64,    67,    68,    62,     0,     0,
-	29
+static const yytype_uint8 yytable[] =
+{
+      16,    20,     1,    17,    19,    45,     2,    30,     3,    35,
+      21,     4,    22,     5,    36,     6,     7,    31,    23,    30,
+      40,    39,    41,    58,    30,    34,    32,    49,    50,    31,
+      48,    33,    35,    30,    31,    51,    30,    36,    38,    53,
+      55,    56,    66,    31,    24,    43,    31,    59,    42,    54,
+      63,    25,    25,    26,    44,    65,     1,    52,    57,     4,
+       2,     5,    47,     6,     7,     1,     4,    60,    25,     2,
+       6,     7,    18,    61,    64,    67,    68,    62,     0,     0,
+      29
 };
 
-static const yytype_int8 yycheck[] = {
-	2,     5,     3,     3,     4,    28,     7,     4,     9,    12,
-	9,    12,     7,    14,    17,    16,    17,    14,     0,     4,
-	22,    21,    24,    46,     4,    10,    14,    31,    32,    14,
-	30,     8,    12,     4,    14,    35,     4,    17,    10,    10,
-	42,    43,    10,    14,     6,     6,    14,    47,     6,     8,
-	52,    13,    13,    15,    15,    57,     3,     7,     6,    12,
-	7,    14,     9,    16,    17,     3,    12,    10,    13,     7,
-	16,    17,     4,    10,    10,     8,    10,    51,    -1,    -1,
-	11
+static const yytype_int8 yycheck[] =
+{
+       2,     5,     3,     3,     4,    28,     7,     4,     9,    12,
+       9,    12,     7,    14,    17,    16,    17,    14,     0,     4,
+      22,    21,    24,    46,     4,    10,    14,    31,    32,    14,
+      30,     8,    12,     4,    14,    35,     4,    17,    10,    10,
+      42,    43,    10,    14,     6,     6,    14,    47,     6,     8,
+      52,    13,    13,    15,    15,    57,     3,     7,     6,    12,
+       7,    14,     9,    16,    17,     3,    12,    10,    13,     7,
+      16,    17,     4,    10,    10,     8,    10,    51,    -1,    -1,
+      11
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] = {
-	0,     3,     7,     9,    12,    14,    16,    17,    19,    21,
-	24,    25,    26,    27,    28,    29,    27,    26,    24,    26,
-	29,     9,     7,     0,     6,    13,    15,    20,    22,    28,
-	4,    14,    14,     8,    10,    12,    17,    30,    10,    26,
-	27,    27,     6,     6,    15,    20,    23,     9,    26,    29,
-	29,    26,     7,    10,     8,    27,    27,     6,    20,    26,
-	10,    10,    30,    27,    10,    27,    10,     8,    10
+static const yytype_uint8 yystos[] =
+{
+       0,     3,     7,     9,    12,    14,    16,    17,    19,    21,
+      24,    25,    26,    27,    28,    29,    27,    26,    24,    26,
+      29,     9,     7,     0,     6,    13,    15,    20,    22,    28,
+       4,    14,    14,     8,    10,    12,    17,    30,    10,    26,
+      27,    27,     6,     6,    15,    20,    23,     9,    26,    29,
+      29,    26,     7,    10,     8,    27,    27,     6,    20,    26,
+      10,    10,    30,    27,    10,    27,    10,     8,    10
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -767,27 +792,28 @@ do {									  \
 #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)
+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;
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
 {
-	if (!yyvaluep)
-		return;
+  if (!yyvaluep)
+    return;
 # ifdef YYPRINT
-	if (yytype < YYNTOKENS)
-		YYPRINT(yyoutput, yytoknum[yytype], *yyvaluep);
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
 # else
-	YYUSE(yyoutput);
+  YYUSE (yyoutput);
 # endif
-	switch (yytype) {
-	default:
-		break;
-	}
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -798,22 +824,22 @@ YYSTYPE const * const yyvaluep;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print(FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+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;
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
 {
-	if (yytype < YYNTOKENS)
-		YYFPRINTF(yyoutput, "token %s (", yytname[yytype]);
-	else
-		YYFPRINTF(yyoutput, "nterm %s (", yytname[yytype]);
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-	yy_symbol_value_print(yyoutput, yytype, yyvaluep);
-	YYFPRINTF(yyoutput, ")");
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -824,18 +850,18 @@ YYSTYPE const * const yyvaluep;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print(yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print(bottom, top)
-yytype_int16 *bottom;
-yytype_int16 *top;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
-	YYerror("Stack now");
-	for (; bottom <= top; ++bottom)
-		YYerror(" %d", *bottom);
-	YYerror("\n");
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
 }
 
 # define YY_STACK_PRINT(Bottom, Top)				\
@@ -852,27 +878,28 @@ do {								\
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print(YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print(yyvsp, yyrule)
-YYSTYPE *yyvsp;
-int yyrule;
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
 #endif
 {
-	int yynrhs = yyr2[yyrule];
-	int yyi;
-	unsigned long int yylno = yyrline[yyrule];
-	YYerror("Reducing stack by rule %d (line %lu):\n",
-	          yyrule - 1, yylno);
-	/* The symbols being reduced.  */
-	for (yyi = 0; yyi < yynrhs; yyi++) {
-		error("   $%d = ", yyi + 1);
-		yy_symbol_print(stderr, yyrhs[yyprhs[yyrule] + yyi],
-		                &(yyvsp[(yyi + 1) - (yynrhs)])
-		               );
-		error("\n");
-	}
+  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);
+  /* 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");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
@@ -920,17 +947,17 @@ int yydebug;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-yystrlen(const char *yystr)
+yystrlen (const char *yystr)
 #else
 static YYSIZE_T
-yystrlen(yystr)
-const char *yystr;
+yystrlen (yystr)
+    const char *yystr;
 #endif
 {
-	YYSIZE_T yylen;
-	for (yylen = 0; yystr[yylen]; yylen++)
-		continue;
-	return yylen;
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
 }
 #  endif
 # endif
@@ -944,21 +971,21 @@ const char *yystr;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static char *
-yystpcpy(char *yydest, const char *yysrc)
+yystpcpy (char *yydest, const char *yysrc)
 #else
 static char *
-yystpcpy(yydest, yysrc)
-char *yydest;
-const char *yysrc;
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
 #endif
 {
-	char *yyd = yydest;
-	const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-	while ((*yyd++ = *yys++) != '\0')
-		continue;
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-	return yyd - 1;
+  return yyd - 1;
 }
 #  endif
 # endif
@@ -972,40 +999,42 @@ const char *yysrc;
    null, do not copy; instead, return the length of what the result
    would have been.  */
 static YYSIZE_T
-yytnamerr(char *yyres, const char *yystr) {
-	if (*yystr == '"') {
-		YYSIZE_T yyn = 0;
-		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;
-			}
-do_not_strip_quotes:
-		;
-	}
-
-	if (! yyres)
-		return yystrlen(yystr);
-
-	return yystpcpy(yyres, yystr) - yyres;
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      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;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
 }
 # endif
 
@@ -1017,95 +1046,104 @@ do_not_strip_quotes:
    message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
    size calculation.  */
 static YYSIZE_T
-yysyntax_error(char *yyresult, int yystate, int yychar) {
-	int yyn = yypact[yystate];
-
-	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;
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  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");
+      /* 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);
-		yysize = yysize1;
-
-		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++;
-				}
-			}
+      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);
+      yysize = yysize1;
+
+      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;
+	    }
 	}
+      return yysize;
+    }
 }
 #endif /* YYERROR_VERBOSE */
 
@@ -1118,44 +1156,43 @@ yysyntax_error(char *yyresult, int yystate, int yychar) {
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct(const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct(yymsg, yytype, yyvaluep)
-const char *yymsg;
-int yytype;
-YYSTYPE *yyvaluep;
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
 {
-	YYUSE(yyvaluep);
+  YYUSE (yyvaluep);
 
-	if (!yymsg)
-		yymsg = "Deleting";
-	YY_SYMBOL_PRINT(yymsg, yytype, yyvaluep, yylocationp);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-#if 0
-	switch (yytype) {
+  switch (yytype)
+    {
 
-	default:
-		break;
-	}
-#endif
+      default:
+	break;
+    }
 }
-
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
-int yyparse(void *YYPARSE_PARAM);
+int yyparse (void *YYPARSE_PARAM);
 #else
-int yyparse();
+int yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int yyparse(void);
+int yyparse (void);
 #else
-int yyparse();
+int yyparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
@@ -1180,635 +1217,655 @@ int yynerrs;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 int
-yyparse(void *YYPARSE_PARAM)
+yyparse (void *YYPARSE_PARAM)
 #else
 int
-yyparse(YYPARSE_PARAM)
-void *YYPARSE_PARAM;
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
 #endif
 #else /* ! YYPARSE_PARAM */
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 int
-yyparse(void)
+yyparse (void)
 #else
 int
-yyparse()
+yyparse ()
 
 #endif
 #endif
 {
-
-	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.  */
-	int yytoken = 0;
+  
+  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.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
-	/* Buffer for error messages, and its allocated size.  */
-	char yymsgbuf[128];
-	char *yymsg = yymsgbuf;
-	YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  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.
+  /* 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.  */
+     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 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;
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
 
 
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-	YYSIZE_T yystacksize = YYINITDEPTH;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-	/* The variables used to return semantic value and location from the
-	   action routines.  */
-	YYSTYPE yyval;
+  /* 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;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
-	YYDPRINTF((stderr, "Starting parse\n"));
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
-	yystate = 0;
-	yyerrstatus = 0;
-	yynerrs = 0;
-	yychar = YYEMPTY;		/* Cause a token to be read.  */
+  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.  */
+  /* 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;
+  yyssp = yyss;
+  yyvsp = yyvs;
 
-	goto yysetstate;
+  goto yysetstate;
 
-	/*------------------------------------------------------------.
-	| yynewstate -- Push a new state, which is found in yystate.  |
-	`------------------------------------------------------------*/
-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++;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ 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;
+ yysetstate:
+  *yyssp = yystate;
 
-	if (yyss + yystacksize - 1 <= yyssp) {
-		/* Get the current used size of the three stacks, in elements.  */
-		YYSIZE_T yysize = yyssp - yyss + 1;
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef 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;
+      goto yyexhaustedlab;
 # else
-		/* Extend the stack our own way.  */
-		if (YYMAXDEPTH <= yystacksize)
-			goto yyexhaustedlab;
-		yystacksize *= 2;
-		if (YYMAXDEPTH < yystacksize)
-			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);
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	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);
-		}
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
 # endif
 #endif /* no yyoverflow */
 
-		yyssp = yyss + yysize - 1;
-		yyvsp = yyvs + yysize - 1;
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
 
 
-		YYDPRINTF((stderr, "Stack size increased to %lu\n",
-		           (unsigned long int) yystacksize));
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
 
-		if (yyss + yystacksize - 1 <= yyssp)
-			YYABORT;
-	}
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
 
-	YYDPRINTF((stderr, "Entering state %d\n", yystate));
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-	goto yybackup;
+  goto yybackup;
 
-	/*-----------.
-	| 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.  */
-
-	/* First try to decide what to do without reference to look-ahead token.  */
-	yyn = yypact[yystate];
-	if (yyn == YYPACT_NINF)
-		goto yydefault;
-
-	/* Not known => get a look-ahead token if don't already have one.  */
-
-	/* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
-	if (yychar == YYEMPTY) {
-		YYDPRINTF((stderr, "Reading a token: "));
-		yychar = YYLEX;
-	}
-
-	if (yychar <= YYEOF) {
-		yychar = yytoken = YYEOF;
-		YYDPRINTF((stderr, "Now at end of input.\n"));
-	} else {
-		yytoken = YYTRANSLATE(yychar);
-		YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
-	}
-
-	/* If the proper action on seeing token YYTOKEN is to reduce or to
-	   detect an error, take that action.  */
-	yyn += yytoken;
-	if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-		goto yydefault;
-	yyn = yytable[yyn];
-	if (yyn <= 0) {
-		if (yyn == 0 || yyn == YYTABLE_NINF)
-			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.  */
-	YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
-
-	/* Discard the shifted token unless it is eof.  */
-	if (yychar != YYEOF)
-		yychar = YYEMPTY;
-
-	yystate = yyn;
-	*++yyvsp = yylval;
-
-	goto yynewstate;
-
-
-	/*-----------------------------------------------------------.
-	| yydefault -- do the default action for the current state.  |
-	`-----------------------------------------------------------*/
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	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.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
 yydefault:
-	yyn = yydefact[yystate];
-	if (yyn == 0)
-		goto yyerrlab;
-	goto yyreduce;
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
 
 
-	/*-----------------------------.
-	| 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'.
-
-	   Otherwise, the following line sets YYVAL to garbage.
-	   This behavior is undocumented and Bison
-	   users should not rely upon it.  Assigning to YYVAL
-	   unconditionally makes the parser a bit smaller, and it avoids a
-	   GCC warning that YYVAL may be used uninitialized.  */
-	yyval = yyvsp[1-yylen];
-
-
-	YY_REDUCE_PRINT(yyn);
-	switch (yyn) {
-	case 2:
-#line 139 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]))); }
-		break;
-
-	case 3:
-#line 141 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (3)]), said_attach_branch((yyvsp[(2) - (3)]), (yyvsp[(3) - (3)])))); }
-		break;
-
-	case 4:
-#line 143 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (4)]), said_attach_branch((yyvsp[(2) - (4)]), said_attach_branch((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]))))); }
-		break;
-
-	case 5:
-#line 148 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = SAID_BRANCH_NULL; }
-		break;
-
-	case 6:
-#line 150 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_paren(said_value(0x14b, said_value(0xf900, said_terminal(0xf900))), SAID_BRANCH_NULL); }
-		break;
-
-	case 7:
-#line 156 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = SAID_BRANCH_NULL; }
-		break;
-
-	case 8:
-#line 158 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_paren(said_value(0x141, said_value(0x149, (yyvsp[(1) - (1)]))), SAID_BRANCH_NULL); }
-		break;
-
-	case 9:
-#line 164 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x142, 0x14a, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); }
-		break;
-
-	case 10:
-#line 166 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x152, 0x142, said_aug_branch(0x142, 0x14a, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
-		break;
-
-	case 11:
-#line 168 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = SAID_BRANCH_NULL; }
-		break;
-
-	case 12:
-#line 174 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x143, 0x14a, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); }
-		break;
-
-	case 13:
-#line 176 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x152, 0x143, said_aug_branch(0x143, 0x14a, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
-		break;
-
-	case 14:
-#line 178 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = SAID_BRANCH_NULL; }
-		break;
-
-	case 15:
-#line 184 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_paren(said_value(0x141, said_value(0x153, said_terminal((yyvsp[(1) - (1)])))), SAID_BRANCH_NULL); }
-		break;
-
-	case 16:
-#line 189 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x141, 0x14f, (yyvsp[(1) - (1)]), SAID_BRANCH_NULL); }
-		break;
-
-	case 17:
-#line 191 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x141, 0x14f, said_aug_branch(0x152, 0x14c, said_aug_branch(0x141, 0x14f, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
-		break;
-
-	case 18:
-#line 196 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = (yyvsp[(1) - (1)]); }
-		break;
-
-	case 19:
-#line 198 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = (yyvsp[(1) - (3)]); }
-		break;
-
-	case 20:
-#line 200 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_attach_branch((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); }
-		break;
-
-	case 21:
-#line 202 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_attach_branch((yyvsp[(1) - (4)]), (yyvsp[(3) - (4)])); }
-		break;
-
-	case 22:
-#line 204 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_attach_branch((yyvsp[(1) - (5)]), (yyvsp[(3) - (5)])); }
-		break;
-
-	case 23:
-#line 210 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_attach_branch((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); }
-		break;
-
-	case 24:
-#line 212 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = (yyvsp[(1) - (1)]); }
-		break;
-
-	case 25:
-#line 214 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = (yyvsp[(1) - (1)]); }
-		break;
-
-	case 26:
-#line 220 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = (yyvsp[(1) - (1)]); }
-		break;
-
-	case 27:
-#line 222 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x152, 0x144, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL); }
-		break;
-
-	case 28:
-#line 224 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_attach_branch((yyvsp[(1) - (4)]), said_aug_branch(0x152, 0x144, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL)); }
-		break;
-
-	case 29:
-#line 230 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)])); }
-		break;
-
-	case 30:
-#line 232 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x144, 0x14f, said_aug_branch(0x141, 0x144, (yyvsp[(2) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
-		break;
-
-	case 31:
-#line 234 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); }
-		break;
-
-	case 32:
-#line 236 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x152, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
-		break;
-
-	case 33:
-#line 242 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x141, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL), (yyvsp[(3) - (3)])); }
-		break;
-
-	case 34:
-#line 244 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x141, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
-		break;
-
-	case 35:
-#line 246 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
-		{(yyval) = said_aug_branch(0x141, 0x14c, (yyvsp[(2) - (4)]), SAID_BRANCH_NULL); }
-		break;
-
-
-		/* Line 1267 of yacc.c.  */
-#line 1647 "y.tab.c"
-	default:
-		break;
-	}
-	YY_SYMBOL_PRINT("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-	YYPOPSTACK(yylen);
-	yylen = 0;
-	YY_STACK_PRINT(yyss, yyssp);
-
-	*++yyvsp = yyval;
-
-
-	/* 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];
-
-	goto yynewstate;
-
-
-	/*------------------------------------.
-	| yyerrlab -- here on detecting error |
-	`------------------------------------*/
+  /* 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'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 120 "said.y"
+    { (yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]))); ;}
+    break;
+
+  case 3:
+#line 122 "said.y"
+    { (yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (3)]), said_attach_branch((yyvsp[(2) - (3)]), (yyvsp[(3) - (3)])))); ;}
+    break;
+
+  case 4:
+#line 124 "said.y"
+    { (yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (4)]), said_attach_branch((yyvsp[(2) - (4)]), said_attach_branch((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]))))); ;}
+    break;
+
+  case 5:
+#line 129 "said.y"
+    { (yyval) = SAID_BRANCH_NULL; ;}
+    break;
+
+  case 6:
+#line 131 "said.y"
+    { (yyval) = said_paren(said_value(0x14b, said_value(0xf900, said_terminal(0xf900))), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 7:
+#line 137 "said.y"
+    { (yyval) = SAID_BRANCH_NULL; ;}
+    break;
+
+  case 8:
+#line 139 "said.y"
+    { (yyval) = said_paren(said_value(0x141, said_value(0x149, (yyvsp[(1) - (1)]))), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 9:
+#line 145 "said.y"
+    { (yyval) = said_aug_branch(0x142, 0x14a, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 10:
+#line 147 "said.y"
+    { (yyval) = said_aug_branch(0x152, 0x142, said_aug_branch(0x142, 0x14a, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 11:
+#line 149 "said.y"
+    { (yyval) = SAID_BRANCH_NULL; ;}
+    break;
+
+  case 12:
+#line 155 "said.y"
+    { (yyval) = said_aug_branch(0x143, 0x14a, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 13:
+#line 157 "said.y"
+    { (yyval) = said_aug_branch(0x152, 0x143, said_aug_branch(0x143, 0x14a, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 14:
+#line 159 "said.y"
+    { (yyval) = SAID_BRANCH_NULL; ;}
+    break;
+
+  case 15:
+#line 164 "said.y"
+    { (yyval) = said_paren(said_value(0x141, said_value(0x153, said_terminal((yyvsp[(1) - (1)])))), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 16:
+#line 169 "said.y"
+    { (yyval) = said_aug_branch(0x141, 0x14f, (yyvsp[(1) - (1)]), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 17:
+#line 171 "said.y"
+    { (yyval) = said_aug_branch(0x141, 0x14f, said_aug_branch(0x152, 0x14c, said_aug_branch(0x141, 0x14f, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 18:
+#line 176 "said.y"
+    { (yyval) = (yyvsp[(1) - (1)]); ;}
+    break;
+
+  case 19:
+#line 178 "said.y"
+    { (yyval) = (yyvsp[(1) - (3)]); ;}
+    break;
+
+  case 20:
+#line 180 "said.y"
+    { (yyval) = said_attach_branch((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+    break;
+
+  case 21:
+#line 182 "said.y"
+    { (yyval) = said_attach_branch((yyvsp[(1) - (4)]), (yyvsp[(3) - (4)])); ;}
+    break;
+
+  case 22:
+#line 184 "said.y"
+    { (yyval) = said_attach_branch((yyvsp[(1) - (5)]), (yyvsp[(3) - (5)])); ;}
+    break;
+
+  case 23:
+#line 189 "said.y"
+    { (yyval) = said_attach_branch((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); ;}
+    break;
+
+  case 24:
+#line 191 "said.y"
+    { (yyval) = (yyvsp[(1) - (1)]); ;}
+    break;
+
+  case 25:
+#line 193 "said.y"
+    { (yyval) = (yyvsp[(1) - (1)]); ;}
+    break;
+
+  case 26:
+#line 198 "said.y"
+    { (yyval) = (yyvsp[(1) - (1)]); ;}
+    break;
+
+  case 27:
+#line 200 "said.y"
+    { (yyval) = said_aug_branch(0x152, 0x144, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 28:
+#line 202 "said.y"
+    { (yyval) = said_attach_branch((yyvsp[(1) - (4)]), said_aug_branch(0x152, 0x144, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL)); ;}
+    break;
+
+  case 29:
+#line 207 "said.y"
+    { (yyval) = said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)])); ;}
+    break;
+
+  case 30:
+#line 209 "said.y"
+    { (yyval) = said_aug_branch(0x144, 0x14f, said_aug_branch(0x141, 0x144, (yyvsp[(2) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 31:
+#line 211 "said.y"
+    { (yyval) = said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 32:
+#line 213 "said.y"
+    { (yyval) = said_aug_branch(0x152, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 33:
+#line 218 "said.y"
+    { (yyval) = said_aug_branch(0x141, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL), (yyvsp[(3) - (3)])); ;}
+    break;
+
+  case 34:
+#line 220 "said.y"
+    { (yyval) = said_aug_branch(0x141, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); ;}
+    break;
+
+  case 35:
+#line 222 "said.y"
+    { (yyval) = said_aug_branch(0x141, 0x14c, (yyvsp[(2) - (4)]), SAID_BRANCH_NULL); ;}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 1655 "said.cpp"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* 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];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
 yyerrlab:
-	/* If not already recovering from an error, report this error.  */
-	if (!yyerrstatus) {
-		++yynerrs;
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
 #if ! YYERROR_VERBOSE
-		yyerror(YY_("syntax error"));
+      yyerror (YY_("syntax error"));
 #else
-		{
-			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;
-			}
-		}
+      {
+	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;
+	  }
+      }
 #endif
-	}
+    }
 
 
 
-	if (yyerrstatus == 3) {
-		/* If just tried and failed to reuse look-ahead token after an
-		error, discard it.  */
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
 
-		if (yychar <= YYEOF) {
-			/* Return failure if at end of input.  */
-			if (yychar == YYEOF)
-				YYABORT;
-		} else {
-			yydestruct("Error: discarding",
-			           yytoken, &yylval);
-			yychar = YYEMPTY;
-		}
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
 	}
+    }
 
-	/* Else will try to reuse look-ahead token after shifting the error
-	   token.  */
-	goto yyerrlab1;
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
 
-	/*---------------------------------------------------.
-	| yyerrorlab -- error raised explicitly by YYERROR.  |
-	`---------------------------------------------------*/
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
 yyerrorlab:
 
-	/* 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;
+  /* 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
-	   this YYERROR.  */
-	YYPOPSTACK(yylen);
-	yylen = 0;
-	YY_STACK_PRINT(yyss, yyssp);
-	yystate = *yyssp;
-	goto yyerrlab1;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-	/*-------------------------------------------------------------.
-	| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-	`-------------------------------------------------------------*/
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
 yyerrlab1:
-	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;
-			}
-		}
+  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;
+	    }
+	}
 
-		/* Pop the current state because it cannot handle the error token.  */
-		if (yyssp == yyss)
-			YYABORT;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
 
-		yydestruct("Error: popping",
-		           yystos[yystate], yyvsp);
-		YYPOPSTACK(1);
-		yystate = *yyssp;
-		YY_STACK_PRINT(yyss, yyssp);
-	}
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
 
-	if (yyn == YYFINAL)
-		YYACCEPT;
+  if (yyn == YYFINAL)
+    YYACCEPT;
 
-	*++yyvsp = yylval;
+  *++yyvsp = yylval;
 
 
-	/* Shift the error token.  */
-	YY_SYMBOL_PRINT("Shifting", yystos[yyn], yyvsp, yylsp);
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
-	yystate = yyn;
-	goto yynewstate;
+  yystate = yyn;
+  goto yynewstate;
 
 
-	/*-------------------------------------.
-	| yyacceptlab -- YYACCEPT comes here.  |
-	`-------------------------------------*/
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
 yyacceptlab:
-	yyresult = 0;
-	goto yyreturn;
+  yyresult = 0;
+  goto yyreturn;
 
-	/*-----------------------------------.
-	| yyabortlab -- YYABORT comes here.  |
-	`-----------------------------------*/
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
 yyabortlab:
-	yyresult = 1;
-	goto yyreturn;
+  yyresult = 1;
+  goto yyreturn;
 
 #ifndef yyoverflow
-	/*-------------------------------------------------.
-	| yyexhaustedlab -- memory exhaustion comes here.  |
-	`-------------------------------------------------*/
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
-	yyerror(YY_("memory exhausted"));
-	yyresult = 2;
-	/* Fall through.  */
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
 #endif
 
 yyreturn:
-	if (yychar != YYEOF && yychar != YYEMPTY)
-		yydestruct("Cleanup: discarding lookahead",
-		           yytoken, &yylval);
-	/* Do not reclaim the symbols of the rule which action triggered
-	   this YYABORT or YYACCEPT.  */
-	YYPOPSTACK(yylen);
-	YY_STACK_PRINT(yyss, yyssp);
-	while (yyssp != yyss) {
-		yydestruct("Cleanup: popping",
-		           yystos[*yyssp], yyvsp);
-		YYPOPSTACK(1);
-	}
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
-	if (yyss != yyssa)
-		YYSTACK_FREE(yyss);
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
 #if YYERROR_VERBOSE
-	if (yymsg != yymsgbuf)
-		YYSTACK_FREE(yymsg);
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
 #endif
-	/* Make sure YYID is used.  */
-	return YYID(yyresult);
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
-#line 251 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
+#line 225 "said.y"
 
 
 int parse_yy_token_lookup[] = {YY_COMMA, YY_AMP, YY_SLASH, YY_PARENO, YY_PARENC, YY_BRACKETSO, YY_BRACKETSC, YY_HASH, YY_LT, YY_GT};
@@ -1890,11 +1947,19 @@ static tree_t said_terminal(int val) {
 static tree_t said_aug_branch(int n1, int n2, tree_t t1, tree_t t2) {
 	int retval;
 
-	retval = said_branch_node(SAID_NEXT_NODE, said_branch_node(SAID_NEXT_NODE, said_leaf_node(SAID_NEXT_NODE, n1),
-				said_branch_node(SAID_NEXT_NODE, said_leaf_node(SAID_NEXT_NODE, n2), t1)), t2);
+	// FIXME: The following code is ambiguous and *not* safely portable,
+	// due to the way the SAID_NEXT_NODE macro is implemented
+	retval = said_branch_node(SAID_NEXT_NODE,
+				said_branch_node(SAID_NEXT_NODE,
+					said_leaf_node(SAID_NEXT_NODE, n1),
+						said_branch_node(SAID_NEXT_NODE,
+							said_leaf_node(SAID_NEXT_NODE, n2),
+						t1)
+					),
+				t2);
 
 #ifdef SAID_DEBUG
-	error("AUG(0x%x, 0x%x, [%04x], [%04x]) = [%04x]\n", n1, n2, t1, t2, retval);
+	fprintf(stderr, "AUG(0x%x, 0x%x, [%04x], [%04x]) = [%04x]\n", n1, n2, t1, t2, retval);
 #endif
 
 	return retval;
@@ -1902,7 +1967,7 @@ static tree_t said_aug_branch(int n1, int n2, tree_t t1, tree_t t2) {
 
 static tree_t said_attach_branch(tree_t base, tree_t attacheant) {
 #ifdef SAID_DEBUG
-	error("ATT2([%04x], [%04x]) = [%04x]\n", base, attacheant, base);
+	fprintf(stderr, "ATT2([%04x], [%04x]) = [%04x]\n", base, attacheant, base);
 #endif
 
 	if (!attacheant)
@@ -1920,7 +1985,7 @@ static tree_t said_attach_branch(tree_t base, tree_t attacheant) {
 
 static said_spec_t said_top_branch(tree_t first) {
 #ifdef SAID_DEBUG
-	error("TOP([%04x])\n", first);
+	fprintf(stderr, "TOP([%04x])\n", first);
 #endif
 	said_branch_node(0, 1, 2);
 	said_leaf_node(1, 0x141); // Magic number #1
@@ -1970,7 +2035,7 @@ int said_parse_spec(state_t *s, byte *spec) {
 	}
 
 	if (said_blessed != 1) {
-		sciprintf("Error: Found %d top branches\n");
+		sciprintf("Error: Found multiple top branches\n");
 		return 1;
 	}
 
diff --git a/engines/sci/engine/said.y b/engines/sci/engine/said.y
index 9459405f79..3cf8c9661a 100644
--- a/engines/sci/engine/said.y
+++ b/engines/sci/engine/said.y
@@ -1,3 +1,4 @@
+%{
 /* ScummVM - Graphic Adventure Engine
  *
  * ScummVM is the legal property of its developers, whose names
@@ -23,8 +24,6 @@
  *
  */
 
-%{
-
 #include "sci/include/engine.h"
 
 #define SAID_BRANCH_NULL 0
@@ -392,7 +391,7 @@ int said_parse_spec(state_t *s, byte *spec) {
 	}
 
 	if (said_blessed != 1) {
-		sciprintf("Error: Found %d top branches\n");
+		sciprintf("Error: Found multiple top branches\n");
 		return 1;
 	}