zeroc-ice 3.7.0 → 3.7.1

data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -37,11 +37,12 @@ const int TypeContextCpp11 = 64;
 
 bool isMovable(const TypePtr&);
 
-std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0);
-std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
+std::string getAbsolute(const std::string&, const std::string&);
+std::string typeToString(const TypePtr&, const std::string& = "", const StringList& = StringList(), int = 0);
+std::string typeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
+std::string returnTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
+std::string inputTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
+std::string outputTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
 std::string operationModeToString(Operation::Mode, bool = false);
 std::string opFormatTypeToString(const OperationPtr&, bool);
 
@@ -55,7 +56,7 @@ void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const Op
                       int = 0, const std::string& = "", const std::string& = "");
 void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0,
                         const std::string& = "", const std::string& = "", const std::string& = "");
-void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool,
+void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, const std::string&,
                        int = 0, const std::string& = "");
 
 std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
@@ -63,7 +64,7 @@ void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const Operat
 void writeMarshalUnmarshalDataMemberInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, bool);
 void writeMarshalUnmarshalAllInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberList&, bool, bool);
 void writeStreamHelpers(::IceUtilInternal::Output&, const ContainedPtr&, DataMemberList, bool, bool, bool);
-void writeIceTuple(::IceUtilInternal::Output&, DataMemberList, int);
+void writeIceTuple(::IceUtilInternal::Output&, const std::string&, DataMemberList, int);
 
 bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&);
 bool findMetaData(const std::string&, const StringList&, std::string&);

data/ext/ice/cpp/src/Slice/Checksum.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Slice/Checksum.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Slice/FileTracker.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Slice/FileTracker.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Slice/Grammar.cpp

@@ -75,7 +75,7 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -189,8 +189,8 @@ extern int slice_debug;
      ICE_IDEMPOTENT = 285,
      ICE_OPTIONAL = 286,
      ICE_VALUE = 287,
-     ICE_SCOPE_DELIMITER = 288,
-     ICE_IDENTIFIER = 289,
+     ICE_IDENTIFIER = 288,
+     ICE_SCOPED_IDENTIFIER = 289,
      ICE_STRING_LITERAL = 290,
      ICE_INTEGER_LITERAL = 291,
      ICE_FLOATING_POINT_LITERAL = 292,
@@ -453,16 +453,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  11
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   876
+#define YYLAST   869
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  55
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  86
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  226
+#define YYNRULES  225
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  329
+#define YYNSTATES  326
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -528,13 +528,13 @@ static const yytype_uint16 yyprhs[] =
      371,   374,   375,   377,   381,   383,   385,   387,   395,   403,
      414,   425,   428,   431,   432,   439,   440,   447,   451,   453,
      455,   459,   461,   462,   464,   466,   468,   469,   470,   474,
-     480,   485,   492,   496,   502,   505,   506,   508,   511,   515,
-     517,   519,   521,   523,   525,   527,   529,   531,   533,   536,
-     538,   540,   542,   545,   548,   550,   554,   556,   558,   559,
-     561,   563,   565,   567,   569,   571,   578,   584,   586,   588,
-     590,   592,   594,   596,   598,   600,   602,   604,   606,   608,
-     610,   612,   614,   616,   618,   620,   622,   624,   626,   628,
-     630,   632,   634,   636,   638,   640,   642
+     480,   485,   492,   496,   502,   505,   506,   508,   510,   512,
+     514,   516,   518,   520,   522,   524,   526,   528,   531,   533,
+     535,   537,   540,   543,   545,   549,   551,   553,   554,   556,
+     558,   560,   562,   564,   566,   573,   579,   581,   583,   585,
+     587,   589,   591,   593,   595,   597,   599,   601,   603,   605,
+     607,   609,   611,   613,   615,   617,   619,   621,   623,   625,
+     627,   629,   631,   633,   635,   637
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -551,17 +551,17 @@ static const yytype_int16 yyrhs[] =
       57,    -1,    -1,   121,    73,    46,    -1,   121,    -1,    -1,
      122,    74,    46,    -1,   122,    -1,    -1,   124,    75,    57,
       -1,    -1,   139,    76,    46,    -1,   139,    -1,     1,    46,
-      -1,    -1,     3,    34,    78,    47,    60,    48,    -1,     6,
-      34,    -1,     6,   140,    -1,   137,    79,    -1,    -1,   137,
+      -1,    -1,     3,    33,    78,    47,    60,    48,    -1,     6,
+      33,    -1,     6,   140,    -1,   137,    79,    -1,    -1,   137,
       79,    83,    82,    47,    84,    48,    -1,    12,   133,    -1,
       -1,    59,    88,    46,    84,    -1,     1,    46,    84,    -1,
-      59,    88,    -1,    -1,   134,    34,    -1,    40,    36,    49,
+      59,    88,    -1,    -1,   134,    33,    -1,    40,    36,    49,
       -1,    40,   133,    49,    -1,    40,    49,    -1,    31,    -1,
-      86,    85,    -1,    85,    -1,   103,    -1,     7,    34,    -1,
+      86,    85,    -1,    85,    -1,   103,    -1,     7,    33,    -1,
        7,   140,    -1,   137,    89,    -1,    -1,   137,    89,    92,
       47,    93,    48,    -1,    59,    94,    46,    93,    -1,     1,
       46,    93,    -1,    59,    94,    -1,    -1,   104,    -1,     4,
-      34,    -1,     4,   140,    -1,     4,    38,    36,    49,    -1,
+      33,    -1,     4,   140,    -1,     4,    38,    36,    49,    -1,
        4,    38,   133,    49,    -1,    95,    -1,   137,    95,    -1,
       -1,   137,    96,   100,   101,    99,    47,   102,    48,    -1,
       12,   133,    -1,    -1,    13,   115,    -1,    -1,    59,   110,
@@ -573,66 +573,65 @@ static const yytype_int16 yyrhs[] =
       -1,    30,   105,    38,    -1,   105,    39,    -1,    30,   105,
       39,    -1,    -1,   106,   131,    49,   108,   132,    -1,    -1,
      106,     1,    49,   109,   132,    -1,   103,    -1,   107,    -1,
-       5,    34,    -1,     5,   140,    -1,   137,   111,    -1,    -1,
+       5,    33,    -1,     5,   140,    -1,   137,   111,    -1,    -1,
      137,   111,   116,   114,    47,   117,    48,    -1,   133,    51,
      115,    -1,   133,    -1,    24,    -1,    32,    -1,    12,   115,
       -1,    -1,    59,   118,    46,   117,    -1,     1,    46,   117,
       -1,    59,   118,    -1,    -1,   107,    -1,   120,    51,   119,
       -1,   120,    -1,   133,    -1,   140,    -1,   137,     8,    52,
-      59,   134,    53,    34,    -1,   137,     8,    52,    59,   134,
+      59,   134,    53,    33,    -1,   137,     8,    52,    59,   134,
       53,   140,    -1,   137,     9,    52,    59,   134,    51,    59,
-     134,    53,    34,    -1,   137,     9,    52,    59,   134,    51,
-      59,   134,    53,   140,    -1,    10,    34,    -1,    10,   140,
+     134,    53,    33,    -1,   137,     9,    52,    59,   134,    51,
+      59,   134,    53,   140,    -1,    10,    33,    -1,    10,   140,
       -1,    -1,   137,   123,   125,    47,   127,    48,    -1,    -1,
      137,    10,   126,    47,   127,    48,    -1,   128,    51,   127,
-      -1,   128,    -1,    34,    -1,    34,    50,   129,    -1,   140,
+      -1,   128,    -1,    33,    -1,    33,    50,   129,    -1,   140,
       -1,    -1,    36,    -1,   133,    -1,    11,    -1,    -1,    -1,
      130,    59,    87,    -1,   131,    51,   130,    59,    87,    -1,
      130,    59,   134,   140,    -1,   131,    51,   130,    59,   134,
      140,    -1,   130,    59,   134,    -1,   131,    51,   130,    59,
-     134,    -1,    14,   119,    -1,    -1,    34,    -1,    33,    34,
-      -1,   133,    33,    34,    -1,    16,    -1,    17,    -1,    18,
-      -1,    19,    -1,    20,    -1,    21,    -1,    22,    -1,    23,
-      -1,    24,    -1,    24,    54,    -1,    25,    -1,    32,    -1,
-     133,    -1,   133,    54,    -1,    35,   135,    -1,    35,    -1,
-     136,    51,   135,    -1,   135,    -1,    26,    -1,    -1,    36,
-      -1,    37,    -1,   133,    -1,    35,    -1,    28,    -1,    29,
-      -1,    27,    59,   134,    34,    50,   138,    -1,    27,    59,
-     134,    50,   138,    -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,
+     134,    -1,    14,   119,    -1,    -1,    33,    -1,    34,    -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,    32,    -1
+      21,    -1,    22,    -1,    23,    -1,    24,    -1,    24,    54,
+      -1,    25,    -1,    32,    -1,   133,    -1,   133,    54,    -1,
+      35,   135,    -1,    35,    -1,   136,    51,   135,    -1,   135,
+      -1,    26,    -1,    -1,    36,    -1,    37,    -1,   133,    -1,
+      35,    -1,    28,    -1,    29,    -1,    27,    59,   134,    33,
+      50,   138,    -1,    27,    59,   134,    50,   138,    -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,    32,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   115,   115,   123,   127,   134,   143,   148,   157,   156,
-     166,   165,   176,   184,   183,   189,   188,   193,   198,   197,
-     203,   202,   207,   212,   211,   217,   216,   221,   226,   225,
-     231,   230,   235,   240,   239,   245,   244,   249,   254,   253,
-     258,   263,   262,   268,   267,   272,   276,   286,   285,   319,
-     323,   334,   345,   344,   371,   380,   388,   397,   400,   405,
-     412,   425,   445,   538,   546,   559,   567,   582,   588,   592,
-     603,   614,   613,   655,   664,   667,   672,   679,   685,   689,
-     700,   725,   827,   839,   853,   852,   892,   927,   935,   940,
-     948,   957,   960,   965,   972,   994,  1021,  1043,  1069,  1078,
-    1089,  1098,  1107,  1117,  1131,  1137,  1145,  1157,  1181,  1206,
-    1230,  1261,  1260,  1283,  1282,  1305,  1306,  1312,  1316,  1327,
-    1342,  1341,  1376,  1411,  1446,  1451,  1461,  1466,  1474,  1483,
-    1486,  1491,  1498,  1504,  1511,  1523,  1535,  1546,  1555,  1570,
-    1581,  1598,  1602,  1614,  1613,  1646,  1645,  1664,  1670,  1678,
-    1690,  1710,  1718,  1727,  1731,  1770,  1777,  1788,  1790,  1806,
-    1822,  1834,  1846,  1857,  1873,  1878,  1886,  1889,  1895,  1908,
-    1912,  1916,  1920,  1924,  1928,  1932,  1936,  1940,  1944,  1948,
-    1952,  1956,  1975,  2016,  2022,  2030,  2037,  2049,  2056,  2066,
-    2079,  2092,  2139,  2150,  2161,  2177,  2186,  2200,  2203,  2206,
-    2209,  2212,  2215,  2218,  2221,  2224,  2227,  2230,  2233,  2236,
-    2239,  2242,  2245,  2248,  2251,  2254,  2257,  2260,  2263,  2266,
-    2269,  2272,  2275,  2278,  2281,  2284,  2287
+       0,   114,   114,   122,   126,   133,   142,   147,   156,   155,
+     165,   164,   175,   183,   182,   188,   187,   192,   197,   196,
+     202,   201,   206,   211,   210,   216,   215,   220,   225,   224,
+     230,   229,   234,   239,   238,   244,   243,   248,   253,   252,
+     257,   262,   261,   267,   266,   271,   275,   285,   284,   318,
+     322,   333,   344,   343,   370,   379,   387,   396,   399,   404,
+     411,   424,   444,   537,   545,   558,   566,   581,   587,   591,
+     602,   613,   612,   654,   663,   666,   671,   678,   684,   688,
+     699,   724,   826,   838,   852,   851,   891,   926,   934,   939,
+     947,   956,   959,   964,   971,   993,  1020,  1042,  1068,  1077,
+    1088,  1097,  1106,  1116,  1130,  1136,  1144,  1156,  1180,  1205,
+    1229,  1260,  1259,  1282,  1281,  1304,  1305,  1311,  1315,  1326,
+    1341,  1340,  1375,  1410,  1445,  1450,  1460,  1465,  1473,  1482,
+    1485,  1490,  1497,  1503,  1510,  1522,  1534,  1545,  1554,  1569,
+    1580,  1597,  1601,  1613,  1612,  1645,  1644,  1663,  1669,  1677,
+    1689,  1709,  1717,  1726,  1730,  1769,  1776,  1787,  1789,  1805,
+    1821,  1833,  1845,  1856,  1872,  1877,  1885,  1888,  1896,  1900,
+    1904,  1908,  1912,  1916,  1920,  1924,  1928,  1932,  1936,  1940,
+    1944,  1963,  2004,  2010,  2018,  2025,  2037,  2044,  2054,  2067,
+    2080,  2127,  2138,  2149,  2165,  2174,  2188,  2191,  2194,  2197,
+    2200,  2203,  2206,  2209,  2212,  2215,  2218,  2221,  2224,  2227,
+    2230,  2233,  2236,  2239,  2242,  2245,  2248,  2251,  2254,  2257,
+    2260,  2263,  2266,  2269,  2272,  2275
 };
 #endif
 
@@ -647,8 +646,8 @@ static const char *const yytname[] =
   "ICE_THROWS", "ICE_VOID", "ICE_BYTE", "ICE_BOOL", "ICE_SHORT", "ICE_INT",
   "ICE_LONG", "ICE_FLOAT", "ICE_DOUBLE", "ICE_STRING", "ICE_OBJECT",
   "ICE_LOCAL_OBJECT", "ICE_LOCAL", "ICE_CONST", "ICE_FALSE", "ICE_TRUE",
-  "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_VALUE", "ICE_SCOPE_DELIMITER",
-  "ICE_IDENTIFIER", "ICE_STRING_LITERAL", "ICE_INTEGER_LITERAL",
+  "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_VALUE", "ICE_IDENTIFIER",
+  "ICE_SCOPED_IDENTIFIER", "ICE_STRING_LITERAL", "ICE_INTEGER_LITERAL",
   "ICE_FLOATING_POINT_LITERAL", "ICE_IDENT_OP", "ICE_KEYWORD_OP",
   "ICE_OPTIONAL_OP", "ICE_METADATA_OPEN", "ICE_METADATA_CLOSE",
   "ICE_GLOBAL_METADATA_OPEN", "ICE_GLOBAL_METADATA_CLOSE", "BAD_CHAR",
@@ -706,13 +705,13 @@ static const yytype_uint8 yyr1[] =
      117,   117,   118,   119,   119,   120,   120,   121,   121,   122,
      122,   123,   123,   125,   124,   126,   124,   127,   127,   128,
      128,   128,   128,   129,   129,   130,   130,   131,   131,   131,
-     131,   131,   131,   131,   132,   132,   133,   133,   133,   134,
+     131,   131,   131,   131,   132,   132,   133,   133,   134,   134,
      134,   134,   134,   134,   134,   134,   134,   134,   134,   134,
-     134,   134,   134,   135,   135,   136,   136,   137,   137,   138,
-     138,   138,   138,   138,   138,   139,   139,   140,   140,   140,
+     134,   134,   135,   135,   136,   136,   137,   137,   138,   138,
+     138,   138,   138,   138,   139,   139,   140,   140,   140,   140,
      140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
      140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140
+     140,   140,   140,   140,   140,   140
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -734,13 +733,13 @@ static const yytype_uint8 yyr2[] =
        2,     0,     1,     3,     1,     1,     1,     7,     7,    10,
       10,     2,     2,     0,     6,     0,     6,     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,     1,     2,     2,     1,     3,     1,     1,     0,     1,
-       1,     1,     1,     1,     1,     6,     5,     1,     1,     1,
+       4,     6,     3,     5,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     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,     1,     1
+       1,     1,     1,     1,     1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -748,39 +747,39 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       7,     0,     0,     0,     8,     0,     2,   184,   186,     0,
-       0,     1,     7,     0,     0,   187,     7,    10,    13,    27,
+       7,     0,     0,     0,     8,     0,     2,   183,   185,     0,
+       0,     1,     7,     0,     0,   186,     7,    10,    13,    27,
       28,    32,    33,    17,    18,    22,    23,    37,    40,    41,
-       0,    45,   183,     6,     0,     5,     9,    46,    47,     0,
+       0,    45,   182,     6,     0,     5,     9,    46,    47,     0,
        7,     4,     0,     4,     0,     4,     0,     4,     0,     4,
        0,     0,     4,     0,     0,     0,     0,     0,     0,   145,
-      51,    70,    83,    87,   119,   143,     0,   185,     0,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   179,   180,
-       0,   166,   181,     0,    11,     3,    14,    26,    29,    31,
-      34,    16,    19,    21,    24,    36,    39,    42,   197,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-     219,   220,   221,   222,   223,   224,   225,   226,    78,     0,
+      51,    70,    83,    87,   119,   143,     0,   184,     0,   168,
+     169,   170,   171,   172,   173,   174,   175,   176,   178,   179,
+     166,   167,   180,     0,    11,     3,    14,    26,    29,    31,
+      34,    16,    19,    21,    24,    36,    39,    42,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,    78,     0,
       79,   117,   118,    49,    50,    68,    69,     7,     7,   141,
        0,   142,     0,    52,     0,     0,    89,     0,   120,     0,
-      44,     7,   178,   167,     0,   182,     0,     0,     0,     0,
-       0,     0,   152,    54,     0,     0,    86,     0,    84,   124,
-     125,   126,   123,     0,   152,     0,   168,     0,   193,   194,
-     192,   189,   190,   191,   196,    80,    81,     0,     0,   149,
-       0,   148,   151,     0,     0,     0,     0,    88,     0,     0,
-       0,     0,    48,   195,     0,     7,     0,   146,   152,     0,
-       0,     0,     0,    64,     0,    98,     0,    75,    77,   103,
-      72,     0,   122,     0,     0,     0,   144,   137,   138,     0,
-     153,   150,   154,   147,     0,    66,     0,    94,    58,    67,
-      97,    53,    74,     0,    63,     0,     0,   100,     0,     0,
-      60,   102,     0,     0,     0,     0,   106,     0,     0,     0,
-       0,   132,   130,   105,   121,     0,    57,    65,     0,     0,
-      96,    61,    62,    99,     0,    73,     0,     0,   115,   116,
-      92,    97,    85,   129,     0,   104,   107,   109,     0,   155,
-       7,     0,     0,     0,    95,    56,   101,    91,   104,     0,
-     108,   110,   113,     0,   111,   156,   128,   139,   140,    90,
-     165,   158,   162,   165,     7,     0,   114,   160,   112,     0,
-     164,   134,   135,   136,   159,   163,     0,   161,   133
+      44,     7,   177,   181,     0,     0,     0,     0,     0,     0,
+     152,    54,     0,     0,    86,     0,    84,   124,   125,   126,
+     123,     0,   152,     0,     0,   192,   193,   191,   188,   189,
+     190,   195,    80,    81,     0,     0,   149,     0,   148,   151,
+       0,     0,     0,     0,    88,     0,     0,     0,     0,    48,
+     194,     0,     7,     0,   146,   152,     0,     0,     0,     0,
+      64,     0,    98,     0,    75,    77,   103,    72,     0,   122,
+       0,     0,     0,   144,   137,   138,     0,   153,   150,   154,
+     147,     0,    66,     0,    94,    58,    67,    97,    53,    74,
+       0,    63,     0,     0,   100,     0,     0,    60,   102,     0,
+       0,     0,     0,   106,     0,     0,     0,     0,   132,   130,
+     105,   121,     0,    57,    65,     0,     0,    96,    61,    62,
+      99,     0,    73,     0,     0,   115,   116,    92,    97,    85,
+     129,     0,   104,   107,   109,     0,   155,     7,     0,     0,
+       0,    95,    56,   101,    91,   104,     0,   108,   110,   113,
+       0,   111,   156,   128,   139,   140,    90,   165,   158,   162,
+     165,     7,     0,   114,   160,   112,     0,   164,   134,   135,
+     136,   159,   163,     0,   161,   133
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
@@ -788,261 +787,259 @@ static const yytype_int16 yydefgoto[] =
 {
       -1,     3,    86,     4,     5,     6,    12,    40,    17,    41,
       46,    47,    48,    49,    42,    43,    44,    45,    50,    51,
-      52,    66,    18,    68,    60,    19,    20,   164,   143,   211,
-     235,   236,   237,   238,    61,    21,    22,   144,   196,   217,
-      62,    63,    23,    24,   198,   146,   168,   254,   239,   218,
-     259,   260,   261,   313,   310,   280,    64,    25,    26,   173,
-     171,   148,   225,   262,   320,   321,    27,    28,    65,    29,
-     149,   140,   190,   191,   231,   290,   291,   316,    82,   248,
-       8,     9,    30,   184,    31,   192
+      52,    66,    18,    68,    60,    19,    20,   162,   143,   208,
+     232,   233,   234,   235,    61,    21,    22,   144,   193,   214,
+      62,    63,    23,    24,   195,   146,   166,   251,   236,   215,
+     256,   257,   258,   310,   307,   277,    64,    25,    26,   171,
+     169,   148,   222,   259,   317,   318,    27,    28,    65,    29,
+     149,   140,   187,   188,   228,   287,   288,   313,    82,   245,
+       8,     9,    30,   181,    31,   189
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -260
+#define YYPACT_NINF -278
 static const yytype_int16 yypact[] =
 {
-      13,    -2,    -2,    42,  -260,   159,  -260,    -2,  -260,    -4,
-      28,  -260,    10,     0,    32,  -260,     3,  -260,  -260,    23,
-    -260,    37,  -260,    53,  -260,    68,  -260,    70,    85,  -260,
-     194,    90,  -260,  -260,    -2,  -260,  -260,  -260,  -260,   842,
-      10,    94,   102,    94,   105,    94,   106,    94,   107,    94,
-     108,   109,    94,   454,   522,   554,   586,    73,    89,   618,
-      14,   112,    24,   149,    18,  -260,   124,  -260,   128,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,   117,  -260,  -260,
-     145,  -260,   -13,   -15,  -260,  -260,  -260,  -260,  -260,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,    79,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,     3,     3,  -260,
-     134,  -260,    57,  -260,   135,    57,   175,    61,  -260,   143,
-    -260,    34,  -260,  -260,   157,  -260,   144,   110,   146,    29,
-     842,   842,   650,   173,   160,   337,   173,    61,  -260,  -260,
-    -260,  -260,    -1,   162,   650,   163,  -260,   110,  -260,  -260,
-    -260,  -260,  -260,   173,  -260,  -260,  -260,   161,   164,   167,
-     165,   168,  -260,   371,   166,   817,   174,  -260,   176,    61,
-     269,   177,  -260,  -260,   682,     3,    96,  -260,   650,   178,
-     817,   179,   337,  -260,    40,   180,   842,   182,  -260,   714,
-    -260,   303,  -260,   183,   766,   184,  -260,  -260,  -260,   842,
-    -260,  -260,   173,  -260,   371,  -260,   842,   181,   189,  -260,
-     714,  -260,  -260,   187,  -260,    31,   110,   188,   192,   337,
-    -260,  -260,   191,   766,   193,   269,  -260,   792,   842,    62,
-      86,  -260,   196,  -260,  -260,   190,  -260,  -260,   110,   371,
-    -260,  -260,  -260,  -260,   110,  -260,   303,   842,  -260,  -260,
-     198,   417,  -260,  -260,    95,  -260,  -260,  -260,   199,  -260,
-       3,   -28,   269,   746,  -260,  -260,  -260,  -260,   192,   303,
-    -260,  -260,  -260,   817,  -260,   234,  -260,  -260,  -260,  -260,
-     233,  -260,   714,   233,     3,   490,  -260,  -260,  -260,   817,
-    -260,   200,   173,  -260,  -260,   714,   490,  -260,  -260
+      13,     1,     1,    42,  -278,   156,  -278,     1,  -278,    -7,
+      -3,  -278,    10,     4,    33,  -278,     6,  -278,  -278,    28,
+    -278,    30,  -278,    32,  -278,    39,  -278,    52,    68,  -278,
+     200,    77,  -278,  -278,     1,  -278,  -278,  -278,  -278,   835,
+      10,    84,    85,    84,    87,    84,    89,    84,    92,    84,
+      93,    94,    84,   455,   523,   554,   585,    80,    96,   616,
+      12,    35,    16,    76,    14,  -278,   100,  -278,    95,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,    82,  -278,  -278,
+    -278,  -278,   101,   -12,  -278,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,    59,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,     6,     6,  -278,
+     109,  -278,    37,  -278,   120,    37,   155,    57,  -278,   123,
+    -278,    36,  -278,  -278,   121,   116,   126,   127,   835,   835,
+     647,  -278,   125,   338,  -278,    57,  -278,  -278,  -278,  -278,
+     128,   130,   647,   132,   116,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,   135,   134,   139,   143,   146,  -278,
+     372,   153,   810,   163,  -278,   131,    57,    86,   164,  -278,
+    -278,   678,     6,    63,  -278,   647,   167,   810,   166,   338,
+    -278,    31,   168,   835,   171,  -278,   709,  -278,   304,  -278,
+     173,   759,   174,  -278,  -278,  -278,   835,  -278,  -278,  -278,
+    -278,   372,  -278,   835,   175,   177,  -278,   709,  -278,  -278,
+     152,  -278,   178,   116,   176,   191,   338,  -278,  -278,   182,
+     759,   181,    86,  -278,   785,   835,    74,   267,  -278,   186,
+    -278,  -278,   180,  -278,  -278,   116,   372,  -278,  -278,  -278,
+    -278,   116,  -278,   304,   835,  -278,  -278,   188,   418,  -278,
+    -278,    90,  -278,  -278,  -278,   189,  -278,     6,   -17,    86,
+     740,  -278,  -278,  -278,  -278,   191,   304,  -278,  -278,  -278,
+     810,  -278,   224,  -278,  -278,  -278,  -278,   223,  -278,   709,
+     223,     6,   491,  -278,  -278,  -278,   810,  -278,   190,  -278,
+    -278,  -278,   709,   491,  -278,  -278
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -260,  -260,   131,  -260,   -16,    -9,  -260,  -260,  -260,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -212,
-    -191,  -190,  -235,  -260,  -260,  -260,  -260,  -260,  -197,  -260,
-    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -259,   -43,  -260,
-      -8,  -260,    -3,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
-    -139,  -260,  -237,  -260,   -74,  -260,  -260,  -260,  -260,  -260,
-    -260,  -260,  -160,  -260,  -260,   -51,  -260,   -58,  -118,   -37,
-       9,   254,  -260,  -176,  -260,   -47
+    -278,  -278,   151,  -278,   -16,   -10,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -278,  -209,
+    -188,  -181,  -277,  -278,  -278,  -278,  -278,  -278,  -194,  -278,
+    -278,  -278,  -278,  -278,  -278,  -278,  -278,  -253,   -11,  -278,
+      -9,  -278,    -8,  -278,  -278,  -278,  -278,  -278,  -278,  -278,
+    -134,  -278,  -234,  -278,   -79,  -278,  -278,  -278,  -278,  -278,
+    -278,  -278,  -156,  -278,  -278,   -56,  -278,   -63,  -128,   -34,
+      26,   246,  -278,  -171,  -278,   -47
 };
 
 /* 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 YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -189
+#define YYTABLE_NINF -188
 static const yytype_int16 yytable[] =
 {
-      39,   203,    83,    36,   215,   216,   130,   132,   134,   136,
-     -12,   159,   141,   -12,   201,   242,    32,   297,   283,   156,
-     154,   304,   266,   305,   163,   247,   142,   166,   197,   172,
-     147,    84,   154,     7,   258,   157,   -82,   -82,    33,   183,
-     309,   155,    11,    67,     1,   267,    37,    34,   233,   172,
-     199,     1,   275,     2,     1,   306,     2,   295,   -12,   183,
-     222,   -55,   154,   277,   154,  -127,    38,   258,   311,   -25,
-     273,   -82,    35,    80,    81,     1,   243,     2,   186,    34,
-     272,   172,   -12,   -30,   324,   169,   267,   288,   232,   244,
-      80,    81,   294,   170,    80,    81,   245,   289,   296,   -15,
-     286,   287,  -156,  -156,  -156,  -156,  -156,  -156,  -156,  -156,
-    -156,  -156,    80,    81,   -20,   158,   -35,  -156,  -156,  -156,
-    -156,   160,   161,   187,   188,   137,  -156,  -156,   183,    80,
-      81,   -38,   230,   300,   301,  -157,   -43,  -157,   178,   179,
-      85,   138,   175,    80,    81,   180,   181,   182,    87,   195,
-     183,    89,    91,    93,    95,    96,   183,   228,   219,   -71,
-      13,   145,    14,  -188,  -188,  -188,  -188,  -188,  -188,  -188,
-     150,   152,   251,   240,    88,   151,    90,   210,    92,   153,
-      94,   162,   165,    97,   224,    15,    16,   263,   167,   229,
-     174,   176,   265,   270,   177,   185,   195,   322,    53,    54,
-      55,    56,    57,    58,    59,   253,   154,   193,   322,   200,
-     278,   202,   212,   207,   204,   205,   281,   206,   210,   208,
-     263,   285,   220,   221,   234,   226,   250,   241,   249,   255,
-     246,   268,   264,   195,   270,   269,   271,   276,   274,   224,
-     298,   282,   292,   293,   299,   289,   308,   315,   302,   284,
-     279,   326,   328,   210,   314,   318,    10,     0,     0,     0,
-     253,     0,     0,     0,     0,   317,   312,     0,   323,     0,
-     223,     0,     0,     0,   303,     0,   224,     0,   327,   323,
-       0,     0,   325,   253,    -7,    -7,    -7,    -7,    -7,    -7,
-      -7,    -7,    -7,    -7,    -7,     0,     0,     0,   319,    -7,
-      -7,    -7,    -7,    -7,   252,     0,     0,     0,     0,    -7,
-       1,     0,     0,     0,     0,     0,     0,  -131,    -7,    -7,
-      -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,     0,
-       0,     0,     0,    -7,    -7,    -7,    -7,    -7,   194,     0,
-       0,     0,     0,    -7,     1,     0,     0,     0,     0,     0,
-       0,   -93,     0,    -7,    -7,    -7,    -7,    -7,    -7,    -7,
-      -7,    -7,    -7,     0,     0,     0,     0,     0,    -7,    -7,
-      -7,    -7,   209,     0,     0,     0,     0,    -7,     1,     0,
-       0,     0,     0,     0,     0,   -76,     0,    -7,    -7,    -7,
-      -7,    -7,    -7,    -7,    -7,    -7,    -7,     0,     0,     0,
-       0,     0,    -7,    -7,    -7,    -7,     0,     0,     0,     0,
-       0,    -7,     1,     0,     0,     0,     0,     0,     0,   -59,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-       0,   250,     0,     0,     0,  -105,  -105,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,     0,   128,     0,
-       0,     0,   129,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,    80,    81,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,     0,   131,    98,    99,   100,
+      39,   157,    36,   200,   212,    83,   130,   132,   134,   136,
+     -12,   213,   141,   -12,   161,   239,   198,   164,   280,   170,
+     294,   154,   263,   308,   142,   244,   147,   180,   -82,   -82,
+      84,   194,   301,    32,   302,    33,     7,   170,   155,   321,
+     255,    35,    11,   306,    34,   264,   180,     1,    34,   230,
+      37,     1,   272,     2,     1,   303,     2,   292,   -12,   -55,
+      67,  -127,   219,   -82,    80,    81,    38,   240,   170,   274,
+      80,    81,   270,   255,   -25,   229,   -30,     1,   -15,     2,
+     241,   167,   -71,   242,   -12,   -20,   264,   220,   145,   168,
+      80,    81,    80,    81,   291,   156,    80,    81,   -35,   227,
+     293,    -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,
+      -7,    -7,   283,   284,   -38,   180,    -7,    -7,    -7,    -7,
+      -7,   158,   159,   -43,   184,   185,    -7,     1,   297,   298,
+      85,    87,   137,    89,  -131,    91,   152,   180,    93,    95,
+      96,   173,   151,   180,   175,   176,   150,   192,   138,    80,
+      81,   177,   178,   179,   225,   153,   160,    13,   216,    14,
+    -187,  -187,  -187,  -187,  -187,  -187,  -187,   163,   165,   248,
+     172,   174,   190,   237,   207,   182,   183,   197,   218,   196,
+     199,   221,    15,    16,   319,   202,   226,   260,   201,   203,
+     267,   204,   262,   192,    88,   319,    90,   205,    92,   209,
+      94,   268,   250,    97,    53,    54,    55,    56,    57,    58,
+      59,   217,   223,   231,   238,   207,   278,   246,   243,   252,
+     260,   282,   261,   266,   247,   265,   271,   269,   273,   279,
+     192,   267,   289,   290,   296,   286,   221,   312,   299,   275,
+     295,   323,   276,   305,   325,   281,   311,   315,    10,     0,
+     207,     0,     0,     0,     0,     0,     0,   250,     0,     0,
+       0,     0,   314,     0,     0,   320,   309,     0,   285,     0,
+       0,   300,     0,   221,     0,   324,   320,     0,   286,     0,
+     250,     0,   322,  -156,  -156,  -156,  -156,  -156,  -156,  -156,
+    -156,  -156,  -156,     0,     0,   316,     0,     0,  -156,  -156,
+    -156,  -156,     0,     0,     0,   249,     0,  -156,  -156,     0,
+       0,     0,     0,     0,     0,     0,  -157,     0,  -157,    -7,
+      -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,
+       0,     0,     0,     0,    -7,    -7,    -7,    -7,    -7,   191,
+       0,     0,     0,     0,    -7,     1,     0,     0,     0,     0,
+       0,     0,   -93,     0,    -7,    -7,    -7,    -7,    -7,    -7,
+      -7,    -7,    -7,    -7,     0,     0,     0,     0,     0,    -7,
+      -7,    -7,    -7,   206,     0,     0,     0,     0,    -7,     1,
+       0,     0,     0,     0,     0,     0,   -76,     0,    -7,    -7,
+      -7,    -7,    -7,    -7,    -7,    -7,    -7,    -7,     0,     0,
+       0,     0,     0,    -7,    -7,    -7,    -7,     0,     0,     0,
+       0,     0,    -7,     1,     0,     0,     0,     0,     0,     0,
+     -59,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   247,     0,     0,     0,     0,  -105,  -105,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,     0,
+       0,     0,     0,   129,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,    80,    81,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   131,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,     0,   133,    98,
+     121,   122,   123,   124,   125,   126,   127,   133,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   135,    98,
       99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
      109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,     0,
-     135,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   139,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     186,    98,    99,   100,   101,   102,   103,   104,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
      117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,     0,   139,    98,    99,   100,   101,   102,   103,   104,
+     127,   224,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   247,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,     0,   189,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,     0,   227,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,     0,   250,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,     0,
-     307,   256,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,     0,     0,     0,     0,   257,   213,    79,    80,
-      81,     0,     0,     0,     0,     0,   214,   256,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,     0,     0,
-       0,     0,     0,   213,    79,    80,    81,     0,     0,     0,
-       0,     0,   214,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,     0,     0,     0,     0,     0,   213,    79,
-      80,    81,     0,     0,     0,     0,     0,   214,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,     0,     0,
-       0,     0,     0,     0,    79,    80,    81
+     125,   126,   127,   304,   253,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,     0,     0,     0,     0,   254,
+     210,    79,    80,    81,     0,     0,     0,     0,     0,   211,
+     253,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,     0,     0,     0,     0,     0,   210,    79,    80,    81,
+       0,     0,     0,     0,     0,   211,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,     0,     0,     0,     0,
+       0,   210,    79,    80,    81,     0,     0,     0,     0,     0,
+     211,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,     0,     0,     0,     0,     0,     0,    79,    80,    81
 };
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-260)))
+  (!!((Yystate) == (-278)))
 
 #define yytable_value_is_error(Yytable_value) \
   YYID (0)
 
 static const yytype_int16 yycheck[] =
 {
-      16,   177,    39,    12,   195,   195,    53,    54,    55,    56,
-       0,   129,    59,     0,   174,   212,     7,   276,   255,    34,
-      33,    49,   234,    51,   142,   216,    12,   145,   167,   147,
-      12,    40,    33,    35,   224,    50,    12,    13,    42,   157,
-     299,    54,     0,    34,    41,   236,    46,    51,   208,   167,
-      51,    41,   249,    43,    41,   292,    43,   269,    48,   177,
-     199,    47,    33,   253,    33,    47,    34,   257,   303,    46,
-     246,    47,    44,    33,    34,    41,    36,    43,    49,    51,
-      49,   199,    48,    46,   319,    24,   277,     1,   206,    49,
-      33,    34,   268,    32,    33,    34,   214,    11,   274,    46,
-      38,    39,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    33,    34,    46,    36,    46,    31,    32,    33,
-      34,   137,   138,   160,   161,    52,    40,    41,   246,    33,
-      34,    46,    36,    38,    39,    49,    46,    51,    28,    29,
-      46,    52,   151,    33,    34,    35,    36,    37,    46,   165,
-     268,    46,    46,    46,    46,    46,   274,   204,   195,    47,
-       1,    12,     3,     4,     5,     6,     7,     8,     9,    10,
-      46,    54,   219,   210,    43,    47,    45,   193,    47,    34,
-      49,    47,    47,    52,   200,    26,    27,   224,    13,   205,
-      47,    34,   229,   240,    50,    49,   212,   315,     4,     5,
-       6,     7,     8,     9,    10,   221,    33,    47,   326,    47,
-     253,    48,    46,    48,    53,    51,   253,    50,   234,    51,
-     257,   258,    48,    47,    46,    48,    34,    48,    46,    46,
-      50,    50,    48,   249,   281,    46,    49,    46,    50,   255,
-     277,    48,    46,    53,    46,    11,   293,    14,    49,   257,
-     253,    51,   326,   269,   305,   313,     2,    -1,    -1,    -1,
-     276,    -1,    -1,    -1,    -1,   312,   303,    -1,   315,    -1,
-       1,    -1,    -1,    -1,   290,    -1,   292,    -1,   325,   326,
-      -1,    -1,   319,   299,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    -1,    -1,   314,    30,
-      31,    32,    33,    34,     1,    -1,    -1,    -1,    -1,    40,
-      41,    -1,    -1,    -1,    -1,    -1,    -1,    48,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      -1,    -1,    -1,    30,    31,    32,    33,    34,     1,    -1,
-      -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
-      -1,    48,    -1,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,
-      33,    34,     1,    -1,    -1,    -1,    -1,    40,    41,    -1,
-      -1,    -1,    -1,    -1,    -1,    48,    -1,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    -1,    -1,    -1,
-      -1,    -1,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
-      -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,    48,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      -1,    34,    -1,    -1,    -1,    38,    39,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,   129,    12,   174,   192,    39,    53,    54,    55,    56,
+       0,   192,    59,     0,   142,   209,   172,   145,   252,   147,
+     273,    33,   231,   300,    12,   213,    12,   155,    12,    13,
+      40,   165,    49,     7,    51,    42,    35,   165,    50,   316,
+     221,    44,     0,   296,    51,   233,   174,    41,    51,   205,
+      46,    41,   246,    43,    41,   289,    43,   266,    48,    47,
+      34,    47,   196,    47,    33,    34,    33,    36,   196,   250,
+      33,    34,   243,   254,    46,   203,    46,    41,    46,    43,
+      49,    24,    47,   211,    48,    46,   274,     1,    12,    32,
+      33,    34,    33,    34,   265,    36,    33,    34,    46,    36,
+     271,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    38,    39,    46,   243,    30,    31,    32,    33,
+      34,   137,   138,    46,   158,   159,    40,    41,    38,    39,
+      46,    46,    52,    46,    48,    46,    54,   265,    46,    46,
+      46,   151,    47,   271,    28,    29,    46,   163,    52,    33,
+      34,    35,    36,    37,   201,    54,    47,     1,   192,     3,
+       4,     5,     6,     7,     8,     9,    10,    47,    13,   216,
+      47,    50,    47,   207,   190,    49,    49,    47,    47,    51,
+      48,   197,    26,    27,   312,    51,   202,   221,    53,    50,
+     237,    48,   226,   209,    43,   323,    45,    51,    47,    46,
+      49,    49,   218,    52,     4,     5,     6,     7,     8,     9,
+      10,    48,    48,    46,    48,   231,   250,    46,    50,    46,
+     254,   255,    48,    46,    33,    50,    50,    49,    46,    48,
+     246,   278,    46,    53,    46,    11,   252,    14,    49,   250,
+     274,    51,   250,   290,   323,   254,   302,   310,     2,    -1,
+     266,    -1,    -1,    -1,    -1,    -1,    -1,   273,    -1,    -1,
+      -1,    -1,   309,    -1,    -1,   312,   300,    -1,     1,    -1,
+      -1,   287,    -1,   289,    -1,   322,   323,    -1,    11,    -1,
+     296,    -1,   316,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    -1,    -1,   311,    -1,    -1,    31,    32,
+      33,    34,    -1,    -1,    -1,     1,    -1,    40,    41,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    49,    -1,    51,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    -1,    34,    -1,
-      -1,    -1,    38,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    -1,    34,     3,     4,     5,
+      -1,    -1,    -1,    -1,    30,    31,    32,    33,    34,     1,
+      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    48,    -1,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,    31,
+      32,    33,    34,     1,    -1,    -1,    -1,    -1,    40,    41,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    -1,
+      -1,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    -1,
+      -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
+      48,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    -1,    -1,    -1,    -1,    38,    39,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    -1,
+      -1,    -1,    -1,    38,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    -1,    34,     3,
+      26,    27,    28,    29,    30,    31,    32,    33,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,     3,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    -1,
-      34,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,     3,     4,     5,     6,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    -1,    34,     3,     4,     5,     6,     7,     8,     9,
+      32,    33,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,     3,     4,     5,     6,     7,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    -1,    34,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    -1,    34,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    -1,    34,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    -1,
-      34,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    -1,    -1,    -1,    30,    31,    32,    33,
-      34,    -1,    -1,    -1,    -1,    -1,    40,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    -1,
-      -1,    -1,    -1,    31,    32,    33,    34,    -1,    -1,    -1,
-      -1,    -1,    40,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,
-      33,    34,    -1,    -1,    -1,    -1,    -1,    40,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    -1,
-      -1,    -1,    -1,    -1,    32,    33,    34
+      30,    31,    32,    33,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,    30,
+      31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,    40,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,    34,
+      -1,    -1,    -1,    -1,    -1,    40,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,
+      40,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    -1,    -1,    -1,    -1,    -1,    -1,    32,    33,    34
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1052,7 +1049,7 @@ static const yytype_uint8 yystos[] =
        0,    41,    43,    56,    58,    59,    60,    35,   135,   136,
      136,     0,    61,     1,     3,    26,    27,    63,    77,    80,
       81,    90,    91,    97,    98,   112,   113,   121,   122,   124,
-     137,   139,   135,    42,    51,    44,    60,    46,    34,    59,
+     137,   139,   135,    42,    51,    44,    60,    46,    33,    59,
       62,    64,    69,    70,    71,    72,    65,    66,    67,    68,
       73,    74,    75,     4,     5,     6,     7,     8,     9,    10,
       79,    89,    95,    96,   111,   123,    76,   135,    78,    16,
@@ -1061,27 +1058,27 @@ static const yytype_uint8 yystos[] =
       57,    46,    57,    46,    57,    46,    46,    57,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    34,    38,
-     140,    34,   140,    34,   140,    34,   140,    52,    52,    34,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    38,
+     140,    33,   140,    33,   140,    33,   140,    52,    52,    33,
      126,   140,    12,    83,    92,    12,   100,    12,   116,   125,
-      46,    47,    54,    34,    33,    54,    34,    50,    36,   133,
-      59,    59,    47,   133,    82,    47,   133,    13,   101,    24,
-      32,   115,   133,   114,    47,    60,    34,    50,    28,    29,
-      35,    36,    37,   133,   138,    49,    49,   134,   134,    34,
-     127,   128,   140,    47,     1,    59,    93,   115,    99,    51,
-      47,   127,    48,   138,    53,    51,    50,    48,    51,     1,
-      59,    84,    46,    31,    40,    85,    86,    94,   104,   134,
-      48,    47,   115,     1,    59,   117,    48,    34,   140,    59,
-      36,   129,   133,   127,    46,    85,    86,    87,    88,   103,
-     134,    48,    93,    36,    49,   133,    50,    85,   134,    46,
-      34,   140,     1,    59,   102,    46,    15,    30,    86,   105,
-     106,   107,   118,   134,    48,   134,    84,    85,    50,    46,
-     140,    49,    49,   138,    50,    93,    46,    86,   103,   107,
-     110,   134,    48,   117,   105,   134,    38,    39,     1,    11,
-     130,   131,    46,    53,   138,    84,   138,   102,   134,    46,
-      38,    39,    49,    59,    49,    51,   117,    34,   140,   102,
-     109,    87,   134,   108,   130,    14,   132,   140,   132,    59,
-     119,   120,   133,   140,    87,   134,    51,   140,   119
+      46,    47,    54,    54,    33,    50,    36,   133,    59,    59,
+      47,   133,    82,    47,   133,    13,   101,    24,    32,   115,
+     133,   114,    47,    60,    50,    28,    29,    35,    36,    37,
+     133,   138,    49,    49,   134,   134,    33,   127,   128,   140,
+      47,     1,    59,    93,   115,    99,    51,    47,   127,    48,
+     138,    53,    51,    50,    48,    51,     1,    59,    84,    46,
+      31,    40,    85,    86,    94,   104,   134,    48,    47,   115,
+       1,    59,   117,    48,    33,   140,    59,    36,   129,   133,
+     127,    46,    85,    86,    87,    88,   103,   134,    48,    93,
+      36,    49,   133,    50,    85,   134,    46,    33,   140,     1,
+      59,   102,    46,    15,    30,    86,   105,   106,   107,   118,
+     134,    48,   134,    84,    85,    50,    46,   140,    49,    49,
+     138,    50,    93,    46,    86,   103,   107,   110,   134,    48,
+     117,   105,   134,    38,    39,     1,    11,   130,   131,    46,
+      53,   138,    84,   138,   102,   134,    46,    38,    39,    49,
+      59,    49,    51,   117,    33,   140,   102,   109,    87,   134,
+     108,   130,    14,   132,   140,   132,    59,   119,   120,   133,
+     140,    87,   134,    51,   140,   119
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1896,28 +1893,28 @@ yyreduce:
     {
         case 2:
 /* Line 1792 of yacc.c  */
-#line 116 "src/Slice/Grammar.y"
+#line 115 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 3:
 /* Line 1792 of yacc.c  */
-#line 124 "src/Slice/Grammar.y"
+#line 123 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 4:
 /* Line 1792 of yacc.c  */
-#line 127 "src/Slice/Grammar.y"
+#line 126 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 5:
 /* Line 1792 of yacc.c  */
-#line 135 "src/Slice/Grammar.y"
+#line 134 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
 }
@@ -1925,7 +1922,7 @@ yyreduce:
 
   case 6:
 /* Line 1792 of yacc.c  */
-#line 144 "src/Slice/Grammar.y"
+#line 143 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
 }
@@ -1933,7 +1930,7 @@ yyreduce:
 
   case 7:
 /* Line 1792 of yacc.c  */
-#line 148 "src/Slice/Grammar.y"
+#line 147 "src/Slice/Grammar.y"
     {
     (yyval) = new StringListTok;
 }
@@ -1941,7 +1938,7 @@ yyreduce:
 
   case 8:
 /* Line 1792 of yacc.c  */
-#line 157 "src/Slice/Grammar.y"
+#line 156 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     if(!metaData->v.empty())
@@ -1953,7 +1950,7 @@ yyreduce:
 
   case 10:
 /* Line 1792 of yacc.c  */
-#line 166 "src/Slice/Grammar.y"
+#line 165 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -1966,14 +1963,14 @@ yyreduce:
 
   case 12:
 /* Line 1792 of yacc.c  */
-#line 176 "src/Slice/Grammar.y"
+#line 175 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 13:
 /* Line 1792 of yacc.c  */
-#line 184 "src/Slice/Grammar.y"
+#line 183 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -1981,7 +1978,7 @@ yyreduce:
 
   case 15:
 /* Line 1792 of yacc.c  */
-#line 189 "src/Slice/Grammar.y"
+#line 188 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -1989,7 +1986,7 @@ yyreduce:
 
   case 17:
 /* Line 1792 of yacc.c  */
-#line 194 "src/Slice/Grammar.y"
+#line 193 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after class forward declaration");
 }
@@ -1997,7 +1994,7 @@ yyreduce:
 
   case 18:
 /* Line 1792 of yacc.c  */
-#line 198 "src/Slice/Grammar.y"
+#line 197 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2005,7 +2002,7 @@ yyreduce:
 
   case 20:
 /* Line 1792 of yacc.c  */
-#line 203 "src/Slice/Grammar.y"
+#line 202 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2013,7 +2010,7 @@ yyreduce:
 
   case 22:
 /* Line 1792 of yacc.c  */
-#line 208 "src/Slice/Grammar.y"
+#line 207 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after interface forward declaration");
 }
@@ -2021,7 +2018,7 @@ yyreduce:
 
   case 23:
 /* Line 1792 of yacc.c  */
-#line 212 "src/Slice/Grammar.y"
+#line 211 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2029,7 +2026,7 @@ yyreduce:
 
   case 25:
 /* Line 1792 of yacc.c  */
-#line 217 "src/Slice/Grammar.y"
+#line 216 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0);
 }
@@ -2037,7 +2034,7 @@ yyreduce:
 
   case 27:
 /* Line 1792 of yacc.c  */
-#line 222 "src/Slice/Grammar.y"
+#line 221 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after exception forward declaration");
 }
@@ -2045,7 +2042,7 @@ yyreduce:
 
   case 28:
 /* Line 1792 of yacc.c  */
-#line 226 "src/Slice/Grammar.y"
+#line 225 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2053,7 +2050,7 @@ yyreduce:
 
   case 30:
 /* Line 1792 of yacc.c  */
-#line 231 "src/Slice/Grammar.y"
+#line 230 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0);
 }
@@ -2061,7 +2058,7 @@ yyreduce:
 
   case 32:
 /* Line 1792 of yacc.c  */
-#line 236 "src/Slice/Grammar.y"
+#line 235 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after struct forward declaration");
 }
@@ -2069,7 +2066,7 @@ yyreduce:
 
   case 33:
 /* Line 1792 of yacc.c  */
-#line 240 "src/Slice/Grammar.y"
+#line 239 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2077,7 +2074,7 @@ yyreduce:
 
   case 35:
 /* Line 1792 of yacc.c  */
-#line 245 "src/Slice/Grammar.y"
+#line 244 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2085,7 +2082,7 @@ yyreduce:
 
   case 37:
 /* Line 1792 of yacc.c  */
-#line 250 "src/Slice/Grammar.y"
+#line 249 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after sequence definition");
 }
@@ -2093,7 +2090,7 @@ yyreduce:
 
   case 38:
 /* Line 1792 of yacc.c  */
-#line 254 "src/Slice/Grammar.y"
+#line 253 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2101,7 +2098,7 @@ yyreduce:
 
   case 40:
 /* Line 1792 of yacc.c  */
-#line 259 "src/Slice/Grammar.y"
+#line 258 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after dictionary definition");
 }
@@ -2109,7 +2106,7 @@ yyreduce:
 
   case 41:
 /* Line 1792 of yacc.c  */
-#line 263 "src/Slice/Grammar.y"
+#line 262 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2117,7 +2114,7 @@ yyreduce:
 
   case 43:
 /* Line 1792 of yacc.c  */
-#line 268 "src/Slice/Grammar.y"
+#line 267 "src/Slice/Grammar.y"
     {
     assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)])));
 }
@@ -2125,7 +2122,7 @@ yyreduce:
 
   case 45:
 /* Line 1792 of yacc.c  */
-#line 273 "src/Slice/Grammar.y"
+#line 272 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after const definition");
 }
@@ -2133,7 +2130,7 @@ yyreduce:
 
   case 46:
 /* Line 1792 of yacc.c  */
-#line 277 "src/Slice/Grammar.y"
+#line 276 "src/Slice/Grammar.y"
     {
     yyerrok;
 }
@@ -2141,7 +2138,7 @@ yyreduce:
 
   case 47:
 /* Line 1792 of yacc.c  */
-#line 286 "src/Slice/Grammar.y"
+#line 285 "src/Slice/Grammar.y"
     {
     unit->setSeenDefinition();
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2162,7 +2159,7 @@ yyreduce:
 
   case 48:
 /* Line 1792 of yacc.c  */
-#line 303 "src/Slice/Grammar.y"
+#line 302 "src/Slice/Grammar.y"
     {
     if((yyvsp[(3) - (6)]))
     {
@@ -2178,7 +2175,7 @@ yyreduce:
 
   case 49:
 /* Line 1792 of yacc.c  */
-#line 320 "src/Slice/Grammar.y"
+#line 319 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2186,7 +2183,7 @@ yyreduce:
 
   case 50:
 /* Line 1792 of yacc.c  */
-#line 324 "src/Slice/Grammar.y"
+#line 323 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
@@ -2196,7 +2193,7 @@ yyreduce:
 
   case 51:
 /* Line 1792 of yacc.c  */
-#line 335 "src/Slice/Grammar.y"
+#line 334 "src/Slice/Grammar.y"
     {
     unit->error("exceptions cannot be forward declared");
     (yyval) = 0;
@@ -2205,7 +2202,7 @@ yyreduce:
 
   case 52:
 /* Line 1792 of yacc.c  */
-#line 345 "src/Slice/Grammar.y"
+#line 344 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
@@ -2223,7 +2220,7 @@ yyreduce:
 
   case 53:
 /* Line 1792 of yacc.c  */
-#line 359 "src/Slice/Grammar.y"
+#line 358 "src/Slice/Grammar.y"
     {
     if((yyvsp[(4) - (7)]))
     {
@@ -2235,7 +2232,7 @@ yyreduce:
 
   case 54:
 /* Line 1792 of yacc.c  */
-#line 372 "src/Slice/Grammar.y"
+#line 371 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
@@ -2247,7 +2244,7 @@ yyreduce:
 
   case 55:
 /* Line 1792 of yacc.c  */
-#line 380 "src/Slice/Grammar.y"
+#line 379 "src/Slice/Grammar.y"
     {
     (yyval) = 0;
 }
@@ -2255,7 +2252,7 @@ yyreduce:
 
   case 56:
 /* Line 1792 of yacc.c  */
-#line 389 "src/Slice/Grammar.y"
+#line 388 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2268,14 +2265,14 @@ yyreduce:
 
   case 57:
 /* Line 1792 of yacc.c  */
-#line 398 "src/Slice/Grammar.y"
+#line 397 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 58:
 /* Line 1792 of yacc.c  */
-#line 401 "src/Slice/Grammar.y"
+#line 400 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -2283,14 +2280,14 @@ yyreduce:
 
   case 59:
 /* Line 1792 of yacc.c  */
-#line 405 "src/Slice/Grammar.y"
+#line 404 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 60:
 /* Line 1792 of yacc.c  */
-#line 413 "src/Slice/Grammar.y"
+#line 412 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2302,7 +2299,7 @@ yyreduce:
 
   case 61:
 /* Line 1792 of yacc.c  */
-#line 426 "src/Slice/Grammar.y"
+#line 425 "src/Slice/Grammar.y"
     {
     IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[(2) - (3)]));
 
@@ -2326,7 +2323,7 @@ yyreduce:
 
   case 62:
 /* Line 1792 of yacc.c  */
-#line 446 "src/Slice/Grammar.y"
+#line 445 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
 
@@ -2423,7 +2420,7 @@ yyreduce:
 
   case 63:
 /* Line 1792 of yacc.c  */
-#line 539 "src/Slice/Grammar.y"
+#line 538 "src/Slice/Grammar.y"
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
@@ -2435,7 +2432,7 @@ yyreduce:
 
   case 64:
 /* Line 1792 of yacc.c  */
-#line 547 "src/Slice/Grammar.y"
+#line 546 "src/Slice/Grammar.y"
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
@@ -2447,7 +2444,7 @@ yyreduce:
 
   case 65:
 /* Line 1792 of yacc.c  */
-#line 560 "src/Slice/Grammar.y"
+#line 559 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2459,7 +2456,7 @@ yyreduce:
 
   case 66:
 /* Line 1792 of yacc.c  */
-#line 568 "src/Slice/Grammar.y"
+#line 567 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     OptionalDefTokPtr m = new OptionalDefTok;
@@ -2473,7 +2470,7 @@ yyreduce:
 
   case 68:
 /* Line 1792 of yacc.c  */
-#line 589 "src/Slice/Grammar.y"
+#line 588 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2481,7 +2478,7 @@ yyreduce:
 
   case 69:
 /* Line 1792 of yacc.c  */
-#line 593 "src/Slice/Grammar.y"
+#line 592 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as struct name");
@@ -2491,7 +2488,7 @@ yyreduce:
 
   case 70:
 /* Line 1792 of yacc.c  */
-#line 604 "src/Slice/Grammar.y"
+#line 603 "src/Slice/Grammar.y"
     {
     unit->error("structs cannot be forward declared");
     (yyval) = 0; // Dummy
@@ -2500,7 +2497,7 @@ yyreduce:
 
   case 71:
 /* Line 1792 of yacc.c  */
-#line 614 "src/Slice/Grammar.y"
+#line 613 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2523,7 +2520,7 @@ yyreduce:
 
   case 72:
 /* Line 1792 of yacc.c  */
-#line 633 "src/Slice/Grammar.y"
+#line 632 "src/Slice/Grammar.y"
     {
     if((yyvsp[(3) - (6)]))
     {
@@ -2545,7 +2542,7 @@ yyreduce:
 
   case 73:
 /* Line 1792 of yacc.c  */
-#line 656 "src/Slice/Grammar.y"
+#line 655 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2558,14 +2555,14 @@ yyreduce:
 
   case 74:
 /* Line 1792 of yacc.c  */
-#line 665 "src/Slice/Grammar.y"
+#line 664 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 75:
 /* Line 1792 of yacc.c  */
-#line 668 "src/Slice/Grammar.y"
+#line 667 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -2573,14 +2570,14 @@ yyreduce:
 
   case 76:
 /* Line 1792 of yacc.c  */
-#line 672 "src/Slice/Grammar.y"
+#line 671 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 78:
 /* Line 1792 of yacc.c  */
-#line 686 "src/Slice/Grammar.y"
+#line 685 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2588,7 +2585,7 @@ yyreduce:
 
   case 79:
 /* Line 1792 of yacc.c  */
-#line 690 "src/Slice/Grammar.y"
+#line 689 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as class name");
@@ -2598,7 +2595,7 @@ yyreduce:
 
   case 80:
 /* Line 1792 of yacc.c  */
-#line 701 "src/Slice/Grammar.y"
+#line 700 "src/Slice/Grammar.y"
     {
     IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[(3) - (4)]))->v;
     if(id < 0)
@@ -2627,7 +2624,7 @@ yyreduce:
 
   case 81:
 /* Line 1792 of yacc.c  */
-#line 726 "src/Slice/Grammar.y"
+#line 725 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(3) - (4)]));
 
@@ -2733,7 +2730,7 @@ yyreduce:
 
   case 82:
 /* Line 1792 of yacc.c  */
-#line 828 "src/Slice/Grammar.y"
+#line 827 "src/Slice/Grammar.y"
     {
     ClassIdTokPtr classId = new ClassIdTok();
     classId->v = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v;
@@ -2744,7 +2741,7 @@ yyreduce:
 
   case 83:
 /* Line 1792 of yacc.c  */
-#line 840 "src/Slice/Grammar.y"
+#line 839 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -2756,7 +2753,7 @@ yyreduce:
 
   case 84:
 /* Line 1792 of yacc.c  */
-#line 853 "src/Slice/Grammar.y"
+#line 852 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2783,7 +2780,7 @@ yyreduce:
 
   case 85:
 /* Line 1792 of yacc.c  */
-#line 876 "src/Slice/Grammar.y"
+#line 875 "src/Slice/Grammar.y"
     {
     if((yyvsp[(5) - (8)]))
     {
@@ -2799,7 +2796,7 @@ yyreduce:
 
   case 86:
 /* Line 1792 of yacc.c  */
-#line 893 "src/Slice/Grammar.y"
+#line 892 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     ContainerPtr cont = unit->currentContainer();
@@ -2837,7 +2834,7 @@ yyreduce:
 
   case 87:
 /* Line 1792 of yacc.c  */
-#line 927 "src/Slice/Grammar.y"
+#line 926 "src/Slice/Grammar.y"
     {
     (yyval) = 0;
 }
@@ -2845,7 +2842,7 @@ yyreduce:
 
   case 88:
 /* Line 1792 of yacc.c  */
-#line 936 "src/Slice/Grammar.y"
+#line 935 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -2853,7 +2850,7 @@ yyreduce:
 
   case 89:
 /* Line 1792 of yacc.c  */
-#line 940 "src/Slice/Grammar.y"
+#line 939 "src/Slice/Grammar.y"
     {
     (yyval) = new ClassListTok;
 }
@@ -2861,7 +2858,7 @@ yyreduce:
 
   case 90:
 /* Line 1792 of yacc.c  */
-#line 949 "src/Slice/Grammar.y"
+#line 948 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -2874,14 +2871,14 @@ yyreduce:
 
   case 91:
 /* Line 1792 of yacc.c  */
-#line 958 "src/Slice/Grammar.y"
+#line 957 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 92:
 /* Line 1792 of yacc.c  */
-#line 961 "src/Slice/Grammar.y"
+#line 960 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -2889,14 +2886,14 @@ yyreduce:
 
   case 93:
 /* Line 1792 of yacc.c  */
-#line 965 "src/Slice/Grammar.y"
+#line 964 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 94:
 /* Line 1792 of yacc.c  */
-#line 973 "src/Slice/Grammar.y"
+#line 972 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
@@ -2922,7 +2919,7 @@ yyreduce:
 
   case 95:
 /* Line 1792 of yacc.c  */
-#line 995 "src/Slice/Grammar.y"
+#line 994 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -2953,7 +2950,7 @@ yyreduce:
 
   case 96:
 /* Line 1792 of yacc.c  */
-#line 1022 "src/Slice/Grammar.y"
+#line 1021 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -2979,7 +2976,7 @@ yyreduce:
 
   case 97:
 /* Line 1792 of yacc.c  */
-#line 1044 "src/Slice/Grammar.y"
+#line 1043 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
@@ -3004,7 +3001,7 @@ yyreduce:
 
   case 98:
 /* Line 1792 of yacc.c  */
-#line 1070 "src/Slice/Grammar.y"
+#line 1069 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3017,7 +3014,7 @@ yyreduce:
 
   case 99:
 /* Line 1792 of yacc.c  */
-#line 1079 "src/Slice/Grammar.y"
+#line 1078 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3032,7 +3029,7 @@ yyreduce:
 
   case 100:
 /* Line 1792 of yacc.c  */
-#line 1090 "src/Slice/Grammar.y"
+#line 1089 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3045,7 +3042,7 @@ yyreduce:
 
   case 101:
 /* Line 1792 of yacc.c  */
-#line 1099 "src/Slice/Grammar.y"
+#line 1098 "src/Slice/Grammar.y"
     {
     TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (4)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3058,7 +3055,7 @@ yyreduce:
 
   case 102:
 /* Line 1792 of yacc.c  */
-#line 1108 "src/Slice/Grammar.y"
+#line 1107 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -3072,7 +3069,7 @@ yyreduce:
 
   case 103:
 /* Line 1792 of yacc.c  */
-#line 1118 "src/Slice/Grammar.y"
+#line 1117 "src/Slice/Grammar.y"
     {
     TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
@@ -3085,7 +3082,7 @@ yyreduce:
 
   case 104:
 /* Line 1792 of yacc.c  */
-#line 1132 "src/Slice/Grammar.y"
+#line 1131 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     m->v.type = TypePtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3095,7 +3092,7 @@ yyreduce:
 
   case 105:
 /* Line 1792 of yacc.c  */
-#line 1138 "src/Slice/Grammar.y"
+#line 1137 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = new OptionalDefTok();
     m->v.type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3107,7 +3104,7 @@ yyreduce:
 
   case 106:
 /* Line 1792 of yacc.c  */
-#line 1146 "src/Slice/Grammar.y"
+#line 1145 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.optional = false;
@@ -3118,7 +3115,7 @@ yyreduce:
 
   case 107:
 /* Line 1792 of yacc.c  */
-#line 1158 "src/Slice/Grammar.y"
+#line 1157 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -3146,7 +3143,7 @@ yyreduce:
 
   case 108:
 /* Line 1792 of yacc.c  */
-#line 1182 "src/Slice/Grammar.y"
+#line 1181 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
@@ -3175,7 +3172,7 @@ yyreduce:
 
   case 109:
 /* Line 1792 of yacc.c  */
-#line 1207 "src/Slice/Grammar.y"
+#line 1206 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
@@ -3203,7 +3200,7 @@ yyreduce:
 
   case 110:
 /* Line 1792 of yacc.c  */
-#line 1231 "src/Slice/Grammar.y"
+#line 1230 "src/Slice/Grammar.y"
     {
     OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
     string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
@@ -3232,7 +3229,7 @@ yyreduce:
 
   case 111:
 /* Line 1792 of yacc.c  */
-#line 1261 "src/Slice/Grammar.y"
+#line 1260 "src/Slice/Grammar.y"
     {
     if((yyvsp[(1) - (3)]))
     {
@@ -3248,7 +3245,7 @@ yyreduce:
 
   case 112:
 /* Line 1792 of yacc.c  */
-#line 1273 "src/Slice/Grammar.y"
+#line 1272 "src/Slice/Grammar.y"
     {
     OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
     ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3262,7 +3259,7 @@ yyreduce:
 
   case 113:
 /* Line 1792 of yacc.c  */
-#line 1283 "src/Slice/Grammar.y"
+#line 1282 "src/Slice/Grammar.y"
     {
     if((yyvsp[(1) - (3)]))
     {
@@ -3274,7 +3271,7 @@ yyreduce:
 
   case 114:
 /* Line 1792 of yacc.c  */
-#line 1291 "src/Slice/Grammar.y"
+#line 1290 "src/Slice/Grammar.y"
     {
     OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
     ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3288,7 +3285,7 @@ yyreduce:
 
   case 117:
 /* Line 1792 of yacc.c  */
-#line 1313 "src/Slice/Grammar.y"
+#line 1312 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3296,7 +3293,7 @@ yyreduce:
 
   case 118:
 /* Line 1792 of yacc.c  */
-#line 1317 "src/Slice/Grammar.y"
+#line 1316 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as interface name");
@@ -3306,7 +3303,7 @@ yyreduce:
 
   case 119:
 /* Line 1792 of yacc.c  */
-#line 1328 "src/Slice/Grammar.y"
+#line 1327 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3319,7 +3316,7 @@ yyreduce:
 
   case 120:
 /* Line 1792 of yacc.c  */
-#line 1342 "src/Slice/Grammar.y"
+#line 1341 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
@@ -3341,7 +3338,7 @@ yyreduce:
 
   case 121:
 /* Line 1792 of yacc.c  */
-#line 1360 "src/Slice/Grammar.y"
+#line 1359 "src/Slice/Grammar.y"
     {
     if((yyvsp[(4) - (7)]))
     {
@@ -3357,7 +3354,7 @@ yyreduce:
 
   case 122:
 /* Line 1792 of yacc.c  */
-#line 1377 "src/Slice/Grammar.y"
+#line 1376 "src/Slice/Grammar.y"
     {
     ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -3396,7 +3393,7 @@ yyreduce:
 
   case 123:
 /* Line 1792 of yacc.c  */
-#line 1412 "src/Slice/Grammar.y"
+#line 1411 "src/Slice/Grammar.y"
     {
     ClassListTokPtr intfs = new ClassListTok;
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -3435,7 +3432,7 @@ yyreduce:
 
   case 124:
 /* Line 1792 of yacc.c  */
-#line 1447 "src/Slice/Grammar.y"
+#line 1446 "src/Slice/Grammar.y"
     {
     unit->error("illegal inheritance from type Object");
     (yyval) = new ClassListTok; // Dummy
@@ -3444,7 +3441,7 @@ yyreduce:
 
   case 125:
 /* Line 1792 of yacc.c  */
-#line 1452 "src/Slice/Grammar.y"
+#line 1451 "src/Slice/Grammar.y"
     {
     unit->error("illegal inheritance from type Value");
     (yyval) = new ClassListTok; // Dummy
@@ -3453,7 +3450,7 @@ yyreduce:
 
   case 126:
 /* Line 1792 of yacc.c  */
-#line 1462 "src/Slice/Grammar.y"
+#line 1461 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3461,7 +3458,7 @@ yyreduce:
 
   case 127:
 /* Line 1792 of yacc.c  */
-#line 1466 "src/Slice/Grammar.y"
+#line 1465 "src/Slice/Grammar.y"
     {
     (yyval) = new ClassListTok;
 }
@@ -3469,7 +3466,7 @@ yyreduce:
 
   case 128:
 /* Line 1792 of yacc.c  */
-#line 1475 "src/Slice/Grammar.y"
+#line 1474 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
@@ -3482,14 +3479,14 @@ yyreduce:
 
   case 129:
 /* Line 1792 of yacc.c  */
-#line 1484 "src/Slice/Grammar.y"
+#line 1483 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 130:
 /* Line 1792 of yacc.c  */
-#line 1487 "src/Slice/Grammar.y"
+#line 1486 "src/Slice/Grammar.y"
     {
     unit->error("`;' missing after definition");
 }
@@ -3497,14 +3494,14 @@ yyreduce:
 
   case 131:
 /* Line 1792 of yacc.c  */
-#line 1491 "src/Slice/Grammar.y"
+#line 1490 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 133:
 /* Line 1792 of yacc.c  */
-#line 1505 "src/Slice/Grammar.y"
+#line 1504 "src/Slice/Grammar.y"
     {
     ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)]));
     ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3515,7 +3512,7 @@ yyreduce:
 
   case 134:
 /* Line 1792 of yacc.c  */
-#line 1512 "src/Slice/Grammar.y"
+#line 1511 "src/Slice/Grammar.y"
     {
     ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]));
     ExceptionListTokPtr exceptionList = new ExceptionListTok;
@@ -3526,7 +3523,7 @@ yyreduce:
 
   case 135:
 /* Line 1792 of yacc.c  */
-#line 1524 "src/Slice/Grammar.y"
+#line 1523 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
@@ -3542,7 +3539,7 @@ yyreduce:
 
   case 136:
 /* Line 1792 of yacc.c  */
-#line 1536 "src/Slice/Grammar.y"
+#line 1535 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
@@ -3552,7 +3549,7 @@ yyreduce:
 
   case 137:
 /* Line 1792 of yacc.c  */
-#line 1547 "src/Slice/Grammar.y"
+#line 1546 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
@@ -3565,7 +3562,7 @@ yyreduce:
 
   case 138:
 /* Line 1792 of yacc.c  */
-#line 1556 "src/Slice/Grammar.y"
+#line 1555 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
@@ -3579,7 +3576,7 @@ yyreduce:
 
   case 139:
 /* Line 1792 of yacc.c  */
-#line 1571 "src/Slice/Grammar.y"
+#line 1570 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
@@ -3594,7 +3591,7 @@ yyreduce:
 
   case 140:
 /* Line 1792 of yacc.c  */
-#line 1582 "src/Slice/Grammar.y"
+#line 1581 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
@@ -3610,7 +3607,7 @@ yyreduce:
 
   case 141:
 /* Line 1792 of yacc.c  */
-#line 1599 "src/Slice/Grammar.y"
+#line 1598 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3618,7 +3615,7 @@ yyreduce:
 
   case 142:
 /* Line 1792 of yacc.c  */
-#line 1603 "src/Slice/Grammar.y"
+#line 1602 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
@@ -3628,7 +3625,7 @@ yyreduce:
 
   case 143:
 /* Line 1792 of yacc.c  */
-#line 1614 "src/Slice/Grammar.y"
+#line 1613 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -3649,7 +3646,7 @@ yyreduce:
 
   case 144:
 /* Line 1792 of yacc.c  */
-#line 1631 "src/Slice/Grammar.y"
+#line 1630 "src/Slice/Grammar.y"
     {
     EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)]));
     if(en)
@@ -3667,7 +3664,7 @@ yyreduce:
 
   case 145:
 /* Line 1792 of yacc.c  */
-#line 1646 "src/Slice/Grammar.y"
+#line 1645 "src/Slice/Grammar.y"
     {
     unit->error("missing enumeration name");
     BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
@@ -3680,7 +3677,7 @@ yyreduce:
 
   case 146:
 /* Line 1792 of yacc.c  */
-#line 1655 "src/Slice/Grammar.y"
+#line 1654 "src/Slice/Grammar.y"
     {
     unit->popContainer();
     (yyval) = (yyvsp[(2) - (6)]);
@@ -3689,7 +3686,7 @@ yyreduce:
 
   case 147:
 /* Line 1792 of yacc.c  */
-#line 1665 "src/Slice/Grammar.y"
+#line 1664 "src/Slice/Grammar.y"
     {
     EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v);
@@ -3699,14 +3696,14 @@ yyreduce:
 
   case 148:
 /* Line 1792 of yacc.c  */
-#line 1671 "src/Slice/Grammar.y"
+#line 1670 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 149:
 /* Line 1792 of yacc.c  */
-#line 1679 "src/Slice/Grammar.y"
+#line 1678 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
@@ -3722,7 +3719,7 @@ yyreduce:
 
   case 150:
 /* Line 1792 of yacc.c  */
-#line 1691 "src/Slice/Grammar.y"
+#line 1690 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
@@ -3746,7 +3743,7 @@ yyreduce:
 
   case 151:
 /* Line 1792 of yacc.c  */
-#line 1711 "src/Slice/Grammar.y"
+#line 1710 "src/Slice/Grammar.y"
     {
     StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumerator");
@@ -3757,7 +3754,7 @@ yyreduce:
 
   case 152:
 /* Line 1792 of yacc.c  */
-#line 1718 "src/Slice/Grammar.y"
+#line 1717 "src/Slice/Grammar.y"
     {
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     (yyval) = ens; // Dummy
@@ -3766,7 +3763,7 @@ yyreduce:
 
   case 153:
 /* Line 1792 of yacc.c  */
-#line 1728 "src/Slice/Grammar.y"
+#line 1727 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(1) - (1)]);
 }
@@ -3774,7 +3771,7 @@ yyreduce:
 
   case 154:
 /* Line 1792 of yacc.c  */
-#line 1732 "src/Slice/Grammar.y"
+#line 1731 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
@@ -3812,7 +3809,7 @@ yyreduce:
 
   case 155:
 /* Line 1792 of yacc.c  */
-#line 1771 "src/Slice/Grammar.y"
+#line 1770 "src/Slice/Grammar.y"
     {
     BoolTokPtr out = new BoolTok;
     out->v = true;
@@ -3822,7 +3819,7 @@ yyreduce:
 
   case 156:
 /* Line 1792 of yacc.c  */
-#line 1777 "src/Slice/Grammar.y"
+#line 1776 "src/Slice/Grammar.y"
     {
     BoolTokPtr out = new BoolTok;
     out->v = false;
@@ -3832,14 +3829,14 @@ yyreduce:
 
   case 157:
 /* Line 1792 of yacc.c  */
-#line 1788 "src/Slice/Grammar.y"
+#line 1787 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 158:
 /* Line 1792 of yacc.c  */
-#line 1791 "src/Slice/Grammar.y"
+#line 1790 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3859,7 +3856,7 @@ yyreduce:
 
   case 159:
 /* Line 1792 of yacc.c  */
-#line 1807 "src/Slice/Grammar.y"
+#line 1806 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
     OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3879,7 +3876,7 @@ yyreduce:
 
   case 160:
 /* Line 1792 of yacc.c  */
-#line 1823 "src/Slice/Grammar.y"
+#line 1822 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (4)]));
@@ -3895,7 +3892,7 @@ yyreduce:
 
   case 161:
 /* Line 1792 of yacc.c  */
-#line 1835 "src/Slice/Grammar.y"
+#line 1834 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (6)]));
@@ -3911,7 +3908,7 @@ yyreduce:
 
   case 162:
 /* Line 1792 of yacc.c  */
-#line 1847 "src/Slice/Grammar.y"
+#line 1846 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (3)]));
@@ -3926,7 +3923,7 @@ yyreduce:
 
   case 163:
 /* Line 1792 of yacc.c  */
-#line 1858 "src/Slice/Grammar.y"
+#line 1857 "src/Slice/Grammar.y"
     {
     BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
     TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (5)]));
@@ -3941,7 +3938,7 @@ yyreduce:
 
   case 164:
 /* Line 1792 of yacc.c  */
-#line 1874 "src/Slice/Grammar.y"
+#line 1873 "src/Slice/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
 }
@@ -3949,7 +3946,7 @@ yyreduce:
 
   case 165:
 /* Line 1792 of yacc.c  */
-#line 1878 "src/Slice/Grammar.y"
+#line 1877 "src/Slice/Grammar.y"
     {
     (yyval) = new ExceptionListTok;
 }
@@ -3957,132 +3954,117 @@ yyreduce:
 
   case 166:
 /* Line 1792 of yacc.c  */
-#line 1887 "src/Slice/Grammar.y"
+#line 1886 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 167:
 /* Line 1792 of yacc.c  */
-#line 1890 "src/Slice/Grammar.y"
+#line 1889 "src/Slice/Grammar.y"
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
-    ident->v = "::" + ident->v;
-    (yyval) = ident;
 }
     break;
 
   case 168:
 /* Line 1792 of yacc.c  */
-#line 1896 "src/Slice/Grammar.y"
-    {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    scoped->v += "::";
-    scoped->v += ident->v;
-    (yyval) = scoped;
-}
-    break;
-
-  case 169:
-/* Line 1792 of yacc.c  */
-#line 1909 "src/Slice/Grammar.y"
+#line 1897 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindByte);
 }
     break;
 
-  case 170:
+  case 169:
 /* Line 1792 of yacc.c  */
-#line 1913 "src/Slice/Grammar.y"
+#line 1901 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindBool);
 }
     break;
 
-  case 171:
+  case 170:
 /* Line 1792 of yacc.c  */
-#line 1917 "src/Slice/Grammar.y"
+#line 1905 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindShort);
 }
     break;
 
-  case 172:
+  case 171:
 /* Line 1792 of yacc.c  */
-#line 1921 "src/Slice/Grammar.y"
+#line 1909 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindInt);
 }
     break;
 
-  case 173:
+  case 172:
 /* Line 1792 of yacc.c  */
-#line 1925 "src/Slice/Grammar.y"
+#line 1913 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindLong);
 }
     break;
 
-  case 174:
+  case 173:
 /* Line 1792 of yacc.c  */
-#line 1929 "src/Slice/Grammar.y"
+#line 1917 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindFloat);
 }
     break;
 
-  case 175:
+  case 174:
 /* Line 1792 of yacc.c  */
-#line 1933 "src/Slice/Grammar.y"
+#line 1921 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindDouble);
 }
     break;
 
-  case 176:
+  case 175:
 /* Line 1792 of yacc.c  */
-#line 1937 "src/Slice/Grammar.y"
+#line 1925 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindString);
 }
     break;
 
-  case 177:
+  case 176:
 /* Line 1792 of yacc.c  */
-#line 1941 "src/Slice/Grammar.y"
+#line 1929 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindObject);
 }
     break;
 
-  case 178:
+  case 177:
 /* Line 1792 of yacc.c  */
-#line 1945 "src/Slice/Grammar.y"
+#line 1933 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindObjectProxy);
 }
     break;
 
-  case 179:
+  case 178:
 /* Line 1792 of yacc.c  */
-#line 1949 "src/Slice/Grammar.y"
+#line 1937 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindLocalObject);
 }
     break;
 
-  case 180:
+  case 179:
 /* Line 1792 of yacc.c  */
-#line 1953 "src/Slice/Grammar.y"
+#line 1941 "src/Slice/Grammar.y"
     {
     (yyval) = unit->builtin(Builtin::KindValue);
 }
     break;
 
-  case 181:
+  case 180:
 /* Line 1792 of yacc.c  */
-#line 1957 "src/Slice/Grammar.y"
+#line 1945 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ContainerPtr cont = unit->currentContainer();
@@ -4103,9 +4085,9 @@ yyreduce:
 }
     break;
 
-  case 182:
+  case 181:
 /* Line 1792 of yacc.c  */
-#line 1976 "src/Slice/Grammar.y"
+#line 1964 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     ContainerPtr cont = unit->currentContainer();
@@ -4143,9 +4125,9 @@ yyreduce:
 }
     break;
 
-  case 183:
+  case 182:
 /* Line 1792 of yacc.c  */
-#line 2017 "src/Slice/Grammar.y"
+#line 2005 "src/Slice/Grammar.y"
     {
     StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
     StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
@@ -4153,16 +4135,16 @@ yyreduce:
 }
     break;
 
-  case 184:
+  case 183:
 /* Line 1792 of yacc.c  */
-#line 2023 "src/Slice/Grammar.y"
+#line 2011 "src/Slice/Grammar.y"
     {
 }
     break;
 
-  case 185:
+  case 184:
 /* Line 1792 of yacc.c  */
-#line 2031 "src/Slice/Grammar.y"
+#line 2019 "src/Slice/Grammar.y"
     {
     StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
     StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
@@ -4171,9 +4153,9 @@ yyreduce:
 }
     break;
 
-  case 186:
+  case 185:
 /* Line 1792 of yacc.c  */
-#line 2038 "src/Slice/Grammar.y"
+#line 2026 "src/Slice/Grammar.y"
     {
     StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     StringListTokPtr stringList = new StringListTok;
@@ -4182,9 +4164,9 @@ yyreduce:
 }
     break;
 
-  case 187:
+  case 186:
 /* Line 1792 of yacc.c  */
-#line 2050 "src/Slice/Grammar.y"
+#line 2038 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = new BoolTok;
     local->v = true;
@@ -4192,9 +4174,9 @@ yyreduce:
 }
     break;
 
-  case 188:
+  case 187:
 /* Line 1792 of yacc.c  */
-#line 2056 "src/Slice/Grammar.y"
+#line 2044 "src/Slice/Grammar.y"
     {
     BoolTokPtr local = new BoolTok;
     local->v = false;
@@ -4202,9 +4184,9 @@ yyreduce:
 }
     break;
 
-  case 189:
+  case 188:
 /* Line 1792 of yacc.c  */
-#line 2067 "src/Slice/Grammar.y"
+#line 2055 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindLong);
     IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4219,9 +4201,9 @@ yyreduce:
 }
     break;
 
-  case 190:
+  case 189:
 /* Line 1792 of yacc.c  */
-#line 2080 "src/Slice/Grammar.y"
+#line 2068 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindDouble);
     FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4236,9 +4218,9 @@ yyreduce:
 }
     break;
 
-  case 191:
+  case 190:
 /* Line 1792 of yacc.c  */
-#line 2093 "src/Slice/Grammar.y"
+#line 2081 "src/Slice/Grammar.y"
     {
     StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
     ConstDefTokPtr def = new ConstDefTok;
@@ -4287,9 +4269,9 @@ yyreduce:
 }
     break;
 
-  case 192:
+  case 191:
 /* Line 1792 of yacc.c  */
-#line 2140 "src/Slice/Grammar.y"
+#line 2128 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindString);
     StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4302,9 +4284,9 @@ yyreduce:
 }
     break;
 
-  case 193:
+  case 192:
 /* Line 1792 of yacc.c  */
-#line 2151 "src/Slice/Grammar.y"
+#line 2139 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
     StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4317,9 +4299,9 @@ yyreduce:
 }
     break;
 
-  case 194:
+  case 193:
 /* Line 1792 of yacc.c  */
-#line 2162 "src/Slice/Grammar.y"
+#line 2150 "src/Slice/Grammar.y"
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
     StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
@@ -4332,9 +4314,9 @@ yyreduce:
 }
     break;
 
-  case 195:
+  case 194:
 /* Line 1792 of yacc.c  */
-#line 2178 "src/Slice/Grammar.y"
+#line 2166 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (6)]));
     TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (6)]));
@@ -4345,9 +4327,9 @@ yyreduce:
 }
     break;
 
-  case 196:
+  case 195:
 /* Line 1792 of yacc.c  */
-#line 2187 "src/Slice/Grammar.y"
+#line 2175 "src/Slice/Grammar.y"
     {
     StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (5)]));
     TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (5)]));
@@ -4358,219 +4340,219 @@ yyreduce:
 }
     break;
 
+  case 196:
+/* Line 1792 of yacc.c  */
+#line 2189 "src/Slice/Grammar.y"
+    {
+}
+    break;
+
   case 197:
 /* Line 1792 of yacc.c  */
-#line 2201 "src/Slice/Grammar.y"
+#line 2192 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 198:
 /* Line 1792 of yacc.c  */
-#line 2204 "src/Slice/Grammar.y"
+#line 2195 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 199:
 /* Line 1792 of yacc.c  */
-#line 2207 "src/Slice/Grammar.y"
+#line 2198 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 200:
 /* Line 1792 of yacc.c  */
-#line 2210 "src/Slice/Grammar.y"
+#line 2201 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 201:
 /* Line 1792 of yacc.c  */
-#line 2213 "src/Slice/Grammar.y"
+#line 2204 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 202:
 /* Line 1792 of yacc.c  */
-#line 2216 "src/Slice/Grammar.y"
+#line 2207 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 203:
 /* Line 1792 of yacc.c  */
-#line 2219 "src/Slice/Grammar.y"
+#line 2210 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 204:
 /* Line 1792 of yacc.c  */
-#line 2222 "src/Slice/Grammar.y"
+#line 2213 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 205:
 /* Line 1792 of yacc.c  */
-#line 2225 "src/Slice/Grammar.y"
+#line 2216 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 206:
 /* Line 1792 of yacc.c  */
-#line 2228 "src/Slice/Grammar.y"
+#line 2219 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 207:
 /* Line 1792 of yacc.c  */
-#line 2231 "src/Slice/Grammar.y"
+#line 2222 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 208:
 /* Line 1792 of yacc.c  */
-#line 2234 "src/Slice/Grammar.y"
+#line 2225 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 209:
 /* Line 1792 of yacc.c  */
-#line 2237 "src/Slice/Grammar.y"
+#line 2228 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 210:
 /* Line 1792 of yacc.c  */
-#line 2240 "src/Slice/Grammar.y"
+#line 2231 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 211:
 /* Line 1792 of yacc.c  */
-#line 2243 "src/Slice/Grammar.y"
+#line 2234 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 212:
 /* Line 1792 of yacc.c  */
-#line 2246 "src/Slice/Grammar.y"
+#line 2237 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 213:
 /* Line 1792 of yacc.c  */
-#line 2249 "src/Slice/Grammar.y"
+#line 2240 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 214:
 /* Line 1792 of yacc.c  */
-#line 2252 "src/Slice/Grammar.y"
+#line 2243 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 215:
 /* Line 1792 of yacc.c  */
-#line 2255 "src/Slice/Grammar.y"
+#line 2246 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 216:
 /* Line 1792 of yacc.c  */
-#line 2258 "src/Slice/Grammar.y"
+#line 2249 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 217:
 /* Line 1792 of yacc.c  */
-#line 2261 "src/Slice/Grammar.y"
+#line 2252 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 218:
 /* Line 1792 of yacc.c  */
-#line 2264 "src/Slice/Grammar.y"
+#line 2255 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 219:
 /* Line 1792 of yacc.c  */
-#line 2267 "src/Slice/Grammar.y"
+#line 2258 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 220:
 /* Line 1792 of yacc.c  */
-#line 2270 "src/Slice/Grammar.y"
+#line 2261 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 221:
 /* Line 1792 of yacc.c  */
-#line 2273 "src/Slice/Grammar.y"
+#line 2264 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 222:
 /* Line 1792 of yacc.c  */
-#line 2276 "src/Slice/Grammar.y"
+#line 2267 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 223:
 /* Line 1792 of yacc.c  */
-#line 2279 "src/Slice/Grammar.y"
+#line 2270 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 224:
 /* Line 1792 of yacc.c  */
-#line 2282 "src/Slice/Grammar.y"
+#line 2273 "src/Slice/Grammar.y"
     {
 }
     break;
 
   case 225:
 /* Line 1792 of yacc.c  */
-#line 2285 "src/Slice/Grammar.y"
-    {
-}
-    break;
-
-  case 226:
-/* Line 1792 of yacc.c  */
-#line 2288 "src/Slice/Grammar.y"
+#line 2276 "src/Slice/Grammar.y"
     {
 }
     break;
 
 
 /* Line 1792 of yacc.c  */
-#line 4574 "src/Slice/Grammar.cpp"
+#line 4556 "src/Slice/Grammar.cpp"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4802,5 +4784,5 @@ yyreturn:
 
 
 /* Line 2055 of yacc.c  */
-#line 2292 "src/Slice/Grammar.y"
+#line 2280 "src/Slice/Grammar.y"