Revert changes to Bison generated files

8 files changed, 5287 insertions, 4313 deletions

diff --git a/cpp/src/FreezeScript/Grammar.cpp b/cpp/src/FreezeScript/Grammar.cpp
index 1484fd9f74c..93f2d55858b 100644
--- a/cpp/src/FreezeScript/Grammar.cpp
+++ b/cpp/src/FreezeScript/Grammar.cpp
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -58,17 +60,23 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
 #define yyparse         freeze_script_parse
 #define yylex           freeze_script_lex
 #define yyerror         freeze_script_error
+#define yylval          freeze_script_lval
+#define yychar          freeze_script_char
 #define yydebug         freeze_script_debug
 #define yynerrs         freeze_script_nerrs
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "../FreezeScript/Grammar.y" /* yacc.c:339  */
+
+/* Line 189 of yacc.c  */
+#line 1 "../FreezeScript/Grammar.y"
 
 
 // **********************************************************************
@@ -117,15 +125,14 @@ freeze_script_error(const char* s)
 }
 
 
-#line 121 "Grammar.tab.c" /* yacc.c:339  */
 
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
+/* Line 189 of yacc.c  */
+#line 131 "Grammar.tab.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -135,69 +142,63 @@ freeze_script_error(const char* s)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "Grammar.tab.h".  */
-#ifndef YY_FREEZE_SCRIPT_GRAMMAR_TAB_H_INCLUDED
-# define YY_FREEZE_SCRIPT_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int freeze_script_debug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
-/* Token type.  */
+
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    TOK_AND = 258,
-    TOK_OR = 259,
-    TOK_NOT = 260,
-    TOK_ADD = 261,
-    TOK_SUB = 262,
-    TOK_MUL = 263,
-    TOK_DIV = 264,
-    TOK_MOD = 265,
-    TOK_LPAREN = 266,
-    TOK_RPAREN = 267,
-    TOK_LBRACKET = 268,
-    TOK_RBRACKET = 269,
-    TOK_LESS_THAN = 270,
-    TOK_GREATER_THAN = 271,
-    TOK_LESS_EQUAL = 272,
-    TOK_GREATER_EQUAL = 273,
-    TOK_EQUAL = 274,
-    TOK_NEQ = 275,
-    TOK_TRUE = 276,
-    TOK_FALSE = 277,
-    TOK_NIL = 278,
-    TOK_SCOPE_DELIMITER = 279,
-    TOK_IDENTIFIER = 280,
-    TOK_STRING_LITERAL = 281,
-    TOK_INTEGER_LITERAL = 282,
-    TOK_FLOATING_POINT_LITERAL = 283,
-    UNARY_OP = 284
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TOK_AND = 258,
+     TOK_OR = 259,
+     TOK_NOT = 260,
+     TOK_ADD = 261,
+     TOK_SUB = 262,
+     TOK_MUL = 263,
+     TOK_DIV = 264,
+     TOK_MOD = 265,
+     TOK_LPAREN = 266,
+     TOK_RPAREN = 267,
+     TOK_LBRACKET = 268,
+     TOK_RBRACKET = 269,
+     TOK_LESS_THAN = 270,
+     TOK_GREATER_THAN = 271,
+     TOK_LESS_EQUAL = 272,
+     TOK_GREATER_EQUAL = 273,
+     TOK_EQUAL = 274,
+     TOK_NEQ = 275,
+     TOK_TRUE = 276,
+     TOK_FALSE = 277,
+     TOK_NIL = 278,
+     TOK_SCOPE_DELIMITER = 279,
+     TOK_IDENTIFIER = 280,
+     TOK_STRING_LITERAL = 281,
+     TOK_INTEGER_LITERAL = 282,
+     TOK_FLOATING_POINT_LITERAL = 283,
+     UNARY_OP = 284
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-
-int freeze_script_parse (void);
-
-#endif /* !YY_FREEZE_SCRIPT_GRAMMAR_TAB_H_INCLUDED  */
-
 /* Copy the second part of user declarations.  */
 
-#line 201 "Grammar.tab.c" /* yacc.c:358  */
+
+/* Line 264 of yacc.c  */
+#line 202 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -211,8 +212,11 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#else
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -232,7 +236,8 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -243,71 +248,42 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if 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
-# 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
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+#  define YY_(msgid) msgid
 # endif
 #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
 
-#if defined __GNUC__ && 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")
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
 #else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
 #endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+{
+  return yyi;
+}
 #endif
 
-
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -325,11 +301,11 @@ typedef short int yytype_int16;
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -337,8 +313,8 @@ typedef short int yytype_int16;
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* 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
@@ -352,23 +328,25 @@ typedef short int yytype_int16;
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
+#   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 */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -378,7 +356,7 @@ 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
@@ -396,46 +374,42 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* 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
 
 /* 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_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)
+# 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 (YYID (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  24
 /* YYLAST -- Last index in YYTABLE.  */
@@ -447,19 +421,17 @@ union yyalloc
 #define YYNNTS  9
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  39
-/* YYNSTATES -- Number of states.  */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  65
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   284
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -494,7 +466,35 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     5,     7,    11,    15,    19,    23,    27,
+      31,    35,    39,    43,    47,    51,    55,    59,    61,    65,
+      68,    71,    73,    75,    77,    79,    81,    83,    85,    89,
+      91,    93,    98,   102,   104,   109,   113,   115,   116,   120
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      33,     0,    -1,    34,    -1,    35,    -1,    35,    15,    35,
+      -1,    35,    16,    35,    -1,    35,    17,    35,    -1,    35,
+      18,    35,    -1,    35,    19,    35,    -1,    35,    20,    35,
+      -1,    35,     4,    35,    -1,    35,     3,    35,    -1,    35,
+       8,    35,    -1,    35,     9,    35,    -1,    35,    10,    35,
+      -1,    35,     6,    35,    -1,    35,     7,    35,    -1,    36,
+      -1,    11,    34,    12,    -1,     7,    36,    -1,     5,    36,
+      -1,    27,    -1,    28,    -1,    26,    -1,    21,    -1,    22,
+      -1,    23,    -1,    37,    -1,    37,    30,    38,    -1,    38,
+      -1,    40,    -1,    37,    13,    34,    14,    -1,    37,    30,
+      25,    -1,    25,    -1,    25,    11,    39,    12,    -1,    39,
+      31,    34,    -1,    34,    -1,    -1,    40,    24,    25,    -1,
+      24,    25,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,    91,    91,   100,   109,   113,   117,   121,   125,   129,
@@ -504,7 +504,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#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[] =
@@ -517,13 +517,13 @@ static const char *const yytname[] =
   "TOK_IDENTIFIER", "TOK_STRING_LITERAL", "TOK_INTEGER_LITERAL",
   "TOK_FLOATING_POINT_LITERAL", "UNARY_OP", "'.'", "','", "$accept",
   "start", "expr", "binary", "unary", "entity", "function", "arg_list",
-  "constant", YY_NULLPTR
+  "constant", 0
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
+/* 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,
@@ -533,32 +533,27 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF -20
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-20)))
-
-#define YYTABLE_NINF -1
-
-#define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-1)))
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    32,    33,    34,    35,    35,    35,    35,    35,    35,
+      35,    35,    35,    35,    35,    35,    35,    35,    36,    36,
+      36,    36,    36,    36,    36,    36,    36,    36,    36,    36,
+      36,    37,    37,    37,    38,    39,    39,    39,    40,    40
+};
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int8 yypact[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
 {
-       0,     0,     0,     0,   -20,   -20,   -20,   -19,     1,   -20,
-     -20,   -20,    13,   -20,    30,   -20,   -12,   -20,   -10,   -20,
-     -20,     3,   -20,     0,   -20,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    -9,
-      -8,   -20,   -20,    -2,    63,    48,    -6,    -6,   -20,   -20,
-     -20,    78,    78,    78,    78,    78,    78,     5,     1,   -20,
-     -20,   -20,     0,   -20,   -20
+       0,     2,     1,     1,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     1,     3,     2,
+       2,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       1,     4,     3,     1,     4,     3,     1,     0,     3,     2
 };
 
-  /* 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.  */
+/* 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,     0,     0,    24,    25,    26,     0,    33,    23,
@@ -570,21 +565,37 @@ static const yytype_uint8 yydefact[] =
       38,    34,     0,    31,    35
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
-     -20,   -20,    -3,    74,     7,   -20,    -7,   -20,   -20
+      -1,    12,    13,    14,    15,    16,    17,    43,    18
 };
 
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -20
+static const yytype_int8 yypact[] =
 {
-      -1,    12,    13,    14,    15,    16,    17,    43,    18
+       0,     0,     0,     0,   -20,   -20,   -20,   -19,     1,   -20,
+     -20,   -20,    13,   -20,    30,   -20,   -12,   -20,   -10,   -20,
+     -20,     3,   -20,     0,   -20,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    -9,
+      -8,   -20,   -20,    -2,    63,    48,    -6,    -6,   -20,   -20,
+     -20,    78,    78,    78,    78,    78,    78,     5,     1,   -20,
+     -20,   -20,     0,   -20,   -20
 };
 
-  /* 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.  */
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -20,   -20,    -3,    74,     7,   -20,    -7,   -20,   -20
+};
+
+/* 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 -1
 static const yytype_int8 yytable[] =
 {
       21,    38,    29,    30,    31,     1,    22,     2,    19,    20,
@@ -617,8 +628,8 @@ static const yytype_int8 yycheck[] =
       36,    37
 };
 
-  /* 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,     5,     7,    11,    21,    22,    23,    24,    25,    26,
@@ -630,59 +641,95 @@ static const yytype_uint8 yystos[] =
       25,    12,    31,    14,    34
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    32,    33,    34,    35,    35,    35,    35,    35,    35,
-      35,    35,    35,    35,    35,    35,    35,    35,    36,    36,
-      36,    36,    36,    36,    36,    36,    36,    36,    36,    36,
-      36,    37,    37,    37,    38,    39,    39,    39,    40,    40
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     1,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     1,     3,     2,
-       2,     1,     1,     1,     1,     1,     1,     1,     3,     1,
-       1,     4,     3,     1,     4,     3,     1,     0,     3,     2
-};
+#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
 
-#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.  */
 
+#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#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 (0)
+      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
+
+
+/* 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.  */
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
+#ifndef YY_LOCATION_PRINT
+# if 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
 
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval)
+#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -692,46 +739,54 @@ while (0)
 #  define YYFPRINTF fprintf
 # endif
 
-# 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 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 (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's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*--------------------------------.
+| 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;
+#endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
 # endif
-  YYUSE (yytype);
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -739,11 +794,22 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
+#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
 {
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", 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, ")");
@@ -754,8 +820,16 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -766,42 +840,49 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (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 (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
 {
-  unsigned long int 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++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -815,7 +896,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
+#ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -830,6 +911,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -838,8 +920,15 @@ 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++)
@@ -855,8 +944,16 @@ yystrlen (const char *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;
@@ -886,27 +983,27 @@ 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;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
     do_not_strip_quotes: ;
     }
 
@@ -917,178 +1014,197 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* 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)
+/* 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)
 {
-  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))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      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))
-      return 2;
-    yysize = yysize1;
-  }
+  int yyn = yypact[yystate];
 
-  if (*yymsg_alloc < yysize)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+      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);
+      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;
     }
-
-  /* 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);
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
 
+/* 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 */
+
+
 
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
+#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
 {
 /* The lookahead symbol.  */
 int yychar;
 
-
 /* The semantic value of the lookahead symbol.  */
-/* Default value used for initialization, for pacifying older GCCs
-   or non-GCC compilers.  */
-YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
-YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
+YYSTYPE yylval;
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1098,10 +1214,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     int yyerrstatus;
 
     /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-       Refer to the stacks through separate pointers, to allow yyoverflow
+       Refer to the stacks thru separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1119,7 +1235,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1137,8 +1253,9 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1147,6 +1264,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   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;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1167,23 +1292,23 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
 #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
@@ -1191,22 +1316,22 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 # else
       /* 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_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	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);
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1215,10 +1340,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+		  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+	YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1238,7 +1363,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1247,7 +1372,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex (&yylval);
+      yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
@@ -1269,8 +1394,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1287,9 +1412,7 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1312,7 +1435,7 @@ yyreduce:
   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
@@ -1326,365 +1449,394 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 92 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 92 "../FreezeScript/Grammar.y"
     {
-    parseResult = (yyvsp[0]);
-}
-#line 1334 "Grammar.tab.c" /* yacc.c:1646  */
+    parseResult = (yyvsp[(1) - (1)]);
+;}
     break;
 
   case 3:
-#line 101 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 101 "../FreezeScript/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 1342 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (1)]);
+;}
     break;
 
   case 4:
-#line 110 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 110 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpLess, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1350 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpLess, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 5:
-#line 114 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 114 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpGreater, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1358 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpGreater, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 6:
-#line 118 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 118 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpLessEq, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1366 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpLessEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 7:
-#line 122 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 122 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpGrEq, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1374 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpGrEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 8:
-#line 126 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 126 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpEq, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1382 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 9:
-#line 130 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 130 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpNotEq, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1390 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpNotEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 10:
-#line 134 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 134 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpOr, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1398 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpOr, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 11:
-#line 138 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 138 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpAnd, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1406 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpAnd, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 12:
-#line 142 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 142 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpMul, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1414 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpMul, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 13:
-#line 146 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 146 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpDiv, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1422 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpDiv, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 14:
-#line 150 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 150 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpMod, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1430 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpMod, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 15:
-#line 154 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 154 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpAdd, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1438 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpAdd, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 16:
-#line 158 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 158 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new BinaryNode(BinOpSub, parseDataFactory, (yyvsp[-2]), (yyvsp[0]));
-}
-#line 1446 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new BinaryNode(BinOpSub, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
+;}
     break;
 
   case 17:
-#line 162 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 162 "../FreezeScript/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 1454 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (1)]);
+;}
     break;
 
   case 18:
-#line 171 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 171 "../FreezeScript/Grammar.y"
     {
-    (yyval) = (yyvsp[-1]);
-}
-#line 1462 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (3)]);
+;}
     break;
 
   case 19:
-#line 175 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 175 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new UnaryNode(UnaryOpNeg, parseDataFactory, (yyvsp[0]));
-}
-#line 1470 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new UnaryNode(UnaryOpNeg, parseDataFactory, (yyvsp[(2) - (2)]));
+;}
     break;
 
   case 20:
-#line 179 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 179 "../FreezeScript/Grammar.y"
     {
-    (yyval) = new UnaryNode(UnaryOpNot, parseDataFactory, (yyvsp[0]));
-}
-#line 1478 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = new UnaryNode(UnaryOpNot, parseDataFactory, (yyvsp[(2) - (2)]));
+;}
     break;
 
   case 21:
-#line 183 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 183 "../FreezeScript/Grammar.y"
     {
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     assert(intVal);
     (yyval) = new DataNode(parseDataFactory->createInteger(intVal->v, true));
-}
-#line 1488 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 22:
-#line 189 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 189 "../FreezeScript/Grammar.y"
     {
-    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[0]));
+    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     assert(floatVal);
     (yyval) = new DataNode(parseDataFactory->createDouble(floatVal->v, true));
-}
-#line 1498 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 23:
-#line 195 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 195 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     assert(stringVal);
     (yyval) = new DataNode(parseDataFactory->createString(stringVal->v, true));
-}
-#line 1508 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 24:
-#line 201 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 201 "../FreezeScript/Grammar.y"
     {
     (yyval) = new DataNode(parseDataFactory->createBoolean(true, true));
-}
-#line 1516 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 25:
-#line 205 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 205 "../FreezeScript/Grammar.y"
     {
     (yyval) = new DataNode(parseDataFactory->createBoolean(false, true));
-}
-#line 1524 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 26:
-#line 209 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 209 "../FreezeScript/Grammar.y"
     {
     (yyval) = new DataNode(parseDataFactory->createNil(true));
-}
-#line 1532 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 27:
-#line 213 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 213 "../FreezeScript/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 1540 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (1)]);
+;}
     break;
 
   case 28:
-#line 217 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 217 "../FreezeScript/Grammar.y"
     {
-    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[-2]));
+    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (3)]));
     assert(entity);
-    FunctionNodePtr func = FunctionNodePtr::dynamicCast((yyvsp[0]));
+    FunctionNodePtr func = FunctionNodePtr::dynamicCast((yyvsp[(3) - (3)]));
     assert(func);
     func->setTarget(entity);
-    (yyval) = (yyvsp[0]);
-}
-#line 1553 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(3) - (3)]);
+;}
     break;
 
   case 29:
-#line 226 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 226 "../FreezeScript/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 1561 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (1)]);
+;}
     break;
 
   case 30:
-#line 230 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 230 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     assert(stringVal);
     (yyval) = new ConstantNode(stringVal->v);
-}
-#line 1571 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 31:
-#line 241 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 241 "../FreezeScript/Grammar.y"
     {
-    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[-3]));
+    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (4)]));
     assert(entity);
-    entity->append(new ElementNode((yyvsp[-1])));
-    (yyval) = (yyvsp[-3]);
-}
-#line 1582 "Grammar.tab.c" /* yacc.c:1646  */
+    entity->append(new ElementNode((yyvsp[(3) - (4)])));
+    (yyval) = (yyvsp[(1) - (4)]);
+;}
     break;
 
   case 32:
-#line 248 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 248 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     assert(stringVal);
-    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[-2]));
+    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (3)]));
     assert(entity);
     entity->append(new IdentNode(stringVal->v));
-    (yyval) = (yyvsp[-2]);
-}
-#line 1595 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (3)]);
+;}
     break;
 
   case 33:
-#line 257 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 257 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     assert(stringVal);
     (yyval) = new IdentNode(stringVal->v);
-}
-#line 1605 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 34:
-#line 268 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 268 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr func = StringTokPtr::dynamicCast((yyvsp[-3]));
+    StringTokPtr func = StringTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     assert(func);
-    NodeListTokPtr args = NodeListTokPtr::dynamicCast((yyvsp[-1]));
+    NodeListTokPtr args = NodeListTokPtr::dynamicCast((yyvsp[(3) - (4)]));
     assert(args);
     (yyval) = new FunctionNode(func->v, args->v);
-}
-#line 1617 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 35:
-#line 281 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 281 "../FreezeScript/Grammar.y"
     {
-    NodeListTokPtr l = NodeListTokPtr::dynamicCast((yyvsp[-2]));
+    NodeListTokPtr l = NodeListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     assert(l);
-    l->v.push_back((yyvsp[0]));
-    (yyval) = (yyvsp[-2]);
-}
-#line 1628 "Grammar.tab.c" /* yacc.c:1646  */
+    l->v.push_back((yyvsp[(3) - (3)]));
+    (yyval) = (yyvsp[(1) - (3)]);
+;}
     break;
 
   case 36:
-#line 288 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 288 "../FreezeScript/Grammar.y"
     {
     NodeListTokPtr result = new NodeListTok;
-    result->v.push_back((yyvsp[0]));
+    result->v.push_back((yyvsp[(1) - (1)]));
     (yyval) = result;
-}
-#line 1638 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 37:
-#line 294 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 294 "../FreezeScript/Grammar.y"
     {
     (yyval) = new NodeListTok;
-}
-#line 1646 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 38:
-#line 303 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 303 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     assert(stringVal);
-    StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     assert(idVal);
     stringVal->v.append("::" + idVal->v);
-    (yyval) = (yyvsp[-2]);
-}
-#line 1659 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (3)]);
+;}
     break;
 
   case 39:
-#line 312 "../FreezeScript/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 312 "../FreezeScript/Grammar.y"
     {
-    StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     assert(idVal);
     StringTokPtr stringVal = new StringTok;
     stringVal->v.append("::" + idVal->v);
     (yyval) = stringVal;
-}
-#line 1671 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
 
-#line 1675 "Grammar.tab.c" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1838 "Grammar.tab.c"
       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);
@@ -1693,7 +1845,7 @@ 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.  */
 
@@ -1708,14 +1860,10 @@ yyreduce:
   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)
     {
@@ -1723,36 +1871,37 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        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;
+	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;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1761,20 +1910,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
+	 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 lookahead token after shifting the error
@@ -1793,7 +1942,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule whose action triggered
+  /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -1806,37 +1955,35 @@ 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 (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
+      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;
+	YYABORT;
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+		  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -1860,7 +2007,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1872,21 +2019,16 @@ yyexhaustedlab:
 
 yyreturn:
   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
+     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);
+		  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1897,7 +2039,13 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
-#line 321 "../FreezeScript/Grammar.y" /* yacc.c:1906  */
+
+
+
+/* Line 1675 of yacc.c  */
+#line 321 "../FreezeScript/Grammar.y"
+
 
diff --git a/cpp/src/FreezeScript/Grammar.h b/cpp/src/FreezeScript/Grammar.h
index 05419b9b4e8..ae561a72f12 100644
--- a/cpp/src/FreezeScript/Grammar.h
+++ b/cpp/src/FreezeScript/Grammar.h
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,64 +28,56 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_FREEZE_SCRIPT_GRAMMAR_TAB_H_INCLUDED
-# define YY_FREEZE_SCRIPT_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int freeze_script_debug;
-#endif
 
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    TOK_AND = 258,
-    TOK_OR = 259,
-    TOK_NOT = 260,
-    TOK_ADD = 261,
-    TOK_SUB = 262,
-    TOK_MUL = 263,
-    TOK_DIV = 264,
-    TOK_MOD = 265,
-    TOK_LPAREN = 266,
-    TOK_RPAREN = 267,
-    TOK_LBRACKET = 268,
-    TOK_RBRACKET = 269,
-    TOK_LESS_THAN = 270,
-    TOK_GREATER_THAN = 271,
-    TOK_LESS_EQUAL = 272,
-    TOK_GREATER_EQUAL = 273,
-    TOK_EQUAL = 274,
-    TOK_NEQ = 275,
-    TOK_TRUE = 276,
-    TOK_FALSE = 277,
-    TOK_NIL = 278,
-    TOK_SCOPE_DELIMITER = 279,
-    TOK_IDENTIFIER = 280,
-    TOK_STRING_LITERAL = 281,
-    TOK_INTEGER_LITERAL = 282,
-    TOK_FLOATING_POINT_LITERAL = 283,
-    UNARY_OP = 284
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TOK_AND = 258,
+     TOK_OR = 259,
+     TOK_NOT = 260,
+     TOK_ADD = 261,
+     TOK_SUB = 262,
+     TOK_MUL = 263,
+     TOK_DIV = 264,
+     TOK_MOD = 265,
+     TOK_LPAREN = 266,
+     TOK_RPAREN = 267,
+     TOK_LBRACKET = 268,
+     TOK_RBRACKET = 269,
+     TOK_LESS_THAN = 270,
+     TOK_GREATER_THAN = 271,
+     TOK_LESS_EQUAL = 272,
+     TOK_GREATER_EQUAL = 273,
+     TOK_EQUAL = 274,
+     TOK_NEQ = 275,
+     TOK_TRUE = 276,
+     TOK_FALSE = 277,
+     TOK_NIL = 278,
+     TOK_SCOPE_DELIMITER = 279,
+     TOK_IDENTIFIER = 280,
+     TOK_STRING_LITERAL = 281,
+     TOK_INTEGER_LITERAL = 282,
+     TOK_FLOATING_POINT_LITERAL = 283,
+     UNARY_OP = 284
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
-int freeze_script_parse (void);
 
-#endif /* !YY_FREEZE_SCRIPT_GRAMMAR_TAB_H_INCLUDED  */
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index fa695ebd997..c4790117810 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -58,11 +60,15 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "../IceGrid/Grammar.y" /* yacc.c:339  */
+
+/* Line 189 of yacc.c  */
+#line 1 "Grammar.y"
 
 
 // **********************************************************************
@@ -103,15 +109,14 @@ yyerror(const char* s)
 }
 
 
-#line 107 "Grammar.tab.c" /* yacc.c:339  */
 
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
+/* Line 189 of yacc.c  */
+#line 115 "Grammar.tab.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -121,82 +126,76 @@ yyerror(const char* s)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "Grammar.tab.h".  */
-#ifndef YY_YY_GRAMMAR_TAB_H_INCLUDED
-# define YY_YY_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
-/* Token type.  */
+
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    ICE_GRID_HELP = 258,
-    ICE_GRID_EXIT = 259,
-    ICE_GRID_APPLICATION = 260,
-    ICE_GRID_NODE = 261,
-    ICE_GRID_REGISTRY = 262,
-    ICE_GRID_SERVER = 263,
-    ICE_GRID_ADAPTER = 264,
-    ICE_GRID_PING = 265,
-    ICE_GRID_LOAD = 266,
-    ICE_GRID_SOCKETS = 267,
-    ICE_GRID_ADD = 268,
-    ICE_GRID_REMOVE = 269,
-    ICE_GRID_LIST = 270,
-    ICE_GRID_SHUTDOWN = 271,
-    ICE_GRID_STRING = 272,
-    ICE_GRID_START = 273,
-    ICE_GRID_STOP = 274,
-    ICE_GRID_PATCH = 275,
-    ICE_GRID_SIGNAL = 276,
-    ICE_GRID_STDOUT = 277,
-    ICE_GRID_STDERR = 278,
-    ICE_GRID_DESCRIBE = 279,
-    ICE_GRID_PROPERTIES = 280,
-    ICE_GRID_PROPERTY = 281,
-    ICE_GRID_STATE = 282,
-    ICE_GRID_PID = 283,
-    ICE_GRID_ENDPOINTS = 284,
-    ICE_GRID_ACTIVATION = 285,
-    ICE_GRID_OBJECT = 286,
-    ICE_GRID_FIND = 287,
-    ICE_GRID_SHOW = 288,
-    ICE_GRID_COPYING = 289,
-    ICE_GRID_WARRANTY = 290,
-    ICE_GRID_DIFF = 291,
-    ICE_GRID_UPDATE = 292,
-    ICE_GRID_INSTANTIATE = 293,
-    ICE_GRID_TEMPLATE = 294,
-    ICE_GRID_SERVICE = 295,
-    ICE_GRID_ENABLE = 296,
-    ICE_GRID_DISABLE = 297
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_GRID_HELP = 258,
+     ICE_GRID_EXIT = 259,
+     ICE_GRID_APPLICATION = 260,
+     ICE_GRID_NODE = 261,
+     ICE_GRID_REGISTRY = 262,
+     ICE_GRID_SERVER = 263,
+     ICE_GRID_ADAPTER = 264,
+     ICE_GRID_PING = 265,
+     ICE_GRID_LOAD = 266,
+     ICE_GRID_SOCKETS = 267,
+     ICE_GRID_ADD = 268,
+     ICE_GRID_REMOVE = 269,
+     ICE_GRID_LIST = 270,
+     ICE_GRID_SHUTDOWN = 271,
+     ICE_GRID_STRING = 272,
+     ICE_GRID_START = 273,
+     ICE_GRID_STOP = 274,
+     ICE_GRID_PATCH = 275,
+     ICE_GRID_SIGNAL = 276,
+     ICE_GRID_STDOUT = 277,
+     ICE_GRID_STDERR = 278,
+     ICE_GRID_DESCRIBE = 279,
+     ICE_GRID_PROPERTIES = 280,
+     ICE_GRID_PROPERTY = 281,
+     ICE_GRID_STATE = 282,
+     ICE_GRID_PID = 283,
+     ICE_GRID_ENDPOINTS = 284,
+     ICE_GRID_ACTIVATION = 285,
+     ICE_GRID_OBJECT = 286,
+     ICE_GRID_FIND = 287,
+     ICE_GRID_SHOW = 288,
+     ICE_GRID_COPYING = 289,
+     ICE_GRID_WARRANTY = 290,
+     ICE_GRID_DIFF = 291,
+     ICE_GRID_UPDATE = 292,
+     ICE_GRID_INSTANTIATE = 293,
+     ICE_GRID_TEMPLATE = 294,
+     ICE_GRID_SERVICE = 295,
+     ICE_GRID_ENABLE = 296,
+     ICE_GRID_DISABLE = 297
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-
-int yyparse (void);
-
-#endif /* !YY_YY_GRAMMAR_TAB_H_INCLUDED  */
-
 /* Copy the second part of user declarations.  */
 
-#line 200 "Grammar.tab.c" /* yacc.c:358  */
+
+/* Line 264 of yacc.c  */
+#line 199 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -210,8 +209,11 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#else
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -231,7 +233,8 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -242,71 +245,42 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if 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
-# 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
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+#  define YY_(msgid) msgid
 # endif
 #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
 
-#if defined __GNUC__ && 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")
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
 #else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
 #endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+{
+  return yyi;
+}
 #endif
 
-
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -324,11 +298,11 @@ typedef short int yytype_int16;
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -336,8 +310,8 @@ typedef short int yytype_int16;
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* 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
@@ -351,23 +325,25 @@ typedef short int yytype_int16;
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
+#   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 */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -377,7 +353,7 @@ 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
@@ -395,46 +371,42 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* 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
 
 /* 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_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)
+# 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 (YYID (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  4
 /* YYLAST -- Last index in YYTABLE.  */
@@ -446,19 +418,17 @@ union yyalloc
 #define YYNNTS  7
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  172
-/* YYNSTATES -- Number of states.  */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  367
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   297
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -494,7 +464,108 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     6,    10,    13,    14,    17,    20,
+      25,    30,    35,    40,    45,    50,    55,    60,    65,    70,
+      75,    80,    85,    90,    96,   102,   108,   114,   119,   125,
+     131,   136,   141,   146,   151,   156,   161,   166,   171,   176,
+     181,   186,   191,   196,   201,   206,   211,   216,   221,   226,
+     231,   236,   241,   246,   251,   256,   261,   266,   271,   276,
+     281,   286,   291,   296,   301,   306,   311,   316,   321,   326,
+     331,   336,   341,   346,   351,   356,   361,   366,   371,   376,
+     381,   386,   391,   396,   401,   406,   411,   416,   421,   426,
+     431,   436,   441,   446,   451,   456,   461,   466,   471,   476,
+     481,   486,   491,   496,   501,   506,   511,   516,   521,   526,
+     531,   536,   541,   546,   551,   556,   560,   564,   568,   573,
+     579,   585,   592,   597,   601,   605,   610,   614,   618,   621,
+     623,   626,   629,   633,   637,   638,   640,   642,   644,   646,
+     648,   650,   652,   654,   656,   658,   660,   662,   664,   666,
+     668,   670,   672,   674,   676,   678,   680,   682,   684,   686,
+     688,   690,   692,   694,   696,   698,   700,   702,   704,   706,
+     708,   710,   712
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      45,     0,    -1,    46,    -1,    -1,    46,    47,    48,    -1,
+      47,    48,    -1,    -1,     3,    43,    -1,     4,    43,    -1,
+       5,    13,    49,    43,    -1,     5,    13,     3,    43,    -1,
+       5,    14,    49,    43,    -1,     5,    14,     3,    43,    -1,
+       5,    36,    49,    43,    -1,     5,    36,     3,    43,    -1,
+       5,    37,    49,    43,    -1,     5,    37,     3,    43,    -1,
+       5,    24,    49,    43,    -1,     5,    24,     3,    43,    -1,
+       5,    20,    49,    43,    -1,     5,    20,     3,    43,    -1,
+       5,    15,    49,    43,    -1,     5,    15,     3,    43,    -1,
+       8,    39,    24,    49,    43,    -1,     8,    39,    24,     3,
+      43,    -1,     8,    39,    38,    49,    43,    -1,     8,    39,
+      38,     3,    43,    -1,     8,    39,     3,    43,    -1,    40,
+      39,    24,    49,    43,    -1,    40,    39,    24,     3,    43,
+      -1,    40,    39,     3,    43,    -1,     6,    24,    49,    43,
+      -1,     6,    24,     3,    43,    -1,     6,    10,    49,    43,
+      -1,     6,    10,     3,    43,    -1,     6,    11,    49,    43,
+      -1,     6,    11,     3,    43,    -1,     6,    12,    49,    43,
+      -1,     6,    12,     3,    43,    -1,     6,    16,    49,    43,
+      -1,     6,    16,     3,    43,    -1,     6,    15,    49,    43,
+      -1,     6,    15,     3,    43,    -1,     6,    33,    49,    43,
+      -1,     6,    33,     3,    43,    -1,     7,    24,    49,    43,
+      -1,     7,    24,     3,    43,    -1,     7,    10,    49,    43,
+      -1,     7,    10,     3,    43,    -1,     7,    16,    49,    43,
+      -1,     7,    16,     3,    43,    -1,     7,    15,    49,    43,
+      -1,     7,    15,     3,    43,    -1,     7,    33,    49,    43,
+      -1,     7,    33,     3,    43,    -1,     8,    14,    49,    43,
+      -1,     8,    14,     3,    43,    -1,     8,    24,    49,    43,
+      -1,     8,    24,     3,    43,    -1,     8,    18,    49,    43,
+      -1,     8,    18,     3,    43,    -1,     8,    19,    49,    43,
+      -1,     8,    19,     3,    43,    -1,     8,    20,    49,    43,
+      -1,     8,    20,     3,    43,    -1,     8,    21,    49,    43,
+      -1,     8,    21,     3,    43,    -1,     8,    22,    49,    43,
+      -1,     8,    22,     3,    43,    -1,     8,    23,    49,    43,
+      -1,     8,    23,     3,    43,    -1,     8,    27,    49,    43,
+      -1,     8,    27,     3,    43,    -1,     8,    28,    49,    43,
+      -1,     8,    28,     3,    43,    -1,     8,    25,    49,    43,
+      -1,     8,    25,     3,    43,    -1,     8,    26,    49,    43,
+      -1,     8,    26,     3,    43,    -1,     8,    41,    49,    43,
+      -1,     8,    41,     3,    43,    -1,     8,    42,    49,    43,
+      -1,     8,    42,     3,    43,    -1,     8,    15,    49,    43,
+      -1,     8,    15,     3,    43,    -1,     8,    33,    49,    43,
+      -1,     8,    33,     3,    43,    -1,    40,    18,    49,    43,
+      -1,    40,    18,     3,    43,    -1,    40,    19,    49,    43,
+      -1,    40,    19,     3,    43,    -1,    40,    24,    49,    43,
+      -1,    40,    24,     3,    43,    -1,    40,    25,    49,    43,
+      -1,    40,    25,     3,    43,    -1,    40,    26,    49,    43,
+      -1,    40,    26,     3,    43,    -1,    40,    15,    49,    43,
+      -1,    40,    15,     3,    43,    -1,     9,    29,    49,    43,
+      -1,     9,    29,     3,    43,    -1,     9,    14,    49,    43,
+      -1,     9,    14,     3,    43,    -1,     9,    15,    49,    43,
+      -1,     9,    15,     3,    43,    -1,    31,    13,    49,    43,
+      -1,    31,    13,     3,    43,    -1,    31,    14,    49,    43,
+      -1,    31,    14,     3,    43,    -1,    31,    32,    49,    43,
+      -1,    31,    32,     3,    43,    -1,    31,    15,    49,    43,
+      -1,    31,    15,     3,    43,    -1,    31,    24,    49,    43,
+      -1,    31,    24,     3,    43,    -1,    33,    34,    43,    -1,
+      33,    35,    43,    -1,     3,    50,    43,    -1,     3,    50,
+      50,    43,    -1,     3,    50,    17,    49,    43,    -1,     3,
+      50,    50,    50,    43,    -1,     3,    50,    50,    17,    49,
+      43,    -1,     3,    17,    49,    43,    -1,     3,     1,    43,
+      -1,    50,     3,    43,    -1,    50,    17,     1,    43,    -1,
+      50,     1,    43,    -1,    17,     1,    43,    -1,     1,    43,
+      -1,    43,    -1,    17,    49,    -1,    50,    49,    -1,    17,
+       3,    49,    -1,    50,     3,    49,    -1,    -1,     4,    -1,
+       5,    -1,     6,    -1,     7,    -1,     8,    -1,     9,    -1,
+      10,    -1,    11,    -1,    12,    -1,    13,    -1,    14,    -1,
+      15,    -1,    16,    -1,    18,    -1,    19,    -1,    20,    -1,
+      21,    -1,    24,    -1,    27,    -1,    28,    -1,    25,    -1,
+      26,    -1,    29,    -1,    30,    -1,    31,    -1,    32,    -1,
+      33,    -1,    34,    -1,    35,    -1,    36,    -1,    37,    -1,
+      38,    -1,    39,    -1,    40,    -1,    41,    -1,    42,    -1,
+      23,    -1,    22,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,    95,    95,    99,   106,   109,   116,   124,   128,   132,
@@ -518,7 +589,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#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[] =
@@ -536,13 +607,13 @@ static const char *const yytname[] =
   "ICE_GRID_WARRANTY", "ICE_GRID_DIFF", "ICE_GRID_UPDATE",
   "ICE_GRID_INSTANTIATE", "ICE_GRID_TEMPLATE", "ICE_GRID_SERVICE",
   "ICE_GRID_ENABLE", "ICE_GRID_DISABLE", "';'", "$accept", "start",
-  "commands", "checkInterrupted", "command", "strings", "keyword", YY_NULLPTR
+  "commands", "checkInterrupted", "command", "strings", "keyword", 0
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
+/* 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,
@@ -553,62 +624,55 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF -67
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-67)))
-
-#define YYTABLE_NINF -4
-
-#define yytable_value_is_error(Yytable_value) \
-  0
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    44,    45,    45,    46,    46,    47,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+      49,    49,    49,    49,    49,    50,    50,    50,    50,    50,
+      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+      50,    50,    50
+};
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
 {
-      39,    53,    56,    61,   -67,    61,    20,   179,    69,    93,
-     142,  2492,   123,    95,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   117,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   146,   -67,    11,   -67,   -67,
-     -67,   -67,   -67,   -67,    96,   -67,   -67,   -67,   -67,   122,
-     -67,   -67,    76,   -67,   -67,   -67,   -67,   -67,   -67,  2459,
-     -67,   -67,   -67,   -67,   219,   -67,   260,   300,   340,   380,
-     420,   460,   500,   540,   580,   620,   660,   700,   740,   780,
-     820,   860,   900,   940,   980,  1020,  1060,  1100,  1140,  1180,
-    1220,  1260,  1300,  1340,  1380,  1420,  1460,  1500,  1540,   102,
-    1580,  1620,  1660,  1700,  1740,    84,  1780,  1820,  1860,  1900,
-    1940,    85,    90,  1980,  2020,  2060,  2100,  2140,  2180,    30,
-      91,   112,   135,   -67,  2220,   120,  2260,  2459,   -67,  2299,
-     124,   125,   128,   129,   131,   134,   139,  2460,  2461,  2462,
-    2463,  2466,  2467,  2468,  2469,  2470,  2471,  2472,  2474,  2475,
-    2476,  2477,  2478,  2479,  2480,  2481,  2483,  2484,  2485,  2486,
-    2487,  2488,  2489,  2490,  2491,  2493,  2494,  2495,  2496,  2497,
-    2498,  2499,  2500,  2501,  2502,  2503,  2504,  2505,  2506,  2507,
-    2508,  2509,  2510,  2511,  2512,  2513,  2514,  2515,  2516,  2517,
-    2518,  2519,  2520,  2521,  2522,  2523,  2524,  2340,  2380,  2525,
-    2526,  2527,  2528,  2529,  2530,  2531,  2532,  2533,  2534,   -67,
-    2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,  2543,  2544,
-     -67,   -67,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,
-    2553,  2554,  2555,  2556,  2557,  2420,   -67,   -67,  2558,  2459,
-     -67,   -67,  2459,   -67,  2559,  2459,   -67,  2560,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,  2561,  2562,  2563,  2564,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
-     -67,   -67,  2565,  2566,   -67,   -67,   -67,   -67,  2567,   -67,
-     -67,   -67,   -67,   -67,   -67,   -67,   -67
+       0,     2,     1,     0,     3,     2,     0,     2,     2,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     5,     5,     5,     5,     4,     5,     5,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     3,     3,     3,     4,     5,
+       5,     6,     4,     3,     3,     4,     3,     3,     2,     1,
+       2,     2,     3,     3,     0,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1
 };
 
-  /* 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.  */
+/* 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[] =
 {
        6,     0,     6,     0,     1,     0,     0,     0,   135,   136,
@@ -650,21 +714,67 @@ static const yytype_uint8 yydefact[] =
       24,    23,    26,    25,    29,    28,   121
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
-     -67,   -67,   -67,  2609,  2607,   -66,    52
+      -1,     1,     2,     3,    48,   125,   126
 };
 
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -67
+static const yytype_int16 yypact[] =
 {
-      -1,     1,     2,     3,    48,   125,   126
+      39,    53,    56,    61,   -67,    61,    20,   179,    69,    93,
+     142,  2492,   123,    95,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   117,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   146,   -67,    11,   -67,   -67,
+     -67,   -67,   -67,   -67,    96,   -67,   -67,   -67,   -67,   122,
+     -67,   -67,    76,   -67,   -67,   -67,   -67,   -67,   -67,  2459,
+     -67,   -67,   -67,   -67,   219,   -67,   260,   300,   340,   380,
+     420,   460,   500,   540,   580,   620,   660,   700,   740,   780,
+     820,   860,   900,   940,   980,  1020,  1060,  1100,  1140,  1180,
+    1220,  1260,  1300,  1340,  1380,  1420,  1460,  1500,  1540,   102,
+    1580,  1620,  1660,  1700,  1740,    84,  1780,  1820,  1860,  1900,
+    1940,    85,    90,  1980,  2020,  2060,  2100,  2140,  2180,    30,
+      91,   112,   135,   -67,  2220,   120,  2260,  2459,   -67,  2299,
+     124,   125,   128,   129,   131,   134,   139,  2460,  2461,  2462,
+    2463,  2466,  2467,  2468,  2469,  2470,  2471,  2472,  2474,  2475,
+    2476,  2477,  2478,  2479,  2480,  2481,  2483,  2484,  2485,  2486,
+    2487,  2488,  2489,  2490,  2491,  2493,  2494,  2495,  2496,  2497,
+    2498,  2499,  2500,  2501,  2502,  2503,  2504,  2505,  2506,  2507,
+    2508,  2509,  2510,  2511,  2512,  2513,  2514,  2515,  2516,  2517,
+    2518,  2519,  2520,  2521,  2522,  2523,  2524,  2340,  2380,  2525,
+    2526,  2527,  2528,  2529,  2530,  2531,  2532,  2533,  2534,   -67,
+    2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,  2543,  2544,
+     -67,   -67,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,
+    2553,  2554,  2555,  2556,  2557,  2420,   -67,   -67,  2558,  2459,
+     -67,   -67,  2459,   -67,  2559,  2459,   -67,  2560,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,  2561,  2562,  2563,  2564,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,  2565,  2566,   -67,   -67,   -67,   -67,  2567,   -67,
+     -67,   -67,   -67,   -67,   -67,   -67,   -67
 };
 
-  /* 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.  */
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+     -67,   -67,   -67,  2609,  2607,   -66,    52
+};
+
+/* 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 -4
 static const yytype_int16 yytable[] =
 {
      131,   133,   135,   137,   139,   141,   143,   145,   147,   149,
@@ -1197,8 +1307,8 @@ static const yytype_int16 yycheck[] =
       43,     2,     5
 };
 
-  /* 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,    45,    46,    47,     0,    47,     1,     3,     4,     5,
@@ -1240,88 +1350,96 @@ static const yytype_uint8 yystos[] =
       43,    43,    43,    43,    43,    43,    43
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    44,    45,    45,    46,    46,    47,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      49,    49,    49,    49,    49,    50,    50,    50,    50,    50,
-      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
-      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
-      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
-      50,    50,    50
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     0,     3,     2,     0,     2,     2,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     5,     5,     5,     5,     4,     5,     5,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     3,     3,     3,     4,     5,
-       5,     6,     4,     3,     3,     4,     3,     3,     2,     1,
-       2,     2,     3,     3,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1
-};
+#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
 
-#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.  */
 
+#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#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 (0)
+      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
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
 
+/* 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 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
 
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval)
+#endif
+
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
@@ -1330,46 +1448,54 @@ while (0)
 #  define YYFPRINTF fprintf
 # endif
 
-# 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 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 (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's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*--------------------------------.
+| 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;
+#endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
 # endif
-  YYUSE (yytype);
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -1377,11 +1503,22 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
+#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
 {
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", 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, ")");
@@ -1392,8 +1529,16 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -1404,42 +1549,49 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (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 (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
 {
-  unsigned long int 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++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1453,7 +1605,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
+#ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1468,6 +1620,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1476,8 +1629,15 @@ 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++)
@@ -1493,8 +1653,16 @@ yystrlen (const char *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;
@@ -1524,27 +1692,27 @@ 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;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
     do_not_strip_quotes: ;
     }
 
@@ -1555,178 +1723,197 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* 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)
+/* 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)
 {
-  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))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      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))
-      return 2;
-    yysize = yysize1;
-  }
+  int yyn = yypact[yystate];
 
-  if (*yymsg_alloc < yysize)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+      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);
+      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;
     }
-
-  /* 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);
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
 
+/* 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 */
+
+
 
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
+#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
 {
 /* The lookahead symbol.  */
 int yychar;
 
-
 /* The semantic value of the lookahead symbol.  */
-/* Default value used for initialization, for pacifying older GCCs
-   or non-GCC compilers.  */
-YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
-YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
+YYSTYPE yylval;
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1736,10 +1923,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     int yyerrstatus;
 
     /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-       Refer to the stacks through separate pointers, to allow yyoverflow
+       Refer to the stacks thru separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1757,7 +1944,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1775,8 +1962,9 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1785,6 +1973,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   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;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1805,23 +2001,23 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
 #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
@@ -1829,22 +2025,22 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 # else
       /* 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_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	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);
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1853,10 +2049,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+		  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+	YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1876,7 +2072,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1885,7 +2081,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex (&yylval);
+      yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
@@ -1907,8 +2103,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1925,9 +2121,7 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1950,7 +2144,7 @@ yyreduce:
   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
@@ -1964,1376 +2158,1538 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 96 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 96 "Grammar.y"
     {
-}
-#line 1971 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 3:
-#line 99 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 99 "Grammar.y"
     {
-}
-#line 1978 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 4:
-#line 107 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 107 "Grammar.y"
     {
-}
-#line 1985 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 5:
-#line 110 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 110 "Grammar.y"
     {
-}
-#line 1992 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 6:
-#line 116 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 116 "Grammar.y"
     {
     parser->checkInterrupted();
-}
-#line 2000 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 7:
-#line 125 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 125 "Grammar.y"
     {
     parser->usage();
-}
-#line 2008 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 8:
-#line 129 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 129 "Grammar.y"
     {
     return 0;
-}
-#line 2016 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 9:
-#line 133 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 133 "Grammar.y"
     {
-    parser->addApplication((yyvsp[-1]));
-}
-#line 2024 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->addApplication((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 10:
-#line 137 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 137 "Grammar.y"
     {
     parser->usage("application", "add");
-}
-#line 2032 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 11:
-#line 141 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 141 "Grammar.y"
     {
-    parser->removeApplication((yyvsp[-1]));
-}
-#line 2040 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->removeApplication((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 12:
-#line 145 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 145 "Grammar.y"
     {
     parser->usage("application", "remove");
-}
-#line 2048 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 13:
-#line 149 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 149 "Grammar.y"
     {
-    parser->diffApplication((yyvsp[-1]));
-}
-#line 2056 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->diffApplication((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 14:
-#line 153 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 153 "Grammar.y"
     {
     parser->usage("application", "diff");
-}
-#line 2064 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 15:
-#line 157 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 157 "Grammar.y"
     {
-    parser->updateApplication((yyvsp[-1]));
-}
-#line 2072 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->updateApplication((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 16:
-#line 161 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 161 "Grammar.y"
     {
     parser->usage("application", "update");
-}
-#line 2080 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 17:
-#line 165 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 165 "Grammar.y"
     {
-    parser->describeApplication((yyvsp[-1]));
-}
-#line 2088 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeApplication((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 18:
-#line 169 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 169 "Grammar.y"
     {
     parser->usage("application", "describe");
-}
-#line 2096 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 19:
-#line 173 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 173 "Grammar.y"
     {
-    parser->patchApplication((yyvsp[-1]));
-}
-#line 2104 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->patchApplication((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 20:
-#line 177 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 177 "Grammar.y"
     {
     parser->usage("application", "patch");
-}
-#line 2112 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 21:
-#line 181 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 181 "Grammar.y"
     {
-    parser->listAllApplications((yyvsp[-1]));
-}
-#line 2120 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listAllApplications((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 22:
-#line 185 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 185 "Grammar.y"
     {
     parser->usage("application", "list");
-}
-#line 2128 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 23:
-#line 189 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 189 "Grammar.y"
     {
-    parser->describeServerTemplate((yyvsp[-1]));
-}
-#line 2136 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeServerTemplate((yyvsp[(4) - (5)]));
+;}
     break;
 
   case 24:
-#line 193 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 193 "Grammar.y"
     {
     parser->usage("server template", "describe");
-}
-#line 2144 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 25:
-#line 197 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 197 "Grammar.y"
     {
-    parser->instantiateServerTemplate((yyvsp[-1]));
-}
-#line 2152 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->instantiateServerTemplate((yyvsp[(4) - (5)]));
+;}
     break;
 
   case 26:
-#line 201 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 201 "Grammar.y"
     {
     parser->usage("server template", "instantiate");
-}
-#line 2160 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 27:
-#line 205 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 205 "Grammar.y"
     {
     parser->usage("server template");
-}
-#line 2168 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 28:
-#line 209 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 209 "Grammar.y"
     {
-    parser->describeServiceTemplate((yyvsp[-1]));
-}
-#line 2176 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeServiceTemplate((yyvsp[(4) - (5)]));
+;}
     break;
 
   case 29:
-#line 213 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 213 "Grammar.y"
     {
     parser->usage("service template", "describe");
-}
-#line 2184 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 30:
-#line 217 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 217 "Grammar.y"
     {
     parser->usage("service template");
-}
-#line 2192 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 31:
-#line 221 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 221 "Grammar.y"
     {
-    parser->describeNode((yyvsp[-1]));
-}
-#line 2200 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeNode((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 32:
-#line 225 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 225 "Grammar.y"
     {
     parser->usage("node", "describe");
-}
-#line 2208 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 33:
-#line 229 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 229 "Grammar.y"
     {
-    parser->pingNode((yyvsp[-1]));
-}
-#line 2216 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->pingNode((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 34:
-#line 233 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 233 "Grammar.y"
     {
     parser->usage("node", "ping");
-}
-#line 2224 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 35:
-#line 237 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 237 "Grammar.y"
     {
-    parser->printLoadNode((yyvsp[-1]));
-}
-#line 2232 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->printLoadNode((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 36:
-#line 241 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 241 "Grammar.y"
     {
     parser->usage("node", "load");
-}
-#line 2240 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 37:
-#line 245 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 245 "Grammar.y"
     {
-    parser->printNodeProcessorSockets((yyvsp[-1]));
-}
-#line 2248 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->printNodeProcessorSockets((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 38:
-#line 249 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 249 "Grammar.y"
     {
     parser->usage("node", "sockets");
-}
-#line 2256 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 39:
-#line 253 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 253 "Grammar.y"
     {
-    parser->shutdownNode((yyvsp[-1]));
-}
-#line 2264 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->shutdownNode((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 40:
-#line 257 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 257 "Grammar.y"
     {
     parser->usage("node", "shutdown");
-}
-#line 2272 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 41:
-#line 261 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 261 "Grammar.y"
     {
-    parser->listAllNodes((yyvsp[-1]));
-}
-#line 2280 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listAllNodes((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 42:
-#line 265 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 265 "Grammar.y"
     {
     parser->usage("node", "list");
-}
-#line 2288 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 43:
-#line 269 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 269 "Grammar.y"
     {
-    parser->show("node", (yyvsp[-1]));
-}
-#line 2296 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->show("node", (yyvsp[(3) - (4)]));
+;}
     break;
 
   case 44:
-#line 273 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 273 "Grammar.y"
     {
     parser->usage("node", "show");
-}
-#line 2304 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 45:
-#line 277 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 277 "Grammar.y"
     {
-    parser->describeRegistry((yyvsp[-1]));
-}
-#line 2312 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeRegistry((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 46:
-#line 281 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 281 "Grammar.y"
     {
     parser->usage("registry", "describe");
-}
-#line 2320 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 47:
-#line 285 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 285 "Grammar.y"
     {
-    parser->pingRegistry((yyvsp[-1]));
-}
-#line 2328 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->pingRegistry((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 48:
-#line 289 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 289 "Grammar.y"
     {
     parser->usage("registry", "ping");
-}
-#line 2336 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 49:
-#line 293 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 293 "Grammar.y"
     {
-    parser->shutdownRegistry((yyvsp[-1]));
-}
-#line 2344 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->shutdownRegistry((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 50:
-#line 297 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 297 "Grammar.y"
     {
     parser->usage("registry", "shutdown");
-}
-#line 2352 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 51:
-#line 301 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 301 "Grammar.y"
     {
-    parser->listAllRegistries((yyvsp[-1]));
-}
-#line 2360 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listAllRegistries((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 52:
-#line 305 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 305 "Grammar.y"
     {
     parser->usage("registry", "list");
-}
-#line 2368 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 53:
-#line 309 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 309 "Grammar.y"
     {
-    parser->show("registry", (yyvsp[-1]));
-}
-#line 2376 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->show("registry", (yyvsp[(3) - (4)]));
+;}
     break;
 
   case 54:
-#line 313 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 313 "Grammar.y"
     {
     parser->usage("registry", "show");
-}
-#line 2384 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 55:
-#line 317 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 317 "Grammar.y"
     {
-    parser->removeServer((yyvsp[-1]));
-}
-#line 2392 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->removeServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 56:
-#line 321 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 321 "Grammar.y"
     {
     parser->usage("server", "remove");
-}
-#line 2400 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 57:
-#line 325 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 325 "Grammar.y"
     {
-    parser->describeServer((yyvsp[-1]));
-}
-#line 2408 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 58:
-#line 329 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 329 "Grammar.y"
     {
     parser->usage("server", "describe");
-}
-#line 2416 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 59:
-#line 333 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 333 "Grammar.y"
     {
-    parser->startServer((yyvsp[-1]));
-}
-#line 2424 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->startServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 60:
-#line 337 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 337 "Grammar.y"
     {
     parser->usage("server", "start");
-}
-#line 2432 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 61:
-#line 341 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 341 "Grammar.y"
     {
-    parser->stopServer((yyvsp[-1]));
-}
-#line 2440 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->stopServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 62:
-#line 345 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 345 "Grammar.y"
     {
     parser->usage("server", "stop");
-}
-#line 2448 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 63:
-#line 349 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 349 "Grammar.y"
     {
-    parser->patchServer((yyvsp[-1]));
-}
-#line 2456 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->patchServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 64:
-#line 353 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 353 "Grammar.y"
     {
     parser->usage("server", "patch");
-}
-#line 2464 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 65:
-#line 357 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 357 "Grammar.y"
     {
-    parser->signalServer((yyvsp[-1]));
-}
-#line 2472 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->signalServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 66:
-#line 361 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 361 "Grammar.y"
     {
     parser->usage("server", "signal");
-}
-#line 2480 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 67:
-#line 365 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 365 "Grammar.y"
     {
-    parser->writeMessage((yyvsp[-1]), 1);
-}
-#line 2488 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->writeMessage((yyvsp[(3) - (4)]), 1);
+;}
     break;
 
   case 68:
-#line 369 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 369 "Grammar.y"
     {
     parser->usage("server", "stdout");
-}
-#line 2496 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 69:
-#line 373 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 373 "Grammar.y"
     {
-    parser->writeMessage((yyvsp[-1]), 2);
-}
-#line 2504 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->writeMessage((yyvsp[(3) - (4)]), 2);
+;}
     break;
 
   case 70:
-#line 377 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 377 "Grammar.y"
     {
     parser->usage("server", "stderr");
-}
-#line 2512 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 71:
-#line 381 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 381 "Grammar.y"
     {
-    parser->stateServer((yyvsp[-1]));
-}
-#line 2520 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->stateServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 72:
-#line 385 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 385 "Grammar.y"
     {
     parser->usage("server", "start");
-}
-#line 2528 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 73:
-#line 389 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 389 "Grammar.y"
     {
-    parser->pidServer((yyvsp[-1]));
-}
-#line 2536 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->pidServer((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 74:
-#line 393 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 393 "Grammar.y"
     {
     parser->usage("server", "pid");
-}
-#line 2544 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 75:
-#line 397 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 397 "Grammar.y"
     {
-    parser->propertiesServer((yyvsp[-1]), false);
-}
-#line 2552 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->propertiesServer((yyvsp[(3) - (4)]), false);
+;}
     break;
 
   case 76:
-#line 401 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 401 "Grammar.y"
     {
     parser->usage("server", "properties");
-}
-#line 2560 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 77:
-#line 405 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 405 "Grammar.y"
     {
-    parser->propertiesServer((yyvsp[-1]), true);
-}
-#line 2568 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->propertiesServer((yyvsp[(3) - (4)]), true);
+;}
     break;
 
   case 78:
-#line 409 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 409 "Grammar.y"
     {
     parser->usage("server", "property");
-}
-#line 2576 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 79:
-#line 413 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 413 "Grammar.y"
     {
-    parser->enableServer((yyvsp[-1]), true);
-}
-#line 2584 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->enableServer((yyvsp[(3) - (4)]), true);
+;}
     break;
 
   case 80:
-#line 417 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 417 "Grammar.y"
     {
     parser->usage("server", "enable");
-}
-#line 2592 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 81:
-#line 421 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 421 "Grammar.y"
     {
-    parser->enableServer((yyvsp[-1]), false);
-}
-#line 2600 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->enableServer((yyvsp[(3) - (4)]), false);
+;}
     break;
 
   case 82:
-#line 425 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 425 "Grammar.y"
     {
     parser->usage("server", "disable");
-}
-#line 2608 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 83:
-#line 429 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 429 "Grammar.y"
     {
-    parser->listAllServers((yyvsp[-1]));
-}
-#line 2616 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listAllServers((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 84:
-#line 433 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 433 "Grammar.y"
     {
     parser->usage("server", "list");
-}
-#line 2624 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 85:
-#line 437 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 437 "Grammar.y"
     {
-    parser->show("server", (yyvsp[-1]));
-}
-#line 2632 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->show("server", (yyvsp[(3) - (4)]));
+;}
     break;
 
   case 86:
-#line 441 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 441 "Grammar.y"
     {
     parser->usage("server", "show");
-}
-#line 2640 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 87:
-#line 445 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 445 "Grammar.y"
     {
-    parser->startService((yyvsp[-1]));
-}
-#line 2648 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->startService((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 88:
-#line 449 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 449 "Grammar.y"
     {
     parser->usage("service", "start");
-}
-#line 2656 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 89:
-#line 453 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 453 "Grammar.y"
     {
-    parser->stopService((yyvsp[-1]));
-}
-#line 2664 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->stopService((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 90:
-#line 457 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 457 "Grammar.y"
     {
     parser->usage("service", "stop");
-}
-#line 2672 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 91:
-#line 461 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 461 "Grammar.y"
     {
-    parser->describeService((yyvsp[-1]));
-}
-#line 2680 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeService((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 92:
-#line 465 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 465 "Grammar.y"
     {
     parser->usage("service", "describe");
-}
-#line 2688 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 93:
-#line 469 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 469 "Grammar.y"
     {
-    parser->propertiesService((yyvsp[-1]), false);
-}
-#line 2696 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->propertiesService((yyvsp[(3) - (4)]), false);
+;}
     break;
 
   case 94:
-#line 473 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 473 "Grammar.y"
     {
     parser->usage("service", "properties");
-}
-#line 2704 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 95:
-#line 477 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 477 "Grammar.y"
     {
-    parser->propertiesService((yyvsp[-1]), true);
-}
-#line 2712 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->propertiesService((yyvsp[(3) - (4)]), true);
+;}
     break;
 
   case 96:
-#line 481 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 481 "Grammar.y"
     {
     parser->usage("service", "property");
-}
-#line 2720 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 97:
-#line 485 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 485 "Grammar.y"
     {
-    parser->listServices((yyvsp[-1]));
-}
-#line 2728 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listServices((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 98:
-#line 489 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 489 "Grammar.y"
     {
     parser->usage("service", "list");
-}
-#line 2736 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 99:
-#line 493 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 493 "Grammar.y"
     {
-    parser->endpointsAdapter((yyvsp[-1]));
-}
-#line 2744 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->endpointsAdapter((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 100:
-#line 497 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 497 "Grammar.y"
     {
     parser->usage("adapter", "endpoints");
-}
-#line 2752 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 101:
-#line 501 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 501 "Grammar.y"
     {
-    parser->removeAdapter((yyvsp[-1]));
-}
-#line 2760 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->removeAdapter((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 102:
-#line 505 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 505 "Grammar.y"
     {
     parser->usage("adapter", "remove");
-}
-#line 2768 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 103:
-#line 509 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 509 "Grammar.y"
     {
-    parser->listAllAdapters((yyvsp[-1]));
-}
-#line 2776 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listAllAdapters((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 104:
-#line 513 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 513 "Grammar.y"
     {
     parser->usage("adapter", "list");
-}
-#line 2784 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 105:
-#line 517 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 517 "Grammar.y"
     {
-    parser->addObject((yyvsp[-1]));
-}
-#line 2792 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->addObject((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 106:
-#line 521 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 521 "Grammar.y"
     {
     parser->usage("object", "add");
-}
-#line 2800 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 107:
-#line 525 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 525 "Grammar.y"
     {
-    parser->removeObject((yyvsp[-1]));
-}
-#line 2808 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->removeObject((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 108:
-#line 529 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 529 "Grammar.y"
     {
     parser->usage("object", "remove");
-}
-#line 2816 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 109:
-#line 533 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 533 "Grammar.y"
     {
-    parser->findObject((yyvsp[-1]));
-}
-#line 2824 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->findObject((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 110:
-#line 537 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 537 "Grammar.y"
     {
     parser->usage("object", "find");
-}
-#line 2832 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 111:
-#line 541 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 541 "Grammar.y"
     {
-    parser->listObject((yyvsp[-1]));
-}
-#line 2840 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->listObject((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 112:
-#line 545 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 545 "Grammar.y"
     {
     parser->usage("object", "list");
-}
-#line 2848 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 113:
-#line 549 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 549 "Grammar.y"
     {
-    parser->describeObject((yyvsp[-1]));
-}
-#line 2856 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->describeObject((yyvsp[(3) - (4)]));
+;}
     break;
 
   case 114:
-#line 553 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 553 "Grammar.y"
     {
     parser->usage("object", "describe");
-}
-#line 2864 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 115:
-#line 557 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 557 "Grammar.y"
     {
     parser->showCopying();
-}
-#line 2872 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 116:
-#line 561 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 561 "Grammar.y"
     {
     parser->showWarranty();
-}
-#line 2880 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 117:
-#line 565 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 565 "Grammar.y"
     {
-    parser->usage((yyvsp[-1]).front());
-}
-#line 2888 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->usage((yyvsp[(2) - (3)]).front());
+;}
     break;
 
   case 118:
-#line 569 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 569 "Grammar.y"
     {
-    if(((yyvsp[-2]).front() == "server" || (yyvsp[-2]).front() == "service") && (yyvsp[-1]).front() == "template")
+    if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template")
     {
-        parser->usage((yyvsp[-2]).front() + " " + (yyvsp[-1]).front());
+        parser->usage((yyvsp[(2) - (4)]).front() + " " + (yyvsp[(3) - (4)]).front());
     }
     else
     {
-        parser->usage((yyvsp[-2]).front(), (yyvsp[-1]).front());
+        parser->usage((yyvsp[(2) - (4)]).front(), (yyvsp[(3) - (4)]).front());
     }
-}
-#line 2903 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 119:
-#line 580 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 580 "Grammar.y"
     {
-    parser->usage((yyvsp[-3]).front(), (yyvsp[-2]).front());
-}
-#line 2911 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
+;}
     break;
 
   case 120:
-#line 584 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 584 "Grammar.y"
     {
-    if(((yyvsp[-3]).front() == "server" || (yyvsp[-3]).front() == "service") && (yyvsp[-2]).front() == "template")
+    if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template")
     {
-        parser->usage((yyvsp[-3]).front() + " " + (yyvsp[-2]).front(), (yyvsp[-1]).front());
+        parser->usage((yyvsp[(2) - (5)]).front() + " " + (yyvsp[(3) - (5)]).front(), (yyvsp[(4) - (5)]).front());
     }
     else
     {
-        parser->usage((yyvsp[-3]).front(), (yyvsp[-2]).front());
+        parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
     }
-}
-#line 2926 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 121:
-#line 595 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 595 "Grammar.y"
     {
-    if(((yyvsp[-4]).front() == "server" || (yyvsp[-4]).front() == "service") && (yyvsp[-3]).front() == "template")
+    if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template")
     {
-        parser->usage((yyvsp[-4]).front() + " " + (yyvsp[-3]).front(), (yyvsp[-2]).front());
+        parser->usage((yyvsp[(2) - (6)]).front() + " " + (yyvsp[(3) - (6)]).front(), (yyvsp[(4) - (6)]).front());
     }
     else
     {
-        parser->usage((yyvsp[-4]).front(), (yyvsp[-3]).front());
+        parser->usage((yyvsp[(2) - (6)]).front(), (yyvsp[(3) - (6)]).front());
     }
-}
-#line 2941 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 122:
-#line 606 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 606 "Grammar.y"
     {
-    parser->usage((yyvsp[-2]).front());
-}
-#line 2949 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->usage((yyvsp[(2) - (4)]).front());
+;}
     break;
 
   case 123:
-#line 610 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 610 "Grammar.y"
     {
     parser->usage();
-}
-#line 2957 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 124:
-#line 614 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 614 "Grammar.y"
     {
-    parser->usage((yyvsp[-2]).front());
-}
-#line 2965 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->usage((yyvsp[(1) - (3)]).front());
+;}
     break;
 
   case 125:
-#line 618 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 618 "Grammar.y"
     {
-    (yyvsp[-3]).push_back((yyvsp[-2]).front());
-    parser->invalidCommand((yyvsp[-3]));
+    (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front());
+    parser->invalidCommand((yyvsp[(1) - (4)]));
     yyerrok;
-}
-#line 2975 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 126:
-#line 624 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 624 "Grammar.y"
     {
-    parser->invalidCommand((yyvsp[-2]));
+    parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
-}
-#line 2984 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 127:
-#line 629 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 629 "Grammar.y"
     {
-    parser->invalidCommand((yyvsp[-2]));
+    parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
-}
-#line 2993 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 128:
-#line 634 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 634 "Grammar.y"
     {
     yyerrok;
-}
-#line 3001 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 129:
-#line 638 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 638 "Grammar.y"
     {
-}
-#line 3008 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 130:
-#line 647 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 647 "Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-    (yyval).push_front((yyvsp[-1]).front());
-}
-#line 3017 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+    (yyval).push_front((yyvsp[(1) - (2)]).front());
+;}
     break;
 
   case 131:
-#line 652 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 652 "Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-    (yyval).push_front((yyvsp[-1]).front());
-}
-#line 3026 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+    (yyval).push_front((yyvsp[(1) - (2)]).front());
+;}
     break;
 
   case 132:
-#line 657 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 657 "Grammar.y"
     {
-    (yyval) = (yyvsp[-1]);
+    (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
-    (yyval).push_front((yyvsp[-2]).front());
-}
-#line 3036 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval).push_front((yyvsp[(1) - (3)]).front());
+;}
     break;
 
   case 133:
-#line 663 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 663 "Grammar.y"
     {
-    (yyval) = (yyvsp[-1]);
+    (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
-    (yyval).push_front((yyvsp[-2]).front());
-}
-#line 3046 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval).push_front((yyvsp[(1) - (3)]).front());
+;}
     break;
 
   case 134:
-#line 669 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 669 "Grammar.y"
     {
     (yyval) = YYSTYPE();
-}
-#line 3054 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 135:
-#line 678 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 678 "Grammar.y"
     {
-}
-#line 3061 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 136:
-#line 681 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 681 "Grammar.y"
     {
-}
-#line 3068 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 137:
-#line 684 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 684 "Grammar.y"
     {
-}
-#line 3075 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 138:
-#line 687 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 687 "Grammar.y"
     {
-}
-#line 3082 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 139:
-#line 690 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 690 "Grammar.y"
     {
-}
-#line 3089 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 140:
-#line 693 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 693 "Grammar.y"
     {
-}
-#line 3096 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 141:
-#line 696 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 696 "Grammar.y"
     {
-}
-#line 3103 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 142:
-#line 699 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 699 "Grammar.y"
     {
-}
-#line 3110 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 143:
-#line 702 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 702 "Grammar.y"
     {
-}
-#line 3117 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 144:
-#line 705 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 705 "Grammar.y"
     {
-}
-#line 3124 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 145:
-#line 708 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 708 "Grammar.y"
     {
-}
-#line 3131 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 146:
-#line 711 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 711 "Grammar.y"
     {
-}
-#line 3138 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 147:
-#line 714 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 714 "Grammar.y"
     {
-}
-#line 3145 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 148:
-#line 717 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 717 "Grammar.y"
     {
-}
-#line 3152 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 149:
-#line 720 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 720 "Grammar.y"
     {
-}
-#line 3159 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 150:
-#line 723 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 723 "Grammar.y"
     {
-}
-#line 3166 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 151:
-#line 726 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 726 "Grammar.y"
     {
-}
-#line 3173 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 152:
-#line 729 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 729 "Grammar.y"
     {
-}
-#line 3180 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 153:
-#line 732 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 732 "Grammar.y"
     {
-}
-#line 3187 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 154:
-#line 735 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 735 "Grammar.y"
     {
-}
-#line 3194 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 155:
-#line 738 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 738 "Grammar.y"
     {
-}
-#line 3201 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 156:
-#line 741 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 741 "Grammar.y"
     {
-}
-#line 3208 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 157:
-#line 744 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 744 "Grammar.y"
     {
-}
-#line 3215 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 158:
-#line 747 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 747 "Grammar.y"
     {
-}
-#line 3222 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 159:
-#line 750 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 750 "Grammar.y"
     {
-}
-#line 3229 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 160:
-#line 753 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 753 "Grammar.y"
     {
-}
-#line 3236 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 161:
-#line 756 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 756 "Grammar.y"
     {
-}
-#line 3243 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 162:
-#line 759 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 759 "Grammar.y"
     {
-}
-#line 3250 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 163:
-#line 762 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 762 "Grammar.y"
     {
-}
-#line 3257 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 164:
-#line 765 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 765 "Grammar.y"
     {
-}
-#line 3264 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 165:
-#line 768 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 768 "Grammar.y"
     {
-}
-#line 3271 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 166:
-#line 771 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 771 "Grammar.y"
     {
-}
-#line 3278 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 167:
-#line 774 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 774 "Grammar.y"
     {
-}
-#line 3285 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 168:
-#line 777 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 777 "Grammar.y"
     {
-}
-#line 3292 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 169:
-#line 780 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 780 "Grammar.y"
     {
-}
-#line 3299 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 170:
-#line 783 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 783 "Grammar.y"
     {
-}
-#line 3306 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 171:
-#line 786 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 786 "Grammar.y"
     {
-}
-#line 3313 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 172:
-#line 789 "../IceGrid/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 789 "Grammar.y"
     {
-}
-#line 3320 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
 
-#line 3324 "Grammar.tab.c" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 3691 "Grammar.tab.c"
       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);
@@ -3342,7 +3698,7 @@ 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.  */
 
@@ -3357,14 +3713,10 @@ yyreduce:
   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)
     {
@@ -3372,36 +3724,37 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        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;
+	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;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -3410,20 +3763,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
+	 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 lookahead token after shifting the error
@@ -3442,7 +3795,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule whose action triggered
+  /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -3455,37 +3808,35 @@ 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 (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
+      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;
+	YYABORT;
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+		  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -3509,7 +3860,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -3521,21 +3872,16 @@ yyexhaustedlab:
 
 yyreturn:
   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
+     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);
+		  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -3546,5 +3892,9 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
+
+
+
diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h
index 89ab767be0a..e39828c6ae7 100644
--- a/cpp/src/IceGrid/Grammar.h
+++ b/cpp/src/IceGrid/Grammar.h
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,77 +28,69 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_GRAMMAR_TAB_H_INCLUDED
-# define YY_YY_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
 
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    ICE_GRID_HELP = 258,
-    ICE_GRID_EXIT = 259,
-    ICE_GRID_APPLICATION = 260,
-    ICE_GRID_NODE = 261,
-    ICE_GRID_REGISTRY = 262,
-    ICE_GRID_SERVER = 263,
-    ICE_GRID_ADAPTER = 264,
-    ICE_GRID_PING = 265,
-    ICE_GRID_LOAD = 266,
-    ICE_GRID_SOCKETS = 267,
-    ICE_GRID_ADD = 268,
-    ICE_GRID_REMOVE = 269,
-    ICE_GRID_LIST = 270,
-    ICE_GRID_SHUTDOWN = 271,
-    ICE_GRID_STRING = 272,
-    ICE_GRID_START = 273,
-    ICE_GRID_STOP = 274,
-    ICE_GRID_PATCH = 275,
-    ICE_GRID_SIGNAL = 276,
-    ICE_GRID_STDOUT = 277,
-    ICE_GRID_STDERR = 278,
-    ICE_GRID_DESCRIBE = 279,
-    ICE_GRID_PROPERTIES = 280,
-    ICE_GRID_PROPERTY = 281,
-    ICE_GRID_STATE = 282,
-    ICE_GRID_PID = 283,
-    ICE_GRID_ENDPOINTS = 284,
-    ICE_GRID_ACTIVATION = 285,
-    ICE_GRID_OBJECT = 286,
-    ICE_GRID_FIND = 287,
-    ICE_GRID_SHOW = 288,
-    ICE_GRID_COPYING = 289,
-    ICE_GRID_WARRANTY = 290,
-    ICE_GRID_DIFF = 291,
-    ICE_GRID_UPDATE = 292,
-    ICE_GRID_INSTANTIATE = 293,
-    ICE_GRID_TEMPLATE = 294,
-    ICE_GRID_SERVICE = 295,
-    ICE_GRID_ENABLE = 296,
-    ICE_GRID_DISABLE = 297
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_GRID_HELP = 258,
+     ICE_GRID_EXIT = 259,
+     ICE_GRID_APPLICATION = 260,
+     ICE_GRID_NODE = 261,
+     ICE_GRID_REGISTRY = 262,
+     ICE_GRID_SERVER = 263,
+     ICE_GRID_ADAPTER = 264,
+     ICE_GRID_PING = 265,
+     ICE_GRID_LOAD = 266,
+     ICE_GRID_SOCKETS = 267,
+     ICE_GRID_ADD = 268,
+     ICE_GRID_REMOVE = 269,
+     ICE_GRID_LIST = 270,
+     ICE_GRID_SHUTDOWN = 271,
+     ICE_GRID_STRING = 272,
+     ICE_GRID_START = 273,
+     ICE_GRID_STOP = 274,
+     ICE_GRID_PATCH = 275,
+     ICE_GRID_SIGNAL = 276,
+     ICE_GRID_STDOUT = 277,
+     ICE_GRID_STDERR = 278,
+     ICE_GRID_DESCRIBE = 279,
+     ICE_GRID_PROPERTIES = 280,
+     ICE_GRID_PROPERTY = 281,
+     ICE_GRID_STATE = 282,
+     ICE_GRID_PID = 283,
+     ICE_GRID_ENDPOINTS = 284,
+     ICE_GRID_ACTIVATION = 285,
+     ICE_GRID_OBJECT = 286,
+     ICE_GRID_FIND = 287,
+     ICE_GRID_SHOW = 288,
+     ICE_GRID_COPYING = 289,
+     ICE_GRID_WARRANTY = 290,
+     ICE_GRID_DIFF = 291,
+     ICE_GRID_UPDATE = 292,
+     ICE_GRID_INSTANTIATE = 293,
+     ICE_GRID_TEMPLATE = 294,
+     ICE_GRID_SERVICE = 295,
+     ICE_GRID_ENABLE = 296,
+     ICE_GRID_DISABLE = 297
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
-int yyparse (void);
 
-#endif /* !YY_YY_GRAMMAR_TAB_H_INCLUDED  */
diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp
index f16a3b8ec0f..7370e6cc4ef 100644
--- a/cpp/src/IceStorm/Grammar.cpp
+++ b/cpp/src/IceStorm/Grammar.cpp
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -58,11 +60,15 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "../IceStorm/Grammar.y" /* yacc.c:339  */
+
+/* Line 189 of yacc.c  */
+#line 1 "Grammar.y"
 
 
 // **********************************************************************
@@ -103,15 +109,14 @@ yyerror(const char* s)
 }
 
 
-#line 107 "Grammar.tab.c" /* yacc.c:339  */
 
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
+/* Line 189 of yacc.c  */
+#line 115 "Grammar.tab.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -121,54 +126,48 @@ yyerror(const char* s)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "Grammar.tab.h".  */
-#ifndef YY_YY_GRAMMAR_TAB_H_INCLUDED
-# define YY_YY_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
-/* Token type.  */
+
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    ICE_STORM_HELP = 258,
-    ICE_STORM_EXIT = 259,
-    ICE_STORM_CURRENT = 260,
-    ICE_STORM_CREATE = 261,
-    ICE_STORM_DESTROY = 262,
-    ICE_STORM_LINK = 263,
-    ICE_STORM_UNLINK = 264,
-    ICE_STORM_LINKS = 265,
-    ICE_STORM_TOPICS = 266,
-    ICE_STORM_REPLICA = 267,
-    ICE_STORM_SUBSCRIBERS = 268,
-    ICE_STORM_STRING = 269
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_STORM_HELP = 258,
+     ICE_STORM_EXIT = 259,
+     ICE_STORM_CURRENT = 260,
+     ICE_STORM_CREATE = 261,
+     ICE_STORM_DESTROY = 262,
+     ICE_STORM_LINK = 263,
+     ICE_STORM_UNLINK = 264,
+     ICE_STORM_LINKS = 265,
+     ICE_STORM_TOPICS = 266,
+     ICE_STORM_REPLICA = 267,
+     ICE_STORM_SUBSCRIBERS = 268,
+     ICE_STORM_STRING = 269
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-
-int yyparse (void);
-
-#endif /* !YY_YY_GRAMMAR_TAB_H_INCLUDED  */
-
 /* Copy the second part of user declarations.  */
 
-#line 172 "Grammar.tab.c" /* yacc.c:358  */
+
+/* Line 264 of yacc.c  */
+#line 171 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -182,8 +181,11 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#else
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -203,7 +205,8 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -214,71 +217,42 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if 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
-# 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
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+#  define YY_(msgid) msgid
 # endif
 #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
 
-#if defined __GNUC__ && 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")
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
 #else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
 #endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+{
+  return yyi;
+}
 #endif
 
-
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -296,11 +270,11 @@ typedef short int yytype_int16;
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -308,8 +282,8 @@ typedef short int yytype_int16;
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* 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
@@ -323,23 +297,25 @@ typedef short int yytype_int16;
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
+#   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 */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -349,7 +325,7 @@ 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
@@ -367,46 +343,42 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* 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
 
 /* 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_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)
+# 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 (YYID (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  42
 /* YYLAST -- Last index in YYTABLE.  */
@@ -418,19 +390,17 @@ union yyalloc
 #define YYNNTS  6
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  31
-/* YYNSTATES -- Number of states.  */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  56
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   269
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -463,7 +433,31 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     5,     6,     9,    11,    14,    17,    21,
+      25,    29,    33,    37,    41,    45,    49,    53,    57,    60,
+      62,    65,    68,    69,    71,    73,    75,    77,    79,    81,
+      83,    85
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      17,     0,    -1,    18,    -1,    -1,    18,    19,    -1,    19,
+      -1,     3,    15,    -1,     4,    15,    -1,     6,    20,    15,
+      -1,     5,    20,    15,    -1,     7,    20,    15,    -1,     8,
+      20,    15,    -1,     9,    20,    15,    -1,    10,    20,    15,
+      -1,    11,    20,    15,    -1,    12,    20,    15,    -1,    13,
+      20,    15,    -1,    14,     1,    15,    -1,     1,    15,    -1,
+      15,    -1,    14,    20,    -1,    21,    20,    -1,    -1,     3,
+      -1,     4,    -1,     5,    -1,     6,    -1,     7,    -1,     8,
+      -1,     9,    -1,    10,    -1,    11,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
        0,    67,    67,    71,    78,    81,    89,    93,    97,   101,
@@ -473,7 +467,7 @@ static const yytype_uint8 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#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[] =
@@ -483,13 +477,13 @@ static const char *const yytname[] =
   "ICE_STORM_LINK", "ICE_STORM_UNLINK", "ICE_STORM_LINKS",
   "ICE_STORM_TOPICS", "ICE_STORM_REPLICA", "ICE_STORM_SUBSCRIBERS",
   "ICE_STORM_STRING", "';'", "$accept", "start", "commands", "command",
-  "strings", "keyword", YY_NULLPTR
+  "strings", "keyword", 0
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
+/* 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,
@@ -497,31 +491,27 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF -6
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-6)))
-
-#define YYTABLE_NINF -4
-
-#define yytable_value_is_error(Yytable_value) \
-  0
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    16,    17,    17,    18,    18,    19,    19,    19,    19,
+      19,    19,    19,    19,    19,    19,    19,    19,    19,    19,
+      20,    20,    20,    21,    21,    21,    21,    21,    21,    21,
+      21,    21
+};
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int8 yypact[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
 {
-       8,     9,    11,    15,    41,    41,    41,    41,    41,    41,
-      41,    41,    41,    52,    -6,    10,    28,    -6,    -6,    -6,
-      -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,
-      41,    39,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,
-      -6,    -6,    -6,    -6,    -6,    -6
+       0,     2,     1,     0,     2,     1,     2,     2,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     2,     1,
+       2,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       1,     1
 };
 
-  /* 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.  */
+/* 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,     0,     0,    22,    22,    22,    22,    22,    22,
@@ -532,21 +522,36 @@ static const yytype_uint8 yydefact[] =
       12,    13,    14,    15,    16,    17
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
-      -6,    -6,    -6,    40,    -5,    -6
+      -1,    15,    16,    17,    31,    32
 };
 
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -6
+static const yytype_int8 yypact[] =
 {
-      -1,    15,    16,    17,    31,    32
+       8,     9,    11,    15,    41,    41,    41,    41,    41,    41,
+      41,    41,    41,    52,    -6,    10,    28,    -6,    -6,    -6,
+      -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,
+      41,    39,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6,
+      -6,    -6,    -6,    -6,    -6,    -6
 };
 
-  /* 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.  */
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+      -6,    -6,    -6,    40,    -5,    -6
+};
+
+/* 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 -4
 static const yytype_int8 yytable[] =
 {
       33,    34,    35,    36,    37,    38,    39,    40,    -3,     1,
@@ -569,8 +574,8 @@ static const yytype_uint8 yycheck[] =
       15,    15,    15,    15,    15,    15
 };
 
-  /* 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,     3,     4,     5,     6,     7,     8,     9,    10,
@@ -581,59 +586,95 @@ static const yytype_uint8 yystos[] =
       15,    15,    15,    15,    15,    15
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    16,    17,    17,    18,    18,    19,    19,    19,    19,
-      19,    19,    19,    19,    19,    19,    19,    19,    19,    19,
-      20,    20,    20,    21,    21,    21,    21,    21,    21,    21,
-      21,    21
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     0,     2,     1,     2,     2,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     2,     1,
-       2,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     1
-};
+#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
 
-#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.  */
 
+#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#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 (0)
+      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
+
+
+/* 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.  */
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
+#ifndef YY_LOCATION_PRINT
+# if 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
 
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval)
+#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -643,46 +684,54 @@ while (0)
 #  define YYFPRINTF fprintf
 # endif
 
-# 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 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))
 
-# 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 on YYOUTPUT.  |
+`--------------------------------*/
 
-/*----------------------------------------.
-| Print this symbol's value 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;
+#endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
 # endif
-  YYUSE (yytype);
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -690,11 +739,22 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
+#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
 {
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", 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, ")");
@@ -705,8 +765,16 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -717,42 +785,49 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (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 (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
 {
-  unsigned long int 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++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -766,7 +841,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
+#ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -781,6 +856,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -789,8 +865,15 @@ 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++)
@@ -806,8 +889,16 @@ yystrlen (const char *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;
@@ -837,27 +928,27 @@ 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;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
     do_not_strip_quotes: ;
     }
 
@@ -868,178 +959,197 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* 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)
+/* 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)
 {
-  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))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
+  int yyn = yypact[yystate];
 
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      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))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+      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);
+      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;
     }
-
-  /* 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);
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
 
+/* 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 */
+
 
 
 
-/*----------.
-| yyparse.  |
-`----------*/
 
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
+
+#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
 {
 /* The lookahead symbol.  */
 int yychar;
 
-
 /* The semantic value of the lookahead symbol.  */
-/* Default value used for initialization, for pacifying older GCCs
-   or non-GCC compilers.  */
-YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
-YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
+YYSTYPE yylval;
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1049,10 +1159,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     int yyerrstatus;
 
     /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-       Refer to the stacks through separate pointers, to allow yyoverflow
+       Refer to the stacks thru separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1070,7 +1180,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1088,8 +1198,9 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1098,6 +1209,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   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;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1118,23 +1237,23 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
 #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
@@ -1142,22 +1261,22 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 # else
       /* 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_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	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);
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1166,10 +1285,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+		  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+	YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1189,7 +1308,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1198,7 +1317,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex (&yylval);
+      yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
@@ -1220,8 +1339,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1238,9 +1357,7 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1263,7 +1380,7 @@ yyreduce:
   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
@@ -1277,248 +1394,269 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 68 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 68 "Grammar.y"
     {
-}
-#line 1284 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 3:
-#line 71 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 71 "Grammar.y"
     {
-}
-#line 1291 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 4:
-#line 79 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 79 "Grammar.y"
     {
-}
-#line 1298 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 5:
-#line 82 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 82 "Grammar.y"
     {
-}
-#line 1305 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 6:
-#line 90 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 90 "Grammar.y"
     {
     parser->usage();
-}
-#line 1313 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 7:
-#line 94 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 94 "Grammar.y"
     {
     return 0;
-}
-#line 1321 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 8:
-#line 98 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 98 "Grammar.y"
     {
-    parser->create((yyvsp[-1]));
-}
-#line 1329 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->create((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 9:
-#line 102 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 102 "Grammar.y"
     {
-    parser->current((yyvsp[-1]));
-}
-#line 1337 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->current((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 10:
-#line 106 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 106 "Grammar.y"
     {
-    parser->destroy((yyvsp[-1]));
-}
-#line 1345 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->destroy((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 11:
-#line 110 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 110 "Grammar.y"
     {
-    parser->link((yyvsp[-1]));
-}
-#line 1353 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->link((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 12:
-#line 114 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 114 "Grammar.y"
     {
-    parser->unlink((yyvsp[-1]));
-}
-#line 1361 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->unlink((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 13:
-#line 118 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 118 "Grammar.y"
     {
-    parser->links((yyvsp[-1]));
-}
-#line 1369 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->links((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 14:
-#line 122 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 122 "Grammar.y"
     {
-    parser->topics((yyvsp[-1]));
-}
-#line 1377 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->topics((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 15:
-#line 126 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 126 "Grammar.y"
     {
-    parser->replica((yyvsp[-1]));
-}
-#line 1385 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->replica((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 16:
-#line 130 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 130 "Grammar.y"
     {
-    parser->subscribers((yyvsp[-1]));
-}
-#line 1393 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->subscribers((yyvsp[(2) - (3)]));
+;}
     break;
 
   case 17:
-#line 134 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 134 "Grammar.y"
     {
-    parser->invalidCommand("unknown command `" + (yyvsp[-2]).front() + "' (type `help' for more info)");
-}
-#line 1401 "Grammar.tab.c" /* yacc.c:1646  */
+    parser->invalidCommand("unknown command `" + (yyvsp[(1) - (3)]).front() + "' (type `help' for more info)");
+;}
     break;
 
   case 18:
-#line 138 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 138 "Grammar.y"
     {
     yyerrok;
-}
-#line 1409 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 19:
-#line 142 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 142 "Grammar.y"
     {
-}
-#line 1416 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 20:
-#line 150 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 150 "Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-    (yyval).push_front((yyvsp[-1]).front());
-}
-#line 1425 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+    (yyval).push_front((yyvsp[(1) - (2)]).front());
+;}
     break;
 
   case 21:
-#line 155 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 155 "Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-    (yyval).push_front((yyvsp[-1]).front());
-}
-#line 1434 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+    (yyval).push_front((yyvsp[(1) - (2)]).front());
+;}
     break;
 
   case 22:
-#line 160 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 160 "Grammar.y"
     {
     (yyval) = YYSTYPE();
-}
-#line 1442 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 23:
-#line 169 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 169 "Grammar.y"
     {
-}
-#line 1449 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 24:
-#line 172 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 172 "Grammar.y"
     {
-}
-#line 1456 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 25:
-#line 175 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 175 "Grammar.y"
     {
-}
-#line 1463 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 26:
-#line 178 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 178 "Grammar.y"
     {
-}
-#line 1470 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 27:
-#line 181 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 181 "Grammar.y"
     {
-}
-#line 1477 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 28:
-#line 184 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 184 "Grammar.y"
     {
-}
-#line 1484 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 29:
-#line 187 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 187 "Grammar.y"
     {
-}
-#line 1491 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 30:
-#line 190 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 190 "Grammar.y"
     {
-}
-#line 1498 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 31:
-#line 193 "../IceStorm/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 193 "Grammar.y"
     {
-}
-#line 1505 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
 
-#line 1509 "Grammar.tab.c" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1658 "Grammar.tab.c"
       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);
@@ -1527,7 +1665,7 @@ 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.  */
 
@@ -1542,14 +1680,10 @@ yyreduce:
   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)
     {
@@ -1557,36 +1691,37 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        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;
+	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;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1595,20 +1730,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
+	 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 lookahead token after shifting the error
@@ -1627,7 +1762,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule whose action triggered
+  /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -1640,37 +1775,35 @@ 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 (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
+      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;
+	YYABORT;
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+		  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -1694,7 +1827,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1706,21 +1839,16 @@ yyexhaustedlab:
 
 yyreturn:
   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
+     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);
+		  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1731,7 +1859,13 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
-#line 196 "../IceStorm/Grammar.y" /* yacc.c:1906  */
+
+
+
+/* Line 1675 of yacc.c  */
+#line 196 "Grammar.y"
+
 
diff --git a/cpp/src/IceStorm/Grammar.h b/cpp/src/IceStorm/Grammar.h
index 24a0b71b80a..facdbd92762 100644
--- a/cpp/src/IceStorm/Grammar.h
+++ b/cpp/src/IceStorm/Grammar.h
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,49 +28,41 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_GRAMMAR_TAB_H_INCLUDED
-# define YY_YY_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
 
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    ICE_STORM_HELP = 258,
-    ICE_STORM_EXIT = 259,
-    ICE_STORM_CURRENT = 260,
-    ICE_STORM_CREATE = 261,
-    ICE_STORM_DESTROY = 262,
-    ICE_STORM_LINK = 263,
-    ICE_STORM_UNLINK = 264,
-    ICE_STORM_LINKS = 265,
-    ICE_STORM_TOPICS = 266,
-    ICE_STORM_REPLICA = 267,
-    ICE_STORM_SUBSCRIBERS = 268,
-    ICE_STORM_STRING = 269
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_STORM_HELP = 258,
+     ICE_STORM_EXIT = 259,
+     ICE_STORM_CURRENT = 260,
+     ICE_STORM_CREATE = 261,
+     ICE_STORM_DESTROY = 262,
+     ICE_STORM_LINK = 263,
+     ICE_STORM_UNLINK = 264,
+     ICE_STORM_LINKS = 265,
+     ICE_STORM_TOPICS = 266,
+     ICE_STORM_REPLICA = 267,
+     ICE_STORM_SUBSCRIBERS = 268,
+     ICE_STORM_STRING = 269
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
-int yyparse (void);
 
-#endif /* !YY_YY_GRAMMAR_TAB_H_INCLUDED  */
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index c2b6c414955..54bba9d542d 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -58,17 +60,23 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
 #define yyparse         slice_parse
 #define yylex           slice_lex
 #define yyerror         slice_error
+#define yylval          slice_lval
+#define yychar          slice_char
 #define yydebug         slice_debug
 #define yynerrs         slice_nerrs
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "../Slice/Grammar.y" /* yacc.c:339  */
+
+/* Line 189 of yacc.c  */
+#line 1 "../Slice/Grammar.y"
 
 
 // **********************************************************************
@@ -120,15 +128,14 @@ slice_error(const char* s)
 }
 
 
-#line 124 "Grammar.tab.c" /* yacc.c:339  */
 
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
+/* Line 189 of yacc.c  */
+#line 134 "Grammar.tab.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -138,84 +145,78 @@ slice_error(const char* s)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "Grammar.tab.h".  */
-#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED
-# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int slice_debug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
 
-/* Token type.  */
+
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    ICE_MODULE = 258,
-    ICE_CLASS = 259,
-    ICE_INTERFACE = 260,
-    ICE_EXCEPTION = 261,
-    ICE_STRUCT = 262,
-    ICE_SEQUENCE = 263,
-    ICE_DICTIONARY = 264,
-    ICE_ENUM = 265,
-    ICE_OUT = 266,
-    ICE_EXTENDS = 267,
-    ICE_IMPLEMENTS = 268,
-    ICE_THROWS = 269,
-    ICE_VOID = 270,
-    ICE_BYTE = 271,
-    ICE_BOOL = 272,
-    ICE_SHORT = 273,
-    ICE_INT = 274,
-    ICE_LONG = 275,
-    ICE_FLOAT = 276,
-    ICE_DOUBLE = 277,
-    ICE_STRING = 278,
-    ICE_OBJECT = 279,
-    ICE_LOCAL_OBJECT = 280,
-    ICE_LOCAL = 281,
-    ICE_CONST = 282,
-    ICE_FALSE = 283,
-    ICE_TRUE = 284,
-    ICE_IDEMPOTENT = 285,
-    ICE_OPTIONAL = 286,
-    ICE_SCOPE_DELIMITER = 287,
-    ICE_IDENTIFIER = 288,
-    ICE_STRING_LITERAL = 289,
-    ICE_INTEGER_LITERAL = 290,
-    ICE_FLOATING_POINT_LITERAL = 291,
-    ICE_IDENT_OP = 292,
-    ICE_KEYWORD_OP = 293,
-    ICE_OPTIONAL_OP = 294,
-    ICE_METADATA_OPEN = 295,
-    ICE_METADATA_CLOSE = 296,
-    ICE_GLOBAL_METADATA_OPEN = 297,
-    ICE_GLOBAL_METADATA_CLOSE = 298,
-    BAD_CHAR = 299
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_MODULE = 258,
+     ICE_CLASS = 259,
+     ICE_INTERFACE = 260,
+     ICE_EXCEPTION = 261,
+     ICE_STRUCT = 262,
+     ICE_SEQUENCE = 263,
+     ICE_DICTIONARY = 264,
+     ICE_ENUM = 265,
+     ICE_OUT = 266,
+     ICE_EXTENDS = 267,
+     ICE_IMPLEMENTS = 268,
+     ICE_THROWS = 269,
+     ICE_VOID = 270,
+     ICE_BYTE = 271,
+     ICE_BOOL = 272,
+     ICE_SHORT = 273,
+     ICE_INT = 274,
+     ICE_LONG = 275,
+     ICE_FLOAT = 276,
+     ICE_DOUBLE = 277,
+     ICE_STRING = 278,
+     ICE_OBJECT = 279,
+     ICE_LOCAL_OBJECT = 280,
+     ICE_LOCAL = 281,
+     ICE_CONST = 282,
+     ICE_FALSE = 283,
+     ICE_TRUE = 284,
+     ICE_IDEMPOTENT = 285,
+     ICE_OPTIONAL = 286,
+     ICE_SCOPE_DELIMITER = 287,
+     ICE_IDENTIFIER = 288,
+     ICE_STRING_LITERAL = 289,
+     ICE_INTEGER_LITERAL = 290,
+     ICE_FLOATING_POINT_LITERAL = 291,
+     ICE_IDENT_OP = 292,
+     ICE_KEYWORD_OP = 293,
+     ICE_OPTIONAL_OP = 294,
+     ICE_METADATA_OPEN = 295,
+     ICE_METADATA_CLOSE = 296,
+     ICE_GLOBAL_METADATA_OPEN = 297,
+     ICE_GLOBAL_METADATA_CLOSE = 298,
+     BAD_CHAR = 299
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-
-int slice_parse (void);
-
-#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED  */
-
 /* Copy the second part of user declarations.  */
 
-#line 219 "Grammar.tab.c" /* yacc.c:358  */
+
+/* Line 264 of yacc.c  */
+#line 220 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -229,8 +230,11 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#else
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -250,7 +254,8 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -261,71 +266,42 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if 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
-# 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
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+#  define YY_(msgid) msgid
 # endif
 #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
 
-#if defined __GNUC__ && 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")
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
 #else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
 #endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+{
+  return yyi;
+}
 #endif
 
-
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -343,11 +319,11 @@ typedef short int yytype_int16;
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -355,8 +331,8 @@ typedef short int yytype_int16;
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* 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
@@ -370,23 +346,25 @@ typedef short int yytype_int16;
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
+#   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 */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -396,7 +374,7 @@ 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
@@ -414,46 +392,42 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* 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
 
 /* 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_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)
+# 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 (YYID (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  13
 /* YYLAST -- Last index in YYTABLE.  */
@@ -465,19 +439,17 @@ union yyalloc
 #define YYNNTS  72
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  202
-/* YYNSTATES -- Number of states.  */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  301
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   299
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -513,7 +485,98 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     9,    13,    14,    15,    19,    20,
+      26,    27,    32,    35,    36,    38,    40,    42,    44,    46,
+      48,    50,    52,    54,    56,    58,    60,    62,    63,    70,
+      73,    76,    79,    80,    88,    91,    92,    97,   101,   104,
+     105,   108,   112,   116,   119,   121,   124,   126,   128,   131,
+     134,   137,   138,   145,   150,   154,   157,   158,   160,   163,
+     166,   171,   176,   178,   181,   182,   191,   194,   195,   198,
+     199,   204,   208,   211,   212,   214,   218,   221,   223,   225,
+     229,   232,   237,   240,   242,   245,   247,   249,   252,   256,
+     259,   263,   264,   270,   271,   277,   279,   281,   284,   287,
+     290,   291,   299,   303,   305,   307,   310,   311,   316,   320,
+     323,   324,   326,   330,   332,   334,   336,   344,   352,   363,
+     374,   377,   380,   381,   388,   394,   398,   400,   402,   406,
+     408,   409,   411,   413,   415,   416,   417,   421,   427,   432,
+     439,   443,   449,   452,   453,   455,   458,   462,   464,   466,
+     468,   470,   472,   474,   476,   478,   480,   483,   485,   487,
+     490,   493,   495,   499,   501,   503,   504,   506,   508,   510,
+     512,   514,   516,   523,   529,   531,   533,   535,   537,   539,
+     541,   543,   545,   547,   549,   551,   553,   555,   557,   559,
+     561,   563,   565,   567,   569,   571,   573,   575,   577,   579,
+     581,   583,   585
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      55,     0,    -1,    58,    -1,    42,   121,    43,    -1,    40,
+     121,    41,    -1,    -1,    -1,    56,    59,    58,    -1,    -1,
+      57,    62,    60,    45,    58,    -1,    -1,     1,    45,    61,
+      58,    -1,    57,    62,    -1,    -1,    63,    -1,    83,    -1,
+      84,    -1,    98,    -1,    99,    -1,    66,    -1,    67,    -1,
+      76,    -1,    77,    -1,   107,    -1,   108,    -1,   110,    -1,
+     124,    -1,    -1,     3,    33,    64,    46,    58,    47,    -1,
+       6,    33,    -1,     6,   125,    -1,   122,    65,    -1,    -1,
+     122,    65,    69,    68,    46,    70,    47,    -1,    12,   118,
+      -1,    -1,    57,    74,    45,    70,    -1,     1,    45,    70,
+      -1,    57,    74,    -1,    -1,   119,    33,    -1,    39,    35,
+      48,    -1,    39,   118,    48,    -1,    39,    48,    -1,    31,
+      -1,    72,    71,    -1,    71,    -1,    89,    -1,     7,    33,
+      -1,     7,   125,    -1,   122,    75,    -1,    -1,   122,    75,
+      78,    46,    79,    47,    -1,    57,    80,    45,    79,    -1,
+       1,    45,    79,    -1,    57,    80,    -1,    -1,    90,    -1,
+       4,    33,    -1,     4,   125,    -1,     4,    37,    35,    48,
+      -1,     4,    37,   118,    48,    -1,    81,    -1,   122,    81,
+      -1,    -1,   122,    82,    86,    87,    85,    46,    88,    47,
+      -1,    12,   118,    -1,    -1,    13,   101,    -1,    -1,    57,
+      96,    45,    88,    -1,     1,    45,    88,    -1,    57,    96,
+      -1,    -1,    73,    -1,    73,    49,   123,    -1,   119,   125,
+      -1,   119,    -1,    71,    -1,    71,    49,   123,    -1,    72,
+      71,    -1,    72,    71,    49,   123,    -1,   119,   125,    -1,
+     119,    -1,    72,   119,    -1,   119,    -1,    15,    -1,    91,
+      37,    -1,    30,    91,    37,    -1,    91,    38,    -1,    30,
+      91,    38,    -1,    -1,    92,   116,    48,    94,   117,    -1,
+      -1,    92,     1,    48,    95,   117,    -1,    89,    -1,    93,
+      -1,     5,    33,    -1,     5,   125,    -1,   122,    97,    -1,
+      -1,   122,    97,   102,   100,    46,   103,    47,    -1,   118,
+      50,   101,    -1,   118,    -1,    24,    -1,    12,   101,    -1,
+      -1,    57,   104,    45,   103,    -1,     1,    45,   103,    -1,
+      57,   104,    -1,    -1,    93,    -1,   106,    50,   105,    -1,
+     106,    -1,   118,    -1,   125,    -1,   122,     8,    51,    57,
+     119,    52,    33,    -1,   122,     8,    51,    57,   119,    52,
+     125,    -1,   122,     9,    51,    57,   119,    50,    57,   119,
+      52,    33,    -1,   122,     9,    51,    57,   119,    50,    57,
+     119,    52,   125,    -1,    10,    33,    -1,    10,   125,    -1,
+      -1,   122,   109,   111,    46,   112,    47,    -1,   122,    10,
+      46,   112,    47,    -1,   113,    50,   112,    -1,   113,    -1,
+      33,    -1,    33,    49,   114,    -1,   125,    -1,    -1,    35,
+      -1,   118,    -1,    11,    -1,    -1,    -1,   115,    57,    73,
+      -1,   116,    50,   115,    57,    73,    -1,   115,    57,   119,
+     125,    -1,   116,    50,   115,    57,   119,   125,    -1,   115,
+      57,   119,    -1,   116,    50,   115,    57,   119,    -1,    14,
+     105,    -1,    -1,    33,    -1,    32,    33,    -1,   118,    32,
+      33,    -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,
+      20,    -1,    21,    -1,    22,    -1,    23,    -1,    24,    -1,
+      24,    53,    -1,    25,    -1,   118,    -1,   118,    53,    -1,
+      34,   120,    -1,    34,    -1,   121,    50,   120,    -1,   120,
+      -1,    26,    -1,    -1,    35,    -1,    36,    -1,   118,    -1,
+      34,    -1,    28,    -1,    29,    -1,    27,    57,   119,    33,
+      49,   123,    -1,    27,    57,   119,    49,   123,    -1,     3,
+      -1,     4,    -1,     5,    -1,     6,    -1,     7,    -1,     8,
+      -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
+      -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,
+      -1,    19,    -1,    20,    -1,    21,    -1,    22,    -1,    23,
+      -1,    24,    -1,    25,    -1,    26,    -1,    27,    -1,    28,
+      -1,    29,    -1,    30,    -1,    31,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   114,   114,   122,   131,   136,   145,   144,   154,   153,
@@ -540,7 +603,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#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[] =
@@ -572,13 +635,13 @@ static const char *const yytname[] =
   "dictionary_def", "enum_id", "enum_def", "@11", "enumerator_list",
   "enumerator", "enumerator_initializer", "out_qualifier", "parameters",
   "throws", "scoped_name", "type", "string_literal", "string_list",
-  "local_qualifier", "const_initializer", "const_def", "keyword", YY_NULLPTR
+  "local_qualifier", "const_initializer", "const_def", "keyword", 0
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
+/* 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,
@@ -590,56 +653,61 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF -227
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-227)))
-
-#define YYTABLE_NINF -136
-
-#define yytable_value_is_error(Yytable_value) \
-  0
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    54,    55,    56,    57,    57,    59,    58,    60,    58,
+      61,    58,    58,    58,    62,    62,    62,    62,    62,    62,
+      62,    62,    62,    62,    62,    62,    62,    64,    63,    65,
+      65,    66,    68,    67,    69,    69,    70,    70,    70,    70,
+      71,    72,    72,    72,    72,    73,    73,    74,    75,    75,
+      76,    78,    77,    79,    79,    79,    79,    80,    81,    81,
+      82,    82,    82,    83,    85,    84,    86,    86,    87,    87,
+      88,    88,    88,    88,    89,    89,    89,    89,    90,    90,
+      90,    90,    90,    90,    91,    91,    91,    92,    92,    92,
+      92,    94,    93,    95,    93,    96,    96,    97,    97,    98,
+     100,    99,   101,   101,   101,   102,   102,   103,   103,   103,
+     103,   104,   105,   105,   106,   106,   107,   107,   108,   108,
+     109,   109,   111,   110,   110,   112,   112,   113,   113,   113,
+     113,   114,   114,   115,   115,   116,   116,   116,   116,   116,
+     116,   116,   117,   117,   118,   118,   118,   119,   119,   119,
+     119,   119,   119,   119,   119,   119,   119,   119,   119,   119,
+     120,   120,   121,   121,   122,   122,   123,   123,   123,   123,
+     123,   123,   124,   124,   125,   125,   125,   125,   125,   125,
+     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
+     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
+     125,   125,   125
+};
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
 {
-     126,   -16,     4,     4,    65,  -227,    21,  -227,  -227,     4,
-    -227,   -10,   -11,  -227,    73,    38,  -227,    46,    58,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,   291,  -227,    73,  -227,  -227,     4,  -227,  -227,  -227,
-     853,    61,   559,   625,   656,   687,    59,    63,   479,     6,
-      77,     9,    99,    11,  -227,  -227,  -227,    82,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,    84,  -227,   106,  -227,
-       5,    26,    73,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,    29,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,    46,    46,  -227,   718,  -227,     1,  -227,    94,     1,
-     129,     3,  -227,   100,   434,  -227,  -227,   112,  -227,    98,
-     158,  -227,   101,    37,   853,   853,   105,   103,   110,  -227,
-     116,   109,   356,   116,     3,  -227,  -227,  -227,    -6,   115,
-     718,   117,  -227,   158,  -227,  -227,  -227,  -227,  -227,   116,
-    -227,  -227,  -227,   104,   119,    86,  -227,   718,   389,   120,
-     829,   123,  -227,   121,     3,   290,   125,  -227,  -227,   749,
-      46,  -227,  -227,   116,  -227,   130,   829,   132,   356,  -227,
-      69,   113,   853,   131,  -227,   780,  -227,   323,  -227,   136,
-     432,   135,  -227,  -227,  -227,   853,   389,  -227,   853,   128,
-     138,  -227,   780,  -227,  -227,   140,  -227,    57,   158,   146,
-     151,   356,  -227,  -227,   152,   432,   153,   290,  -227,   219,
-     853,    54,   254,  -227,   154,  -227,  -227,   149,  -227,  -227,
-     158,   389,  -227,  -227,  -227,  -227,   158,  -227,   323,   853,
-    -227,  -227,   160,   523,  -227,  -227,    60,  -227,  -227,  -227,
-     159,  -227,    46,    74,   290,   811,  -227,  -227,  -227,  -227,
-     151,   323,  -227,  -227,  -227,   829,  -227,   195,  -227,  -227,
-    -227,  -227,   194,  -227,   780,   194,    46,   594,  -227,  -227,
-    -227,   829,  -227,   161,   116,  -227,  -227,   780,   594,  -227,
-    -227
+       0,     2,     1,     3,     3,     0,     0,     3,     0,     5,
+       0,     4,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     6,     2,
+       2,     2,     0,     7,     2,     0,     4,     3,     2,     0,
+       2,     3,     3,     2,     1,     2,     1,     1,     2,     2,
+       2,     0,     6,     4,     3,     2,     0,     1,     2,     2,
+       4,     4,     1,     2,     0,     8,     2,     0,     2,     0,
+       4,     3,     2,     0,     1,     3,     2,     1,     1,     3,
+       2,     4,     2,     1,     2,     1,     1,     2,     3,     2,
+       3,     0,     5,     0,     5,     1,     1,     2,     2,     2,
+       0,     7,     3,     1,     1,     2,     0,     4,     3,     2,
+       0,     1,     3,     1,     1,     1,     7,     7,    10,    10,
+       2,     2,     0,     6,     5,     3,     1,     1,     3,     1,
+       0,     1,     1,     1,     0,     0,     3,     5,     4,     6,
+       3,     5,     2,     0,     1,     2,     3,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     1,     1,     2,
+       2,     1,     3,     1,     1,     0,     1,     1,     1,     1,
+       1,     1,     6,     5,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1
 };
 
-  /* 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.  */
+/* 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,     0,     0,     0,     6,   165,     2,    10,   161,
@@ -675,20 +743,7 @@ static const yytype_uint8 yydefact[] =
      112
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-    -227,  -227,  -227,   -17,   -12,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -191,  -162,  -159,  -182,
-    -227,  -227,  -227,  -227,  -227,  -168,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -226,   -13,  -227,   -20,  -227,    -9,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -119,  -227,  -215,
-    -227,   -85,  -227,  -227,  -227,  -227,  -227,  -227,   -83,  -227,
-    -227,   -63,  -227,   -68,  -102,   -27,     7,   215,  -227,  -150,
-    -227,   -38
-};
-
-  /* YYDEFGOTO[NTERM-NUM].  */
+/* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     4,     5,     6,     7,    14,    41,    33,    18,    19,
@@ -701,9 +756,62 @@ static const yytype_int16 yydefgoto[] =
       32,   139
 };
 
-  /* 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.  */
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -227
+static const yytype_int16 yypact[] =
+{
+     126,   -16,     4,     4,    65,  -227,    21,  -227,  -227,     4,
+    -227,   -10,   -11,  -227,    73,    38,  -227,    46,    58,  -227,
+    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
+    -227,   291,  -227,    73,  -227,  -227,     4,  -227,  -227,  -227,
+     853,    61,   559,   625,   656,   687,    59,    63,   479,     6,
+      77,     9,    99,    11,  -227,  -227,  -227,    82,  -227,  -227,
+    -227,  -227,  -227,  -227,  -227,  -227,    84,  -227,   106,  -227,
+       5,    26,    73,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
+    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
+    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
+    -227,  -227,  -227,    29,  -227,  -227,  -227,  -227,  -227,  -227,
+    -227,    46,    46,  -227,   718,  -227,     1,  -227,    94,     1,
+     129,     3,  -227,   100,   434,  -227,  -227,   112,  -227,    98,
+     158,  -227,   101,    37,   853,   853,   105,   103,   110,  -227,
+     116,   109,   356,   116,     3,  -227,  -227,  -227,    -6,   115,
+     718,   117,  -227,   158,  -227,  -227,  -227,  -227,  -227,   116,
+    -227,  -227,  -227,   104,   119,    86,  -227,   718,   389,   120,
+     829,   123,  -227,   121,     3,   290,   125,  -227,  -227,   749,
+      46,  -227,  -227,   116,  -227,   130,   829,   132,   356,  -227,
+      69,   113,   853,   131,  -227,   780,  -227,   323,  -227,   136,
+     432,   135,  -227,  -227,  -227,   853,   389,  -227,   853,   128,
+     138,  -227,   780,  -227,  -227,   140,  -227,    57,   158,   146,
+     151,   356,  -227,  -227,   152,   432,   153,   290,  -227,   219,
+     853,    54,   254,  -227,   154,  -227,  -227,   149,  -227,  -227,
+     158,   389,  -227,  -227,  -227,  -227,   158,  -227,   323,   853,
+    -227,  -227,   160,   523,  -227,  -227,    60,  -227,  -227,  -227,
+     159,  -227,    46,    74,   290,   811,  -227,  -227,  -227,  -227,
+     151,   323,  -227,  -227,  -227,   829,  -227,   195,  -227,  -227,
+    -227,  -227,   194,  -227,   780,   194,    46,   594,  -227,  -227,
+    -227,   829,  -227,   161,   116,  -227,  -227,   780,   594,  -227,
+    -227
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -227,  -227,  -227,   -17,   -12,  -227,  -227,  -227,  -227,  -227,
+    -227,  -227,  -227,  -227,  -227,  -227,  -191,  -162,  -159,  -182,
+    -227,  -227,  -227,  -227,  -227,  -168,  -227,  -227,  -227,  -227,
+    -227,  -227,  -227,  -227,  -226,   -13,  -227,   -20,  -227,    -9,
+    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -119,  -227,  -215,
+    -227,   -85,  -227,  -227,  -227,  -227,  -227,  -227,   -83,  -227,
+    -227,   -63,  -227,   -68,  -102,   -27,     7,   215,  -227,  -150,
+    -227,   -38
+};
+
+/* 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 -136
 static const yytype_int16 yytable[] =
 {
       40,   133,    38,   178,   104,   106,   108,   110,   191,   -63,
@@ -890,8 +998,8 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    -1,    -1,    32,    33
 };
 
-  /* 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,    40,    42,    55,    56,    57,    58,    45,    34,
@@ -927,93 +1035,95 @@ static const yytype_uint8 yystos[] =
      105
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    54,    55,    56,    57,    57,    59,    58,    60,    58,
-      61,    58,    58,    58,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    64,    63,    65,
-      65,    66,    68,    67,    69,    69,    70,    70,    70,    70,
-      71,    72,    72,    72,    72,    73,    73,    74,    75,    75,
-      76,    78,    77,    79,    79,    79,    79,    80,    81,    81,
-      82,    82,    82,    83,    85,    84,    86,    86,    87,    87,
-      88,    88,    88,    88,    89,    89,    89,    89,    90,    90,
-      90,    90,    90,    90,    91,    91,    91,    92,    92,    92,
-      92,    94,    93,    95,    93,    96,    96,    97,    97,    98,
-     100,    99,   101,   101,   101,   102,   102,   103,   103,   103,
-     103,   104,   105,   105,   106,   106,   107,   107,   108,   108,
-     109,   109,   111,   110,   110,   112,   112,   113,   113,   113,
-     113,   114,   114,   115,   115,   116,   116,   116,   116,   116,
-     116,   116,   117,   117,   118,   118,   118,   119,   119,   119,
-     119,   119,   119,   119,   119,   119,   119,   119,   119,   119,
-     120,   120,   121,   121,   122,   122,   123,   123,   123,   123,
-     123,   123,   124,   124,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-     125,   125,   125
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     3,     3,     0,     0,     3,     0,     5,
-       0,     4,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     6,     2,
-       2,     2,     0,     7,     2,     0,     4,     3,     2,     0,
-       2,     3,     3,     2,     1,     2,     1,     1,     2,     2,
-       2,     0,     6,     4,     3,     2,     0,     1,     2,     2,
-       4,     4,     1,     2,     0,     8,     2,     0,     2,     0,
-       4,     3,     2,     0,     1,     3,     2,     1,     1,     3,
-       2,     4,     2,     1,     2,     1,     1,     2,     3,     2,
-       3,     0,     5,     0,     5,     1,     1,     2,     2,     2,
-       0,     7,     3,     1,     1,     2,     0,     4,     3,     2,
-       0,     1,     3,     1,     1,     1,     7,     7,    10,    10,
-       2,     2,     0,     6,     5,     3,     1,     1,     3,     1,
-       0,     1,     1,     1,     0,     0,     3,     5,     4,     6,
-       3,     5,     2,     0,     1,     2,     3,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     1,     1,     2,
-       2,     1,     3,     1,     1,     0,     1,     1,     1,     1,
-       1,     1,     6,     5,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1
-};
+#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
 
-#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.  */
 
+#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#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 (0)
+      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
+
+
+/* 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 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
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
 
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval)
+#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -1023,46 +1133,54 @@ while (0)
 #  define YYFPRINTF fprintf
 # endif
 
-# 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 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 (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's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*--------------------------------.
+| 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;
+#endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
 # endif
-  YYUSE (yytype);
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -1070,11 +1188,22 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
+#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
 {
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", 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, ")");
@@ -1085,8 +1214,16 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -1097,42 +1234,49 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (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 (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
 {
-  unsigned long int 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++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1146,7 +1290,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
+#ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1161,6 +1305,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1169,8 +1314,15 @@ 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++)
@@ -1186,8 +1338,16 @@ yystrlen (const char *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;
@@ -1217,27 +1377,27 @@ 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;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
     do_not_strip_quotes: ;
     }
 
@@ -1248,178 +1408,197 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* 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)
+/* 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)
 {
-  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))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      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))
-      return 2;
-    yysize = yysize1;
-  }
+  int yyn = yypact[yystate];
 
-  if (*yymsg_alloc < yysize)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+      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);
+      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;
     }
-
-  /* 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);
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
 
+/* 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 */
+
+
 
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
+#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
 {
 /* The lookahead symbol.  */
 int yychar;
 
-
 /* The semantic value of the lookahead symbol.  */
-/* Default value used for initialization, for pacifying older GCCs
-   or non-GCC compilers.  */
-YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
-YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
+YYSTYPE yylval;
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1429,10 +1608,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     int yyerrstatus;
 
     /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-       Refer to the stacks through separate pointers, to allow yyoverflow
+       Refer to the stacks thru separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1450,7 +1629,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1468,8 +1647,9 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1478,6 +1658,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   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;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1498,23 +1686,23 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
 #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
@@ -1522,22 +1710,22 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 # else
       /* 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_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	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);
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1546,10 +1734,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+		  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+	YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1569,7 +1757,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1578,7 +1766,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex (&yylval);
+      yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
@@ -1600,8 +1788,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1618,9 +1806,7 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1643,7 +1829,7 @@ yyreduce:
   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
@@ -1657,193 +1843,217 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 115 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 115 "../Slice/Grammar.y"
     {
-}
-#line 1664 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 3:
-#line 123 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 123 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[-1]);
-}
-#line 1672 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (3)]);
+;}
     break;
 
   case 4:
-#line 132 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 132 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[-1]);
-}
-#line 1680 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (3)]);
+;}
     break;
 
   case 5:
-#line 136 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 136 "../Slice/Grammar.y"
     {
     (yyval) = new StringListTok;
-}
-#line 1688 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 6:
-#line 145 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 145 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     if(!metaData->v.empty())
     {
         unit->addGlobalMetaData(metaData->v);
     }
-}
-#line 1700 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 8:
-#line 154 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 154 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (2)]));
     if(contained && !metaData->v.empty())
     {
 	contained->setMetaData(metaData->v);
     }
-}
-#line 1713 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 10:
-#line 164 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 164 "../Slice/Grammar.y"
     {
     yyerrok;
-}
-#line 1721 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 12:
-#line 169 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 169 "../Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
-}
-#line 1729 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 13:
-#line 173 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 173 "../Slice/Grammar.y"
     {
-}
-#line 1736 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 14:
-#line 181 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 181 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ModulePtr::dynamicCast((yyvsp[0])));
-}
-#line 1744 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 15:
-#line 185 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 185 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0])));
-}
-#line 1752 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 16:
-#line 189 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 189 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0])));
-}
-#line 1760 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 17:
-#line 193 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 193 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0])));
-}
-#line 1768 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 18:
-#line 197 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 197 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0])));
-}
-#line 1776 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 19:
-#line 201 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 201 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0);
-}
-#line 1784 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0);
+;}
     break;
 
   case 20:
-#line 205 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 205 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ExceptionPtr::dynamicCast((yyvsp[0])));
-}
-#line 1792 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 21:
-#line 209 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 209 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0);
-}
-#line 1800 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0);
+;}
     break;
 
   case 22:
-#line 213 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 213 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || StructPtr::dynamicCast((yyvsp[0])));
-}
-#line 1808 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 23:
-#line 217 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 217 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || SequencePtr::dynamicCast((yyvsp[0])));
-}
-#line 1816 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 24:
-#line 221 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 221 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || DictionaryPtr::dynamicCast((yyvsp[0])));
-}
-#line 1824 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 25:
-#line 225 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 225 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || EnumPtr::dynamicCast((yyvsp[0])));
-}
-#line 1832 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 26:
-#line 229 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 229 "../Slice/Grammar.y"
     {
-    assert((yyvsp[0]) == 0 || ConstPtr::dynamicCast((yyvsp[0])));
-}
-#line 1840 "Grammar.tab.c" /* yacc.c:1646  */
+    assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)])));
+;}
     break;
 
   case 27:
-#line 238 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 238 "../Slice/Grammar.y"
     {
     unit->setSeenDefinition();
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     ModulePtr module = cont->createModule(ident->v);
     if(module)
@@ -1856,59 +2066,64 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 1861 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 28:
-#line 255 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 255 "../Slice/Grammar.y"
     {
-    if((yyvsp[-3]))
+    if((yyvsp[(3) - (6)]))
     {
 	unit->popContainer();
-	(yyval) = (yyvsp[-3]);
+	(yyval) = (yyvsp[(3) - (6)]);
     }
     else
     {
         (yyval) = 0;
     }
-}
-#line 1877 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 29:
-#line 272 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 272 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 1885 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 30:
-#line 276 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 276 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
-    (yyval) = (yyvsp[0]); // Dummy
-}
-#line 1895 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]); // Dummy
+;}
     break;
 
   case 31:
-#line 287 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 287 "../Slice/Grammar.y"
     {
     unit->error("exceptions cannot be forward declared");
     (yyval) = 0;
-}
-#line 1904 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 32:
-#line 297 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 297 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1]));
-    ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[(3) - (3)]));
     ContainerPtr cont = unit->currentContainer();
     ExceptionPtr ex = cont->createException(ident->v, base, local->v);
     if(ex)
@@ -1917,93 +2132,102 @@ yyreduce:
 	unit->pushContainer(ex);
     }
     (yyval) = ex;
-}
-#line 1922 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 33:
-#line 311 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 311 "../Slice/Grammar.y"
     {
-    if((yyvsp[-3]))
+    if((yyvsp[(4) - (7)]))
     {
 	unit->popContainer();
     }
-    (yyval) = (yyvsp[-3]);
-}
-#line 1934 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(4) - (7)]);
+;}
     break;
 
   case 34:
-#line 324 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 324 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     ContainedPtr contained = cont->lookupException(scoped->v);
     cont->checkIntroduced(scoped->v);
     (yyval) = contained;
-}
-#line 1946 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 35:
-#line 332 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 332 "../Slice/Grammar.y"
     {
     (yyval) = 0;
-}
-#line 1954 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 36:
-#line 341 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 341 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
     if(contained && !metaData->v.empty())
     {
 	contained->setMetaData(metaData->v);
     }
-}
-#line 1967 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 37:
-#line 350 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 350 "../Slice/Grammar.y"
     {
-}
-#line 1974 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 38:
-#line 353 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 353 "../Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
-}
-#line 1982 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 39:
-#line 357 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 357 "../Slice/Grammar.y"
     {
-}
-#line 1989 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 40:
-#line 365 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 365 "../Slice/Grammar.y"
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     TypeStringTokPtr typestring = new TypeStringTok;
     typestring->v = make_pair(type, ident->v);
     (yyval) = typestring;
-}
-#line 2001 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 41:
-#line 378 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 378 "../Slice/Grammar.y"
     {
-    IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[-1]));
+    IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[(2) - (3)]));
 
     int tag;
     if(i->v < 0 || i->v > Int32Max)
@@ -2020,14 +2244,15 @@ yyreduce:
     m->v.optional = tag >= 0;
     m->v.tag = tag;
     (yyval) = m;
-}
-#line 2025 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 42:
-#line 398 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 398 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
 
     ContainerPtr cont = unit->currentContainer();
     assert(cont);
@@ -2080,92 +2305,100 @@ yyreduce:
     m->v.optional = tag >= 0;
     m->v.tag = tag;
     (yyval) = m;
-}
-#line 2085 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 43:
-#line 454 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 454 "../Slice/Grammar.y"
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-}
-#line 2097 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 44:
-#line 462 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 462 "../Slice/Grammar.y"
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-}
-#line 2109 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 45:
-#line 475 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 475 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
+    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     m->v.type = ts->v.first;
     m->v.name = ts->v.second;
     (yyval) = m;
-}
-#line 2121 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 46:
-#line 483 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 483 "../Slice/Grammar.y"
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.type = ts->v.first;
     m->v.name = ts->v.second;
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-}
-#line 2135 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 48:
-#line 504 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 504 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 2143 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 49:
-#line 508 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 508 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as struct name");
-    (yyval) = (yyvsp[0]); // Dummy
-}
-#line 2153 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]); // Dummy
+;}
     break;
 
   case 50:
-#line 519 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 519 "../Slice/Grammar.y"
     {
     unit->error("structs cannot be forward declared");
     (yyval) = 0; // Dummy
-}
-#line 2162 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 51:
-#line 529 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 529 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     StructPtr st = cont->createStruct(ident->v, local->v);
     if(st)
@@ -2180,18 +2413,19 @@ yyreduce:
         unit->pushContainer(st);
     }
     (yyval) = st;
-}
-#line 2185 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 52:
-#line 548 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 548 "../Slice/Grammar.y"
     {
-    if((yyvsp[-3]))
+    if((yyvsp[(3) - (6)]))
     {
 	unit->popContainer();
     }
-    (yyval) = (yyvsp[-3]);
+    (yyval) = (yyvsp[(3) - (6)]);
 
     //
     // Empty structures are not allowed
@@ -2202,67 +2436,74 @@ yyreduce:
     {
     	unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
     }
-}
-#line 2207 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 53:
-#line 571 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 571 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
     if(contained && !metaData->v.empty())
     {
 	contained->setMetaData(metaData->v);
     }
-}
-#line 2220 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 54:
-#line 580 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 580 "../Slice/Grammar.y"
     {
-}
-#line 2227 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 55:
-#line 583 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 583 "../Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
-}
-#line 2235 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 56:
-#line 587 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 587 "../Slice/Grammar.y"
     {
-}
-#line 2242 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 58:
-#line 601 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 601 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 2250 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 59:
-#line 605 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 605 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as class name");
-    (yyval) = (yyvsp[0]); // Dummy
-}
-#line 2260 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]); // Dummy
+;}
     break;
 
   case 60:
-#line 616 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 616 "../Slice/Grammar.y"
     {
-    IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[-1]))->v;
+    IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[(3) - (4)]))->v;
     if(id < 0)
     {
         unit->error("invalid compact id for class: id must be a positive integer");
@@ -2281,17 +2522,18 @@ yyreduce:
     }
 
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v;
     classId->t = static_cast<int>(id);
     (yyval) = classId;
-}
-#line 2289 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 61:
-#line 641 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 641 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(3) - (4)]));
 
     ContainerPtr cont = unit->currentContainer();
     assert(cont);
@@ -2349,45 +2591,48 @@ yyreduce:
     }
 
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v;
     classId->t = id;
     (yyval) = classId;
 
-}
-#line 2358 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 62:
-#line 706 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 706 "../Slice/Grammar.y"
     {
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v;
     classId->t = -1;
     (yyval) = classId;
-}
-#line 2369 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 63:
-#line 718 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 718 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     ClassDeclPtr cl = cont->createClassDecl(ident->v, false, local->v);
     (yyval) = cl;
-}
-#line 2381 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 64:
-#line 731 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 731 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-3]));
-    ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[-2]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
+    ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[(2) - (4)]));
     ContainerPtr cont = unit->currentContainer();
-    ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[-1]));
-    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0]));
+    ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[(3) - (4)]));
+    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(4) - (4)]));
     if(base)
     {
 	bases->v.push_front(base);
@@ -2403,30 +2648,32 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 2408 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 65:
-#line 754 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 754 "../Slice/Grammar.y"
     {
-    if((yyvsp[-3]))
+    if((yyvsp[(5) - (8)]))
     {
 	unit->popContainer();
-	(yyval) = (yyvsp[-3]);
+	(yyval) = (yyvsp[(5) - (8)]);
     }
     else
     {
         (yyval) = 0;
     }
-}
-#line 2424 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 66:
-#line 771 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 771 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     (yyval) = 0;
@@ -2457,73 +2704,81 @@ yyreduce:
 	    }
 	}
     }
-}
-#line 2462 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 67:
-#line 805 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 805 "../Slice/Grammar.y"
     {
     (yyval) = 0;
-}
-#line 2470 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 68:
-#line 814 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 814 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 2478 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 69:
-#line 818 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 818 "../Slice/Grammar.y"
     {
     (yyval) = new ClassListTok;
-}
-#line 2486 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 70:
-#line 827 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 827 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
     if(contained && !metaData->v.empty())
     {
 	contained->setMetaData(metaData->v);
     }
-}
-#line 2499 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 71:
-#line 836 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 836 "../Slice/Grammar.y"
     {
-}
-#line 2506 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 72:
-#line 839 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 839 "../Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
-}
-#line 2514 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 73:
-#line 843 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 843 "../Slice/Grammar.y"
     {
-}
-#line 2521 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 74:
-#line 851 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 851 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
+    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     DataMemberPtr dm;
     if(cl)
@@ -2542,15 +2797,16 @@ yyreduce:
     }
     unit->currentContainer()->checkIntroduced(def->v.name, dm);
     (yyval) = dm;
-}
-#line 2547 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 75:
-#line 873 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 873 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[-2]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
+    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
 
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     DataMemberPtr dm;
@@ -2573,15 +2829,16 @@ yyreduce:
     }
     unit->currentContainer()->checkIntroduced(def->v.name, dm);
     (yyval) = dm;
-}
-#line 2578 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 76:
-#line 900 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 900 "../Slice/Grammar.y"
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
-    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
+    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2599,14 +2856,15 @@ yyreduce:
     }
     assert((yyval));
     unit->error("keyword `" + name + "' cannot be used as data member name");
-}
-#line 2604 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 77:
-#line 922 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 922 "../Slice/Grammar.y"
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2624,129 +2882,139 @@ yyreduce:
     }
     assert((yyval));
     unit->error("missing data member name");
-}
-#line 2629 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 78:
-#line 948 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 948 "../Slice/Grammar.y"
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, 0, "", "");
     unit->currentContainer()->checkIntroduced(ts->v.second, dm);
     (yyval) = dm;
-}
-#line 2642 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 79:
-#line 957 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 957 "../Slice/Grammar.y"
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, value->v.value,
                                             value->v.valueAsString, value->v.valueAsLiteral);
     unit->currentContainer()->checkIntroduced(ts->v.second, dm);
     (yyval) = dm;
-}
-#line 2657 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 80:
-#line 968 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 968 "../Slice/Grammar.y"
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("optional data members not supported in struct");
-}
-#line 2670 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 81:
-#line 977 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 977 "../Slice/Grammar.y"
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (4)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("optional data members not supported in struct");
-}
-#line 2683 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 82:
-#line 986 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 986 "../Slice/Grammar.y"
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
-    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
+    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(name, type, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("keyword `" + name + "' cannot be used as data member name");
-}
-#line 2697 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 83:
-#line 996 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 996 "../Slice/Grammar.y"
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(IceUtil::generateUUID(), type, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("missing data member name");
-}
-#line 2710 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 84:
-#line 1010 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1010 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
-    m->v.type = TypePtr::dynamicCast((yyvsp[0]));
+    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    m->v.type = TypePtr::dynamicCast((yyvsp[(2) - (2)]));
     (yyval) = m;
-}
-#line 2720 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 85:
-#line 1016 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1016 "../Slice/Grammar.y"
     {
     OptionalDefTokPtr m = new OptionalDefTok();
-    m->v.type = TypePtr::dynamicCast((yyvsp[0]));
+    m->v.type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-}
-#line 2732 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 86:
-#line 1024 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1024 "../Slice/Grammar.y"
     {
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-}
-#line 2743 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 87:
-#line 1036 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1036 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
-    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2766,15 +3034,16 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 2771 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 88:
-#line 1060 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1060 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
-    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2795,15 +3064,16 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 2800 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 89:
-#line 1085 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1085 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
-    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2823,15 +3093,16 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 2828 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 90:
-#line 1109 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1109 "../Slice/Grammar.y"
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
-    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2852,104 +3123,112 @@ yyreduce:
     {
     	(yyval) = 0;
     }
-}
-#line 2857 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 91:
-#line 1139 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1139 "../Slice/Grammar.y"
     {
-    if((yyvsp[-2]))
+    if((yyvsp[(1) - (3)]))
     {
 	unit->popContainer();
-	(yyval) = (yyvsp[-2]);
+	(yyval) = (yyvsp[(1) - (3)]);
     }
     else
     {
         (yyval) = 0;
     }
-}
-#line 2873 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 92:
-#line 1151 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1151 "../Slice/Grammar.y"
     {
-    OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1]));
-    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
+    OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
+    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
     assert(el);
     if(op)
     {
         op->setExceptionList(el->v);
     }
-}
-#line 2887 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 93:
-#line 1161 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1161 "../Slice/Grammar.y"
     {
-    if((yyvsp[-2]))
+    if((yyvsp[(1) - (3)]))
     {
 	unit->popContainer();
     }
     yyerrok;
-}
-#line 2899 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 94:
-#line 1169 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1169 "../Slice/Grammar.y"
     {
-    OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1]));
-    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
+    OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
+    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
     assert(el);
     if(op)
     {
         op->setExceptionList(el->v); // Dummy
     }
-}
-#line 2913 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 97:
-#line 1191 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1191 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 2921 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 98:
-#line 1195 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1195 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as interface name");
-    (yyval) = (yyvsp[0]); // Dummy
-}
-#line 2931 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]); // Dummy
+;}
     break;
 
   case 99:
-#line 1206 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1206 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     ClassDeclPtr cl = cont->createClassDecl(ident->v, true, local->v);
     cont->checkIntroduced(ident->v, cl);
     (yyval) = cl;
-}
-#line 2944 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 100:
-#line 1220 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1220 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
     ContainerPtr cont = unit->currentContainer();
-    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0]));
+    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v);
     if(cl)
     {
@@ -2961,31 +3240,33 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 2966 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 101:
-#line 1238 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1238 "../Slice/Grammar.y"
     {
-    if((yyvsp[-3]))
+    if((yyvsp[(4) - (7)]))
     {
 	unit->popContainer();
-	(yyval) = (yyvsp[-3]);
+	(yyval) = (yyvsp[(4) - (7)]);
     }
     else
     {
 	(yyval) = 0;
     }
-}
-#line 2982 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 102:
-#line 1255 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1255 "../Slice/Grammar.y"
     {
-    ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[0]));
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2]));
+    ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
@@ -3016,15 +3297,16 @@ yyreduce:
 	}
     }
     (yyval) = intfs;
-}
-#line 3021 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 103:
-#line 1290 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1290 "../Slice/Grammar.y"
     {
     ClassListTokPtr intfs = new ClassListTok;
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
@@ -3055,96 +3337,106 @@ yyreduce:
 	}
     }
     (yyval) = intfs;
-}
-#line 3060 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 104:
-#line 1325 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1325 "../Slice/Grammar.y"
     {
     unit->error("illegal inheritance from type Object");
     (yyval) = new ClassListTok; // Dummy
-}
-#line 3069 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 105:
-#line 1335 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1335 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 3077 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 106:
-#line 1339 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1339 "../Slice/Grammar.y"
     {
     (yyval) = new ClassListTok;
-}
-#line 3085 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 107:
-#line 1348 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1348 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
     if(contained && !metaData->v.empty())
     {
 	contained->setMetaData(metaData->v);
     }
-}
-#line 3098 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 108:
-#line 1357 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1357 "../Slice/Grammar.y"
     {
-}
-#line 3105 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 109:
-#line 1360 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1360 "../Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
-}
-#line 3113 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 110:
-#line 1364 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1364 "../Slice/Grammar.y"
     {
-}
-#line 3120 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 112:
-#line 1378 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1378 "../Slice/Grammar.y"
     {
-    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[-2]));
-    ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
+    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)]));
+    ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     exceptionList->v.push_front(exception);
     (yyval) = exceptionList;
-}
-#line 3131 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 113:
-#line 1385 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1385 "../Slice/Grammar.y"
     {
-    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[0]));
+    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]));
     ExceptionListTokPtr exceptionList = new ExceptionListTok;
     exceptionList->v.push_front(exception);
     (yyval) = exceptionList;
-}
-#line 3142 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 114:
-#line 1397 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1397 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
     ExceptionPtr exception = cont->lookupException(scoped->v);
     if(!exception)
@@ -3153,162 +3445,175 @@ yyreduce:
     }
     cont->checkIntroduced(scoped->v, exception);
     (yyval) = exception;
-}
-#line 3158 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 115:
-#line 1409 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1409 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
     (yyval) = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
-}
-#line 3168 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 116:
-#line 1420 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1420 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-2]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v);
-}
-#line 3181 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 117:
-#line 1429 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1429 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-2]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); // Dummy
     unit->error("keyword `" + ident->v + "' cannot be used as sequence name");
-}
-#line 3195 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 118:
-#line 1444 "../Slice/Grammar.y" /* yacc.c:1646  */
-    {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
-    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6]));
-    TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5]));
-    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2]));
+
+/* Line 1455 of yacc.c  */
+#line 1444 "../Slice/Grammar.y"
+    {
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
+    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)]));
+    TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)]));
+    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)]));
+    TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v);
-}
-#line 3210 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 119:
-#line 1455 "../Slice/Grammar.y" /* yacc.c:1646  */
-    {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
-    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6]));
-    TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5]));
-    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2]));
+
+/* Line 1455 of yacc.c  */
+#line 1455 "../Slice/Grammar.y"
+    {
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
+    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)]));
+    TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)]));
+    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)]));
+    TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); // Dummy
     unit->error("keyword `" + ident->v + "' cannot be used as dictionary name");
-}
-#line 3226 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 120:
-#line 1472 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1472 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 3234 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 121:
-#line 1476 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1476 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
-    (yyval) = (yyvsp[0]); // Dummy
-}
-#line 3244 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]); // Dummy
+;}
     break;
 
   case 122:
-#line 1487 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1487 "../Slice/Grammar.y"
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     EnumPtr en = cont->createEnum(ident->v, local->v);
     cont->checkIntroduced(ident->v, en);
     (yyval) = en;
-}
-#line 3257 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 123:
-#line 1496 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1496 "../Slice/Grammar.y"
     {
-    EnumPtr en = EnumPtr::dynamicCast((yyvsp[-3]));
+    EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)]));
     if(en)
     {
-	EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1]));
+	EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(5) - (6)]));
 	if(enumerators->v.empty())
 	{
 	    unit->error("enum `" + en->name() + "' must have at least one enumerator");
 	}
 	en->setEnumerators(enumerators->v); // Dummy
     }
-    (yyval) = (yyvsp[-3]);
-}
-#line 3275 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(3) - (6)]);
+;}
     break;
 
   case 124:
-#line 1511 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1511 "../Slice/Grammar.y"
     {
     unit->error("missing enumeration name");
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-4]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (5)]));
     ContainerPtr cont = unit->currentContainer();
     EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); // Dummy
-    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1]));
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(4) - (5)]));
     en->setEnumerators(enumerators->v); // Dummy
     (yyval) = en;
-}
-#line 3289 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 125:
-#line 1526 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1526 "../Slice/Grammar.y"
     {
-    EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[-2]));
-    ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[0]))->v);
+    EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v);
     (yyval) = ens;
-}
-#line 3299 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 126:
-#line 1532 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1532 "../Slice/Grammar.y"
     {
-}
-#line 3306 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 127:
-#line 1540 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1540 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     ContainerPtr cont = unit->currentContainer();
     EnumeratorPtr en = cont->createEnumerator(ident->v);
@@ -3317,17 +3622,18 @@ yyreduce:
 	ens->v.push_front(en);
     }
     (yyval) = ens;
-}
-#line 3322 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 128:
-#line 1552 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1552 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     ContainerPtr cont = unit->currentContainer();
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     if(intVal)
     {
         if(intVal->v < 0 || intVal->v > Int32Max)
@@ -3344,42 +3650,46 @@ yyreduce:
         }
     }
     (yyval) = ens;
-}
-#line 3349 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 129:
-#line 1575 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1575 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumerator");
     EnumeratorListTokPtr ens = new EnumeratorListTok; // Dummy
     (yyval) = ens;
-}
-#line 3360 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 130:
-#line 1582 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1582 "../Slice/Grammar.y"
     {
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     (yyval) = ens; // Dummy
-}
-#line 3369 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 131:
-#line 1592 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1592 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 3377 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(1) - (1)]);
+;}
     break;
 
   case 132:
-#line 1596 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1596 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
     IntegerTokPtr tok;
     if(!cl.empty())
@@ -3410,276 +3720,302 @@ yyreduce:
     }
 
     (yyval) = tok;
-}
-#line 3415 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 133:
-#line 1635 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1635 "../Slice/Grammar.y"
     {
     BoolTokPtr out = new BoolTok;
     out->v = true;
     (yyval) = out;
-}
-#line 3425 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 134:
-#line 1641 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1641 "../Slice/Grammar.y"
     {
     BoolTokPtr out = new BoolTok;
     out->v = false;
     (yyval) = out;
-}
-#line 3435 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 135:
-#line 1652 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1652 "../Slice/Grammar.y"
     {
-}
-#line 3442 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 136:
-#line 1655 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1655 "../Slice/Grammar.y"
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
-    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
 	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
 	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
-        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
+        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (3)]));
         if(!metaData->v.empty())
         {
             pd->setMetaData(metaData->v);
         }
     }
-}
-#line 3462 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 137:
-#line 1671 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1671 "../Slice/Grammar.y"
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
-    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
+    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
 	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
 	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
-        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
+        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (5)]));
         if(!metaData->v.empty())
         {
             pd->setMetaData(metaData->v);
         }
     }
-}
-#line 3482 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 138:
-#line 1687 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1687 "../Slice/Grammar.y"
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (4)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (4)]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
 	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
 	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
-}
-#line 3498 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 139:
-#line 1699 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1699 "../Slice/Grammar.y"
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (6)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(6) - (6)]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
 	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
 	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
-}
-#line 3514 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 140:
-#line 1711 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1711 "../Slice/Grammar.y"
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (3)]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
 	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
 	unit->error("missing parameter name");
     }
-}
-#line 3529 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 141:
-#line 1722 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1722 "../Slice/Grammar.y"
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (5)]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
 	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
 	unit->error("missing parameter name");
     }
-}
-#line 3544 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 142:
-#line 1738 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1738 "../Slice/Grammar.y"
     {
-    (yyval) = (yyvsp[0]);
-}
-#line 3552 "Grammar.tab.c" /* yacc.c:1646  */
+    (yyval) = (yyvsp[(2) - (2)]);
+;}
     break;
 
   case 143:
-#line 1742 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1742 "../Slice/Grammar.y"
     {
     (yyval) = new ExceptionListTok;
-}
-#line 3560 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 144:
-#line 1751 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1751 "../Slice/Grammar.y"
     {
-}
-#line 3567 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 145:
-#line 1754 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1754 "../Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ident->v = "::" + ident->v;
     (yyval) = ident;
-}
-#line 3577 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 146:
-#line 1760 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1760 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     scoped->v += "::";
     scoped->v += ident->v;
     (yyval) = scoped;
-}
-#line 3589 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 147:
-#line 1773 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1773 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindByte);
-}
-#line 3597 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 148:
-#line 1777 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1777 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindBool);
-}
-#line 3605 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 149:
-#line 1781 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1781 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindShort);
-}
-#line 3613 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 150:
-#line 1785 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1785 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindInt);
-}
-#line 3621 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 151:
-#line 1789 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1789 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindLong);
-}
-#line 3629 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 152:
-#line 1793 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1793 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindFloat);
-}
-#line 3637 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 153:
-#line 1797 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1797 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindDouble);
-}
-#line 3645 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 154:
-#line 1801 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1801 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindString);
-}
-#line 3653 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 155:
-#line 1805 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1805 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindObject);
-}
-#line 3661 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 156:
-#line 1809 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1809 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindObjectProxy);
-}
-#line 3669 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 157:
-#line 1813 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1813 "../Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindLocalObject);
-}
-#line 3677 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 158:
-#line 1817 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1817 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
@@ -3695,14 +4031,15 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 3700 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 159:
-#line 1836 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1836 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
@@ -3735,74 +4072,81 @@ yyreduce:
     {
         (yyval) = 0;
     }
-}
-#line 3740 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 160:
-#line 1877 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1877 "../Slice/Grammar.y"
     {
-    StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[-1]));
-    StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     str1->v += str2->v;
-}
-#line 3750 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 161:
-#line 1883 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1883 "../Slice/Grammar.y"
     {
-}
-#line 3757 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 162:
-#line 1891 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1891 "../Slice/Grammar.y"
     {
-    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0]));
-    StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     stringList->v.push_back(str->v);
     (yyval) = stringList;
-}
-#line 3768 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 163:
-#line 1898 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1898 "../Slice/Grammar.y"
     {
-    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     StringListTokPtr stringList = new StringListTok;
     stringList->v.push_back(str->v);
     (yyval) = stringList;
-}
-#line 3779 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 164:
-#line 1910 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1910 "../Slice/Grammar.y"
     {
     BoolTokPtr local = new BoolTok;
     local->v = true;
     (yyval) = local;
-}
-#line 3789 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 165:
-#line 1916 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1916 "../Slice/Grammar.y"
     {
     BoolTokPtr local = new BoolTok;
     local->v = false;
     (yyval) = local;
-}
-#line 3799 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 166:
-#line 1927 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1927 "../Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindLong);
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ostringstream sstr;
     sstr << intVal->v;
     ConstDefTokPtr def = new ConstDefTok;
@@ -3811,15 +4155,16 @@ yyreduce:
     def->v.valueAsString = sstr.str();
     def->v.valueAsLiteral = intVal->literal;
     (yyval) = def;
-}
-#line 3816 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 167:
-#line 1940 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1940 "../Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindDouble);
-    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[0]));
+    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ostringstream sstr;
     sstr << floatVal->v;
     ConstDefTokPtr def = new ConstDefTok;
@@ -3828,14 +4173,15 @@ yyreduce:
     def->v.valueAsString = sstr.str();
     def->v.valueAsLiteral = floatVal->literal;
     (yyval) = def;
-}
-#line 3833 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 168:
-#line 1953 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1953 "../Slice/Grammar.y"
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ConstDefTokPtr def = new ConstDefTok;
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
     if(cl.empty())
@@ -3878,299 +4224,323 @@ yyreduce:
 	}
     }
     (yyval) = def;
-}
-#line 3883 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 169:
-#line 1999 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 1999 "../Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindString);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = literal->v;
     def->v.valueAsLiteral = literal->literal;
     (yyval) = def;
-}
-#line 3898 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 170:
-#line 2010 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2010 "../Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = "false";
     def->v.valueAsLiteral = "false";
     (yyval) = def;
-}
-#line 3913 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 171:
-#line 2021 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2021 "../Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = "true";
     def->v.valueAsLiteral = "true";
     (yyval) = def;
-}
-#line 3928 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 172:
-#line 2037 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2037 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-4]));
-    TypePtr const_type = TypePtr::dynamicCast((yyvsp[-3]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (6)]));
+    TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (6)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (6)]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(6) - (6)]));
     (yyval) = unit->currentContainer()->createConst(ident->v, const_type, metaData->v, value->v.value,
                                                value->v.valueAsString, value->v.valueAsLiteral);
-}
-#line 3941 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 173:
-#line 2046 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2046 "../Slice/Grammar.y"
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
-    TypePtr const_type = TypePtr::dynamicCast((yyvsp[-2]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (5)]));
+    TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (5)]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
     unit->error("missing constant name");
     (yyval) = unit->currentContainer()->createConst(IceUtil::generateUUID(), const_type, metaData->v, value->v.value,
                                                value->v.valueAsString, value->v.valueAsLiteral, Dummy); // Dummy
-}
-#line 3954 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 174:
-#line 2060 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2060 "../Slice/Grammar.y"
     {
-}
-#line 3961 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 175:
-#line 2063 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2063 "../Slice/Grammar.y"
     {
-}
-#line 3968 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 176:
-#line 2066 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2066 "../Slice/Grammar.y"
     {
-}
-#line 3975 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 177:
-#line 2069 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2069 "../Slice/Grammar.y"
     {
-}
-#line 3982 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 178:
-#line 2072 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2072 "../Slice/Grammar.y"
     {
-}
-#line 3989 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 179:
-#line 2075 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2075 "../Slice/Grammar.y"
     {
-}
-#line 3996 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 180:
-#line 2078 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2078 "../Slice/Grammar.y"
     {
-}
-#line 4003 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 181:
-#line 2081 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2081 "../Slice/Grammar.y"
     {
-}
-#line 4010 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 182:
-#line 2084 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2084 "../Slice/Grammar.y"
     {
-}
-#line 4017 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 183:
-#line 2087 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2087 "../Slice/Grammar.y"
     {
-}
-#line 4024 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 184:
-#line 2090 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2090 "../Slice/Grammar.y"
     {
-}
-#line 4031 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 185:
-#line 2093 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2093 "../Slice/Grammar.y"
     {
-}
-#line 4038 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 186:
-#line 2096 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2096 "../Slice/Grammar.y"
     {
-}
-#line 4045 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 187:
-#line 2099 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2099 "../Slice/Grammar.y"
     {
-}
-#line 4052 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 188:
-#line 2102 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2102 "../Slice/Grammar.y"
     {
-}
-#line 4059 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 189:
-#line 2105 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2105 "../Slice/Grammar.y"
     {
-}
-#line 4066 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 190:
-#line 2108 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2108 "../Slice/Grammar.y"
     {
-}
-#line 4073 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 191:
-#line 2111 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2111 "../Slice/Grammar.y"
     {
-}
-#line 4080 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 192:
-#line 2114 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2114 "../Slice/Grammar.y"
     {
-}
-#line 4087 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 193:
-#line 2117 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2117 "../Slice/Grammar.y"
     {
-}
-#line 4094 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 194:
-#line 2120 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2120 "../Slice/Grammar.y"
     {
-}
-#line 4101 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 195:
-#line 2123 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2123 "../Slice/Grammar.y"
     {
-}
-#line 4108 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 196:
-#line 2126 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2126 "../Slice/Grammar.y"
     {
-}
-#line 4115 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 197:
-#line 2129 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2129 "../Slice/Grammar.y"
     {
-}
-#line 4122 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 198:
-#line 2132 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2132 "../Slice/Grammar.y"
     {
-}
-#line 4129 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 199:
-#line 2135 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2135 "../Slice/Grammar.y"
     {
-}
-#line 4136 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 200:
-#line 2138 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2138 "../Slice/Grammar.y"
     {
-}
-#line 4143 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 201:
-#line 2141 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2141 "../Slice/Grammar.y"
     {
-}
-#line 4150 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
   case 202:
-#line 2144 "../Slice/Grammar.y" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 2144 "../Slice/Grammar.y"
     {
-}
-#line 4157 "Grammar.tab.c" /* yacc.c:1646  */
+;}
     break;
 
 
-#line 4161 "Grammar.tab.c" /* yacc.c:1646  */
+
+/* Line 1455 of yacc.c  */
+#line 4542 "Grammar.tab.c"
       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);
@@ -4179,7 +4549,7 @@ 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.  */
 
@@ -4194,14 +4564,10 @@ yyreduce:
   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)
     {
@@ -4209,36 +4575,37 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        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;
+	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;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -4247,20 +4614,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
+	 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 lookahead token after shifting the error
@@ -4279,7 +4646,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule whose action triggered
+  /* Do not reclaim the symbols of the rule which action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -4292,37 +4659,35 @@ 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 (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
+      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;
+	YYABORT;
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+		  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -4346,7 +4711,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -4358,21 +4723,16 @@ yyexhaustedlab:
 
 yyreturn:
   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
+     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);
+		  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -4383,7 +4743,13 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
-#line 2148 "../Slice/Grammar.y" /* yacc.c:1906  */
+
+
+
+/* Line 1675 of yacc.c  */
+#line 2148 "../Slice/Grammar.y"
+
 
diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h
index da8894fae54..0ee3d141315 100644
--- a/cpp/src/Slice/Grammar.h
+++ b/cpp/src/Slice/Grammar.h
@@ -1,19 +1,21 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
    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 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
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,79 +28,71 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED
-# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int slice_debug;
-#endif
 
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    ICE_MODULE = 258,
-    ICE_CLASS = 259,
-    ICE_INTERFACE = 260,
-    ICE_EXCEPTION = 261,
-    ICE_STRUCT = 262,
-    ICE_SEQUENCE = 263,
-    ICE_DICTIONARY = 264,
-    ICE_ENUM = 265,
-    ICE_OUT = 266,
-    ICE_EXTENDS = 267,
-    ICE_IMPLEMENTS = 268,
-    ICE_THROWS = 269,
-    ICE_VOID = 270,
-    ICE_BYTE = 271,
-    ICE_BOOL = 272,
-    ICE_SHORT = 273,
-    ICE_INT = 274,
-    ICE_LONG = 275,
-    ICE_FLOAT = 276,
-    ICE_DOUBLE = 277,
-    ICE_STRING = 278,
-    ICE_OBJECT = 279,
-    ICE_LOCAL_OBJECT = 280,
-    ICE_LOCAL = 281,
-    ICE_CONST = 282,
-    ICE_FALSE = 283,
-    ICE_TRUE = 284,
-    ICE_IDEMPOTENT = 285,
-    ICE_OPTIONAL = 286,
-    ICE_SCOPE_DELIMITER = 287,
-    ICE_IDENTIFIER = 288,
-    ICE_STRING_LITERAL = 289,
-    ICE_INTEGER_LITERAL = 290,
-    ICE_FLOATING_POINT_LITERAL = 291,
-    ICE_IDENT_OP = 292,
-    ICE_KEYWORD_OP = 293,
-    ICE_OPTIONAL_OP = 294,
-    ICE_METADATA_OPEN = 295,
-    ICE_METADATA_CLOSE = 296,
-    ICE_GLOBAL_METADATA_OPEN = 297,
-    ICE_GLOBAL_METADATA_CLOSE = 298,
-    BAD_CHAR = 299
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_MODULE = 258,
+     ICE_CLASS = 259,
+     ICE_INTERFACE = 260,
+     ICE_EXCEPTION = 261,
+     ICE_STRUCT = 262,
+     ICE_SEQUENCE = 263,
+     ICE_DICTIONARY = 264,
+     ICE_ENUM = 265,
+     ICE_OUT = 266,
+     ICE_EXTENDS = 267,
+     ICE_IMPLEMENTS = 268,
+     ICE_THROWS = 269,
+     ICE_VOID = 270,
+     ICE_BYTE = 271,
+     ICE_BOOL = 272,
+     ICE_SHORT = 273,
+     ICE_INT = 274,
+     ICE_LONG = 275,
+     ICE_FLOAT = 276,
+     ICE_DOUBLE = 277,
+     ICE_STRING = 278,
+     ICE_OBJECT = 279,
+     ICE_LOCAL_OBJECT = 280,
+     ICE_LOCAL = 281,
+     ICE_CONST = 282,
+     ICE_FALSE = 283,
+     ICE_TRUE = 284,
+     ICE_IDEMPOTENT = 285,
+     ICE_OPTIONAL = 286,
+     ICE_SCOPE_DELIMITER = 287,
+     ICE_IDENTIFIER = 288,
+     ICE_STRING_LITERAL = 289,
+     ICE_INTEGER_LITERAL = 290,
+     ICE_FLOATING_POINT_LITERAL = 291,
+     ICE_IDENT_OP = 292,
+     ICE_KEYWORD_OP = 293,
+     ICE_OPTIONAL_OP = 294,
+     ICE_METADATA_OPEN = 295,
+     ICE_METADATA_CLOSE = 296,
+     ICE_GLOBAL_METADATA_OPEN = 297,
+     ICE_GLOBAL_METADATA_CLOSE = 298,
+     BAD_CHAR = 299
+   };
 #endif
 
-/* Value type.  */
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
-int slice_parse (void);
 
-#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED  */