zeroc-ice 3.8.2 → 3.8.3

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

@@ -741,17 +741,17 @@ static const yytype_int16 yyrline[] =
      501,   510,   521,   534,   540,   551,   568,   581,   592,   591,
      618,   622,   633,   653,   665,   678,   677,   711,   737,   746,
      749,   757,   766,   769,   773,   781,   809,   843,   858,   864,
-     874,   878,   887,   917,   916,   948,   947,   970,   974,   985,
-     999,   998,  1032,  1042,  1052,  1057,  1067,  1071,  1080,  1089,
-    1092,  1096,  1104,  1114,  1129,  1140,  1157,  1170,  1186,  1185,
-    1210,  1211,  1215,  1224,  1236,  1253,  1259,  1275,  1287,  1300,
-    1308,  1322,  1323,  1329,  1330,  1336,  1340,  1349,  1352,  1360,
-    1361,  1362,  1363,  1364,  1365,  1366,  1367,  1368,  1369,  1374,
-    1378,  1383,  1388,  1398,  1402,  1487,  1493,  1501,  1511,  1526,
-    1535,  1544,  1579,  1586,  1593,  1605,  1619,  1624,  1632,  1644,
-    1649,  1662,  1663,  1664,  1665,  1666,  1667,  1668,  1669,  1670,
-    1671,  1672,  1673,  1674,  1675,  1676,  1677,  1678,  1679,  1680,
-    1681,  1682,  1683,  1684,  1685,  1686,  1687,  1688
+     874,   878,   887,   917,   916,   948,   947,   971,   975,   986,
+    1000,   999,  1033,  1043,  1053,  1058,  1068,  1072,  1081,  1090,
+    1093,  1097,  1105,  1115,  1130,  1141,  1158,  1171,  1187,  1186,
+    1211,  1212,  1216,  1225,  1237,  1254,  1260,  1276,  1288,  1301,
+    1309,  1323,  1324,  1330,  1331,  1337,  1341,  1350,  1353,  1361,
+    1362,  1363,  1364,  1365,  1366,  1367,  1368,  1369,  1370,  1375,
+    1379,  1384,  1389,  1399,  1403,  1488,  1494,  1502,  1512,  1527,
+    1536,  1545,  1580,  1587,  1594,  1606,  1620,  1625,  1633,  1645,
+    1650,  1663,  1664,  1665,  1666,  1667,  1668,  1669,  1670,  1671,
+    1672,  1673,  1674,  1675,  1676,  1677,  1678,  1679,  1680,  1681,
+    1682,  1683,  1684,  1685,  1686,  1687,  1688,  1689
 };
 #endif
 
@@ -2798,13 +2798,14 @@ yyreduce:
     {
         currentUnit->popContainer();
     }
-    yyerrok;
+    yyval = yyvsp[-2];
+    yyerrok; // Signal that the error has been recovered from.
 }
-#line 2804 "src/Slice/Grammar.cpp"
+#line 2805 "src/Slice/Grammar.cpp"
     break;
 
   case 76: /* operation: operation_preamble error ')' @7 throws  */
-#line 956 "src/Slice/Grammar.y"
+#line 957 "src/Slice/Grammar.y"
 {
     auto op = dynamic_pointer_cast<Operation>(yyvsp[-1]);
     auto el = dynamic_pointer_cast<ExceptionListTok>(yyvsp[0]);
@@ -2814,29 +2815,29 @@ yyreduce:
         op->setExceptionList(el->v); // Dummy
     }
 }
-#line 2818 "src/Slice/Grammar.cpp"
+#line 2819 "src/Slice/Grammar.cpp"
     break;
 
   case 77: /* interface_id: "interface keyword" "identifier"  */
-#line 971 "src/Slice/Grammar.y"
+#line 972 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
-#line 2826 "src/Slice/Grammar.cpp"
+#line 2827 "src/Slice/Grammar.cpp"
     break;
 
   case 78: /* interface_id: "interface keyword" keyword  */
-#line 975 "src/Slice/Grammar.y"
+#line 976 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword '" + ident->v + "' cannot be used as interface name");
     yyval = yyvsp[0]; // Dummy
 }
-#line 2836 "src/Slice/Grammar.cpp"
+#line 2837 "src/Slice/Grammar.cpp"
     break;
 
   case 79: /* interface_decl: interface_id  */
-#line 986 "src/Slice/Grammar.y"
+#line 987 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto cont = currentUnit->currentContainer();
@@ -2844,11 +2845,11 @@ yyreduce:
     cont->checkHasChangedMeaning(ident->v, cl);
     yyval = cl;
 }
-#line 2848 "src/Slice/Grammar.cpp"
+#line 2849 "src/Slice/Grammar.cpp"
     break;
 
   case 80: /* @8: %empty  */
-#line 999 "src/Slice/Grammar.y"
+#line 1000 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2865,11 +2866,11 @@ yyreduce:
         yyval = nullptr;
     }
 }
-#line 2869 "src/Slice/Grammar.cpp"
+#line 2870 "src/Slice/Grammar.cpp"
     break;
 
   case 81: /* interface_def: interface_id interface_extends @8 '{' operations '}'  */
-#line 1016 "src/Slice/Grammar.y"
+#line 1017 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -2881,11 +2882,11 @@ yyreduce:
         yyval = nullptr;
     }
 }
-#line 2885 "src/Slice/Grammar.cpp"
+#line 2886 "src/Slice/Grammar.cpp"
     break;
 
   case 82: /* interface_list: interface_list ',' scoped_name  */
-#line 1033 "src/Slice/Grammar.y"
+#line 1034 "src/Slice/Grammar.y"
 {
     auto interfaces = dynamic_pointer_cast<InterfaceListTok>(yyvsp[-2]);
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -2895,11 +2896,11 @@ yyreduce:
     }
     yyval = interfaces;
 }
-#line 2899 "src/Slice/Grammar.cpp"
+#line 2900 "src/Slice/Grammar.cpp"
     break;
 
   case 83: /* interface_list: scoped_name  */
-#line 1043 "src/Slice/Grammar.y"
+#line 1044 "src/Slice/Grammar.y"
 {
     auto interfaces = make_shared<InterfaceListTok>();
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -2909,45 +2910,45 @@ yyreduce:
     }
     yyval = interfaces;
 }
-#line 2913 "src/Slice/Grammar.cpp"
+#line 2914 "src/Slice/Grammar.cpp"
     break;
 
   case 84: /* interface_list: "Object keyword"  */
-#line 1053 "src/Slice/Grammar.y"
+#line 1054 "src/Slice/Grammar.y"
 {
     currentUnit->error("illegal inheritance from type Object");
     yyval = make_shared<InterfaceListTok>(); // Dummy
 }
-#line 2922 "src/Slice/Grammar.cpp"
+#line 2923 "src/Slice/Grammar.cpp"
     break;
 
   case 85: /* interface_list: "Value keyword"  */
-#line 1058 "src/Slice/Grammar.y"
+#line 1059 "src/Slice/Grammar.y"
 {
     currentUnit->error("illegal inheritance from type Value");
     yyval = make_shared<InterfaceListTok>(); // Dummy
 }
-#line 2931 "src/Slice/Grammar.cpp"
+#line 2932 "src/Slice/Grammar.cpp"
     break;
 
   case 86: /* interface_extends: extends interface_list  */
-#line 1068 "src/Slice/Grammar.y"
+#line 1069 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
-#line 2939 "src/Slice/Grammar.cpp"
+#line 2940 "src/Slice/Grammar.cpp"
     break;
 
   case 87: /* interface_extends: %empty  */
-#line 1072 "src/Slice/Grammar.y"
+#line 1073 "src/Slice/Grammar.y"
 {
     yyval = make_shared<InterfaceListTok>();
 }
-#line 2947 "src/Slice/Grammar.cpp"
+#line 2948 "src/Slice/Grammar.cpp"
     break;
 
   case 88: /* operations: metadata operation ';' operations  */
-#line 1081 "src/Slice/Grammar.y"
+#line 1082 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
     auto contained = dynamic_pointer_cast<Contained>(yyvsp[-2]);
@@ -2956,33 +2957,33 @@ yyreduce:
         contained->appendMetadata(std::move(metadata->v));
     }
 }
-#line 2960 "src/Slice/Grammar.cpp"
+#line 2961 "src/Slice/Grammar.cpp"
     break;
 
   case 89: /* operations: error ';' operations  */
-#line 1090 "src/Slice/Grammar.y"
+#line 1091 "src/Slice/Grammar.y"
 {
 }
-#line 2967 "src/Slice/Grammar.cpp"
+#line 2968 "src/Slice/Grammar.cpp"
     break;
 
   case 90: /* operations: metadata operation  */
-#line 1093 "src/Slice/Grammar.y"
+#line 1094 "src/Slice/Grammar.y"
 {
     currentUnit->error("';' missing after definition");
 }
-#line 2975 "src/Slice/Grammar.cpp"
+#line 2976 "src/Slice/Grammar.cpp"
     break;
 
   case 91: /* operations: %empty  */
-#line 1097 "src/Slice/Grammar.y"
+#line 1098 "src/Slice/Grammar.y"
 {
 }
-#line 2982 "src/Slice/Grammar.cpp"
+#line 2983 "src/Slice/Grammar.cpp"
     break;
 
   case 92: /* exception_list: exception_list ',' exception  */
-#line 1105 "src/Slice/Grammar.y"
+#line 1106 "src/Slice/Grammar.y"
 {
     auto exceptionList = dynamic_pointer_cast<ExceptionListTok>(yyvsp[-2]);
     auto exception = dynamic_pointer_cast<Exception>(yyvsp[0]);
@@ -2992,11 +2993,11 @@ yyreduce:
     }
     yyval = exceptionList;
 }
-#line 2996 "src/Slice/Grammar.cpp"
+#line 2997 "src/Slice/Grammar.cpp"
     break;
 
   case 93: /* exception_list: exception  */
-#line 1115 "src/Slice/Grammar.y"
+#line 1116 "src/Slice/Grammar.y"
 {
     auto exceptionList = make_shared<ExceptionListTok>();
     auto exception = dynamic_pointer_cast<Exception>(yyvsp[0]);
@@ -3006,11 +3007,11 @@ yyreduce:
     }
     yyval = exceptionList;
 }
-#line 3010 "src/Slice/Grammar.cpp"
+#line 3011 "src/Slice/Grammar.cpp"
     break;
 
   case 94: /* exception: scoped_name  */
-#line 1130 "src/Slice/Grammar.y"
+#line 1131 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3021,11 +3022,11 @@ yyreduce:
     }
     yyval = exception;
 }
-#line 3025 "src/Slice/Grammar.cpp"
+#line 3026 "src/Slice/Grammar.cpp"
     break;
 
   case 95: /* exception: keyword  */
-#line 1141 "src/Slice/Grammar.y"
+#line 1142 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword '" + ident->v + "' cannot be used as a name");
@@ -3037,11 +3038,11 @@ yyreduce:
     }
     yyval = exception;
 }
-#line 3041 "src/Slice/Grammar.cpp"
+#line 3042 "src/Slice/Grammar.cpp"
     break;
 
   case 96: /* sequence_def: "sequence keyword" '<' metadata type '>' definition_name  */
-#line 1158 "src/Slice/Grammar.y"
+#line 1159 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
@@ -3049,11 +3050,11 @@ yyreduce:
     ContainerPtr cont = currentUnit->currentContainer();
     yyval = cont->createSequence(ident->v, type, std::move(metadata->v));
 }
-#line 3053 "src/Slice/Grammar.cpp"
+#line 3054 "src/Slice/Grammar.cpp"
     break;
 
   case 97: /* dictionary_def: "dictionary keyword" '<' metadata type ',' metadata type '>' definition_name  */
-#line 1171 "src/Slice/Grammar.y"
+#line 1172 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto keyMetadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-6]);
@@ -3063,11 +3064,11 @@ yyreduce:
     ContainerPtr cont = currentUnit->currentContainer();
     yyval = cont->createDictionary(ident->v, keyType, std::move(keyMetadata->v), valueType, std::move(valueMetadata->v));
 }
-#line 3067 "src/Slice/Grammar.cpp"
+#line 3068 "src/Slice/Grammar.cpp"
     break;
 
   case 98: /* @9: %empty  */
-#line 1186 "src/Slice/Grammar.y"
+#line 1187 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3076,11 +3077,11 @@ yyreduce:
     currentUnit->pushContainer(en);
     yyval = en;
 }
-#line 3080 "src/Slice/Grammar.cpp"
+#line 3081 "src/Slice/Grammar.cpp"
     break;
 
   case 99: /* enum_def: "enum keyword" definition_name @9 '{' enumerators '}'  */
-#line 1195 "src/Slice/Grammar.y"
+#line 1196 "src/Slice/Grammar.y"
 {
     auto en = dynamic_pointer_cast<Enum>(yyvsp[-3]);
     auto enumerators = dynamic_pointer_cast<EnumeratorListTok>(yyvsp[-1]);
@@ -3091,27 +3092,27 @@ yyreduce:
     currentUnit->popContainer();
     yyval = en;
 }
-#line 3095 "src/Slice/Grammar.cpp"
+#line 3096 "src/Slice/Grammar.cpp"
     break;
 
   case 101: /* enumerators: enumerator_list ','  */
-#line 1212 "src/Slice/Grammar.y"
+#line 1213 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[-1];
 }
-#line 3103 "src/Slice/Grammar.cpp"
+#line 3104 "src/Slice/Grammar.cpp"
     break;
 
   case 102: /* enumerators: %empty  */
-#line 1216 "src/Slice/Grammar.y"
+#line 1217 "src/Slice/Grammar.y"
 {
     yyval = make_shared<EnumeratorListTok>(); // Empty list
 }
-#line 3111 "src/Slice/Grammar.cpp"
+#line 3112 "src/Slice/Grammar.cpp"
     break;
 
   case 103: /* enumerator_list: enumerator_list ',' metadata enumerator  */
-#line 1225 "src/Slice/Grammar.y"
+#line 1226 "src/Slice/Grammar.y"
 {
     auto enumeratorList = dynamic_pointer_cast<EnumeratorListTok>(yyvsp[-3]);
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-1]);
@@ -3123,11 +3124,11 @@ yyreduce:
     enumeratorList->v.push_back(enumerator);
     yyval = enumeratorList;
 }
-#line 3127 "src/Slice/Grammar.cpp"
+#line 3128 "src/Slice/Grammar.cpp"
     break;
 
   case 104: /* enumerator_list: metadata enumerator  */
-#line 1237 "src/Slice/Grammar.y"
+#line 1238 "src/Slice/Grammar.y"
 {
     auto enumeratorList = make_shared<EnumeratorListTok>();
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-1]);
@@ -3139,21 +3140,21 @@ yyreduce:
     enumeratorList->v.push_back(enumerator);
     yyval = enumeratorList;
 }
-#line 3143 "src/Slice/Grammar.cpp"
+#line 3144 "src/Slice/Grammar.cpp"
     break;
 
   case 105: /* enumerator: "identifier"  */
-#line 1254 "src/Slice/Grammar.y"
+#line 1255 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     EnumPtr cont = dynamic_pointer_cast<Enum>(currentUnit->currentContainer());
     yyval = cont->createEnumerator(ident->v, nullopt);
 }
-#line 3153 "src/Slice/Grammar.cpp"
+#line 3154 "src/Slice/Grammar.cpp"
     break;
 
   case 106: /* enumerator: "identifier" '=' integer_constant  */
-#line 1260 "src/Slice/Grammar.y"
+#line 1261 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[-2]);
     EnumPtr cont = dynamic_pointer_cast<Enum>(currentUnit->currentContainer());
@@ -3169,22 +3170,22 @@ yyreduce:
         yyval = cont->createEnumerator(ident->v, nullopt); // Dummy
     }
 }
-#line 3173 "src/Slice/Grammar.cpp"
+#line 3174 "src/Slice/Grammar.cpp"
     break;
 
   case 107: /* enumerator: keyword  */
-#line 1276 "src/Slice/Grammar.y"
+#line 1277 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     EnumPtr cont = dynamic_pointer_cast<Enum>(currentUnit->currentContainer());
     currentUnit->error("keyword '" + ident->v + "' cannot be used as enumerator");
     yyval = cont->createEnumerator(ident->v, nullopt); // Dummy
 }
-#line 3184 "src/Slice/Grammar.cpp"
+#line 3185 "src/Slice/Grammar.cpp"
     break;
 
   case 108: /* parameter: optional_type_id  */
-#line 1288 "src/Slice/Grammar.y"
+#line 1289 "src/Slice/Grammar.y"
 {
     auto tsp = dynamic_pointer_cast<OptionalDefTok>(yyvsp[0]);
     ParameterPtr param;
@@ -3197,11 +3198,11 @@ yyreduce:
     }
     yyval = param;
 }
-#line 3201 "src/Slice/Grammar.cpp"
+#line 3202 "src/Slice/Grammar.cpp"
     break;
 
   case 109: /* parameter: "out keyword" parameter  */
-#line 1301 "src/Slice/Grammar.y"
+#line 1302 "src/Slice/Grammar.y"
 {
     if (auto param = dynamic_pointer_cast<Parameter>(yyvsp[0]))
     {
@@ -3209,11 +3210,11 @@ yyreduce:
     }
     yyval = yyvsp[0];
 }
-#line 3213 "src/Slice/Grammar.cpp"
+#line 3214 "src/Slice/Grammar.cpp"
     break;
 
   case 110: /* parameter: local_metadata parameter  */
-#line 1309 "src/Slice/Grammar.y"
+#line 1310 "src/Slice/Grammar.y"
 {
     if (auto param = dynamic_pointer_cast<Parameter>(yyvsp[0]))
     {
@@ -3222,144 +3223,144 @@ yyreduce:
     }
     yyval = yyvsp[0];
 }
-#line 3226 "src/Slice/Grammar.cpp"
+#line 3227 "src/Slice/Grammar.cpp"
     break;
 
   case 115: /* throws: "throws keyword" exception_list  */
-#line 1337 "src/Slice/Grammar.y"
+#line 1338 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
-#line 3234 "src/Slice/Grammar.cpp"
+#line 3235 "src/Slice/Grammar.cpp"
     break;
 
   case 116: /* throws: %empty  */
-#line 1341 "src/Slice/Grammar.y"
+#line 1342 "src/Slice/Grammar.y"
 {
     yyval = make_shared<ExceptionListTok>();
 }
-#line 3242 "src/Slice/Grammar.cpp"
+#line 3243 "src/Slice/Grammar.cpp"
     break;
 
   case 117: /* scoped_name: "identifier"  */
-#line 1350 "src/Slice/Grammar.y"
+#line 1351 "src/Slice/Grammar.y"
 {
 }
-#line 3249 "src/Slice/Grammar.cpp"
+#line 3250 "src/Slice/Grammar.cpp"
     break;
 
   case 118: /* scoped_name: "scoped identifier"  */
-#line 1353 "src/Slice/Grammar.y"
+#line 1354 "src/Slice/Grammar.y"
 {
 }
-#line 3256 "src/Slice/Grammar.cpp"
+#line 3257 "src/Slice/Grammar.cpp"
     break;
 
   case 119: /* builtin: "bool keyword"  */
-#line 1360 "src/Slice/Grammar.y"
+#line 1361 "src/Slice/Grammar.y"
            {}
-#line 3262 "src/Slice/Grammar.cpp"
+#line 3263 "src/Slice/Grammar.cpp"
     break;
 
   case 120: /* builtin: "byte keyword"  */
-#line 1361 "src/Slice/Grammar.y"
+#line 1362 "src/Slice/Grammar.y"
            {}
-#line 3268 "src/Slice/Grammar.cpp"
+#line 3269 "src/Slice/Grammar.cpp"
     break;
 
   case 121: /* builtin: "short keyword"  */
-#line 1362 "src/Slice/Grammar.y"
+#line 1363 "src/Slice/Grammar.y"
             {}
-#line 3274 "src/Slice/Grammar.cpp"
+#line 3275 "src/Slice/Grammar.cpp"
     break;
 
   case 122: /* builtin: "int keyword"  */
-#line 1363 "src/Slice/Grammar.y"
+#line 1364 "src/Slice/Grammar.y"
           {}
-#line 3280 "src/Slice/Grammar.cpp"
+#line 3281 "src/Slice/Grammar.cpp"
     break;
 
   case 123: /* builtin: "long keyword"  */
-#line 1364 "src/Slice/Grammar.y"
+#line 1365 "src/Slice/Grammar.y"
            {}
-#line 3286 "src/Slice/Grammar.cpp"
+#line 3287 "src/Slice/Grammar.cpp"
     break;
 
   case 124: /* builtin: "float keyword"  */
-#line 1365 "src/Slice/Grammar.y"
+#line 1366 "src/Slice/Grammar.y"
             {}
-#line 3292 "src/Slice/Grammar.cpp"
+#line 3293 "src/Slice/Grammar.cpp"
     break;
 
   case 125: /* builtin: "double keyword"  */
-#line 1366 "src/Slice/Grammar.y"
+#line 1367 "src/Slice/Grammar.y"
              {}
-#line 3298 "src/Slice/Grammar.cpp"
+#line 3299 "src/Slice/Grammar.cpp"
     break;
 
   case 126: /* builtin: "string keyword"  */
-#line 1367 "src/Slice/Grammar.y"
+#line 1368 "src/Slice/Grammar.y"
              {}
-#line 3304 "src/Slice/Grammar.cpp"
+#line 3305 "src/Slice/Grammar.cpp"
     break;
 
   case 127: /* builtin: "Object keyword"  */
-#line 1368 "src/Slice/Grammar.y"
+#line 1369 "src/Slice/Grammar.y"
              {}
-#line 3310 "src/Slice/Grammar.cpp"
+#line 3311 "src/Slice/Grammar.cpp"
     break;
 
   case 128: /* builtin: "Value keyword"  */
-#line 1369 "src/Slice/Grammar.y"
+#line 1370 "src/Slice/Grammar.y"
             {}
-#line 3316 "src/Slice/Grammar.cpp"
+#line 3317 "src/Slice/Grammar.cpp"
     break;
 
   case 129: /* type: "Object keyword" '*'  */
-#line 1375 "src/Slice/Grammar.y"
+#line 1376 "src/Slice/Grammar.y"
 {
     yyval = currentUnit->createBuiltin(Builtin::KindObjectProxy);
 }
-#line 3324 "src/Slice/Grammar.cpp"
+#line 3325 "src/Slice/Grammar.cpp"
     break;
 
   case 130: /* type: builtin  */
-#line 1379 "src/Slice/Grammar.y"
+#line 1380 "src/Slice/Grammar.y"
 {
     auto typeName = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     yyval = currentUnit->createBuiltin(Builtin::kindFromString(typeName->v).value());
 }
-#line 3333 "src/Slice/Grammar.cpp"
+#line 3334 "src/Slice/Grammar.cpp"
     break;
 
   case 131: /* type: scoped_name  */
-#line 1384 "src/Slice/Grammar.y"
+#line 1385 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     yyval = lookupTypeByName(scoped->v, false);
 }
-#line 3342 "src/Slice/Grammar.cpp"
+#line 3343 "src/Slice/Grammar.cpp"
     break;
 
   case 132: /* type: scoped_name '*'  */
-#line 1389 "src/Slice/Grammar.y"
+#line 1390 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     yyval = lookupTypeByName(scoped->v, true);
 }
-#line 3351 "src/Slice/Grammar.cpp"
+#line 3352 "src/Slice/Grammar.cpp"
     break;
 
   case 133: /* integer_constant: "integer literal"  */
-#line 1399 "src/Slice/Grammar.y"
+#line 1400 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
-#line 3359 "src/Slice/Grammar.cpp"
+#line 3360 "src/Slice/Grammar.cpp"
     break;
 
   case 134: /* integer_constant: scoped_name  */
-#line 1403 "src/Slice/Grammar.y"
+#line 1404 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3370,7 +3371,7 @@ yyreduce:
         EnumeratorList enumerators = cont->enumerators(scoped->v);
         if (enumerators.size() == 1)
         {
-            // We found the enumerator the user must of been referencing.
+            // We found the enumerator the user must have been referencing.
             cl.push_back(enumerators.front());
             scoped->v = enumerators.front()->scoped();
         }
@@ -3439,28 +3440,28 @@ yyreduce:
         yyval = nullptr;
     }
 }
-#line 3443 "src/Slice/Grammar.cpp"
+#line 3444 "src/Slice/Grammar.cpp"
     break;
 
   case 135: /* string_literal: "string literal" string_literal  */
-#line 1488 "src/Slice/Grammar.y"
+#line 1489 "src/Slice/Grammar.y"
 {
     auto str1 = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     auto str2 = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     str1->v += str2->v;
 }
-#line 3453 "src/Slice/Grammar.cpp"
+#line 3454 "src/Slice/Grammar.cpp"
     break;
 
   case 136: /* string_literal: "string literal"  */
-#line 1494 "src/Slice/Grammar.y"
+#line 1495 "src/Slice/Grammar.y"
 {
 }
-#line 3460 "src/Slice/Grammar.cpp"
+#line 3461 "src/Slice/Grammar.cpp"
     break;
 
   case 137: /* metadata_list: metadata_list ',' string_literal  */
-#line 1502 "src/Slice/Grammar.y"
+#line 1503 "src/Slice/Grammar.y"
 {
     auto str = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadataList = dynamic_pointer_cast<MetadataListTok>(yyvsp[-2]);
@@ -3470,11 +3471,11 @@ yyreduce:
 
     yyval = metadataList;
 }
-#line 3474 "src/Slice/Grammar.cpp"
+#line 3475 "src/Slice/Grammar.cpp"
     break;
 
   case 138: /* metadata_list: string_literal  */
-#line 1512 "src/Slice/Grammar.y"
+#line 1513 "src/Slice/Grammar.y"
 {
     auto str = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadataList = make_shared<MetadataListTok>();
@@ -3484,11 +3485,11 @@ yyreduce:
 
     yyval = metadataList;
 }
-#line 3488 "src/Slice/Grammar.cpp"
+#line 3489 "src/Slice/Grammar.cpp"
     break;
 
   case 139: /* const_initializer: "integer literal"  */
-#line 1527 "src/Slice/Grammar.y"
+#line 1528 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindLong);
     auto intVal = dynamic_pointer_cast<IntegerTok>(yyvsp[0]);
@@ -3497,11 +3498,11 @@ yyreduce:
     auto def = make_shared<ConstDefTok>(type, sstr.str());
     yyval = def;
 }
-#line 3501 "src/Slice/Grammar.cpp"
+#line 3502 "src/Slice/Grammar.cpp"
     break;
 
   case 140: /* const_initializer: "floating-point literal"  */
-#line 1536 "src/Slice/Grammar.y"
+#line 1537 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindDouble);
     auto floatVal = dynamic_pointer_cast<FloatingTok>(yyvsp[0]);
@@ -3510,11 +3511,11 @@ yyreduce:
     auto def = make_shared<ConstDefTok>(type, sstr.str());
     yyval = def;
 }
-#line 3514 "src/Slice/Grammar.cpp"
+#line 3515 "src/Slice/Grammar.cpp"
     break;
 
   case 141: /* const_initializer: scoped_name  */
-#line 1545 "src/Slice/Grammar.y"
+#line 1546 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ConstDefTokPtr def;
@@ -3549,44 +3550,44 @@ yyreduce:
     }
     yyval = def;
 }
-#line 3553 "src/Slice/Grammar.cpp"
+#line 3554 "src/Slice/Grammar.cpp"
     break;
 
   case 142: /* const_initializer: "string literal"  */
-#line 1580 "src/Slice/Grammar.y"
+#line 1581 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindString);
     auto literal = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto def = make_shared<ConstDefTok>(type, literal->v);
     yyval = def;
 }
-#line 3564 "src/Slice/Grammar.cpp"
+#line 3565 "src/Slice/Grammar.cpp"
     break;
 
   case 143: /* const_initializer: "false keyword"  */
-#line 1587 "src/Slice/Grammar.y"
+#line 1588 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool);
     auto literal = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto def = make_shared<ConstDefTok>(type, "false");
     yyval = def;
 }
-#line 3575 "src/Slice/Grammar.cpp"
+#line 3576 "src/Slice/Grammar.cpp"
     break;
 
   case 144: /* const_initializer: "true keyword"  */
-#line 1594 "src/Slice/Grammar.y"
+#line 1595 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool);
     auto literal = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto def = make_shared<ConstDefTok>(type, "true");
     yyval = def;
 }
-#line 3586 "src/Slice/Grammar.cpp"
+#line 3587 "src/Slice/Grammar.cpp"
     break;
 
   case 145: /* const_def: "const keyword" metadata type definition_name '=' const_initializer  */
-#line 1606 "src/Slice/Grammar.y"
+#line 1607 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-4]);
     auto const_type = dynamic_pointer_cast<Type>(yyvsp[-3]);
@@ -3595,20 +3596,20 @@ yyreduce:
     yyval = currentUnit->currentContainer()->createConst(ident->v, const_type, std::move(metadata->v), value->v,
                                                       value->valueAsString);
 }
-#line 3599 "src/Slice/Grammar.cpp"
+#line 3600 "src/Slice/Grammar.cpp"
     break;
 
   case 146: /* definition_name: "identifier"  */
-#line 1620 "src/Slice/Grammar.y"
+#line 1621 "src/Slice/Grammar.y"
 {
     // All good, this is a valid identifier.
     yyval = yyvsp[0];
 }
-#line 3608 "src/Slice/Grammar.cpp"
+#line 3609 "src/Slice/Grammar.cpp"
     break;
 
   case 147: /* definition_name: keyword  */
-#line 1625 "src/Slice/Grammar.y"
+#line 1626 "src/Slice/Grammar.y"
 {
     // If an un-escaped keyword was used as an identifier, we emit an error,
     // but continue along, pretending like the user escaped the keyword.
@@ -3616,31 +3617,31 @@ yyreduce:
     currentUnit->error("keyword '" + ident->v + "' cannot be used as a name");
     yyval = ident;
 }
-#line 3620 "src/Slice/Grammar.cpp"
+#line 3621 "src/Slice/Grammar.cpp"
     break;
 
   case 148: /* definition_name: %empty  */
-#line 1633 "src/Slice/Grammar.y"
+#line 1634 "src/Slice/Grammar.y"
 {
     // If the user forgot to give a name to a Slice definition, we emit an error,
     // but continue along, returning an empty string instead of an identifier.
     currentUnit->error("missing name");
     yyval = make_shared<StringTok>();
 }
-#line 3631 "src/Slice/Grammar.cpp"
+#line 3632 "src/Slice/Grammar.cpp"
     break;
 
   case 149: /* definition_name_open: "identifier("  */
-#line 1645 "src/Slice/Grammar.y"
+#line 1646 "src/Slice/Grammar.y"
 {
     // All good, this is a valid identifier.
     yyval = yyvsp[0];
 }
-#line 3640 "src/Slice/Grammar.cpp"
+#line 3641 "src/Slice/Grammar.cpp"
     break;
 
   case 150: /* definition_name_open: "keyword("  */
-#line 1650 "src/Slice/Grammar.y"
+#line 1651 "src/Slice/Grammar.y"
 {
     // If an un-escaped keyword was used as an identifier, we emit an error,
     // but continue along, pretending like the user escaped the keyword.
@@ -3648,173 +3649,173 @@ yyreduce:
     currentUnit->error("keyword '" + ident->v + "' cannot be used as a name");
     yyval = ident;
 }
-#line 3652 "src/Slice/Grammar.cpp"
+#line 3653 "src/Slice/Grammar.cpp"
     break;
 
   case 151: /* keyword: "module keyword"  */
-#line 1662 "src/Slice/Grammar.y"
+#line 1663 "src/Slice/Grammar.y"
              {}
-#line 3658 "src/Slice/Grammar.cpp"
+#line 3659 "src/Slice/Grammar.cpp"
     break;
 
   case 152: /* keyword: "class keyword"  */
-#line 1663 "src/Slice/Grammar.y"
+#line 1664 "src/Slice/Grammar.y"
             {}
-#line 3664 "src/Slice/Grammar.cpp"
+#line 3665 "src/Slice/Grammar.cpp"
     break;
 
   case 153: /* keyword: "interface keyword"  */
-#line 1664 "src/Slice/Grammar.y"
+#line 1665 "src/Slice/Grammar.y"
                 {}
-#line 3670 "src/Slice/Grammar.cpp"
+#line 3671 "src/Slice/Grammar.cpp"
     break;
 
   case 154: /* keyword: "exception keyword"  */
-#line 1665 "src/Slice/Grammar.y"
+#line 1666 "src/Slice/Grammar.y"
                 {}
-#line 3676 "src/Slice/Grammar.cpp"
+#line 3677 "src/Slice/Grammar.cpp"
     break;
 
   case 155: /* keyword: "struct keyword"  */
-#line 1666 "src/Slice/Grammar.y"
+#line 1667 "src/Slice/Grammar.y"
              {}
-#line 3682 "src/Slice/Grammar.cpp"
+#line 3683 "src/Slice/Grammar.cpp"
     break;
 
   case 156: /* keyword: "sequence keyword"  */
-#line 1667 "src/Slice/Grammar.y"
+#line 1668 "src/Slice/Grammar.y"
                {}
-#line 3688 "src/Slice/Grammar.cpp"
+#line 3689 "src/Slice/Grammar.cpp"
     break;
 
   case 157: /* keyword: "dictionary keyword"  */
-#line 1668 "src/Slice/Grammar.y"
+#line 1669 "src/Slice/Grammar.y"
                  {}
-#line 3694 "src/Slice/Grammar.cpp"
+#line 3695 "src/Slice/Grammar.cpp"
     break;
 
   case 158: /* keyword: "enum keyword"  */
-#line 1669 "src/Slice/Grammar.y"
+#line 1670 "src/Slice/Grammar.y"
            {}
-#line 3700 "src/Slice/Grammar.cpp"
+#line 3701 "src/Slice/Grammar.cpp"
     break;
 
   case 159: /* keyword: "out keyword"  */
-#line 1670 "src/Slice/Grammar.y"
+#line 1671 "src/Slice/Grammar.y"
           {}
-#line 3706 "src/Slice/Grammar.cpp"
+#line 3707 "src/Slice/Grammar.cpp"
     break;
 
   case 160: /* keyword: "extends keyword"  */
-#line 1671 "src/Slice/Grammar.y"
+#line 1672 "src/Slice/Grammar.y"
               {}
-#line 3712 "src/Slice/Grammar.cpp"
+#line 3713 "src/Slice/Grammar.cpp"
     break;
 
   case 161: /* keyword: "throws keyword"  */
-#line 1672 "src/Slice/Grammar.y"
+#line 1673 "src/Slice/Grammar.y"
              {}
-#line 3718 "src/Slice/Grammar.cpp"
+#line 3719 "src/Slice/Grammar.cpp"
     break;
 
   case 162: /* keyword: "void keyword"  */
-#line 1673 "src/Slice/Grammar.y"
+#line 1674 "src/Slice/Grammar.y"
            {}
-#line 3724 "src/Slice/Grammar.cpp"
+#line 3725 "src/Slice/Grammar.cpp"
     break;
 
   case 163: /* keyword: "bool keyword"  */
-#line 1674 "src/Slice/Grammar.y"
+#line 1675 "src/Slice/Grammar.y"
            {}
-#line 3730 "src/Slice/Grammar.cpp"
+#line 3731 "src/Slice/Grammar.cpp"
     break;
 
   case 164: /* keyword: "byte keyword"  */
-#line 1675 "src/Slice/Grammar.y"
+#line 1676 "src/Slice/Grammar.y"
            {}
-#line 3736 "src/Slice/Grammar.cpp"
+#line 3737 "src/Slice/Grammar.cpp"
     break;
 
   case 165: /* keyword: "short keyword"  */
-#line 1676 "src/Slice/Grammar.y"
+#line 1677 "src/Slice/Grammar.y"
             {}
-#line 3742 "src/Slice/Grammar.cpp"
+#line 3743 "src/Slice/Grammar.cpp"
     break;
 
   case 166: /* keyword: "int keyword"  */
-#line 1677 "src/Slice/Grammar.y"
+#line 1678 "src/Slice/Grammar.y"
           {}
-#line 3748 "src/Slice/Grammar.cpp"
+#line 3749 "src/Slice/Grammar.cpp"
     break;
 
   case 167: /* keyword: "long keyword"  */
-#line 1678 "src/Slice/Grammar.y"
+#line 1679 "src/Slice/Grammar.y"
            {}
-#line 3754 "src/Slice/Grammar.cpp"
+#line 3755 "src/Slice/Grammar.cpp"
     break;
 
   case 168: /* keyword: "float keyword"  */
-#line 1679 "src/Slice/Grammar.y"
+#line 1680 "src/Slice/Grammar.y"
             {}
-#line 3760 "src/Slice/Grammar.cpp"
+#line 3761 "src/Slice/Grammar.cpp"
     break;
 
   case 169: /* keyword: "double keyword"  */
-#line 1680 "src/Slice/Grammar.y"
+#line 1681 "src/Slice/Grammar.y"
              {}
-#line 3766 "src/Slice/Grammar.cpp"
+#line 3767 "src/Slice/Grammar.cpp"
     break;
 
   case 170: /* keyword: "string keyword"  */
-#line 1681 "src/Slice/Grammar.y"
+#line 1682 "src/Slice/Grammar.y"
              {}
-#line 3772 "src/Slice/Grammar.cpp"
+#line 3773 "src/Slice/Grammar.cpp"
     break;
 
   case 171: /* keyword: "Object keyword"  */
-#line 1682 "src/Slice/Grammar.y"
+#line 1683 "src/Slice/Grammar.y"
              {}
-#line 3778 "src/Slice/Grammar.cpp"
+#line 3779 "src/Slice/Grammar.cpp"
     break;
 
   case 172: /* keyword: "const keyword"  */
-#line 1683 "src/Slice/Grammar.y"
+#line 1684 "src/Slice/Grammar.y"
             {}
-#line 3784 "src/Slice/Grammar.cpp"
+#line 3785 "src/Slice/Grammar.cpp"
     break;
 
   case 173: /* keyword: "false keyword"  */
-#line 1684 "src/Slice/Grammar.y"
+#line 1685 "src/Slice/Grammar.y"
             {}
-#line 3790 "src/Slice/Grammar.cpp"
+#line 3791 "src/Slice/Grammar.cpp"
     break;
 
   case 174: /* keyword: "true keyword"  */
-#line 1685 "src/Slice/Grammar.y"
+#line 1686 "src/Slice/Grammar.y"
            {}
-#line 3796 "src/Slice/Grammar.cpp"
+#line 3797 "src/Slice/Grammar.cpp"
     break;
 
   case 175: /* keyword: "idempotent keyword"  */
-#line 1686 "src/Slice/Grammar.y"
+#line 1687 "src/Slice/Grammar.y"
                  {}
-#line 3802 "src/Slice/Grammar.cpp"
+#line 3803 "src/Slice/Grammar.cpp"
     break;
 
   case 176: /* keyword: "optional keyword"  */
-#line 1687 "src/Slice/Grammar.y"
+#line 1688 "src/Slice/Grammar.y"
                {}
-#line 3808 "src/Slice/Grammar.cpp"
+#line 3809 "src/Slice/Grammar.cpp"
     break;
 
   case 177: /* keyword: "Value keyword"  */
-#line 1688 "src/Slice/Grammar.y"
+#line 1689 "src/Slice/Grammar.y"
             {}
-#line 3814 "src/Slice/Grammar.cpp"
+#line 3815 "src/Slice/Grammar.cpp"
     break;
 
 
-#line 3818 "src/Slice/Grammar.cpp"
+#line 3819 "src/Slice/Grammar.cpp"
 
       default: break;
     }
@@ -4043,7 +4044,7 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 1691 "src/Slice/Grammar.y"
+#line 1692 "src/Slice/Grammar.y"
 
 
 // NOLINTEND