diff --git a/common/literal.js b/common/literal.js
index 50dfde2..eadf089 100644
--- a/common/literal.js
+++ b/common/literal.js
@@ -27,7 +27,13 @@ exports.rules = {
   hex_number: $ => /0x[0-9a-fA-F]+/i,
   // 7.2.6.4 Floating-point Literals
   floating_pt_literal: $ =>
-    seq(optional($.integer_sign), $.dec_number, '.', $.dec_number, /e/i),
+    seq(
+      optional($.integer_sign),
+      $.dec_number,
+      '.',
+      $.dec_number,
+      optional(/e/i),
+    ),
   // 7.2.6.5 Fixed-Point Literals
   fixed_pt_literal: $ =>
     seq(optional($.integer_sign), $.dec_number, '.', $.dec_number, /d/i),
diff --git a/src/grammar.json b/src/grammar.json
index 83789cd..51358f1 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -995,9 +995,17 @@
           "name": "dec_number"
         },
         {
-          "type": "PATTERN",
-          "value": "e",
-          "flags": "i"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "PATTERN",
+              "value": "e",
+              "flags": "i"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
diff --git a/src/parser.c b/src/parser.c
index 14ba763..711ee8f 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -3552,14 +3552,14 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [31] = 31,
     [32] = 32,
     [33] = 33,
-    [34] = 33,
-    [35] = 33,
-    [36] = 33,
-    [37] = 33,
-    [38] = 38,
-    [39] = 32,
-    [40] = 32,
-    [41] = 32,
+    [34] = 32,
+    [35] = 32,
+    [36] = 36,
+    [37] = 36,
+    [38] = 32,
+    [39] = 36,
+    [40] = 36,
+    [41] = 36,
     [42] = 32,
     [43] = 43,
     [44] = 44,
@@ -3589,28 +3589,28 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [68] = 68,
     [69] = 69,
     [70] = 70,
-    [71] = 71,
-    [72] = 65,
+    [71] = 64,
+    [72] = 72,
     [73] = 73,
     [74] = 74,
     [75] = 75,
     [76] = 76,
     [77] = 77,
-    [78] = 78,
+    [78] = 77,
     [79] = 79,
     [80] = 80,
     [81] = 81,
-    [82] = 77,
+    [82] = 82,
     [83] = 83,
     [84] = 84,
     [85] = 85,
-    [86] = 86,
-    [87] = 77,
-    [88] = 77,
-    [89] = 89,
+    [86] = 77,
+    [87] = 87,
+    [88] = 88,
+    [89] = 77,
     [90] = 77,
-    [91] = 65,
-    [92] = 92,
+    [91] = 91,
+    [92] = 64,
     [93] = 93,
     [94] = 93,
     [95] = 93,
@@ -3649,10 +3649,10 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [128] = 128,
     [129] = 129,
     [130] = 130,
-    [131] = 121,
-    [132] = 120,
+    [131] = 131,
+    [132] = 132,
     [133] = 133,
-    [134] = 134,
+    [134] = 126,
     [135] = 135,
     [136] = 136,
     [137] = 137,
@@ -3661,23 +3661,23 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [140] = 140,
     [141] = 141,
     [142] = 142,
-    [143] = 143,
+    [143] = 141,
     [144] = 144,
     [145] = 145,
     [146] = 146,
-    [147] = 147,
-    [148] = 121,
+    [147] = 126,
+    [148] = 148,
     [149] = 149,
     [150] = 150,
     [151] = 151,
-    [152] = 120,
+    [152] = 141,
     [153] = 153,
     [154] = 154,
     [155] = 155,
-    [156] = 120,
+    [156] = 141,
     [157] = 157,
     [158] = 158,
-    [159] = 120,
+    [159] = 159,
     [160] = 160,
     [161] = 161,
     [162] = 162,
@@ -3688,25 +3688,25 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [167] = 167,
     [168] = 168,
     [169] = 169,
-    [170] = 170,
+    [170] = 141,
     [171] = 171,
     [172] = 172,
-    [173] = 173,
-    [174] = 121,
+    [173] = 126,
+    [174] = 174,
     [175] = 175,
     [176] = 176,
     [177] = 177,
     [178] = 178,
     [179] = 179,
-    [180] = 121,
+    [180] = 126,
     [181] = 181,
     [182] = 182,
     [183] = 183,
     [184] = 184,
     [185] = 185,
     [186] = 186,
-    [187] = 187,
-    [188] = 186,
+    [187] = 186,
+    [188] = 188,
     [189] = 186,
     [190] = 186,
     [191] = 186,
@@ -3715,13 +3715,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [194] = 192,
     [195] = 195,
     [196] = 196,
-    [197] = 197,
-    [198] = 196,
-    [199] = 193,
-    [200] = 197,
+    [197] = 196,
+    [198] = 193,
+    [199] = 199,
+    [200] = 193,
     [201] = 201,
     [202] = 202,
-    [203] = 193,
+    [203] = 199,
     [204] = 204,
     [205] = 205,
     [206] = 201,
@@ -3734,67 +3734,67 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [213] = 202,
     [214] = 201,
     [215] = 205,
-    [216] = 193,
-    [217] = 197,
+    [216] = 199,
+    [217] = 193,
     [218] = 196,
     [219] = 207,
     [220] = 192,
     [221] = 195,
     [222] = 196,
-    [223] = 197,
+    [223] = 193,
     [224] = 195,
     [225] = 192,
-    [226] = 202,
-    [227] = 193,
+    [226] = 226,
+    [227] = 199,
     [228] = 201,
-    [229] = 202,
-    [230] = 195,
-    [231] = 192,
+    [229] = 195,
+    [230] = 192,
+    [231] = 202,
     [232] = 204,
     [233] = 205,
     [234] = 207,
     [235] = 235,
     [236] = 236,
     [237] = 237,
-    [238] = 238,
-    [239] = 207,
-    [240] = 240,
+    [238] = 207,
+    [239] = 239,
+    [240] = 205,
     [241] = 241,
-    [242] = 205,
-    [243] = 204,
+    [242] = 204,
+    [243] = 243,
     [244] = 195,
-    [245] = 245,
+    [245] = 202,
     [246] = 246,
     [247] = 247,
-    [248] = 197,
-    [249] = 201,
+    [248] = 201,
+    [249] = 249,
     [250] = 196,
-    [251] = 251,
+    [251] = 199,
     [252] = 252,
     [253] = 253,
-    [254] = 254,
-    [255] = 252,
+    [254] = 252,
+    [255] = 255,
     [256] = 256,
     [257] = 257,
     [258] = 258,
-    [259] = 257,
-    [260] = 260,
+    [259] = 259,
+    [260] = 255,
     [261] = 261,
     [262] = 262,
     [263] = 253,
-    [264] = 264,
-    [265] = 253,
-    [266] = 264,
-    [267] = 257,
-    [268] = 254,
+    [264] = 262,
+    [265] = 265,
+    [266] = 266,
+    [267] = 253,
+    [268] = 266,
     [269] = 262,
-    [270] = 264,
+    [270] = 270,
     [271] = 271,
     [272] = 258,
     [273] = 273,
     [274] = 256,
-    [275] = 253,
-    [276] = 261,
+    [275] = 265,
+    [276] = 252,
     [277] = 277,
     [278] = 278,
     [279] = 279,
@@ -3802,141 +3802,141 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [281] = 278,
     [282] = 282,
     [283] = 283,
-    [284] = 282,
-    [285] = 285,
-    [286] = 256,
-    [287] = 252,
-    [288] = 285,
-    [289] = 254,
+    [284] = 255,
+    [285] = 256,
+    [286] = 252,
+    [287] = 271,
+    [288] = 288,
+    [289] = 278,
     [290] = 278,
-    [291] = 278,
-    [292] = 285,
-    [293] = 252,
-    [294] = 256,
-    [295] = 282,
+    [291] = 288,
+    [292] = 253,
+    [293] = 256,
+    [294] = 282,
+    [295] = 295,
     [296] = 258,
-    [297] = 297,
-    [298] = 254,
-    [299] = 261,
-    [300] = 262,
-    [301] = 261,
-    [302] = 285,
-    [303] = 257,
-    [304] = 264,
+    [297] = 271,
+    [298] = 265,
+    [299] = 266,
+    [300] = 265,
+    [301] = 282,
+    [302] = 288,
+    [303] = 255,
+    [304] = 262,
     [305] = 305,
-    [306] = 262,
-    [307] = 261,
-    [308] = 262,
+    [306] = 266,
+    [307] = 265,
+    [308] = 266,
     [309] = 253,
     [310] = 258,
     [311] = 256,
     [312] = 252,
-    [313] = 282,
-    [314] = 278,
-    [315] = 315,
-    [316] = 264,
-    [317] = 285,
-    [318] = 318,
-    [319] = 282,
-    [320] = 257,
-    [321] = 254,
+    [313] = 278,
+    [314] = 262,
+    [315] = 288,
+    [316] = 255,
+    [317] = 271,
+    [318] = 282,
+    [319] = 271,
+    [320] = 282,
+    [321] = 288,
     [322] = 322,
     [323] = 323,
-    [324] = 98,
+    [324] = 99,
     [325] = 325,
     [326] = 326,
     [327] = 327,
     [328] = 328,
     [329] = 329,
     [330] = 330,
-    [331] = 102,
-    [332] = 124,
-    [333] = 104,
-    [334] = 113,
-    [335] = 130,
-    [336] = 118,
-    [337] = 100,
-    [338] = 116,
-    [339] = 106,
+    [331] = 103,
+    [332] = 148,
+    [333] = 109,
+    [334] = 106,
+    [335] = 185,
+    [336] = 108,
+    [337] = 105,
+    [338] = 101,
+    [339] = 110,
     [340] = 340,
-    [341] = 101,
-    [342] = 115,
-    [343] = 112,
-    [344] = 344,
-    [345] = 107,
+    [341] = 102,
+    [342] = 100,
+    [343] = 118,
+    [344] = 107,
+    [345] = 345,
     [346] = 346,
     [347] = 347,
-    [348] = 114,
-    [349] = 117,
-    [350] = 105,
-    [351] = 110,
+    [348] = 117,
+    [349] = 111,
+    [350] = 112,
+    [351] = 115,
     [352] = 352,
     [353] = 353,
-    [354] = 103,
-    [355] = 109,
-    [356] = 108,
-    [357] = 111,
-    [358] = 135,
-    [359] = 185,
-    [360] = 126,
-    [361] = 361,
+    [354] = 104,
+    [355] = 116,
+    [356] = 113,
+    [357] = 114,
+    [358] = 142,
+    [359] = 146,
+    [360] = 149,
+    [361] = 174,
     [362] = 362,
-    [363] = 363,
-    [364] = 364,
-    [365] = 365,
-    [366] = 129,
-    [367] = 128,
-    [368] = 123,
-    [369] = 158,
-    [370] = 173,
-    [371] = 184,
-    [372] = 182,
+    [363] = 171,
+    [364] = 169,
+    [365] = 168,
+    [366] = 167,
+    [367] = 166,
+    [368] = 157,
+    [369] = 165,
+    [370] = 163,
+    [371] = 162,
+    [372] = 161,
     [373] = 122,
-    [374] = 176,
-    [375] = 172,
-    [376] = 171,
-    [377] = 170,
-    [378] = 169,
-    [379] = 168,
-    [380] = 167,
-    [381] = 166,
-    [382] = 165,
-    [383] = 164,
-    [384] = 163,
-    [385] = 162,
-    [386] = 386,
-    [387] = 161,
-    [388] = 160,
-    [389] = 141,
+    [374] = 183,
+    [375] = 160,
+    [376] = 159,
+    [377] = 377,
+    [378] = 120,
+    [379] = 155,
+    [380] = 153,
+    [381] = 381,
+    [382] = 150,
+    [383] = 383,
+    [384] = 131,
+    [385] = 184,
+    [386] = 145,
+    [387] = 387,
+    [388] = 119,
+    [389] = 129,
     [390] = 390,
-    [391] = 178,
-    [392] = 125,
-    [393] = 157,
-    [394] = 179,
-    [395] = 177,
-    [396] = 143,
-    [397] = 127,
-    [398] = 119,
-    [399] = 183,
-    [400] = 181,
-    [401] = 133,
-    [402] = 134,
-    [403] = 403,
-    [404] = 136,
-    [405] = 155,
-    [406] = 137,
-    [407] = 138,
-    [408] = 139,
-    [409] = 140,
-    [410] = 153,
-    [411] = 142,
-    [412] = 151,
-    [413] = 144,
-    [414] = 145,
-    [415] = 146,
-    [416] = 147,
-    [417] = 149,
-    [418] = 150,
+    [391] = 175,
+    [392] = 154,
+    [393] = 140,
+    [394] = 177,
+    [395] = 125,
+    [396] = 158,
+    [397] = 179,
+    [398] = 398,
+    [399] = 181,
+    [400] = 176,
+    [401] = 172,
+    [402] = 182,
+    [403] = 178,
+    [404] = 139,
+    [405] = 151,
+    [406] = 144,
+    [407] = 121,
+    [408] = 123,
+    [409] = 124,
+    [410] = 127,
+    [411] = 411,
+    [412] = 128,
+    [413] = 137,
+    [414] = 130,
+    [415] = 132,
+    [416] = 133,
+    [417] = 136,
+    [418] = 135,
     [419] = 419,
     [420] = 420,
     [421] = 421,
@@ -3958,128 +3958,128 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [437] = 437,
     [438] = 438,
     [439] = 439,
-    [440] = 440,
-    [441] = 106,
-    [442] = 107,
-    [443] = 443,
+    [440] = 110,
+    [441] = 441,
+    [442] = 442,
+    [443] = 109,
     [444] = 444,
-    [445] = 104,
+    [445] = 107,
     [446] = 446,
-    [447] = 98,
-    [448] = 104,
+    [447] = 447,
+    [448] = 99,
     [449] = 449,
-    [450] = 107,
-    [451] = 106,
-    [452] = 108,
+    [450] = 450,
+    [451] = 113,
+    [452] = 109,
     [453] = 453,
-    [454] = 454,
-    [455] = 102,
-    [456] = 456,
-    [457] = 113,
+    [454] = 110,
+    [455] = 455,
+    [456] = 107,
+    [457] = 116,
     [458] = 458,
     [459] = 459,
-    [460] = 118,
+    [460] = 460,
     [461] = 461,
-    [462] = 110,
+    [462] = 462,
     [463] = 463,
     [464] = 464,
     [465] = 465,
     [466] = 466,
     [467] = 467,
     [468] = 468,
-    [469] = 469,
-    [470] = 470,
+    [469] = 106,
+    [470] = 108,
     [471] = 471,
     [472] = 472,
     [473] = 473,
-    [474] = 100,
-    [475] = 116,
-    [476] = 112,
+    [474] = 474,
+    [475] = 105,
+    [476] = 101,
     [477] = 477,
-    [478] = 114,
-    [479] = 117,
-    [480] = 480,
-    [481] = 481,
+    [478] = 103,
+    [479] = 102,
+    [480] = 100,
+    [481] = 114,
     [482] = 482,
-    [483] = 483,
-    [484] = 484,
-    [485] = 485,
-    [486] = 101,
+    [483] = 104,
+    [484] = 112,
+    [485] = 111,
+    [486] = 117,
     [487] = 487,
-    [488] = 115,
-    [489] = 103,
+    [488] = 488,
+    [489] = 489,
     [490] = 490,
-    [491] = 111,
-    [492] = 105,
-    [493] = 109,
+    [491] = 491,
+    [492] = 492,
+    [493] = 493,
     [494] = 494,
-    [495] = 161,
-    [496] = 146,
-    [497] = 168,
-    [498] = 130,
-    [499] = 167,
-    [500] = 166,
-    [501] = 165,
-    [502] = 164,
-    [503] = 163,
-    [504] = 162,
-    [505] = 129,
-    [506] = 169,
-    [507] = 124,
-    [508] = 185,
-    [509] = 160,
-    [510] = 157,
-    [511] = 184,
-    [512] = 182,
+    [495] = 115,
+    [496] = 118,
+    [497] = 163,
+    [498] = 145,
+    [499] = 137,
+    [500] = 136,
+    [501] = 140,
+    [502] = 135,
+    [503] = 162,
+    [504] = 133,
+    [505] = 132,
+    [506] = 130,
+    [507] = 129,
+    [508] = 176,
+    [509] = 128,
+    [510] = 181,
+    [511] = 127,
+    [512] = 149,
     [513] = 119,
-    [514] = 155,
-    [515] = 153,
-    [516] = 151,
-    [517] = 158,
-    [518] = 176,
-    [519] = 172,
-    [520] = 178,
-    [521] = 150,
-    [522] = 149,
-    [523] = 147,
-    [524] = 127,
-    [525] = 145,
-    [526] = 144,
-    [527] = 142,
-    [528] = 128,
-    [529] = 171,
-    [530] = 141,
-    [531] = 140,
-    [532] = 139,
-    [533] = 138,
-    [534] = 137,
-    [535] = 136,
-    [536] = 183,
-    [537] = 173,
-    [538] = 170,
-    [539] = 179,
-    [540] = 177,
-    [541] = 133,
-    [542] = 143,
-    [543] = 134,
-    [544] = 125,
-    [545] = 135,
-    [546] = 123,
-    [547] = 126,
-    [548] = 181,
-    [549] = 122,
-    [550] = 550,
-    [551] = 551,
+    [514] = 185,
+    [515] = 131,
+    [516] = 124,
+    [517] = 123,
+    [518] = 121,
+    [519] = 144,
+    [520] = 151,
+    [521] = 179,
+    [522] = 178,
+    [523] = 183,
+    [524] = 154,
+    [525] = 122,
+    [526] = 184,
+    [527] = 158,
+    [528] = 139,
+    [529] = 182,
+    [530] = 125,
+    [531] = 157,
+    [532] = 146,
+    [533] = 177,
+    [534] = 150,
+    [535] = 165,
+    [536] = 153,
+    [537] = 166,
+    [538] = 167,
+    [539] = 175,
+    [540] = 168,
+    [541] = 169,
+    [542] = 171,
+    [543] = 148,
+    [544] = 161,
+    [545] = 160,
+    [546] = 174,
+    [547] = 159,
+    [548] = 120,
+    [549] = 155,
+    [550] = 172,
+    [551] = 142,
     [552] = 552,
     [553] = 553,
     [554] = 554,
     [555] = 555,
-    [556] = 555,
-    [557] = 555,
-    [558] = 555,
-    [559] = 555,
-    [560] = 560,
-    [561] = 561,
+    [556] = 556,
+    [557] = 557,
+    [558] = 557,
+    [559] = 557,
+    [560] = 557,
+    [561] = 557,
     [562] = 562,
     [563] = 563,
     [564] = 564,
@@ -4091,8 +4091,8 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [570] = 570,
     [571] = 571,
     [572] = 572,
-    [573] = 107,
-    [574] = 106,
+    [573] = 109,
+    [574] = 110,
     [575] = 575,
     [576] = 576,
     [577] = 577,
@@ -4101,11 +4101,11 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [580] = 580,
     [581] = 581,
     [582] = 582,
-    [583] = 104,
+    [583] = 583,
     [584] = 584,
     [585] = 585,
     [586] = 586,
-    [587] = 587,
+    [587] = 107,
     [588] = 588,
     [589] = 589,
     [590] = 590,
@@ -4117,103 +4117,103 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [596] = 596,
     [597] = 597,
     [598] = 598,
-    [599] = 599,
-    [600] = 599,
+    [599] = 99,
+    [600] = 99,
     [601] = 601,
     [602] = 602,
     [603] = 603,
     [604] = 604,
-    [605] = 605,
-    [606] = 605,
-    [607] = 599,
-    [608] = 605,
-    [609] = 597,
-    [610] = 597,
-    [611] = 599,
-    [612] = 605,
-    [613] = 597,
+    [605] = 602,
+    [606] = 603,
+    [607] = 607,
+    [608] = 608,
+    [609] = 602,
+    [610] = 610,
+    [611] = 611,
+    [612] = 612,
+    [613] = 603,
     [614] = 614,
     [615] = 615,
-    [616] = 98,
+    [616] = 616,
     [617] = 617,
-    [618] = 597,
-    [619] = 605,
-    [620] = 599,
-    [621] = 621,
-    [622] = 98,
-    [623] = 623,
-    [624] = 624,
+    [618] = 604,
+    [619] = 603,
+    [620] = 602,
+    [621] = 604,
+    [622] = 603,
+    [623] = 604,
+    [624] = 604,
     [625] = 625,
-    [626] = 626,
+    [626] = 602,
     [627] = 627,
-    [628] = 628,
+    [628] = 113,
     [629] = 629,
     [630] = 630,
     [631] = 631,
     [632] = 632,
-    [633] = 633,
-    [634] = 104,
-    [635] = 635,
-    [636] = 106,
-    [637] = 108,
+    [633] = 109,
+    [634] = 632,
+    [635] = 107,
+    [636] = 636,
+    [637] = 632,
     [638] = 638,
     [639] = 639,
     [640] = 640,
-    [641] = 107,
+    [641] = 641,
     [642] = 642,
     [643] = 643,
-    [644] = 644,
+    [644] = 107,
     [645] = 645,
-    [646] = 108,
-    [647] = 625,
-    [648] = 648,
-    [649] = 625,
+    [646] = 113,
+    [647] = 647,
+    [648] = 632,
+    [649] = 110,
     [650] = 650,
     [651] = 651,
-    [652] = 652,
+    [652] = 109,
     [653] = 653,
     [654] = 654,
-    [655] = 655,
-    [656] = 104,
+    [655] = 110,
+    [656] = 656,
     [657] = 657,
-    [658] = 658,
-    [659] = 107,
+    [658] = 632,
+    [659] = 659,
     [660] = 660,
-    [661] = 106,
+    [661] = 661,
     [662] = 662,
     [663] = 663,
-    [664] = 625,
+    [664] = 664,
     [665] = 665,
-    [666] = 625,
+    [666] = 666,
     [667] = 667,
     [668] = 668,
     [669] = 669,
-    [670] = 113,
-    [671] = 118,
-    [672] = 100,
-    [673] = 116,
-    [674] = 102,
-    [675] = 675,
-    [676] = 101,
-    [677] = 115,
-    [678] = 111,
-    [679] = 109,
-    [680] = 680,
-    [681] = 103,
+    [670] = 670,
+    [671] = 671,
+    [672] = 106,
+    [673] = 108,
+    [674] = 105,
+    [675] = 101,
+    [676] = 676,
+    [677] = 103,
+    [678] = 102,
+    [679] = 100,
+    [680] = 114,
+    [681] = 116,
     [682] = 682,
     [683] = 683,
     [684] = 684,
     [685] = 685,
     [686] = 686,
     [687] = 687,
-    [688] = 105,
-    [689] = 117,
-    [690] = 114,
-    [691] = 691,
-    [692] = 112,
-    [693] = 110,
-    [694] = 694,
-    [695] = 695,
+    [688] = 688,
+    [689] = 104,
+    [690] = 112,
+    [691] = 111,
+    [692] = 117,
+    [693] = 693,
+    [694] = 118,
+    [695] = 115,
     [696] = 696,
     [697] = 697,
     [698] = 698,
@@ -4227,56 +4227,56 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [706] = 706,
     [707] = 707,
     [708] = 708,
-    [709] = 110,
-    [710] = 112,
-    [711] = 114,
-    [712] = 117,
-    [713] = 105,
-    [714] = 103,
-    [715] = 682,
-    [716] = 109,
-    [717] = 111,
-    [718] = 687,
-    [719] = 115,
-    [720] = 101,
-    [721] = 102,
-    [722] = 116,
-    [723] = 705,
-    [724] = 100,
-    [725] = 118,
+    [709] = 709,
+    [710] = 710,
+    [711] = 115,
+    [712] = 118,
+    [713] = 117,
+    [714] = 111,
+    [715] = 683,
+    [716] = 112,
+    [717] = 104,
+    [718] = 688,
+    [719] = 116,
+    [720] = 114,
+    [721] = 100,
+    [722] = 102,
+    [723] = 708,
+    [724] = 103,
+    [725] = 101,
     [726] = 726,
     [727] = 727,
-    [728] = 113,
-    [729] = 729,
+    [728] = 105,
+    [729] = 108,
     [730] = 730,
-    [731] = 708,
+    [731] = 106,
     [732] = 732,
     [733] = 733,
-    [734] = 734,
+    [734] = 710,
     [735] = 735,
     [736] = 736,
-    [737] = 708,
+    [737] = 737,
     [738] = 706,
     [739] = 739,
-    [740] = 740,
+    [740] = 710,
     [741] = 741,
     [742] = 742,
     [743] = 743,
-    [744] = 708,
+    [744] = 744,
     [745] = 745,
     [746] = 746,
-    [747] = 747,
-    [748] = 682,
+    [747] = 710,
+    [748] = 748,
     [749] = 749,
-    [750] = 682,
-    [751] = 687,
-    [752] = 706,
-    [753] = 706,
-    [754] = 708,
-    [755] = 707,
-    [756] = 756,
-    [757] = 757,
-    [758] = 687,
+    [750] = 750,
+    [751] = 683,
+    [752] = 683,
+    [753] = 688,
+    [754] = 706,
+    [755] = 706,
+    [756] = 710,
+    [757] = 709,
+    [758] = 688,
     [759] = 759,
     [760] = 760,
     [761] = 761,
@@ -4284,11 +4284,11 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [763] = 763,
     [764] = 764,
     [765] = 765,
-    [766] = 687,
-    [767] = 767,
-    [768] = 682,
+    [766] = 766,
+    [767] = 688,
+    [768] = 768,
     [769] = 769,
-    [770] = 770,
+    [770] = 683,
     [771] = 771,
     [772] = 772,
     [773] = 706,
@@ -4298,16 +4298,16 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [777] = 777,
     [778] = 778,
     [779] = 779,
-    [780] = 699,
+    [780] = 704,
     [781] = 781,
     [782] = 782,
     [783] = 783,
-    [784] = 171,
+    [784] = 784,
     [785] = 785,
     [786] = 786,
     [787] = 787,
-    [788] = 742,
-    [789] = 789,
+    [788] = 788,
+    [789] = 742,
     [790] = 790,
     [791] = 791,
     [792] = 792,
@@ -4315,16 +4315,16 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [794] = 794,
     [795] = 795,
     [796] = 796,
-    [797] = 181,
-    [798] = 183,
+    [797] = 797,
+    [798] = 798,
     [799] = 799,
-    [800] = 800,
+    [800] = 176,
     [801] = 801,
-    [802] = 143,
-    [803] = 177,
-    [804] = 804,
+    [802] = 181,
+    [803] = 803,
+    [804] = 158,
     [805] = 805,
-    [806] = 179,
+    [806] = 125,
     [807] = 807,
     [808] = 808,
     [809] = 809,
@@ -4332,58 +4332,58 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [811] = 811,
     [812] = 812,
     [813] = 813,
-    [814] = 814,
+    [814] = 177,
     [815] = 815,
     [816] = 816,
-    [817] = 178,
-    [818] = 791,
+    [817] = 817,
+    [818] = 818,
     [819] = 819,
-    [820] = 820,
+    [820] = 175,
     [821] = 821,
     [822] = 822,
     [823] = 823,
-    [824] = 824,
+    [824] = 793,
     [825] = 825,
     [826] = 826,
     [827] = 827,
     [828] = 828,
     [829] = 829,
     [830] = 830,
-    [831] = 805,
+    [831] = 831,
     [832] = 832,
     [833] = 833,
     [834] = 834,
     [835] = 835,
-    [836] = 836,
+    [836] = 805,
     [837] = 837,
     [838] = 838,
-    [839] = 122,
-    [840] = 123,
+    [839] = 839,
+    [840] = 840,
     [841] = 841,
-    [842] = 124,
-    [843] = 791,
-    [844] = 126,
+    [842] = 842,
+    [843] = 793,
+    [844] = 122,
     [845] = 845,
-    [846] = 125,
-    [847] = 127,
+    [846] = 157,
+    [847] = 148,
     [848] = 848,
-    [849] = 130,
-    [850] = 133,
+    [849] = 149,
+    [850] = 154,
     [851] = 851,
-    [852] = 134,
+    [852] = 179,
     [853] = 853,
-    [854] = 135,
-    [855] = 855,
+    [854] = 185,
+    [855] = 172,
     [856] = 856,
-    [857] = 857,
-    [858] = 136,
+    [857] = 142,
+    [858] = 182,
     [859] = 859,
-    [860] = 137,
+    [860] = 178,
     [861] = 861,
     [862] = 811,
-    [863] = 138,
+    [863] = 151,
     [864] = 864,
-    [865] = 139,
+    [865] = 144,
     [866] = 866,
     [867] = 867,
     [868] = 868,
@@ -4391,173 +4391,173 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [870] = 870,
     [871] = 871,
     [872] = 872,
-    [873] = 140,
+    [873] = 121,
     [874] = 874,
-    [875] = 141,
+    [875] = 875,
     [876] = 805,
-    [877] = 805,
-    [878] = 142,
+    [877] = 123,
+    [878] = 805,
     [879] = 879,
-    [880] = 144,
-    [881] = 145,
-    [882] = 146,
+    [880] = 124,
+    [881] = 881,
+    [882] = 127,
     [883] = 811,
-    [884] = 147,
+    [884] = 128,
     [885] = 885,
     [886] = 886,
-    [887] = 149,
+    [887] = 129,
     [888] = 867,
     [889] = 889,
     [890] = 890,
-    [891] = 150,
-    [892] = 874,
+    [891] = 130,
+    [892] = 132,
     [893] = 893,
     [894] = 872,
     [895] = 895,
-    [896] = 151,
-    [897] = 153,
-    [898] = 155,
-    [899] = 119,
+    [896] = 872,
+    [897] = 133,
+    [898] = 135,
+    [899] = 874,
     [900] = 900,
-    [901] = 157,
-    [902] = 160,
+    [901] = 136,
+    [902] = 137,
     [903] = 903,
-    [904] = 161,
-    [905] = 162,
+    [904] = 139,
+    [905] = 140,
     [906] = 906,
-    [907] = 907,
-    [908] = 163,
-    [909] = 164,
-    [910] = 910,
+    [907] = 119,
+    [908] = 867,
+    [909] = 145,
+    [910] = 146,
     [911] = 874,
-    [912] = 165,
+    [912] = 150,
     [913] = 913,
-    [914] = 166,
+    [914] = 914,
     [915] = 915,
-    [916] = 167,
+    [916] = 153,
     [917] = 917,
-    [918] = 791,
+    [918] = 155,
     [919] = 919,
-    [920] = 920,
+    [920] = 120,
     [921] = 811,
     [922] = 867,
-    [923] = 923,
+    [923] = 159,
     [924] = 924,
     [925] = 872,
-    [926] = 168,
-    [927] = 169,
+    [926] = 160,
+    [927] = 927,
     [928] = 928,
     [929] = 929,
     [930] = 874,
-    [931] = 872,
-    [932] = 795,
-    [933] = 170,
+    [931] = 793,
+    [932] = 797,
+    [933] = 933,
     [934] = 934,
     [935] = 935,
     [936] = 936,
-    [937] = 172,
-    [938] = 176,
+    [937] = 161,
+    [938] = 162,
     [939] = 939,
-    [940] = 182,
+    [940] = 163,
     [941] = 941,
     [942] = 942,
-    [943] = 184,
-    [944] = 944,
+    [943] = 943,
+    [944] = 165,
     [945] = 945,
     [946] = 946,
-    [947] = 947,
-    [948] = 948,
+    [947] = 166,
+    [948] = 167,
     [949] = 949,
-    [950] = 950,
+    [950] = 168,
     [951] = 811,
     [952] = 952,
     [953] = 743,
     [954] = 867,
-    [955] = 185,
+    [955] = 169,
     [956] = 956,
     [957] = 957,
     [958] = 810,
-    [959] = 181,
-    [960] = 183,
+    [959] = 176,
+    [960] = 181,
     [961] = 961,
     [962] = 962,
-    [963] = 143,
-    [964] = 177,
-    [965] = 179,
+    [963] = 158,
+    [964] = 125,
+    [965] = 177,
     [966] = 966,
     [967] = 967,
-    [968] = 178,
+    [968] = 175,
     [969] = 969,
-    [970] = 173,
+    [970] = 970,
     [971] = 971,
-    [972] = 158,
-    [973] = 128,
-    [974] = 129,
-    [975] = 805,
-    [976] = 976,
-    [977] = 977,
-    [978] = 128,
-    [979] = 867,
-    [980] = 129,
-    [981] = 981,
+    [972] = 171,
+    [973] = 973,
+    [974] = 974,
+    [975] = 975,
+    [976] = 174,
+    [977] = 805,
+    [978] = 131,
+    [979] = 979,
+    [980] = 183,
+    [981] = 184,
     [982] = 122,
-    [983] = 808,
+    [983] = 881,
     [984] = 872,
-    [985] = 123,
-    [986] = 986,
+    [985] = 157,
+    [986] = 131,
     [987] = 874,
-    [988] = 988,
-    [989] = 124,
+    [988] = 183,
+    [989] = 148,
     [990] = 990,
-    [991] = 126,
-    [992] = 125,
+    [991] = 149,
+    [992] = 154,
     [993] = 993,
-    [994] = 127,
-    [995] = 130,
-    [996] = 791,
-    [997] = 133,
-    [998] = 134,
-    [999] = 135,
-    [1000] = 136,
-    [1001] = 137,
-    [1002] = 138,
-    [1003] = 139,
-    [1004] = 140,
-    [1005] = 141,
-    [1006] = 142,
-    [1007] = 144,
-    [1008] = 145,
-    [1009] = 146,
-    [1010] = 147,
-    [1011] = 149,
-    [1012] = 150,
-    [1013] = 151,
-    [1014] = 153,
-    [1015] = 155,
-    [1016] = 119,
-    [1017] = 157,
-    [1018] = 160,
-    [1019] = 161,
-    [1020] = 162,
-    [1021] = 163,
-    [1022] = 164,
-    [1023] = 165,
-    [1024] = 166,
-    [1025] = 167,
-    [1026] = 168,
-    [1027] = 169,
-    [1028] = 170,
-    [1029] = 171,
-    [1030] = 172,
-    [1031] = 176,
-    [1032] = 182,
-    [1033] = 184,
-    [1034] = 185,
-    [1035] = 173,
-    [1036] = 158,
-    [1037] = 795,
+    [994] = 179,
+    [995] = 185,
+    [996] = 996,
+    [997] = 172,
+    [998] = 142,
+    [999] = 182,
+    [1000] = 178,
+    [1001] = 151,
+    [1002] = 144,
+    [1003] = 121,
+    [1004] = 123,
+    [1005] = 124,
+    [1006] = 127,
+    [1007] = 128,
+    [1008] = 129,
+    [1009] = 130,
+    [1010] = 132,
+    [1011] = 133,
+    [1012] = 135,
+    [1013] = 136,
+    [1014] = 137,
+    [1015] = 139,
+    [1016] = 140,
+    [1017] = 119,
+    [1018] = 145,
+    [1019] = 146,
+    [1020] = 150,
+    [1021] = 153,
+    [1022] = 155,
+    [1023] = 120,
+    [1024] = 159,
+    [1025] = 160,
+    [1026] = 161,
+    [1027] = 162,
+    [1028] = 163,
+    [1029] = 165,
+    [1030] = 166,
+    [1031] = 167,
+    [1032] = 168,
+    [1033] = 169,
+    [1034] = 171,
+    [1035] = 174,
+    [1036] = 184,
+    [1037] = 797,
     [1038] = 1038,
-    [1039] = 1039,
+    [1039] = 793,
     [1040] = 1038,
     [1041] = 1041,
     [1042] = 1042,
@@ -4576,7 +4576,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1055] = 1055,
     [1056] = 1056,
     [1057] = 1057,
-    [1058] = 129,
+    [1058] = 183,
     [1059] = 1059,
     [1060] = 1060,
     [1061] = 1061,
@@ -4598,7 +4598,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1077] = 1077,
     [1078] = 1078,
     [1079] = 1079,
-    [1080] = 1049,
+    [1080] = 1080,
     [1081] = 1081,
     [1082] = 1082,
     [1083] = 1083,
@@ -4606,7 +4606,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1085] = 1085,
     [1086] = 1086,
     [1087] = 1087,
-    [1088] = 1088,
+    [1088] = 1055,
     [1089] = 1089,
     [1090] = 1090,
     [1091] = 1091,
@@ -4615,13 +4615,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1094] = 1094,
     [1095] = 1095,
     [1096] = 1096,
-    [1097] = 1049,
+    [1097] = 1097,
     [1098] = 1098,
     [1099] = 1099,
     [1100] = 1100,
     [1101] = 1101,
-    [1102] = 1049,
-    [1103] = 1103,
+    [1102] = 1055,
+    [1103] = 1055,
     [1104] = 1104,
     [1105] = 1105,
     [1106] = 1106,
@@ -4629,22 +4629,22 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1108] = 1108,
     [1109] = 1109,
     [1110] = 1110,
-    [1111] = 1050,
+    [1111] = 1111,
     [1112] = 1112,
-    [1113] = 1049,
+    [1113] = 1113,
     [1114] = 1114,
-    [1115] = 1115,
+    [1115] = 1055,
     [1116] = 1116,
     [1117] = 1117,
     [1118] = 1118,
-    [1119] = 1050,
+    [1119] = 1119,
     [1120] = 1120,
     [1121] = 1121,
     [1122] = 1122,
-    [1123] = 1123,
+    [1123] = 1046,
     [1124] = 1124,
     [1125] = 1125,
-    [1126] = 1126,
+    [1126] = 1047,
     [1127] = 1127,
     [1128] = 1128,
     [1129] = 1129,
@@ -4657,15 +4657,15 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1136] = 1136,
     [1137] = 1137,
     [1138] = 1138,
-    [1139] = 1050,
-    [1140] = 1140,
+    [1139] = 1139,
+    [1140] = 1046,
     [1141] = 1141,
     [1142] = 1142,
     [1143] = 1143,
     [1144] = 1144,
     [1145] = 1145,
-    [1146] = 1122,
-    [1147] = 1122,
+    [1146] = 1146,
+    [1147] = 1047,
     [1148] = 1148,
     [1149] = 1149,
     [1150] = 1150,
@@ -4673,19 +4673,19 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1152] = 1152,
     [1153] = 1153,
     [1154] = 1154,
-    [1155] = 1155,
+    [1155] = 1046,
     [1156] = 1156,
     [1157] = 1157,
-    [1158] = 1158,
-    [1159] = 1122,
-    [1160] = 1122,
+    [1158] = 1047,
+    [1159] = 1159,
+    [1160] = 1047,
     [1161] = 1161,
     [1162] = 1162,
     [1163] = 1163,
     [1164] = 1164,
     [1165] = 1165,
-    [1166] = 1050,
-    [1167] = 1167,
+    [1166] = 1166,
+    [1167] = 1046,
     [1168] = 1168,
     [1169] = 1169,
     [1170] = 1170,
@@ -4708,7 +4708,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1187] = 1187,
     [1188] = 1188,
     [1189] = 1189,
-    [1190] = 487,
+    [1190] = 458,
     [1191] = 1191,
     [1192] = 1192,
     [1193] = 1193,
@@ -4780,7 +4780,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1259] = 1259,
     [1260] = 1260,
     [1261] = 1261,
-    [1262] = 128,
+    [1262] = 131,
     [1263] = 1263,
     [1264] = 1264,
     [1265] = 1265,
@@ -5002,7 +5002,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
     [1481] = 1481,
     [1482] = 1482,
     [1483] = 1483,
-    [1484] = 490,
+    [1484] = 488,
     [1485] = 1485,
     [1486] = 1486,
     [1487] = 1487,
@@ -5414,21 +5414,21 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             END_STATE();
         case 15:
             if(lookahead == '\n')
-                SKIP(115);
+                SKIP(103);
             END_STATE();
         case 16:
             if(lookahead == '\n')
-                SKIP(115);
+                SKIP(103);
             if(lookahead == '\r')
                 SKIP(15);
             END_STATE();
         case 17:
             if(lookahead == '\n')
-                SKIP(103);
+                SKIP(115);
             END_STATE();
         case 18:
             if(lookahead == '\n')
-                SKIP(103);
+                SKIP(115);
             if(lookahead == '\r')
                 SKIP(17);
             END_STATE();
@@ -5464,21 +5464,21 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             END_STATE();
         case 25:
             if(lookahead == '\n')
-                SKIP(89);
+                SKIP(88);
             END_STATE();
         case 26:
             if(lookahead == '\n')
-                SKIP(89);
+                SKIP(88);
             if(lookahead == '\r')
                 SKIP(25);
             END_STATE();
         case 27:
             if(lookahead == '\n')
-                SKIP(91);
+                SKIP(90);
             END_STATE();
         case 28:
             if(lookahead == '\n')
-                SKIP(91);
+                SKIP(90);
             if(lookahead == '\r')
                 SKIP(27);
             END_STATE();
@@ -5494,41 +5494,41 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             END_STATE();
         case 31:
             if(lookahead == '\n')
-                SKIP(90);
+                SKIP(87);
             END_STATE();
         case 32:
             if(lookahead == '\n')
-                SKIP(90);
+                SKIP(87);
             if(lookahead == '\r')
                 SKIP(31);
             END_STATE();
         case 33:
             if(lookahead == '\n')
-                SKIP(88);
+                SKIP(123);
             END_STATE();
         case 34:
             if(lookahead == '\n')
-                SKIP(88);
+                SKIP(123);
             if(lookahead == '\r')
                 SKIP(33);
             END_STATE();
         case 35:
             if(lookahead == '\n')
-                SKIP(123);
+                SKIP(89);
             END_STATE();
         case 36:
             if(lookahead == '\n')
-                SKIP(123);
+                SKIP(89);
             if(lookahead == '\r')
                 SKIP(35);
             END_STATE();
         case 37:
             if(lookahead == '\n')
-                SKIP(92);
+                SKIP(91);
             END_STATE();
         case 38:
             if(lookahead == '\n')
-                SKIP(92);
+                SKIP(91);
             if(lookahead == '\r')
                 SKIP(37);
             END_STATE();
@@ -5554,11 +5554,11 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             END_STATE();
         case 43:
             if(lookahead == '\n')
-                SKIP(96);
+                SKIP(95);
             END_STATE();
         case 44:
             if(lookahead == '\n')
-                SKIP(96);
+                SKIP(95);
             if(lookahead == '\r')
                 SKIP(43);
             END_STATE();
@@ -5574,41 +5574,41 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             END_STATE();
         case 47:
             if(lookahead == '\n')
-                SKIP(95);
+                SKIP(94);
             END_STATE();
         case 48:
             if(lookahead == '\n')
-                SKIP(95);
+                SKIP(94);
             if(lookahead == '\r')
                 SKIP(47);
             END_STATE();
         case 49:
             if(lookahead == '\n')
-                SKIP(87);
+                SKIP(98);
             END_STATE();
         case 50:
             if(lookahead == '\n')
-                SKIP(87);
+                SKIP(98);
             if(lookahead == '\r')
                 SKIP(49);
             END_STATE();
         case 51:
             if(lookahead == '\n')
-                SKIP(93);
+                SKIP(92);
             END_STATE();
         case 52:
             if(lookahead == '\n')
-                SKIP(93);
+                SKIP(92);
             if(lookahead == '\r')
                 SKIP(51);
             END_STATE();
         case 53:
             if(lookahead == '\n')
-                SKIP(98);
+                SKIP(96);
             END_STATE();
         case 54:
             if(lookahead == '\n')
-                SKIP(98);
+                SKIP(96);
             if(lookahead == '\r')
                 SKIP(53);
             END_STATE();
@@ -5663,50 +5663,40 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             END_STATE();
         case 62:
             if(lookahead == '\n')
-                SKIP(120);
+                SKIP(125);
             END_STATE();
         case 63:
             if(lookahead == '\n')
-                SKIP(120);
+                SKIP(125);
             if(lookahead == '\r')
                 SKIP(62);
             END_STATE();
         case 64:
             if(lookahead == '\n')
-                SKIP(125);
+                SKIP(120);
             END_STATE();
         case 65:
             if(lookahead == '\n')
-                SKIP(125);
+                SKIP(120);
             if(lookahead == '\r')
                 SKIP(64);
             END_STATE();
         case 66:
             if(lookahead == '\n')
-                SKIP(127);
-            END_STATE();
-        case 67:
-            if(lookahead == '\n')
-                SKIP(127);
-            if(lookahead == '\r')
-                SKIP(66);
-            END_STATE();
-        case 68:
-            if(lookahead == '\n')
-                SKIP(94);
+                SKIP(93);
             if(lookahead == '"')
                 ADVANCE(1033);
             if(lookahead == '/')
                 ADVANCE(1034);
             if(lookahead == '\\')
-                ADVANCE(69);
+                ADVANCE(67);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
                 ADVANCE(1035);
             if(lookahead != 0)
                 ADVANCE(1036);
             END_STATE();
-        case 69:
+        case 67:
             if(lookahead == '\n')
                 ADVANCE(1030);
             if(lookahead == '\r')
@@ -5722,7 +5712,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead != 0)
                 ADVANCE(1029);
             END_STATE();
-        case 70:
+        case 68:
             if(lookahead == '\n')
                 SKIP(97);
             if(lookahead == '\'')
@@ -5737,13 +5727,23 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead != 0)
                 ADVANCE(1040);
             END_STATE();
-        case 71:
+        case 69:
             if(lookahead == '\n')
                 SKIP(126);
             END_STATE();
-        case 72:
+        case 70:
             if(lookahead == '\n')
                 SKIP(126);
+            if(lookahead == '\r')
+                SKIP(69);
+            END_STATE();
+        case 71:
+            if(lookahead == '\n')
+                SKIP(127);
+            END_STATE();
+        case 72:
+            if(lookahead == '\n')
+                SKIP(127);
             if(lookahead == '\r')
                 SKIP(71);
             END_STATE();
@@ -5894,36 +5894,6 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1927);
             END_STATE();
         case 87:
-            ADVANCE_MAP(
-                '"', 1033,
-                '&', 1004,
-                ')', 1014,
-                ',', 997,
-                '/', 105,
-                ':', 1088,
-                ';', 1090,
-                '<', 990,
-                '>', 991,
-            );
-            if(lookahead == '\\')
-                SKIP(50);
-            if(lookahead == ']')
-                ADVANCE(1269);
-            if(lookahead == '^')
-                ADVANCE(1003);
-            if(lookahead == '{')
-                ADVANCE(1080);
-            if(lookahead == '|')
-                ADVANCE(1002);
-            if(('\t' <= lookahead && lookahead <= '\r') ||
-               lookahead == ' ')
-                SKIP(87);
-            if(('A' <= lookahead && lookahead <= 'Z') ||
-               lookahead == '_' ||
-               ('a' <= lookahead && lookahead <= 'z'))
-                ADVANCE(1927);
-            END_STATE();
-        case 88:
             ADVANCE_MAP(
                 '"', 1033,
                 '\'', 1039,
@@ -5939,12 +5909,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 'T', 1320,
             );
             if(lookahead == '\\')
-                SKIP(34);
+                SKIP(32);
             if(lookahead == '~')
                 ADVANCE(1015);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(88);
+                SKIP(87);
             if(('1' <= lookahead && lookahead <= '9'))
                 ADVANCE(1020);
             if(('A' <= lookahead && lookahead <= 'Z') ||
@@ -5952,7 +5922,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                ('a' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
-        case 89:
+        case 88:
             ADVANCE_MAP(
                 '"', 1033,
                 '\'', 1039,
@@ -5991,7 +5961,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1622);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(89);
+                SKIP(88);
             if(('1' <= lookahead && lookahead <= '9'))
                 ADVANCE(1020);
             if(('D' <= lookahead && lookahead <= 'Z') ||
@@ -5999,7 +5969,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                ('d' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
-        case 90:
+        case 89:
             ADVANCE_MAP(
                 '"', 1033,
                 '\'', 1039,
@@ -6015,7 +5985,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 'T', 1320,
             );
             if(lookahead == '\\')
-                SKIP(32);
+                SKIP(36);
             if(lookahead == '~')
                 ADVANCE(1015);
             if(lookahead == 'D' ||
@@ -6023,7 +5993,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1679);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(90);
+                SKIP(89);
             if(('1' <= lookahead && lookahead <= '9'))
                 ADVANCE(1020);
             if(('A' <= lookahead && lookahead <= 'Z') ||
@@ -6031,7 +6001,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                ('a' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
-        case 91:
+        case 90:
             ADVANCE_MAP(
                 '"', 1033,
                 '\'', 1039,
@@ -6060,7 +6030,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1814);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(91);
+                SKIP(90);
             if(('1' <= lookahead && lookahead <= '9'))
                 ADVANCE(1020);
             if(('C' <= lookahead && lookahead <= 'Z') ||
@@ -6068,7 +6038,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                ('c' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
-        case 92:
+        case 91:
             ADVANCE_MAP(
                 '"', 1033,
                 '\'', 1039,
@@ -6091,7 +6061,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1640);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(92);
+                SKIP(91);
             if(('1' <= lookahead && lookahead <= '9'))
                 ADVANCE(1020);
             if(('A' <= lookahead && lookahead <= 'Z') ||
@@ -6099,7 +6069,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                ('a' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
-        case 93:
+        case 92:
             ADVANCE_MAP(
                 '"', 1033,
                 ')', 1014,
@@ -6116,24 +6086,24 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1080);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(93);
+                SKIP(92);
             if(('A' <= lookahead && lookahead <= 'Z') ||
                lookahead == '_' ||
                ('a' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
-        case 94:
+        case 93:
             if(lookahead == '"')
                 ADVANCE(1033);
             if(lookahead == '/')
                 ADVANCE(105);
             if(lookahead == '\\')
-                ADVANCE(69);
+                ADVANCE(67);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(94);
+                SKIP(93);
             END_STATE();
-        case 95:
+        case 94:
             ADVANCE_MAP(
                 '%', 1012,
                 '&', 1004,
@@ -6173,9 +6143,9 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
                 ADVANCE(1023);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
-                SKIP(95);
+                SKIP(94);
             END_STATE();
-        case 96:
+        case 95:
             ADVANCE_MAP(
                 '%', 1012,
                 '&', 1004,
@@ -6251,9 +6221,46 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == 'X' ||
                lookahead == 'x')
                 ADVANCE(661);
+            if(('\t' <= lookahead && lookahead <= '\r') ||
+               lookahead == ' ')
+                SKIP(95);
+            END_STATE();
+        case 96:
+            if(lookahead == '&')
+                ADVANCE(1004);
+            if(lookahead == ')')
+                ADVANCE(1014);
+            if(lookahead == ',')
+                ADVANCE(997);
+            if(lookahead == '/')
+                ADVANCE(105);
+            if(lookahead == ':')
+                ADVANCE(1088);
+            if(lookahead == ';')
+                ADVANCE(1090);
+            if(lookahead == '>')
+                ADVANCE(991);
+            if(lookahead == '\\')
+                SKIP(54);
+            if(lookahead == ']')
+                ADVANCE(1269);
+            if(lookahead == '^')
+                ADVANCE(1003);
+            if(lookahead == 'a')
+                ADVANCE(1362);
+            if(lookahead == 'i')
+                ADVANCE(1506);
+            if(lookahead == 'l')
+                ADVANCE(1515);
+            if(lookahead == '|')
+                ADVANCE(1002);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
                 SKIP(96);
+            if(('A' <= lookahead && lookahead <= 'Z') ||
+               lookahead == '_' ||
+               ('b' <= lookahead && lookahead <= 'z'))
+                ADVANCE(1927);
             END_STATE();
         case 97:
             if(lookahead == '\'')
@@ -6261,7 +6268,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == '/')
                 ADVANCE(105);
             if(lookahead == '\\')
-                ADVANCE(69);
+                ADVANCE(67);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
                 SKIP(97);
@@ -6278,7 +6285,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == '@')
                 ADVANCE(1115);
             if(lookahead == '\\')
-                SKIP(54);
+                SKIP(50);
             if(lookahead == '}')
                 ADVANCE(1081);
             if(('\t' <= lookahead && lookahead <= '\r') ||
@@ -6533,7 +6540,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == 'V')
                 ADVANCE(1335);
             if(lookahead == '\\')
-                SKIP(18);
+                SKIP(16);
             if(lookahead == 'a')
                 ADVANCE(1488);
             if(lookahead == 'b')
@@ -6873,7 +6880,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == 'V')
                 ADVANCE(1335);
             if(lookahead == '\\')
-                SKIP(16);
+                SKIP(18);
             if(lookahead == 'a')
                 ADVANCE(1488);
             if(lookahead == 'b')
@@ -7070,7 +7077,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == 'O')
                 ADVANCE(1360);
             if(lookahead == '\\')
-                SKIP(63);
+                SKIP(65);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
                 SKIP(120);
@@ -7165,7 +7172,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == ':')
                 ADVANCE(138);
             if(lookahead == '\\')
-                SKIP(36);
+                SKIP(34);
             if(lookahead == 'b')
                 ADVANCE(1512);
             if(lookahead == 'c')
@@ -7231,7 +7238,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
             if(lookahead == ':')
                 ADVANCE(138);
             if(lookahead == '\\')
-                SKIP(65);
+                SKIP(63);
             if(lookahead == 't')
                 ADVANCE(1544);
             if(('\t' <= lookahead && lookahead <= '\r') ||
@@ -7245,12 +7252,14 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 126:
             if(lookahead == '/')
                 ADVANCE(105);
+            if(lookahead == ':')
+                ADVANCE(1088);
             if(lookahead == ';')
                 ADVANCE(1090);
             if(lookahead == '\\')
-                SKIP(72);
-            if(lookahead == 's')
-                ADVANCE(1608);
+                SKIP(70);
+            if(lookahead == '{')
+                ADVANCE(1080);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
                 SKIP(126);
@@ -7262,20 +7271,18 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 127:
             if(lookahead == '/')
                 ADVANCE(105);
+            if(lookahead == ';')
+                ADVANCE(1090);
             if(lookahead == '\\')
-                SKIP(67);
-            if(lookahead == 'a')
-                ADVANCE(1362);
-            if(lookahead == 'i')
-                ADVANCE(1506);
-            if(lookahead == 'l')
-                ADVANCE(1516);
+                SKIP(72);
+            if(lookahead == 's')
+                ADVANCE(1608);
             if(('\t' <= lookahead && lookahead <= '\r') ||
                lookahead == ' ')
                 SKIP(127);
             if(('A' <= lookahead && lookahead <= 'Z') ||
                lookahead == '_' ||
-               ('b' <= lookahead && lookahead <= 'z'))
+               ('a' <= lookahead && lookahead <= 'z'))
                 ADVANCE(1927);
             END_STATE();
         case 128:
@@ -11925,7 +11932,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 1030:
             ACCEPT_TOKEN(sym_escape_sequence);
             if(lookahead == '\\')
-                ADVANCE(69);
+                ADVANCE(67);
             END_STATE();
         case 1031:
             ACCEPT_TOKEN(sym_escape_sequence);
@@ -12018,7 +12025,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 1043:
             ACCEPT_TOKEN(aux_sym_char_literal_token1);
             if(lookahead == '\\')
-                ADVANCE(69);
+                ADVANCE(67);
             END_STATE();
         case 1044:
             ACCEPT_TOKEN(anon_sym_TRUE);
@@ -14452,7 +14459,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 1392:
             ACCEPT_TOKEN(sym_identifier);
             if(lookahead == 'd')
-                ADVANCE(1515);
+                ADVANCE(1516);
             if(('0' <= lookahead && lookahead <= '9') ||
                ('A' <= lookahead && lookahead <= 'Z') ||
                lookahead == '_' ||
@@ -15734,7 +15741,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 1515:
             ACCEPT_TOKEN(sym_identifier);
             if(lookahead == 'o')
-                ADVANCE(1495);
+                ADVANCE(1382);
             if(('0' <= lookahead && lookahead <= '9') ||
                ('A' <= lookahead && lookahead <= 'Z') ||
                lookahead == '_' ||
@@ -15744,7 +15751,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
         case 1516:
             ACCEPT_TOKEN(sym_identifier);
             if(lookahead == 'o')
-                ADVANCE(1382);
+                ADVANCE(1495);
             if(('0' <= lookahead && lookahead <= '9') ||
                ('A' <= lookahead && lookahead <= 'Z') ||
                lookahead == '_' ||
@@ -20389,8 +20396,8 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [2] = { .lex_state = 110 },
     [3] = { .lex_state = 110 },
     [4] = { .lex_state = 110 },
-    [5] = { .lex_state = 110 },
-    [6] = { .lex_state = 111 },
+    [5] = { .lex_state = 111 },
+    [6] = { .lex_state = 110 },
     [7] = { .lex_state = 110 },
     [8] = { .lex_state = 111 },
     [9] = { .lex_state = 111 },
@@ -20406,10 +20413,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [19] = { .lex_state = 112 },
     [20] = { .lex_state = 112 },
     [21] = { .lex_state = 943 },
-    [22] = { .lex_state = 943 },
+    [22] = { .lex_state = 944 },
     [23] = { .lex_state = 944 },
     [24] = { .lex_state = 944 },
-    [25] = { .lex_state = 944 },
+    [25] = { .lex_state = 943 },
     [26] = { .lex_state = 944 },
     [27] = { .lex_state = 944 },
     [28] = { .lex_state = 944 },
@@ -20417,12 +20424,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [30] = { .lex_state = 944 },
     [31] = { .lex_state = 944 },
     [32] = { .lex_state = 102 },
-    [33] = { .lex_state = 102 },
+    [33] = { .lex_state = 99 },
     [34] = { .lex_state = 102 },
     [35] = { .lex_state = 102 },
     [36] = { .lex_state = 102 },
     [37] = { .lex_state = 102 },
-    [38] = { .lex_state = 99 },
+    [38] = { .lex_state = 102 },
     [39] = { .lex_state = 102 },
     [40] = { .lex_state = 102 },
     [41] = { .lex_state = 102 },
@@ -20436,54 +20443,54 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [49] = { .lex_state = 100 },
     [50] = { .lex_state = 100 },
     [51] = { .lex_state = 100 },
-    [52] = { .lex_state = 115 },
-    [53] = { .lex_state = 103 },
+    [52] = { .lex_state = 103 },
+    [53] = { .lex_state = 115 },
     [54] = { .lex_state = 103 },
-    [55] = { .lex_state = 100 },
+    [55] = { .lex_state = 103 },
     [56] = { .lex_state = 100 },
-    [57] = { .lex_state = 103 },
+    [57] = { .lex_state = 100 },
     [58] = { .lex_state = 121 },
     [59] = { .lex_state = 121 },
     [60] = { .lex_state = 121 },
     [61] = { .lex_state = 121 },
     [62] = { .lex_state = 121 },
-    [63] = { .lex_state = 117 },
+    [63] = { .lex_state = 110 },
     [64] = { .lex_state = 110 },
     [65] = { .lex_state = 110 },
     [66] = { .lex_state = 110 },
-    [67] = { .lex_state = 110 },
+    [67] = { .lex_state = 117 },
     [68] = { .lex_state = 110 },
     [69] = { .lex_state = 110 },
     [70] = { .lex_state = 110 },
     [71] = { .lex_state = 111 },
-    [72] = { .lex_state = 111 },
-    [73] = { .lex_state = 117 },
+    [72] = { .lex_state = 117 },
+    [73] = { .lex_state = 111 },
     [74] = { .lex_state = 111 },
     [75] = { .lex_state = 111 },
     [76] = { .lex_state = 118 },
-    [77] = { .lex_state = 89 },
-    [78] = { .lex_state = 118 },
+    [77] = { .lex_state = 88 },
+    [78] = { .lex_state = 88 },
     [79] = { .lex_state = 118 },
     [80] = { .lex_state = 118 },
     [81] = { .lex_state = 118 },
-    [82] = { .lex_state = 89 },
+    [82] = { .lex_state = 118 },
     [83] = { .lex_state = 118 },
     [84] = { .lex_state = 118 },
     [85] = { .lex_state = 118 },
-    [86] = { .lex_state = 118 },
-    [87] = { .lex_state = 89 },
-    [88] = { .lex_state = 89 },
-    [89] = { .lex_state = 118 },
-    [90] = { .lex_state = 89 },
+    [86] = { .lex_state = 88 },
+    [87] = { .lex_state = 118 },
+    [88] = { .lex_state = 118 },
+    [89] = { .lex_state = 88 },
+    [90] = { .lex_state = 88 },
     [91] = { .lex_state = 112 },
     [92] = { .lex_state = 112 },
-    [93] = { .lex_state = 91 },
-    [94] = { .lex_state = 91 },
-    [95] = { .lex_state = 91 },
-    [96] = { .lex_state = 91 },
-    [97] = { .lex_state = 91 },
-    [98] = { .lex_state = 99 },
-    [99] = { .lex_state = 122 },
+    [93] = { .lex_state = 90 },
+    [94] = { .lex_state = 90 },
+    [95] = { .lex_state = 90 },
+    [96] = { .lex_state = 90 },
+    [97] = { .lex_state = 90 },
+    [98] = { .lex_state = 122 },
+    [99] = { .lex_state = 99 },
     [100] = { .lex_state = 99 },
     [101] = { .lex_state = 99 },
     [102] = { .lex_state = 99 },
@@ -20504,217 +20511,217 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [117] = { .lex_state = 99 },
     [118] = { .lex_state = 99 },
     [119] = { .lex_state = 99 },
-    [120] = { .lex_state = 90 },
-    [121] = { .lex_state = 88 },
+    [120] = { .lex_state = 99 },
+    [121] = { .lex_state = 99 },
     [122] = { .lex_state = 99 },
     [123] = { .lex_state = 99 },
     [124] = { .lex_state = 99 },
     [125] = { .lex_state = 99 },
-    [126] = { .lex_state = 99 },
+    [126] = { .lex_state = 87 },
     [127] = { .lex_state = 99 },
     [128] = { .lex_state = 99 },
     [129] = { .lex_state = 99 },
     [130] = { .lex_state = 99 },
-    [131] = { .lex_state = 88 },
-    [132] = { .lex_state = 90 },
+    [131] = { .lex_state = 99 },
+    [132] = { .lex_state = 99 },
     [133] = { .lex_state = 99 },
-    [134] = { .lex_state = 99 },
+    [134] = { .lex_state = 87 },
     [135] = { .lex_state = 99 },
     [136] = { .lex_state = 99 },
     [137] = { .lex_state = 99 },
-    [138] = { .lex_state = 99 },
+    [138] = { .lex_state = 123 },
     [139] = { .lex_state = 99 },
     [140] = { .lex_state = 99 },
-    [141] = { .lex_state = 99 },
+    [141] = { .lex_state = 89 },
     [142] = { .lex_state = 99 },
-    [143] = { .lex_state = 99 },
+    [143] = { .lex_state = 89 },
     [144] = { .lex_state = 99 },
     [145] = { .lex_state = 99 },
     [146] = { .lex_state = 99 },
-    [147] = { .lex_state = 99 },
-    [148] = { .lex_state = 88 },
+    [147] = { .lex_state = 87 },
+    [148] = { .lex_state = 99 },
     [149] = { .lex_state = 99 },
     [150] = { .lex_state = 99 },
     [151] = { .lex_state = 99 },
-    [152] = { .lex_state = 90 },
+    [152] = { .lex_state = 89 },
     [153] = { .lex_state = 99 },
-    [154] = { .lex_state = 123 },
+    [154] = { .lex_state = 99 },
     [155] = { .lex_state = 99 },
-    [156] = { .lex_state = 90 },
+    [156] = { .lex_state = 89 },
     [157] = { .lex_state = 99 },
     [158] = { .lex_state = 99 },
-    [159] = { .lex_state = 90 },
+    [159] = { .lex_state = 99 },
     [160] = { .lex_state = 99 },
     [161] = { .lex_state = 99 },
     [162] = { .lex_state = 99 },
     [163] = { .lex_state = 99 },
-    [164] = { .lex_state = 99 },
+    [164] = { .lex_state = 123 },
     [165] = { .lex_state = 99 },
     [166] = { .lex_state = 99 },
     [167] = { .lex_state = 99 },
     [168] = { .lex_state = 99 },
     [169] = { .lex_state = 99 },
-    [170] = { .lex_state = 99 },
+    [170] = { .lex_state = 89 },
     [171] = { .lex_state = 99 },
     [172] = { .lex_state = 99 },
-    [173] = { .lex_state = 99 },
-    [174] = { .lex_state = 88 },
-    [175] = { .lex_state = 123 },
+    [173] = { .lex_state = 87 },
+    [174] = { .lex_state = 99 },
+    [175] = { .lex_state = 99 },
     [176] = { .lex_state = 99 },
     [177] = { .lex_state = 99 },
     [178] = { .lex_state = 99 },
     [179] = { .lex_state = 99 },
-    [180] = { .lex_state = 88 },
+    [180] = { .lex_state = 87 },
     [181] = { .lex_state = 99 },
     [182] = { .lex_state = 99 },
     [183] = { .lex_state = 99 },
     [184] = { .lex_state = 99 },
     [185] = { .lex_state = 99 },
-    [186] = { .lex_state = 88 },
-    [187] = { .lex_state = 113 },
-    [188] = { .lex_state = 88 },
-    [189] = { .lex_state = 88 },
-    [190] = { .lex_state = 88 },
-    [191] = { .lex_state = 88 },
-    [192] = { .lex_state = 92 },
-    [193] = { .lex_state = 88 },
-    [194] = { .lex_state = 92 },
-    [195] = { .lex_state = 92 },
-    [196] = { .lex_state = 88 },
-    [197] = { .lex_state = 88 },
-    [198] = { .lex_state = 88 },
-    [199] = { .lex_state = 88 },
-    [200] = { .lex_state = 88 },
-    [201] = { .lex_state = 88 },
-    [202] = { .lex_state = 88 },
-    [203] = { .lex_state = 88 },
-    [204] = { .lex_state = 88 },
-    [205] = { .lex_state = 88 },
-    [206] = { .lex_state = 88 },
-    [207] = { .lex_state = 88 },
-    [208] = { .lex_state = 88 },
-    [209] = { .lex_state = 88 },
-    [210] = { .lex_state = 88 },
-    [211] = { .lex_state = 88 },
-    [212] = { .lex_state = 88 },
-    [213] = { .lex_state = 88 },
-    [214] = { .lex_state = 88 },
-    [215] = { .lex_state = 88 },
-    [216] = { .lex_state = 88 },
-    [217] = { .lex_state = 88 },
-    [218] = { .lex_state = 88 },
-    [219] = { .lex_state = 88 },
-    [220] = { .lex_state = 92 },
-    [221] = { .lex_state = 92 },
-    [222] = { .lex_state = 88 },
-    [223] = { .lex_state = 88 },
-    [224] = { .lex_state = 92 },
-    [225] = { .lex_state = 92 },
-    [226] = { .lex_state = 88 },
-    [227] = { .lex_state = 88 },
-    [228] = { .lex_state = 88 },
-    [229] = { .lex_state = 88 },
-    [230] = { .lex_state = 92 },
-    [231] = { .lex_state = 92 },
-    [232] = { .lex_state = 88 },
-    [233] = { .lex_state = 88 },
-    [234] = { .lex_state = 88 },
-    [235] = { .lex_state = 88 },
-    [236] = { .lex_state = 88 },
-    [237] = { .lex_state = 88 },
-    [238] = { .lex_state = 88 },
-    [239] = { .lex_state = 88 },
-    [240] = { .lex_state = 88 },
-    [241] = { .lex_state = 88 },
-    [242] = { .lex_state = 88 },
-    [243] = { .lex_state = 88 },
-    [244] = { .lex_state = 92 },
-    [245] = { .lex_state = 88 },
-    [246] = { .lex_state = 88 },
-    [247] = { .lex_state = 88 },
-    [248] = { .lex_state = 88 },
-    [249] = { .lex_state = 88 },
-    [250] = { .lex_state = 88 },
-    [251] = { .lex_state = 88 },
-    [252] = { .lex_state = 88 },
-    [253] = { .lex_state = 88 },
-    [254] = { .lex_state = 88 },
-    [255] = { .lex_state = 88 },
-    [256] = { .lex_state = 88 },
-    [257] = { .lex_state = 88 },
-    [258] = { .lex_state = 88 },
-    [259] = { .lex_state = 88 },
-    [260] = { .lex_state = 113 },
-    [261] = { .lex_state = 88 },
-    [262] = { .lex_state = 88 },
-    [263] = { .lex_state = 88 },
-    [264] = { .lex_state = 88 },
-    [265] = { .lex_state = 88 },
-    [266] = { .lex_state = 88 },
-    [267] = { .lex_state = 88 },
-    [268] = { .lex_state = 88 },
-    [269] = { .lex_state = 88 },
-    [270] = { .lex_state = 88 },
-    [271] = { .lex_state = 88 },
-    [272] = { .lex_state = 88 },
+    [186] = { .lex_state = 87 },
+    [187] = { .lex_state = 87 },
+    [188] = { .lex_state = 113 },
+    [189] = { .lex_state = 87 },
+    [190] = { .lex_state = 87 },
+    [191] = { .lex_state = 87 },
+    [192] = { .lex_state = 91 },
+    [193] = { .lex_state = 87 },
+    [194] = { .lex_state = 91 },
+    [195] = { .lex_state = 91 },
+    [196] = { .lex_state = 87 },
+    [197] = { .lex_state = 87 },
+    [198] = { .lex_state = 87 },
+    [199] = { .lex_state = 87 },
+    [200] = { .lex_state = 87 },
+    [201] = { .lex_state = 87 },
+    [202] = { .lex_state = 87 },
+    [203] = { .lex_state = 87 },
+    [204] = { .lex_state = 87 },
+    [205] = { .lex_state = 87 },
+    [206] = { .lex_state = 87 },
+    [207] = { .lex_state = 87 },
+    [208] = { .lex_state = 87 },
+    [209] = { .lex_state = 87 },
+    [210] = { .lex_state = 87 },
+    [211] = { .lex_state = 87 },
+    [212] = { .lex_state = 87 },
+    [213] = { .lex_state = 87 },
+    [214] = { .lex_state = 87 },
+    [215] = { .lex_state = 87 },
+    [216] = { .lex_state = 87 },
+    [217] = { .lex_state = 87 },
+    [218] = { .lex_state = 87 },
+    [219] = { .lex_state = 87 },
+    [220] = { .lex_state = 91 },
+    [221] = { .lex_state = 91 },
+    [222] = { .lex_state = 87 },
+    [223] = { .lex_state = 87 },
+    [224] = { .lex_state = 91 },
+    [225] = { .lex_state = 91 },
+    [226] = { .lex_state = 87 },
+    [227] = { .lex_state = 87 },
+    [228] = { .lex_state = 87 },
+    [229] = { .lex_state = 91 },
+    [230] = { .lex_state = 91 },
+    [231] = { .lex_state = 87 },
+    [232] = { .lex_state = 87 },
+    [233] = { .lex_state = 87 },
+    [234] = { .lex_state = 87 },
+    [235] = { .lex_state = 87 },
+    [236] = { .lex_state = 87 },
+    [237] = { .lex_state = 87 },
+    [238] = { .lex_state = 87 },
+    [239] = { .lex_state = 87 },
+    [240] = { .lex_state = 87 },
+    [241] = { .lex_state = 87 },
+    [242] = { .lex_state = 87 },
+    [243] = { .lex_state = 87 },
+    [244] = { .lex_state = 91 },
+    [245] = { .lex_state = 87 },
+    [246] = { .lex_state = 87 },
+    [247] = { .lex_state = 87 },
+    [248] = { .lex_state = 87 },
+    [249] = { .lex_state = 87 },
+    [250] = { .lex_state = 87 },
+    [251] = { .lex_state = 87 },
+    [252] = { .lex_state = 87 },
+    [253] = { .lex_state = 87 },
+    [254] = { .lex_state = 87 },
+    [255] = { .lex_state = 87 },
+    [256] = { .lex_state = 87 },
+    [257] = { .lex_state = 87 },
+    [258] = { .lex_state = 87 },
+    [259] = { .lex_state = 87 },
+    [260] = { .lex_state = 87 },
+    [261] = { .lex_state = 113 },
+    [262] = { .lex_state = 87 },
+    [263] = { .lex_state = 87 },
+    [264] = { .lex_state = 87 },
+    [265] = { .lex_state = 87 },
+    [266] = { .lex_state = 87 },
+    [267] = { .lex_state = 87 },
+    [268] = { .lex_state = 87 },
+    [269] = { .lex_state = 87 },
+    [270] = { .lex_state = 87 },
+    [271] = { .lex_state = 87 },
+    [272] = { .lex_state = 87 },
     [273] = { .lex_state = 113 },
-    [274] = { .lex_state = 88 },
-    [275] = { .lex_state = 88 },
-    [276] = { .lex_state = 88 },
-    [277] = { .lex_state = 88 },
-    [278] = { .lex_state = 88 },
-    [279] = { .lex_state = 88 },
-    [280] = { .lex_state = 88 },
-    [281] = { .lex_state = 88 },
-    [282] = { .lex_state = 88 },
-    [283] = { .lex_state = 88 },
-    [284] = { .lex_state = 88 },
-    [285] = { .lex_state = 88 },
-    [286] = { .lex_state = 88 },
-    [287] = { .lex_state = 88 },
-    [288] = { .lex_state = 88 },
-    [289] = { .lex_state = 88 },
-    [290] = { .lex_state = 88 },
-    [291] = { .lex_state = 88 },
-    [292] = { .lex_state = 88 },
-    [293] = { .lex_state = 88 },
-    [294] = { .lex_state = 88 },
-    [295] = { .lex_state = 88 },
-    [296] = { .lex_state = 88 },
-    [297] = { .lex_state = 113 },
-    [298] = { .lex_state = 88 },
-    [299] = { .lex_state = 88 },
-    [300] = { .lex_state = 88 },
-    [301] = { .lex_state = 88 },
-    [302] = { .lex_state = 88 },
-    [303] = { .lex_state = 88 },
-    [304] = { .lex_state = 88 },
-    [305] = { .lex_state = 88 },
-    [306] = { .lex_state = 88 },
-    [307] = { .lex_state = 88 },
-    [308] = { .lex_state = 88 },
-    [309] = { .lex_state = 88 },
-    [310] = { .lex_state = 88 },
-    [311] = { .lex_state = 88 },
-    [312] = { .lex_state = 88 },
-    [313] = { .lex_state = 88 },
-    [314] = { .lex_state = 88 },
-    [315] = { .lex_state = 88 },
-    [316] = { .lex_state = 88 },
-    [317] = { .lex_state = 88 },
-    [318] = { .lex_state = 88 },
-    [319] = { .lex_state = 88 },
-    [320] = { .lex_state = 88 },
-    [321] = { .lex_state = 88 },
-    [322] = { .lex_state = 88 },
-    [323] = { .lex_state = 88 },
+    [274] = { .lex_state = 87 },
+    [275] = { .lex_state = 87 },
+    [276] = { .lex_state = 87 },
+    [277] = { .lex_state = 87 },
+    [278] = { .lex_state = 87 },
+    [279] = { .lex_state = 87 },
+    [280] = { .lex_state = 87 },
+    [281] = { .lex_state = 87 },
+    [282] = { .lex_state = 87 },
+    [283] = { .lex_state = 87 },
+    [284] = { .lex_state = 87 },
+    [285] = { .lex_state = 87 },
+    [286] = { .lex_state = 87 },
+    [287] = { .lex_state = 87 },
+    [288] = { .lex_state = 87 },
+    [289] = { .lex_state = 87 },
+    [290] = { .lex_state = 87 },
+    [291] = { .lex_state = 87 },
+    [292] = { .lex_state = 87 },
+    [293] = { .lex_state = 87 },
+    [294] = { .lex_state = 87 },
+    [295] = { .lex_state = 113 },
+    [296] = { .lex_state = 87 },
+    [297] = { .lex_state = 87 },
+    [298] = { .lex_state = 87 },
+    [299] = { .lex_state = 87 },
+    [300] = { .lex_state = 87 },
+    [301] = { .lex_state = 87 },
+    [302] = { .lex_state = 87 },
+    [303] = { .lex_state = 87 },
+    [304] = { .lex_state = 87 },
+    [305] = { .lex_state = 87 },
+    [306] = { .lex_state = 87 },
+    [307] = { .lex_state = 87 },
+    [308] = { .lex_state = 87 },
+    [309] = { .lex_state = 87 },
+    [310] = { .lex_state = 87 },
+    [311] = { .lex_state = 87 },
+    [312] = { .lex_state = 87 },
+    [313] = { .lex_state = 87 },
+    [314] = { .lex_state = 87 },
+    [315] = { .lex_state = 87 },
+    [316] = { .lex_state = 87 },
+    [317] = { .lex_state = 87 },
+    [318] = { .lex_state = 87 },
+    [319] = { .lex_state = 87 },
+    [320] = { .lex_state = 87 },
+    [321] = { .lex_state = 87 },
+    [322] = { .lex_state = 87 },
+    [323] = { .lex_state = 87 },
     [324] = { .lex_state = 100 },
-    [325] = { .lex_state = 88 },
+    [325] = { .lex_state = 87 },
     [326] = { .lex_state = 100 },
     [327] = { .lex_state = 100 },
     [328] = { .lex_state = 100 },
     [329] = { .lex_state = 100 },
-    [330] = { .lex_state = 88 },
+    [330] = { .lex_state = 87 },
     [331] = { .lex_state = 100 },
     [332] = { .lex_state = 100 },
     [333] = { .lex_state = 100 },
@@ -20728,7 +20735,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [341] = { .lex_state = 100 },
     [342] = { .lex_state = 100 },
     [343] = { .lex_state = 100 },
-    [344] = { .lex_state = 88 },
+    [344] = { .lex_state = 100 },
     [345] = { .lex_state = 100 },
     [346] = { .lex_state = 100 },
     [347] = { .lex_state = 100 },
@@ -20736,7 +20743,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [349] = { .lex_state = 100 },
     [350] = { .lex_state = 100 },
     [351] = { .lex_state = 100 },
-    [352] = { .lex_state = 100 },
+    [352] = { .lex_state = 87 },
     [353] = { .lex_state = 100 },
     [354] = { .lex_state = 100 },
     [355] = { .lex_state = 100 },
@@ -20745,11 +20752,11 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [358] = { .lex_state = 100 },
     [359] = { .lex_state = 100 },
     [360] = { .lex_state = 100 },
-    [361] = { .lex_state = 88 },
+    [361] = { .lex_state = 100 },
     [362] = { .lex_state = 121 },
-    [363] = { .lex_state = 121 },
-    [364] = { .lex_state = 121 },
-    [365] = { .lex_state = 121 },
+    [363] = { .lex_state = 100 },
+    [364] = { .lex_state = 100 },
+    [365] = { .lex_state = 100 },
     [366] = { .lex_state = 100 },
     [367] = { .lex_state = 100 },
     [368] = { .lex_state = 100 },
@@ -20761,17 +20768,17 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [374] = { .lex_state = 100 },
     [375] = { .lex_state = 100 },
     [376] = { .lex_state = 100 },
-    [377] = { .lex_state = 100 },
+    [377] = { .lex_state = 121 },
     [378] = { .lex_state = 100 },
     [379] = { .lex_state = 100 },
     [380] = { .lex_state = 100 },
-    [381] = { .lex_state = 100 },
+    [381] = { .lex_state = 121 },
     [382] = { .lex_state = 100 },
-    [383] = { .lex_state = 100 },
+    [383] = { .lex_state = 87 },
     [384] = { .lex_state = 100 },
     [385] = { .lex_state = 100 },
-    [386] = { .lex_state = 121 },
-    [387] = { .lex_state = 100 },
+    [386] = { .lex_state = 100 },
+    [387] = { .lex_state = 121 },
     [388] = { .lex_state = 100 },
     [389] = { .lex_state = 100 },
     [390] = { .lex_state = 121 },
@@ -20782,12 +20789,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [395] = { .lex_state = 100 },
     [396] = { .lex_state = 100 },
     [397] = { .lex_state = 100 },
-    [398] = { .lex_state = 100 },
+    [398] = { .lex_state = 121 },
     [399] = { .lex_state = 100 },
     [400] = { .lex_state = 100 },
     [401] = { .lex_state = 100 },
     [402] = { .lex_state = 100 },
-    [403] = { .lex_state = 121 },
+    [403] = { .lex_state = 100 },
     [404] = { .lex_state = 100 },
     [405] = { .lex_state = 100 },
     [406] = { .lex_state = 100 },
@@ -20795,7 +20802,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [408] = { .lex_state = 100 },
     [409] = { .lex_state = 100 },
     [410] = { .lex_state = 100 },
-    [411] = { .lex_state = 100 },
+    [411] = { .lex_state = 121 },
     [412] = { .lex_state = 100 },
     [413] = { .lex_state = 100 },
     [414] = { .lex_state = 100 },
@@ -20803,82 +20810,82 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [416] = { .lex_state = 100 },
     [417] = { .lex_state = 100 },
     [418] = { .lex_state = 100 },
-    [419] = { .lex_state = 101 },
+    [419] = { .lex_state = 944 },
     [420] = { .lex_state = 944 },
     [421] = { .lex_state = 944 },
-    [422] = { .lex_state = 944 },
+    [422] = { .lex_state = 101 },
     [423] = { .lex_state = 944 },
     [424] = { .lex_state = 944 },
     [425] = { .lex_state = 944 },
-    [426] = { .lex_state = 944 },
+    [426] = { .lex_state = 124 },
     [427] = { .lex_state = 944 },
     [428] = { .lex_state = 118 },
     [429] = { .lex_state = 944 },
-    [430] = { .lex_state = 124 },
+    [430] = { .lex_state = 944 },
     [431] = { .lex_state = 944 },
-    [432] = { .lex_state = 88 },
+    [432] = { .lex_state = 87 },
     [433] = { .lex_state = 101 },
     [434] = { .lex_state = 101 },
-    [435] = { .lex_state = 96 },
+    [435] = { .lex_state = 95 },
     [436] = { .lex_state = 101 },
     [437] = { .lex_state = 101 },
     [438] = { .lex_state = 101 },
     [439] = { .lex_state = 101 },
-    [440] = { .lex_state = 101 },
-    [441] = { .lex_state = 96 },
-    [442] = { .lex_state = 96 },
-    [443] = { .lex_state = 101 },
+    [440] = { .lex_state = 95 },
+    [441] = { .lex_state = 101 },
+    [442] = { .lex_state = 101 },
+    [443] = { .lex_state = 95 },
     [444] = { .lex_state = 101 },
     [445] = { .lex_state = 86 },
-    [446] = { .lex_state = 95 },
-    [447] = { .lex_state = 101 },
+    [446] = { .lex_state = 94 },
+    [447] = { .lex_state = 94 },
     [448] = { .lex_state = 101 },
-    [449] = { .lex_state = 95 },
-    [450] = { .lex_state = 101 },
+    [449] = { .lex_state = 94 },
+    [450] = { .lex_state = 943 },
     [451] = { .lex_state = 101 },
     [452] = { .lex_state = 101 },
-    [453] = { .lex_state = 943 },
-    [454] = { .lex_state = 95 },
-    [455] = { .lex_state = 101 },
-    [456] = { .lex_state = 95 },
+    [453] = { .lex_state = 94 },
+    [454] = { .lex_state = 101 },
+    [455] = { .lex_state = 94 },
+    [456] = { .lex_state = 101 },
     [457] = { .lex_state = 101 },
-    [458] = { .lex_state = 95 },
-    [459] = { .lex_state = 95 },
-    [460] = { .lex_state = 101 },
-    [461] = { .lex_state = 88 },
-    [462] = { .lex_state = 101 },
-    [463] = { .lex_state = 95 },
-    [464] = { .lex_state = 88 },
-    [465] = { .lex_state = 95 },
-    [466] = { .lex_state = 95 },
-    [467] = { .lex_state = 95 },
-    [468] = { .lex_state = 95 },
-    [469] = { .lex_state = 95 },
-    [470] = { .lex_state = 95 },
-    [471] = { .lex_state = 95 },
-    [472] = { .lex_state = 95 },
-    [473] = { .lex_state = 95 },
-    [474] = { .lex_state = 101 },
+    [458] = { .lex_state = 94 },
+    [459] = { .lex_state = 94 },
+    [460] = { .lex_state = 94 },
+    [461] = { .lex_state = 94 },
+    [462] = { .lex_state = 94 },
+    [463] = { .lex_state = 94 },
+    [464] = { .lex_state = 94 },
+    [465] = { .lex_state = 94 },
+    [466] = { .lex_state = 87 },
+    [467] = { .lex_state = 87 },
+    [468] = { .lex_state = 94 },
+    [469] = { .lex_state = 101 },
+    [470] = { .lex_state = 101 },
+    [471] = { .lex_state = 94 },
+    [472] = { .lex_state = 94 },
+    [473] = { .lex_state = 94 },
+    [474] = { .lex_state = 94 },
     [475] = { .lex_state = 101 },
     [476] = { .lex_state = 101 },
-    [477] = { .lex_state = 95 },
+    [477] = { .lex_state = 94 },
     [478] = { .lex_state = 101 },
     [479] = { .lex_state = 101 },
-    [480] = { .lex_state = 95 },
-    [481] = { .lex_state = 95 },
-    [482] = { .lex_state = 95 },
-    [483] = { .lex_state = 95 },
-    [484] = { .lex_state = 95 },
-    [485] = { .lex_state = 95 },
+    [480] = { .lex_state = 101 },
+    [481] = { .lex_state = 101 },
+    [482] = { .lex_state = 94 },
+    [483] = { .lex_state = 101 },
+    [484] = { .lex_state = 101 },
+    [485] = { .lex_state = 101 },
     [486] = { .lex_state = 101 },
-    [487] = { .lex_state = 95 },
-    [488] = { .lex_state = 101 },
-    [489] = { .lex_state = 101 },
-    [490] = { .lex_state = 95 },
-    [491] = { .lex_state = 101 },
-    [492] = { .lex_state = 101 },
-    [493] = { .lex_state = 101 },
-    [494] = { .lex_state = 95 },
+    [487] = { .lex_state = 94 },
+    [488] = { .lex_state = 94 },
+    [489] = { .lex_state = 94 },
+    [490] = { .lex_state = 94 },
+    [491] = { .lex_state = 94 },
+    [492] = { .lex_state = 94 },
+    [493] = { .lex_state = 94 },
+    [494] = { .lex_state = 94 },
     [495] = { .lex_state = 101 },
     [496] = { .lex_state = 101 },
     [497] = { .lex_state = 101 },
@@ -20934,300 +20941,300 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [547] = { .lex_state = 101 },
     [548] = { .lex_state = 101 },
     [549] = { .lex_state = 101 },
-    [550] = { .lex_state = 95 },
-    [551] = { .lex_state = 943 },
-    [552] = { .lex_state = 95 },
-    [553] = { .lex_state = 943 },
-    [554] = { .lex_state = 101 },
+    [550] = { .lex_state = 101 },
+    [551] = { .lex_state = 101 },
+    [552] = { .lex_state = 94 },
+    [553] = { .lex_state = 94 },
+    [554] = { .lex_state = 943 },
     [555] = { .lex_state = 943 },
-    [556] = { .lex_state = 943 },
+    [556] = { .lex_state = 101 },
     [557] = { .lex_state = 943 },
     [558] = { .lex_state = 943 },
     [559] = { .lex_state = 943 },
-    [560] = { .lex_state = 101 },
-    [561] = { .lex_state = 95 },
-    [562] = { .lex_state = 95 },
-    [563] = { .lex_state = 96 },
-    [564] = { .lex_state = 101 },
-    [565] = { .lex_state = 101 },
-    [566] = { .lex_state = 87 },
-    [567] = { .lex_state = 87 },
+    [560] = { .lex_state = 943 },
+    [561] = { .lex_state = 943 },
+    [562] = { .lex_state = 101 },
+    [563] = { .lex_state = 94 },
+    [564] = { .lex_state = 94 },
+    [565] = { .lex_state = 95 },
+    [566] = { .lex_state = 101 },
+    [567] = { .lex_state = 101 },
     [568] = { .lex_state = 101 },
-    [569] = { .lex_state = 101 },
+    [569] = { .lex_state = 98 },
     [570] = { .lex_state = 101 },
     [571] = { .lex_state = 101 },
     [572] = { .lex_state = 101 },
-    [573] = { .lex_state = 93 },
-    [574] = { .lex_state = 93 },
-    [575] = { .lex_state = 98 },
-    [576] = { .lex_state = 98 },
+    [573] = { .lex_state = 92 },
+    [574] = { .lex_state = 92 },
+    [575] = { .lex_state = 96 },
+    [576] = { .lex_state = 101 },
     [577] = { .lex_state = 101 },
     [578] = { .lex_state = 98 },
-    [579] = { .lex_state = 943 },
-    [580] = { .lex_state = 98 },
+    [579] = { .lex_state = 96 },
+    [580] = { .lex_state = 96 },
     [581] = { .lex_state = 98 },
-    [582] = { .lex_state = 87 },
-    [583] = { .lex_state = 109 },
-    [584] = { .lex_state = 87 },
-    [585] = { .lex_state = 96 },
+    [582] = { .lex_state = 943 },
+    [583] = { .lex_state = 96 },
+    [584] = { .lex_state = 943 },
+    [585] = { .lex_state = 95 },
     [586] = { .lex_state = 98 },
-    [587] = { .lex_state = 943 },
-    [588] = { .lex_state = 96 },
-    [589] = { .lex_state = 87 },
-    [590] = { .lex_state = 96 },
-    [591] = { .lex_state = 96 },
-    [592] = { .lex_state = 95 },
-    [593] = { .lex_state = 96 },
-    [594] = { .lex_state = 98 },
-    [595] = { .lex_state = 95 },
+    [587] = { .lex_state = 109 },
+    [588] = { .lex_state = 98 },
+    [589] = { .lex_state = 98 },
+    [590] = { .lex_state = 98 },
+    [591] = { .lex_state = 94 },
+    [592] = { .lex_state = 94 },
+    [593] = { .lex_state = 95 },
+    [594] = { .lex_state = 95 },
+    [595] = { .lex_state = 96 },
     [596] = { .lex_state = 98 },
-    [597] = { .lex_state = 59 },
-    [598] = { .lex_state = 98 },
-    [599] = { .lex_state = 96 },
-    [600] = { .lex_state = 96 },
-    [601] = { .lex_state = 95 },
-    [602] = { .lex_state = 95 },
-    [603] = { .lex_state = 86 },
-    [604] = { .lex_state = 943 },
+    [597] = { .lex_state = 95 },
+    [598] = { .lex_state = 95 },
+    [599] = { .lex_state = 98 },
+    [600] = { .lex_state = 59 },
+    [601] = { .lex_state = 943 },
+    [602] = { .lex_state = 59 },
+    [603] = { .lex_state = 95 },
+    [604] = { .lex_state = 59 },
     [605] = { .lex_state = 59 },
-    [606] = { .lex_state = 59 },
-    [607] = { .lex_state = 96 },
-    [608] = { .lex_state = 59 },
+    [606] = { .lex_state = 95 },
+    [607] = { .lex_state = 98 },
+    [608] = { .lex_state = 119 },
     [609] = { .lex_state = 59 },
-    [610] = { .lex_state = 59 },
-    [611] = { .lex_state = 96 },
-    [612] = { .lex_state = 59 },
-    [613] = { .lex_state = 59 },
-    [614] = { .lex_state = 95 },
-    [615] = { .lex_state = 96 },
-    [616] = { .lex_state = 98 },
-    [617] = { .lex_state = 98 },
+    [610] = { .lex_state = 94 },
+    [611] = { .lex_state = 86 },
+    [612] = { .lex_state = 95 },
+    [613] = { .lex_state = 95 },
+    [614] = { .lex_state = 98 },
+    [615] = { .lex_state = 94 },
+    [616] = { .lex_state = 94 },
+    [617] = { .lex_state = 95 },
     [618] = { .lex_state = 59 },
-    [619] = { .lex_state = 59 },
-    [620] = { .lex_state = 96 },
-    [621] = { .lex_state = 119 },
-    [622] = { .lex_state = 59 },
-    [623] = { .lex_state = 96 },
-    [624] = { .lex_state = 96 },
-    [625] = { .lex_state = 96 },
-    [626] = { .lex_state = 87 },
-    [627] = { .lex_state = 96 },
-    [628] = { .lex_state = 87 },
-    [629] = { .lex_state = 87 },
-    [630] = { .lex_state = 87 },
-    [631] = { .lex_state = 93 },
-    [632] = { .lex_state = 87 },
-    [633] = { .lex_state = 120 },
-    [634] = { .lex_state = 98 },
-    [635] = { .lex_state = 87 },
-    [636] = { .lex_state = 98 },
-    [637] = { .lex_state = 59 },
-    [638] = { .lex_state = 96 },
-    [639] = { .lex_state = 87 },
-    [640] = { .lex_state = 96 },
-    [641] = { .lex_state = 98 },
-    [642] = { .lex_state = 96 },
-    [643] = { .lex_state = 96 },
-    [644] = { .lex_state = 86 },
-    [645] = { .lex_state = 87 },
-    [646] = { .lex_state = 98 },
-    [647] = { .lex_state = 96 },
-    [648] = { .lex_state = 87 },
-    [649] = { .lex_state = 96 },
-    [650] = { .lex_state = 125 },
-    [651] = { .lex_state = 86 },
-    [652] = { .lex_state = 87 },
-    [653] = { .lex_state = 96 },
-    [654] = { .lex_state = 87 },
-    [655] = { .lex_state = 127 },
-    [656] = { .lex_state = 59 },
+    [619] = { .lex_state = 95 },
+    [620] = { .lex_state = 59 },
+    [621] = { .lex_state = 59 },
+    [622] = { .lex_state = 95 },
+    [623] = { .lex_state = 59 },
+    [624] = { .lex_state = 59 },
+    [625] = { .lex_state = 95 },
+    [626] = { .lex_state = 59 },
+    [627] = { .lex_state = 92 },
+    [628] = { .lex_state = 98 },
+    [629] = { .lex_state = 92 },
+    [630] = { .lex_state = 86 },
+    [631] = { .lex_state = 86 },
+    [632] = { .lex_state = 95 },
+    [633] = { .lex_state = 98 },
+    [634] = { .lex_state = 95 },
+    [635] = { .lex_state = 98 },
+    [636] = { .lex_state = 92 },
+    [637] = { .lex_state = 95 },
+    [638] = { .lex_state = 92 },
+    [639] = { .lex_state = 95 },
+    [640] = { .lex_state = 92 },
+    [641] = { .lex_state = 92 },
+    [642] = { .lex_state = 94 },
+    [643] = { .lex_state = 92 },
+    [644] = { .lex_state = 59 },
+    [645] = { .lex_state = 92 },
+    [646] = { .lex_state = 59 },
+    [647] = { .lex_state = 86 },
+    [648] = { .lex_state = 95 },
+    [649] = { .lex_state = 98 },
+    [650] = { .lex_state = 92 },
+    [651] = { .lex_state = 125 },
+    [652] = { .lex_state = 59 },
+    [653] = { .lex_state = 95 },
+    [654] = { .lex_state = 92 },
+    [655] = { .lex_state = 59 },
+    [656] = { .lex_state = 120 },
     [657] = { .lex_state = 95 },
-    [658] = { .lex_state = 120 },
-    [659] = { .lex_state = 59 },
-    [660] = { .lex_state = 96 },
-    [661] = { .lex_state = 59 },
-    [662] = { .lex_state = 86 },
-    [663] = { .lex_state = 86 },
-    [664] = { .lex_state = 96 },
-    [665] = { .lex_state = 87 },
-    [666] = { .lex_state = 96 },
-    [667] = { .lex_state = 96 },
-    [668] = { .lex_state = 87 },
-    [669] = { .lex_state = 68 },
-    [670] = { .lex_state = 98 },
-    [671] = { .lex_state = 98 },
+    [658] = { .lex_state = 95 },
+    [659] = { .lex_state = 95 },
+    [660] = { .lex_state = 95 },
+    [661] = { .lex_state = 95 },
+    [662] = { .lex_state = 92 },
+    [663] = { .lex_state = 95 },
+    [664] = { .lex_state = 92 },
+    [665] = { .lex_state = 96 },
+    [666] = { .lex_state = 120 },
+    [667] = { .lex_state = 86 },
+    [668] = { .lex_state = 92 },
+    [669] = { .lex_state = 95 },
+    [670] = { .lex_state = 92 },
+    [671] = { .lex_state = 66 },
     [672] = { .lex_state = 98 },
     [673] = { .lex_state = 98 },
     [674] = { .lex_state = 98 },
-    [675] = { .lex_state = 95 },
-    [676] = { .lex_state = 98 },
+    [675] = { .lex_state = 98 },
+    [676] = { .lex_state = 94 },
     [677] = { .lex_state = 98 },
     [678] = { .lex_state = 98 },
     [679] = { .lex_state = 98 },
-    [680] = { .lex_state = 102 },
+    [680] = { .lex_state = 98 },
     [681] = { .lex_state = 98 },
-    [682] = { .lex_state = 96 },
+    [682] = { .lex_state = 102 },
     [683] = { .lex_state = 95 },
-    [684] = { .lex_state = 95 },
-    [685] = { .lex_state = 86 },
-    [686] = { .lex_state = 96 },
-    [687] = { .lex_state = 96 },
-    [688] = { .lex_state = 98 },
+    [684] = { .lex_state = 94 },
+    [685] = { .lex_state = 94 },
+    [686] = { .lex_state = 86 },
+    [687] = { .lex_state = 95 },
+    [688] = { .lex_state = 95 },
     [689] = { .lex_state = 98 },
     [690] = { .lex_state = 98 },
-    [691] = { .lex_state = 87 },
+    [691] = { .lex_state = 98 },
     [692] = { .lex_state = 98 },
-    [693] = { .lex_state = 98 },
-    [694] = { .lex_state = 86 },
-    [695] = { .lex_state = 96 },
-    [696] = { .lex_state = 96 },
-    [697] = { .lex_state = 96 },
-    [698] = { .lex_state = 86 },
-    [699] = { .lex_state = 943 },
-    [700] = { .lex_state = 68 },
-    [701] = { .lex_state = 70 },
-    [702] = { .lex_state = 70 },
-    [703] = { .lex_state = 96 },
-    [704] = { .lex_state = 86 },
-    [705] = { .lex_state = 68 },
-    [706] = { .lex_state = 96 },
-    [707] = { .lex_state = 68 },
-    [708] = { .lex_state = 96 },
-    [709] = { .lex_state = 59 },
-    [710] = { .lex_state = 59 },
+    [693] = { .lex_state = 92 },
+    [694] = { .lex_state = 98 },
+    [695] = { .lex_state = 98 },
+    [696] = { .lex_state = 86 },
+    [697] = { .lex_state = 95 },
+    [698] = { .lex_state = 95 },
+    [699] = { .lex_state = 95 },
+    [700] = { .lex_state = 86 },
+    [701] = { .lex_state = 66 },
+    [702] = { .lex_state = 68 },
+    [703] = { .lex_state = 68 },
+    [704] = { .lex_state = 943 },
+    [705] = { .lex_state = 95 },
+    [706] = { .lex_state = 95 },
+    [707] = { .lex_state = 86 },
+    [708] = { .lex_state = 66 },
+    [709] = { .lex_state = 66 },
+    [710] = { .lex_state = 95 },
     [711] = { .lex_state = 59 },
     [712] = { .lex_state = 59 },
     [713] = { .lex_state = 59 },
     [714] = { .lex_state = 59 },
-    [715] = { .lex_state = 96 },
+    [715] = { .lex_state = 95 },
     [716] = { .lex_state = 59 },
     [717] = { .lex_state = 59 },
-    [718] = { .lex_state = 96 },
+    [718] = { .lex_state = 95 },
     [719] = { .lex_state = 59 },
     [720] = { .lex_state = 59 },
     [721] = { .lex_state = 59 },
     [722] = { .lex_state = 59 },
-    [723] = { .lex_state = 68 },
+    [723] = { .lex_state = 66 },
     [724] = { .lex_state = 59 },
     [725] = { .lex_state = 59 },
     [726] = { .lex_state = 86 },
-    [727] = { .lex_state = 96 },
+    [727] = { .lex_state = 95 },
     [728] = { .lex_state = 59 },
-    [729] = { .lex_state = 86 },
-    [730] = { .lex_state = 96 },
-    [731] = { .lex_state = 96 },
+    [729] = { .lex_state = 59 },
+    [730] = { .lex_state = 95 },
+    [731] = { .lex_state = 59 },
     [732] = { .lex_state = 86 },
-    [733] = { .lex_state = 943 },
-    [734] = { .lex_state = 87 },
-    [735] = { .lex_state = 96 },
-    [736] = { .lex_state = 86 },
-    [737] = { .lex_state = 96 },
-    [738] = { .lex_state = 96 },
-    [739] = { .lex_state = 96 },
-    [740] = { .lex_state = 943 },
-    [741] = { .lex_state = 96 },
+    [733] = { .lex_state = 86 },
+    [734] = { .lex_state = 95 },
+    [735] = { .lex_state = 943 },
+    [736] = { .lex_state = 92 },
+    [737] = { .lex_state = 95 },
+    [738] = { .lex_state = 95 },
+    [739] = { .lex_state = 86 },
+    [740] = { .lex_state = 95 },
+    [741] = { .lex_state = 95 },
     [742] = { .lex_state = 943 },
     [743] = { .lex_state = 943 },
-    [744] = { .lex_state = 96 },
-    [745] = { .lex_state = 86 },
-    [746] = { .lex_state = 96 },
-    [747] = { .lex_state = 68 },
-    [748] = { .lex_state = 96 },
-    [749] = { .lex_state = 70 },
-    [750] = { .lex_state = 96 },
-    [751] = { .lex_state = 96 },
-    [752] = { .lex_state = 96 },
-    [753] = { .lex_state = 96 },
-    [754] = { .lex_state = 96 },
-    [755] = { .lex_state = 68 },
-    [756] = { .lex_state = 87 },
-    [757] = { .lex_state = 87 },
-    [758] = { .lex_state = 96 },
-    [759] = { .lex_state = 87 },
-    [760] = { .lex_state = 95 },
-    [761] = { .lex_state = 87 },
-    [762] = { .lex_state = 87 },
-    [763] = { .lex_state = 96 },
-    [764] = { .lex_state = 96 },
-    [765] = { .lex_state = 86 },
-    [766] = { .lex_state = 96 },
+    [744] = { .lex_state = 95 },
+    [745] = { .lex_state = 943 },
+    [746] = { .lex_state = 95 },
+    [747] = { .lex_state = 95 },
+    [748] = { .lex_state = 86 },
+    [749] = { .lex_state = 66 },
+    [750] = { .lex_state = 68 },
+    [751] = { .lex_state = 95 },
+    [752] = { .lex_state = 95 },
+    [753] = { .lex_state = 95 },
+    [754] = { .lex_state = 95 },
+    [755] = { .lex_state = 95 },
+    [756] = { .lex_state = 95 },
+    [757] = { .lex_state = 66 },
+    [758] = { .lex_state = 95 },
+    [759] = { .lex_state = 92 },
+    [760] = { .lex_state = 94 },
+    [761] = { .lex_state = 126 },
+    [762] = { .lex_state = 92 },
+    [763] = { .lex_state = 95 },
+    [764] = { .lex_state = 92 },
+    [765] = { .lex_state = 92 },
+    [766] = { .lex_state = 86 },
     [767] = { .lex_state = 95 },
-    [768] = { .lex_state = 96 },
-    [769] = { .lex_state = 96 },
-    [770] = { .lex_state = 86 },
-    [771] = { .lex_state = 86 },
-    [772] = { .lex_state = 96 },
-    [773] = { .lex_state = 96 },
-    [774] = { .lex_state = 87 },
-    [775] = { .lex_state = 87 },
-    [776] = { .lex_state = 96 },
-    [777] = { .lex_state = 87 },
-    [778] = { .lex_state = 87 },
-    [779] = { .lex_state = 87 },
-    [780] = { .lex_state = 96 },
-    [781] = { .lex_state = 87 },
-    [782] = { .lex_state = 87 },
-    [783] = { .lex_state = 943 },
-    [784] = { .lex_state = 98 },
+    [768] = { .lex_state = 95 },
+    [769] = { .lex_state = 94 },
+    [770] = { .lex_state = 95 },
+    [771] = { .lex_state = 95 },
+    [772] = { .lex_state = 86 },
+    [773] = { .lex_state = 95 },
+    [774] = { .lex_state = 86 },
+    [775] = { .lex_state = 92 },
+    [776] = { .lex_state = 95 },
+    [777] = { .lex_state = 92 },
+    [778] = { .lex_state = 92 },
+    [779] = { .lex_state = 92 },
+    [780] = { .lex_state = 95 },
+    [781] = { .lex_state = 92 },
+    [782] = { .lex_state = 92 },
+    [783] = { .lex_state = 92 },
+    [784] = { .lex_state = 95 },
     [785] = { .lex_state = 943 },
     [786] = { .lex_state = 943 },
-    [787] = { .lex_state = 96 },
-    [788] = { .lex_state = 96 },
-    [789] = { .lex_state = 96 },
-    [790] = { .lex_state = 86 },
-    [791] = { .lex_state = 90 },
-    [792] = { .lex_state = 943 },
-    [793] = { .lex_state = 86 },
-    [794] = { .lex_state = 86 },
-    [795] = { .lex_state = 96 },
-    [796] = { .lex_state = 943 },
-    [797] = { .lex_state = 98 },
-    [798] = { .lex_state = 98 },
+    [787] = { .lex_state = 943 },
+    [788] = { .lex_state = 95 },
+    [789] = { .lex_state = 95 },
+    [790] = { .lex_state = 95 },
+    [791] = { .lex_state = 943 },
+    [792] = { .lex_state = 86 },
+    [793] = { .lex_state = 89 },
+    [794] = { .lex_state = 943 },
+    [795] = { .lex_state = 86 },
+    [796] = { .lex_state = 86 },
+    [797] = { .lex_state = 95 },
+    [798] = { .lex_state = 86 },
     [799] = { .lex_state = 943 },
-    [800] = { .lex_state = 943 },
+    [800] = { .lex_state = 98 },
     [801] = { .lex_state = 943 },
     [802] = { .lex_state = 98 },
-    [803] = { .lex_state = 98 },
-    [804] = { .lex_state = 86 },
+    [803] = { .lex_state = 943 },
+    [804] = { .lex_state = 98 },
     [805] = { .lex_state = 943 },
     [806] = { .lex_state = 98 },
-    [807] = { .lex_state = 943 },
-    [808] = { .lex_state = 86 },
-    [809] = { .lex_state = 96 },
+    [807] = { .lex_state = 86 },
+    [808] = { .lex_state = 95 },
+    [809] = { .lex_state = 943 },
     [810] = { .lex_state = 943 },
     [811] = { .lex_state = 943 },
     [812] = { .lex_state = 102 },
-    [813] = { .lex_state = 86 },
-    [814] = { .lex_state = 943 },
-    [815] = { .lex_state = 95 },
+    [813] = { .lex_state = 95 },
+    [814] = { .lex_state = 98 },
+    [815] = { .lex_state = 94 },
     [816] = { .lex_state = 86 },
-    [817] = { .lex_state = 98 },
-    [818] = { .lex_state = 90 },
+    [817] = { .lex_state = 943 },
+    [818] = { .lex_state = 86 },
     [819] = { .lex_state = 102 },
-    [820] = { .lex_state = 943 },
+    [820] = { .lex_state = 98 },
     [821] = { .lex_state = 943 },
-    [822] = { .lex_state = 126 },
+    [822] = { .lex_state = 943 },
     [823] = { .lex_state = 943 },
-    [824] = { .lex_state = 96 },
-    [825] = { .lex_state = 70 },
-    [826] = { .lex_state = 86 },
+    [824] = { .lex_state = 89 },
+    [825] = { .lex_state = 127 },
+    [826] = { .lex_state = 95 },
     [827] = { .lex_state = 943 },
-    [828] = { .lex_state = 943 },
-    [829] = { .lex_state = 943 },
-    [830] = { .lex_state = 96 },
-    [831] = { .lex_state = 943 },
-    [832] = { .lex_state = 68 },
-    [833] = { .lex_state = 96 },
+    [828] = { .lex_state = 86 },
+    [829] = { .lex_state = 86 },
+    [830] = { .lex_state = 943 },
+    [831] = { .lex_state = 68 },
+    [832] = { .lex_state = 66 },
+    [833] = { .lex_state = 943 },
     [834] = { .lex_state = 86 },
     [835] = { .lex_state = 943 },
-    [836] = { .lex_state = 86 },
+    [836] = { .lex_state = 943 },
     [837] = { .lex_state = 86 },
-    [838] = { .lex_state = 86 },
-    [839] = { .lex_state = 98 },
-    [840] = { .lex_state = 98 },
+    [838] = { .lex_state = 95 },
+    [839] = { .lex_state = 95 },
+    [840] = { .lex_state = 86 },
     [841] = { .lex_state = 943 },
-    [842] = { .lex_state = 98 },
-    [843] = { .lex_state = 90 },
+    [842] = { .lex_state = 86 },
+    [843] = { .lex_state = 89 },
     [844] = { .lex_state = 98 },
     [845] = { .lex_state = 943 },
     [846] = { .lex_state = 98 },
@@ -21235,37 +21242,37 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [848] = { .lex_state = 943 },
     [849] = { .lex_state = 98 },
     [850] = { .lex_state = 98 },
-    [851] = { .lex_state = 96 },
+    [851] = { .lex_state = 95 },
     [852] = { .lex_state = 98 },
     [853] = { .lex_state = 943 },
     [854] = { .lex_state = 98 },
-    [855] = { .lex_state = 86 },
+    [855] = { .lex_state = 98 },
     [856] = { .lex_state = 943 },
-    [857] = { .lex_state = 102 },
+    [857] = { .lex_state = 98 },
     [858] = { .lex_state = 98 },
-    [859] = { .lex_state = 96 },
+    [859] = { .lex_state = 95 },
     [860] = { .lex_state = 98 },
     [861] = { .lex_state = 943 },
     [862] = { .lex_state = 943 },
     [863] = { .lex_state = 98 },
-    [864] = { .lex_state = 96 },
+    [864] = { .lex_state = 95 },
     [865] = { .lex_state = 98 },
     [866] = { .lex_state = 943 },
     [867] = { .lex_state = 943 },
-    [868] = { .lex_state = 96 },
-    [869] = { .lex_state = 943 },
-    [870] = { .lex_state = 70 },
-    [871] = { .lex_state = 70 },
+    [868] = { .lex_state = 95 },
+    [869] = { .lex_state = 102 },
+    [870] = { .lex_state = 68 },
+    [871] = { .lex_state = 68 },
     [872] = { .lex_state = 943 },
     [873] = { .lex_state = 98 },
     [874] = { .lex_state = 943 },
-    [875] = { .lex_state = 98 },
+    [875] = { .lex_state = 943 },
     [876] = { .lex_state = 943 },
-    [877] = { .lex_state = 943 },
-    [878] = { .lex_state = 98 },
-    [879] = { .lex_state = 96 },
+    [877] = { .lex_state = 98 },
+    [878] = { .lex_state = 943 },
+    [879] = { .lex_state = 95 },
     [880] = { .lex_state = 98 },
-    [881] = { .lex_state = 98 },
+    [881] = { .lex_state = 86 },
     [882] = { .lex_state = 98 },
     [883] = { .lex_state = 943 },
     [884] = { .lex_state = 98 },
@@ -21274,16 +21281,16 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [887] = { .lex_state = 98 },
     [888] = { .lex_state = 943 },
     [889] = { .lex_state = 943 },
-    [890] = { .lex_state = 96 },
+    [890] = { .lex_state = 95 },
     [891] = { .lex_state = 98 },
-    [892] = { .lex_state = 943 },
+    [892] = { .lex_state = 98 },
     [893] = { .lex_state = 86 },
     [894] = { .lex_state = 943 },
     [895] = { .lex_state = 86 },
-    [896] = { .lex_state = 98 },
+    [896] = { .lex_state = 943 },
     [897] = { .lex_state = 98 },
     [898] = { .lex_state = 98 },
-    [899] = { .lex_state = 98 },
+    [899] = { .lex_state = 943 },
     [900] = { .lex_state = 943 },
     [901] = { .lex_state = 98 },
     [902] = { .lex_state = 98 },
@@ -21291,35 +21298,35 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [904] = { .lex_state = 98 },
     [905] = { .lex_state = 98 },
     [906] = { .lex_state = 943 },
-    [907] = { .lex_state = 943 },
-    [908] = { .lex_state = 98 },
+    [907] = { .lex_state = 98 },
+    [908] = { .lex_state = 943 },
     [909] = { .lex_state = 98 },
-    [910] = { .lex_state = 102 },
+    [910] = { .lex_state = 98 },
     [911] = { .lex_state = 943 },
     [912] = { .lex_state = 98 },
     [913] = { .lex_state = 943 },
-    [914] = { .lex_state = 98 },
+    [914] = { .lex_state = 95 },
     [915] = { .lex_state = 86 },
     [916] = { .lex_state = 98 },
     [917] = { .lex_state = 86 },
-    [918] = { .lex_state = 90 },
+    [918] = { .lex_state = 98 },
     [919] = { .lex_state = 102 },
-    [920] = { .lex_state = 943 },
+    [920] = { .lex_state = 98 },
     [921] = { .lex_state = 943 },
     [922] = { .lex_state = 943 },
-    [923] = { .lex_state = 943 },
+    [923] = { .lex_state = 98 },
     [924] = { .lex_state = 943 },
     [925] = { .lex_state = 943 },
     [926] = { .lex_state = 98 },
-    [927] = { .lex_state = 98 },
-    [928] = { .lex_state = 96 },
+    [927] = { .lex_state = 102 },
+    [928] = { .lex_state = 95 },
     [929] = { .lex_state = 943 },
     [930] = { .lex_state = 943 },
-    [931] = { .lex_state = 943 },
-    [932] = { .lex_state = 96 },
-    [933] = { .lex_state = 98 },
+    [931] = { .lex_state = 89 },
+    [932] = { .lex_state = 95 },
+    [933] = { .lex_state = 943 },
     [934] = { .lex_state = 943 },
-    [935] = { .lex_state = 96 },
+    [935] = { .lex_state = 943 },
     [936] = { .lex_state = 943 },
     [937] = { .lex_state = 98 },
     [938] = { .lex_state = 98 },
@@ -21327,60 +21334,60 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [940] = { .lex_state = 98 },
     [941] = { .lex_state = 943 },
     [942] = { .lex_state = 102 },
-    [943] = { .lex_state = 98 },
-    [944] = { .lex_state = 86 },
+    [943] = { .lex_state = 943 },
+    [944] = { .lex_state = 98 },
     [945] = { .lex_state = 86 },
-    [946] = { .lex_state = 96 },
-    [947] = { .lex_state = 943 },
-    [948] = { .lex_state = 96 },
+    [946] = { .lex_state = 95 },
+    [947] = { .lex_state = 98 },
+    [948] = { .lex_state = 98 },
     [949] = { .lex_state = 943 },
-    [950] = { .lex_state = 943 },
+    [950] = { .lex_state = 98 },
     [951] = { .lex_state = 943 },
     [952] = { .lex_state = 102 },
-    [953] = { .lex_state = 96 },
+    [953] = { .lex_state = 95 },
     [954] = { .lex_state = 943 },
     [955] = { .lex_state = 98 },
-    [956] = { .lex_state = 96 },
+    [956] = { .lex_state = 86 },
     [957] = { .lex_state = 102 },
-    [958] = { .lex_state = 96 },
+    [958] = { .lex_state = 95 },
     [959] = { .lex_state = 59 },
     [960] = { .lex_state = 59 },
     [961] = { .lex_state = 943 },
-    [962] = { .lex_state = 96 },
+    [962] = { .lex_state = 943 },
     [963] = { .lex_state = 59 },
     [964] = { .lex_state = 59 },
     [965] = { .lex_state = 59 },
-    [966] = { .lex_state = 102 },
-    [967] = { .lex_state = 86 },
+    [966] = { .lex_state = 943 },
+    [967] = { .lex_state = 95 },
     [968] = { .lex_state = 59 },
     [969] = { .lex_state = 102 },
-    [970] = { .lex_state = 98 },
-    [971] = { .lex_state = 943 },
+    [970] = { .lex_state = 95 },
+    [971] = { .lex_state = 102 },
     [972] = { .lex_state = 98 },
-    [973] = { .lex_state = 98 },
-    [974] = { .lex_state = 98 },
-    [975] = { .lex_state = 943 },
-    [976] = { .lex_state = 943 },
+    [973] = { .lex_state = 943 },
+    [974] = { .lex_state = 95 },
+    [975] = { .lex_state = 86 },
+    [976] = { .lex_state = 98 },
     [977] = { .lex_state = 943 },
     [978] = { .lex_state = 59 },
     [979] = { .lex_state = 943 },
     [980] = { .lex_state = 59 },
-    [981] = { .lex_state = 86 },
+    [981] = { .lex_state = 98 },
     [982] = { .lex_state = 59 },
     [983] = { .lex_state = 86 },
     [984] = { .lex_state = 943 },
     [985] = { .lex_state = 59 },
-    [986] = { .lex_state = 86 },
+    [986] = { .lex_state = 98 },
     [987] = { .lex_state = 943 },
-    [988] = { .lex_state = 96 },
+    [988] = { .lex_state = 98 },
     [989] = { .lex_state = 59 },
-    [990] = { .lex_state = 86 },
+    [990] = { .lex_state = 943 },
     [991] = { .lex_state = 59 },
     [992] = { .lex_state = 59 },
     [993] = { .lex_state = 86 },
     [994] = { .lex_state = 59 },
     [995] = { .lex_state = 59 },
-    [996] = { .lex_state = 90 },
+    [996] = { .lex_state = 86 },
     [997] = { .lex_state = 59 },
     [998] = { .lex_state = 59 },
     [999] = { .lex_state = 59 },
@@ -21421,137 +21428,137 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1034] = { .lex_state = 59 },
     [1035] = { .lex_state = 59 },
     [1036] = { .lex_state = 59 },
-    [1037] = { .lex_state = 96 },
+    [1037] = { .lex_state = 95 },
     [1038] = { .lex_state = 86 },
-    [1039] = { .lex_state = 86 },
+    [1039] = { .lex_state = 89 },
     [1040] = { .lex_state = 86 },
-    [1041] = { .lex_state = 96 },
+    [1041] = { .lex_state = 95 },
     [1042] = { .lex_state = 86 },
     [1043] = { .lex_state = 86 },
-    [1044] = { .lex_state = 86 },
+    [1044] = { .lex_state = 102 },
     [1045] = { .lex_state = 86 },
-    [1046] = { .lex_state = 86 },
-    [1047] = { .lex_state = 86 },
+    [1046] = { .lex_state = 102 },
+    [1047] = { .lex_state = 102 },
     [1048] = { .lex_state = 86 },
-    [1049] = { .lex_state = 943 },
-    [1050] = { .lex_state = 102 },
-    [1051] = { .lex_state = 943 },
+    [1049] = { .lex_state = 86 },
+    [1050] = { .lex_state = 86 },
+    [1051] = { .lex_state = 86 },
     [1052] = { .lex_state = 943 },
     [1053] = { .lex_state = 86 },
-    [1054] = { .lex_state = 943 },
+    [1054] = { .lex_state = 86 },
     [1055] = { .lex_state = 943 },
-    [1056] = { .lex_state = 102 },
-    [1057] = { .lex_state = 102 },
+    [1056] = { .lex_state = 943 },
+    [1057] = { .lex_state = 86 },
     [1058] = { .lex_state = 943 },
-    [1059] = { .lex_state = 95 },
-    [1060] = { .lex_state = 102 },
-    [1061] = { .lex_state = 96 },
-    [1062] = { .lex_state = 96 },
-    [1063] = { .lex_state = 96 },
-    [1064] = { .lex_state = 86 },
-    [1065] = { .lex_state = 95 },
-    [1066] = { .lex_state = 96 },
-    [1067] = { .lex_state = 943 },
-    [1068] = { .lex_state = 96 },
-    [1069] = { .lex_state = 943 },
+    [1059] = { .lex_state = 86 },
+    [1060] = { .lex_state = 943 },
+    [1061] = { .lex_state = 943 },
+    [1062] = { .lex_state = 86 },
+    [1063] = { .lex_state = 102 },
+    [1064] = { .lex_state = 102 },
+    [1065] = { .lex_state = 86 },
+    [1066] = { .lex_state = 94 },
+    [1067] = { .lex_state = 102 },
+    [1068] = { .lex_state = 95 },
+    [1069] = { .lex_state = 95 },
     [1070] = { .lex_state = 102 },
-    [1071] = { .lex_state = 943 },
-    [1072] = { .lex_state = 96 },
-    [1073] = { .lex_state = 86 },
+    [1071] = { .lex_state = 95 },
+    [1072] = { .lex_state = 86 },
+    [1073] = { .lex_state = 943 },
     [1074] = { .lex_state = 943 },
     [1075] = { .lex_state = 86 },
     [1076] = { .lex_state = 943 },
     [1077] = { .lex_state = 943 },
     [1078] = { .lex_state = 86 },
-    [1079] = { .lex_state = 86 },
+    [1079] = { .lex_state = 95 },
     [1080] = { .lex_state = 943 },
-    [1081] = { .lex_state = 86 },
-    [1082] = { .lex_state = 86 },
-    [1083] = { .lex_state = 943 },
-    [1084] = { .lex_state = 86 },
-    [1085] = { .lex_state = 96 },
-    [1086] = { .lex_state = 943 },
+    [1081] = { .lex_state = 943 },
+    [1082] = { .lex_state = 95 },
+    [1083] = { .lex_state = 95 },
+    [1084] = { .lex_state = 943 },
+    [1085] = { .lex_state = 102 },
+    [1086] = { .lex_state = 86 },
     [1087] = { .lex_state = 102 },
     [1088] = { .lex_state = 943 },
-    [1089] = { .lex_state = 943 },
+    [1089] = { .lex_state = 86 },
     [1090] = { .lex_state = 943 },
-    [1091] = { .lex_state = 86 },
-    [1092] = { .lex_state = 86 },
-    [1093] = { .lex_state = 87 },
+    [1091] = { .lex_state = 95 },
+    [1092] = { .lex_state = 943 },
+    [1093] = { .lex_state = 92 },
     [1094] = { .lex_state = 943 },
     [1095] = { .lex_state = 943 },
-    [1096] = { .lex_state = 86 },
+    [1096] = { .lex_state = 943 },
     [1097] = { .lex_state = 943 },
-    [1098] = { .lex_state = 943 },
-    [1099] = { .lex_state = 95 },
-    [1100] = { .lex_state = 96 },
-    [1101] = { .lex_state = 86 },
+    [1098] = { .lex_state = 86 },
+    [1099] = { .lex_state = 943 },
+    [1100] = { .lex_state = 943 },
+    [1101] = { .lex_state = 95 },
     [1102] = { .lex_state = 943 },
     [1103] = { .lex_state = 943 },
-    [1104] = { .lex_state = 86 },
-    [1105] = { .lex_state = 86 },
-    [1106] = { .lex_state = 96 },
-    [1107] = { .lex_state = 943 },
+    [1104] = { .lex_state = 943 },
+    [1105] = { .lex_state = 94 },
+    [1106] = { .lex_state = 95 },
+    [1107] = { .lex_state = 86 },
     [1108] = { .lex_state = 86 },
-    [1109] = { .lex_state = 102 },
-    [1110] = { .lex_state = 96 },
-    [1111] = { .lex_state = 102 },
-    [1112] = { .lex_state = 943 },
-    [1113] = { .lex_state = 943 },
-    [1114] = { .lex_state = 95 },
-    [1115] = { .lex_state = 86 },
-    [1116] = { .lex_state = 95 },
+    [1109] = { .lex_state = 86 },
+    [1110] = { .lex_state = 86 },
+    [1111] = { .lex_state = 943 },
+    [1112] = { .lex_state = 86 },
+    [1113] = { .lex_state = 95 },
+    [1114] = { .lex_state = 943 },
+    [1115] = { .lex_state = 943 },
+    [1116] = { .lex_state = 94 },
     [1117] = { .lex_state = 86 },
-    [1118] = { .lex_state = 86 },
-    [1119] = { .lex_state = 102 },
-    [1120] = { .lex_state = 943 },
-    [1121] = { .lex_state = 96 },
-    [1122] = { .lex_state = 102 },
-    [1123] = { .lex_state = 943 },
-    [1124] = { .lex_state = 86 },
-    [1125] = { .lex_state = 96 },
-    [1126] = { .lex_state = 943 },
+    [1118] = { .lex_state = 94 },
+    [1119] = { .lex_state = 86 },
+    [1120] = { .lex_state = 86 },
+    [1121] = { .lex_state = 943 },
+    [1122] = { .lex_state = 86 },
+    [1123] = { .lex_state = 102 },
+    [1124] = { .lex_state = 943 },
+    [1125] = { .lex_state = 95 },
+    [1126] = { .lex_state = 102 },
     [1127] = { .lex_state = 943 },
     [1128] = { .lex_state = 86 },
-    [1129] = { .lex_state = 96 },
-    [1130] = { .lex_state = 96 },
-    [1131] = { .lex_state = 102 },
-    [1132] = { .lex_state = 943 },
-    [1133] = { .lex_state = 96 },
-    [1134] = { .lex_state = 102 },
-    [1135] = { .lex_state = 86 },
-    [1136] = { .lex_state = 86 },
-    [1137] = { .lex_state = 86 },
+    [1129] = { .lex_state = 86 },
+    [1130] = { .lex_state = 943 },
+    [1131] = { .lex_state = 95 },
+    [1132] = { .lex_state = 102 },
+    [1133] = { .lex_state = 95 },
+    [1134] = { .lex_state = 95 },
+    [1135] = { .lex_state = 102 },
+    [1136] = { .lex_state = 95 },
+    [1137] = { .lex_state = 943 },
     [1138] = { .lex_state = 943 },
-    [1139] = { .lex_state = 102 },
-    [1140] = { .lex_state = 86 },
+    [1139] = { .lex_state = 86 },
+    [1140] = { .lex_state = 102 },
     [1141] = { .lex_state = 86 },
-    [1142] = { .lex_state = 73 },
-    [1143] = { .lex_state = 102 },
+    [1142] = { .lex_state = 86 },
+    [1143] = { .lex_state = 86 },
     [1144] = { .lex_state = 86 },
     [1145] = { .lex_state = 86 },
-    [1146] = { .lex_state = 102 },
+    [1146] = { .lex_state = 73 },
     [1147] = { .lex_state = 102 },
-    [1148] = { .lex_state = 943 },
+    [1148] = { .lex_state = 86 },
     [1149] = { .lex_state = 943 },
     [1150] = { .lex_state = 86 },
-    [1151] = { .lex_state = 86 },
+    [1151] = { .lex_state = 102 },
     [1152] = { .lex_state = 943 },
     [1153] = { .lex_state = 943 },
-    [1154] = { .lex_state = 96 },
-    [1155] = { .lex_state = 943 },
+    [1154] = { .lex_state = 95 },
+    [1155] = { .lex_state = 102 },
     [1156] = { .lex_state = 86 },
-    [1157] = { .lex_state = 95 },
-    [1158] = { .lex_state = 86 },
-    [1159] = { .lex_state = 102 },
+    [1157] = { .lex_state = 86 },
+    [1158] = { .lex_state = 102 },
+    [1159] = { .lex_state = 943 },
     [1160] = { .lex_state = 102 },
     [1161] = { .lex_state = 943 },
-    [1162] = { .lex_state = 102 },
-    [1163] = { .lex_state = 86 },
+    [1162] = { .lex_state = 86 },
+    [1163] = { .lex_state = 943 },
     [1164] = { .lex_state = 86 },
     [1165] = { .lex_state = 86 },
-    [1166] = { .lex_state = 102 },
-    [1167] = { .lex_state = 943 },
+    [1166] = { .lex_state = 86 },
+    [1167] = { .lex_state = 102 },
     [1168] = { .lex_state = 943 },
     [1169] = { .lex_state = 943 },
     [1170] = { .lex_state = 943 },
@@ -21573,7 +21580,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1186] = { .lex_state = 943 },
     [1187] = { .lex_state = 943 },
     [1188] = { .lex_state = 943 },
-    [1189] = { .lex_state = 943 },
+    [1189] = { .lex_state = 95 },
     [1190] = { .lex_state = 74 },
     [1191] = { .lex_state = 943 },
     [1192] = { .lex_state = 943 },
@@ -21593,14 +21600,14 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1206] = { .lex_state = 943 },
     [1207] = { .lex_state = 943 },
     [1208] = { .lex_state = 943 },
-    [1209] = { .lex_state = 96 },
+    [1209] = { .lex_state = 95 },
     [1210] = { .lex_state = 943 },
     [1211] = { .lex_state = 943 },
-    [1212] = { .lex_state = 96 },
-    [1213] = { .lex_state = 96 },
+    [1212] = { .lex_state = 95 },
+    [1213] = { .lex_state = 95 },
     [1214] = { .lex_state = 943 },
     [1215] = { .lex_state = 86 },
-    [1216] = { .lex_state = 96 },
+    [1216] = { .lex_state = 95 },
     [1217] = { .lex_state = 943 },
     [1218] = { .lex_state = 943 },
     [1219] = { .lex_state = 943 },
@@ -21647,13 +21654,13 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1260] = { .lex_state = 943 },
     [1261] = { .lex_state = 943 },
     [1262] = { .lex_state = 943 },
-    [1263] = { .lex_state = 96 },
+    [1263] = { .lex_state = 943 },
     [1264] = { .lex_state = 943 },
     [1265] = { .lex_state = 943 },
     [1266] = { .lex_state = 86 },
     [1267] = { .lex_state = 943 },
     [1268] = { .lex_state = 943 },
-    [1269] = { .lex_state = 96 },
+    [1269] = { .lex_state = 95 },
     [1270] = { .lex_state = 943 },
     [1271] = { .lex_state = 943 },
     [1272] = { .lex_state = 943 },
@@ -21704,7 +21711,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1317] = { .lex_state = 943 },
     [1318] = { .lex_state = 943 },
     [1319] = { .lex_state = 943 },
-    [1320] = { .lex_state = 95 },
+    [1320] = { .lex_state = 943 },
     [1321] = { .lex_state = 943 },
     [1322] = { .lex_state = 943 },
     [1323] = { .lex_state = 943 },
@@ -21751,7 +21758,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1364] = { .lex_state = 943 },
     [1365] = { .lex_state = 943 },
     [1366] = { .lex_state = 943 },
-    [1367] = { .lex_state = 943 },
+    [1367] = { .lex_state = 94 },
     [1368] = { .lex_state = 943 },
     [1369] = { .lex_state = 943 },
     [1370] = { .lex_state = 943 },
@@ -21807,7 +21814,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1420] = { .lex_state = 943 },
     [1421] = { .lex_state = 943 },
     [1422] = { .lex_state = 943 },
-    [1423] = { .lex_state = 95 },
+    [1423] = { .lex_state = 94 },
     [1424] = { .lex_state = 943 },
     [1425] = { .lex_state = 943 },
     [1426] = { .lex_state = 86 },
@@ -21995,7 +22002,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
     [1608] = { .lex_state = 86 },
     [1609] = { .lex_state = 943 },
     [1610] = { .lex_state = 943 },
-    [1611] = { .lex_state = 96 },
+    [1611] = { .lex_state = 95 },
     [1612] = { .lex_state = 86 },
     [1613] = { .lex_state = 943 },
     [1614] = { .lex_state = 86 },
@@ -22295,11 +22302,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -22308,10 +22315,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -22333,18 +22340,18 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(1),
-        [aux_sym_specification_repeat1] = STATE(30),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [aux_sym_specification_repeat1] = STATE(29),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [ts_builtin_sym_end] = ACTIONS(7),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
@@ -22379,27 +22386,27 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [2] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1282),
         [sym_export] = STATE(69),
         [sym_op_dcl] = STATE(1037),
@@ -22407,10 +22414,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_attr_dcl] = STATE(1282),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1282),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
@@ -22420,10 +22427,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_init_dcl] = STATE(69),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1282),
         [sym_import_dcl] = STATE(1282),
         [sym_object_type] = STATE(775),
@@ -22434,13 +22441,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_type_dcl] = STATE(1282),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1282),
         [sym_comment] = STATE(2),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_value_def_repeat1] = STATE(5),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_value_def_repeat1] = STATE(3),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -22500,27 +22507,27 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [3] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1282),
         [sym_export] = STATE(69),
         [sym_op_dcl] = STATE(1037),
@@ -22528,10 +22535,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_attr_dcl] = STATE(1282),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1282),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
@@ -22541,10 +22548,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_init_dcl] = STATE(69),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1282),
         [sym_import_dcl] = STATE(1282),
         [sym_object_type] = STATE(775),
@@ -22555,13 +22562,134 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_type_dcl] = STATE(1282),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1282),
         [sym_comment] = STATE(3),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_value_def_repeat1] = STATE(2),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_value_def_repeat1] = STATE(3),
+        [anon_sym_short] = ACTIONS(159),
+        [anon_sym_int16] = ACTIONS(159),
+        [anon_sym_long] = ACTIONS(162),
+        [anon_sym_int32] = ACTIONS(162),
+        [anon_sym_longlong] = ACTIONS(165),
+        [anon_sym_int64] = ACTIONS(168),
+        [sym_unsigned_tiny_int] = ACTIONS(171),
+        [sym_boolean_type] = ACTIONS(174),
+        [anon_sym_fixed] = ACTIONS(177),
+        [sym_octet_type] = ACTIONS(174),
+        [sym_signed_tiny_int] = ACTIONS(180),
+        [anon_sym_unsignedshort] = ACTIONS(183),
+        [anon_sym_uint16] = ACTIONS(186),
+        [anon_sym_unsignedlong] = ACTIONS(189),
+        [anon_sym_uint32] = ACTIONS(189),
+        [anon_sym_unsignedlonglong] = ACTIONS(192),
+        [anon_sym_uint64] = ACTIONS(195),
+        [anon_sym_float] = ACTIONS(198),
+        [anon_sym_double] = ACTIONS(198),
+        [anon_sym_longdouble] = ACTIONS(201),
+        [sym_char_type] = ACTIONS(174),
+        [sym_wide_char_type] = ACTIONS(174),
+        [anon_sym_COLON_COLON] = ACTIONS(204),
+        [anon_sym_string] = ACTIONS(207),
+        [anon_sym_wstring] = ACTIONS(210),
+        [anon_sym_any] = ACTIONS(213),
+        [anon_sym_sequence] = ACTIONS(216),
+        [anon_sym_map] = ACTIONS(219),
+        [anon_sym_exception] = ACTIONS(222),
+        [anon_sym_RBRACE] = ACTIONS(225),
+        [anon_sym_abstract] = ACTIONS(227),
+        [anon_sym_void] = ACTIONS(230),
+        [anon_sym_readonly] = ACTIONS(233),
+        [anon_sym_attribute] = ACTIONS(236),
+        [anon_sym_bitset] = ACTIONS(239),
+        [anon_sym_bitmask] = ACTIONS(242),
+        [anon_sym_AT] = ACTIONS(245),
+        [anon_sym_SLASH_SLASH_AT] = ACTIONS(248),
+        [anon_sym_valuetype] = ACTIONS(251),
+        [anon_sym_struct] = ACTIONS(254),
+        [anon_sym_union] = ACTIONS(257),
+        [anon_sym_enum] = ACTIONS(260),
+        [anon_sym_const] = ACTIONS(263),
+        [anon_sym_custom] = ACTIONS(266),
+        [anon_sym_public] = ACTIONS(269),
+        [anon_sym_private] = ACTIONS(269),
+        [anon_sym_factory] = ACTIONS(272),
+        [anon_sym_typedef] = ACTIONS(275),
+        [anon_sym_typeid] = ACTIONS(278),
+        [anon_sym_import] = ACTIONS(281),
+        [anon_sym_Object] = ACTIONS(284),
+        [anon_sym_oneway] = ACTIONS(287),
+        [sym_value_base_type] = ACTIONS(174),
+        [anon_sym_native] = ACTIONS(290),
+        [sym_identifier] = ACTIONS(293),
+        [anon_sym_SLASH_SLASH] = ACTIONS(3),
+        [anon_sym_SLASH_STAR] = ACTIONS(5),
+    },
+    [4] = {
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
+        [sym_integer_type] = STATE(775),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
+        [sym_floating_pt_type] = STATE(775),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
+        [sym_type_spec] = STATE(1215),
+        [sym_simple_type_spec] = STATE(693),
+        [sym_base_type_spec] = STATE(781),
+        [sym_any_type] = STATE(775),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_except_dcl] = STATE(1282),
+        [sym_export] = STATE(69),
+        [sym_op_dcl] = STATE(1037),
+        [sym_op_type_spec] = STATE(1184),
+        [sym_attr_dcl] = STATE(1282),
+        [sym_readonly_attr_spec] = STATE(1183),
+        [sym_attr_spec] = STATE(1183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
+        [sym_value_dcl] = STATE(1282),
+        [sym_value_def] = STATE(1581),
+        [sym_value_kind] = STATE(1580),
+        [sym_value_header] = STATE(1579),
+        [sym_value_element] = STATE(70),
+        [sym_state_member] = STATE(69),
+        [sym_init_dcl] = STATE(69),
+        [sym_value_forward_dcl] = STATE(1581),
+        [sym_typedef_dcl] = STATE(1577),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
+        [sym_type_id_dcl] = STATE(1282),
+        [sym_import_dcl] = STATE(1282),
+        [sym_object_type] = STATE(775),
+        [sym_op_oneway_dcl] = STATE(1037),
+        [sym_op_with_context] = STATE(1282),
+        [sym_value_box_def] = STATE(1581),
+        [sym_value_abs_def] = STATE(1581),
+        [sym_type_dcl] = STATE(1282),
+        [sym_constr_type_dcl] = STATE(1577),
+        [sym_native_dcl] = STATE(1577),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
+        [sym_const_dcl] = STATE(1282),
+        [sym_comment] = STATE(4),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_value_def_repeat1] = STATE(3),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -22591,7 +22719,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(159),
+        [anon_sym_RBRACE] = ACTIONS(296),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -22620,69 +22748,70 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [4] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+    [5] = {
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_except_dcl] = STATE(1282),
-        [sym_export] = STATE(69),
-        [sym_op_dcl] = STATE(1037),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_except_dcl] = STATE(1335),
+        [sym_export] = STATE(73),
+        [sym_op_dcl] = STATE(932),
         [sym_op_type_spec] = STATE(1184),
-        [sym_attr_dcl] = STATE(1282),
+        [sym_attr_dcl] = STATE(1335),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
-        [sym_value_dcl] = STATE(1282),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
+        [sym_value_dcl] = STATE(1335),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
-        [sym_value_element] = STATE(70),
-        [sym_state_member] = STATE(69),
-        [sym_init_dcl] = STATE(69),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
-        [sym_type_id_dcl] = STATE(1282),
-        [sym_import_dcl] = STATE(1282),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
+        [sym_type_id_dcl] = STATE(1335),
+        [sym_import_dcl] = STATE(1335),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(1037),
-        [sym_op_with_context] = STATE(1282),
+        [sym_op_oneway_dcl] = STATE(932),
+        [sym_op_with_context] = STATE(1335),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
-        [sym_type_dcl] = STATE(1282),
+        [sym_home_body] = STATE(1172),
+        [sym_home_export] = STATE(75),
+        [sym_factory_dcl] = STATE(1171),
+        [sym_finder_dcl] = STATE(1171),
+        [sym_type_dcl] = STATE(1335),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
-        [sym_const_dcl] = STATE(1282),
-        [sym_comment] = STATE(4),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_value_def_repeat1] = STATE(7),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
+        [sym_const_dcl] = STATE(1335),
+        [sym_comment] = STATE(5),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_home_body_repeat1] = STATE(9),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -22712,7 +22841,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(161),
+        [anon_sym_RBRACE] = ACTIONS(298),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -22727,42 +22856,41 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_enum] = ACTIONS(135),
         [anon_sym_const] = ACTIONS(137),
         [anon_sym_custom] = ACTIONS(139),
-        [anon_sym_public] = ACTIONS(141),
-        [anon_sym_private] = ACTIONS(141),
-        [anon_sym_factory] = ACTIONS(143),
+        [anon_sym_factory] = ACTIONS(300),
         [anon_sym_typedef] = ACTIONS(145),
         [anon_sym_typeid] = ACTIONS(147),
         [anon_sym_import] = ACTIONS(149),
         [anon_sym_Object] = ACTIONS(151),
         [anon_sym_oneway] = ACTIONS(153),
         [sym_value_base_type] = ACTIONS(77),
+        [anon_sym_finder] = ACTIONS(302),
         [anon_sym_native] = ACTIONS(155),
         [sym_identifier] = ACTIONS(157),
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [5] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+    [6] = {
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1282),
         [sym_export] = STATE(69),
         [sym_op_dcl] = STATE(1037),
@@ -22770,10 +22898,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_attr_dcl] = STATE(1282),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1282),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
@@ -22783,10 +22911,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_init_dcl] = STATE(69),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1282),
         [sym_import_dcl] = STATE(1282),
         [sym_object_type] = STATE(775),
@@ -22797,135 +22925,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_type_dcl] = STATE(1282),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1282),
-        [sym_comment] = STATE(5),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_value_def_repeat1] = STATE(5),
-        [anon_sym_short] = ACTIONS(163),
-        [anon_sym_int16] = ACTIONS(163),
-        [anon_sym_long] = ACTIONS(166),
-        [anon_sym_int32] = ACTIONS(166),
-        [anon_sym_longlong] = ACTIONS(169),
-        [anon_sym_int64] = ACTIONS(172),
-        [sym_unsigned_tiny_int] = ACTIONS(175),
-        [sym_boolean_type] = ACTIONS(178),
-        [anon_sym_fixed] = ACTIONS(181),
-        [sym_octet_type] = ACTIONS(178),
-        [sym_signed_tiny_int] = ACTIONS(184),
-        [anon_sym_unsignedshort] = ACTIONS(187),
-        [anon_sym_uint16] = ACTIONS(190),
-        [anon_sym_unsignedlong] = ACTIONS(193),
-        [anon_sym_uint32] = ACTIONS(193),
-        [anon_sym_unsignedlonglong] = ACTIONS(196),
-        [anon_sym_uint64] = ACTIONS(199),
-        [anon_sym_float] = ACTIONS(202),
-        [anon_sym_double] = ACTIONS(202),
-        [anon_sym_longdouble] = ACTIONS(205),
-        [sym_char_type] = ACTIONS(178),
-        [sym_wide_char_type] = ACTIONS(178),
-        [anon_sym_COLON_COLON] = ACTIONS(208),
-        [anon_sym_string] = ACTIONS(211),
-        [anon_sym_wstring] = ACTIONS(214),
-        [anon_sym_any] = ACTIONS(217),
-        [anon_sym_sequence] = ACTIONS(220),
-        [anon_sym_map] = ACTIONS(223),
-        [anon_sym_exception] = ACTIONS(226),
-        [anon_sym_RBRACE] = ACTIONS(229),
-        [anon_sym_abstract] = ACTIONS(231),
-        [anon_sym_void] = ACTIONS(234),
-        [anon_sym_readonly] = ACTIONS(237),
-        [anon_sym_attribute] = ACTIONS(240),
-        [anon_sym_bitset] = ACTIONS(243),
-        [anon_sym_bitmask] = ACTIONS(246),
-        [anon_sym_AT] = ACTIONS(249),
-        [anon_sym_SLASH_SLASH_AT] = ACTIONS(252),
-        [anon_sym_valuetype] = ACTIONS(255),
-        [anon_sym_struct] = ACTIONS(258),
-        [anon_sym_union] = ACTIONS(261),
-        [anon_sym_enum] = ACTIONS(264),
-        [anon_sym_const] = ACTIONS(267),
-        [anon_sym_custom] = ACTIONS(270),
-        [anon_sym_public] = ACTIONS(273),
-        [anon_sym_private] = ACTIONS(273),
-        [anon_sym_factory] = ACTIONS(276),
-        [anon_sym_typedef] = ACTIONS(279),
-        [anon_sym_typeid] = ACTIONS(282),
-        [anon_sym_import] = ACTIONS(285),
-        [anon_sym_Object] = ACTIONS(288),
-        [anon_sym_oneway] = ACTIONS(291),
-        [sym_value_base_type] = ACTIONS(178),
-        [anon_sym_native] = ACTIONS(294),
-        [sym_identifier] = ACTIONS(297),
-        [anon_sym_SLASH_SLASH] = ACTIONS(3),
-        [anon_sym_SLASH_STAR] = ACTIONS(5),
-    },
-    [6] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
-        [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
-        [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
-        [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
-        [sym_base_type_spec] = STATE(781),
-        [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_except_dcl] = STATE(1335),
-        [sym_export] = STATE(71),
-        [sym_op_dcl] = STATE(932),
-        [sym_op_type_spec] = STATE(1184),
-        [sym_attr_dcl] = STATE(1335),
-        [sym_readonly_attr_spec] = STATE(1183),
-        [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
-        [sym_value_dcl] = STATE(1335),
-        [sym_value_def] = STATE(1581),
-        [sym_value_kind] = STATE(1580),
-        [sym_value_header] = STATE(1579),
-        [sym_value_forward_dcl] = STATE(1581),
-        [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
-        [sym_type_id_dcl] = STATE(1335),
-        [sym_import_dcl] = STATE(1335),
-        [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(932),
-        [sym_op_with_context] = STATE(1335),
-        [sym_value_box_def] = STATE(1581),
-        [sym_value_abs_def] = STATE(1581),
-        [sym_home_body] = STATE(1172),
-        [sym_home_export] = STATE(75),
-        [sym_factory_dcl] = STATE(1171),
-        [sym_finder_dcl] = STATE(1171),
-        [sym_type_dcl] = STATE(1335),
-        [sym_constr_type_dcl] = STATE(1577),
-        [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
-        [sym_const_dcl] = STATE(1335),
         [sym_comment] = STATE(6),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_home_body_repeat1] = STATE(9),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_value_def_repeat1] = STATE(4),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -22955,7 +22961,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(300),
+        [anon_sym_RBRACE] = ACTIONS(304),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -22970,41 +22976,42 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_enum] = ACTIONS(135),
         [anon_sym_const] = ACTIONS(137),
         [anon_sym_custom] = ACTIONS(139),
-        [anon_sym_factory] = ACTIONS(302),
+        [anon_sym_public] = ACTIONS(141),
+        [anon_sym_private] = ACTIONS(141),
+        [anon_sym_factory] = ACTIONS(143),
         [anon_sym_typedef] = ACTIONS(145),
         [anon_sym_typeid] = ACTIONS(147),
         [anon_sym_import] = ACTIONS(149),
         [anon_sym_Object] = ACTIONS(151),
         [anon_sym_oneway] = ACTIONS(153),
         [sym_value_base_type] = ACTIONS(77),
-        [anon_sym_finder] = ACTIONS(304),
         [anon_sym_native] = ACTIONS(155),
         [sym_identifier] = ACTIONS(157),
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [7] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1282),
         [sym_export] = STATE(69),
         [sym_op_dcl] = STATE(1037),
@@ -23012,10 +23019,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_attr_dcl] = STATE(1282),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1282),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
@@ -23025,10 +23032,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_init_dcl] = STATE(69),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1282),
         [sym_import_dcl] = STATE(1282),
         [sym_object_type] = STATE(775),
@@ -23039,13 +23046,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_type_dcl] = STATE(1282),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1282),
         [sym_comment] = STATE(7),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_value_def_repeat1] = STATE(5),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_value_def_repeat1] = STATE(2),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -23105,48 +23112,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [8] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1335),
-        [sym_export] = STATE(71),
+        [sym_export] = STATE(73),
         [sym_op_dcl] = STATE(932),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1335),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1335),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1335),
         [sym_import_dcl] = STATE(1335),
         [sym_object_type] = STATE(775),
@@ -23160,12 +23167,12 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_type_dcl] = STATE(1335),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1335),
         [sym_comment] = STATE(8),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
         [aux_sym_home_body_repeat1] = STATE(8),
         [anon_sym_short] = ACTIONS(308),
         [anon_sym_int16] = ACTIONS(308),
@@ -23225,48 +23232,48 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [9] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1335),
-        [sym_export] = STATE(71),
+        [sym_export] = STATE(73),
         [sym_op_dcl] = STATE(932),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1335),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1335),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1335),
         [sym_import_dcl] = STATE(1335),
         [sym_object_type] = STATE(775),
@@ -23280,12 +23287,12 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_type_dcl] = STATE(1335),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1335),
         [sym_comment] = STATE(9),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
         [aux_sym_home_body_repeat1] = STATE(8),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
@@ -23331,80 +23338,80 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_enum] = ACTIONS(135),
         [anon_sym_const] = ACTIONS(137),
         [anon_sym_custom] = ACTIONS(139),
-        [anon_sym_factory] = ACTIONS(302),
+        [anon_sym_factory] = ACTIONS(300),
         [anon_sym_typedef] = ACTIONS(145),
         [anon_sym_typeid] = ACTIONS(147),
         [anon_sym_import] = ACTIONS(149),
         [anon_sym_Object] = ACTIONS(151),
         [anon_sym_oneway] = ACTIONS(153),
         [sym_value_base_type] = ACTIONS(77),
-        [anon_sym_finder] = ACTIONS(304),
+        [anon_sym_finder] = ACTIONS(302),
         [anon_sym_native] = ACTIONS(155),
         [sym_identifier] = ACTIONS(157),
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [10] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
         [sym_interface_body] = STATE(1168),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(10),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(19),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(18),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -23461,64 +23468,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [11] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(11),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
         [aux_sym_interface_body_repeat1] = STATE(12),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
@@ -23576,180 +23583,65 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [12] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(12),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(12),
-        [anon_sym_short] = ACTIONS(451),
-        [anon_sym_int16] = ACTIONS(451),
-        [anon_sym_long] = ACTIONS(454),
-        [anon_sym_int32] = ACTIONS(454),
-        [anon_sym_longlong] = ACTIONS(457),
-        [anon_sym_int64] = ACTIONS(460),
-        [sym_unsigned_tiny_int] = ACTIONS(463),
-        [sym_boolean_type] = ACTIONS(466),
-        [anon_sym_fixed] = ACTIONS(469),
-        [sym_octet_type] = ACTIONS(466),
-        [sym_signed_tiny_int] = ACTIONS(472),
-        [anon_sym_unsignedshort] = ACTIONS(475),
-        [anon_sym_uint16] = ACTIONS(478),
-        [anon_sym_unsignedlong] = ACTIONS(481),
-        [anon_sym_uint32] = ACTIONS(481),
-        [anon_sym_unsignedlonglong] = ACTIONS(484),
-        [anon_sym_uint64] = ACTIONS(487),
-        [anon_sym_float] = ACTIONS(490),
-        [anon_sym_double] = ACTIONS(490),
-        [anon_sym_longdouble] = ACTIONS(493),
-        [sym_char_type] = ACTIONS(466),
-        [sym_wide_char_type] = ACTIONS(466),
-        [anon_sym_COLON_COLON] = ACTIONS(496),
-        [anon_sym_string] = ACTIONS(499),
-        [anon_sym_wstring] = ACTIONS(502),
-        [anon_sym_any] = ACTIONS(505),
-        [anon_sym_sequence] = ACTIONS(508),
-        [anon_sym_map] = ACTIONS(511),
-        [anon_sym_exception] = ACTIONS(514),
-        [anon_sym_RBRACE] = ACTIONS(517),
-        [anon_sym_abstract] = ACTIONS(519),
-        [anon_sym_void] = ACTIONS(522),
-        [anon_sym_readonly] = ACTIONS(525),
-        [anon_sym_attribute] = ACTIONS(528),
-        [anon_sym_bitset] = ACTIONS(531),
-        [anon_sym_bitmask] = ACTIONS(534),
-        [anon_sym_AT] = ACTIONS(537),
-        [anon_sym_SLASH_SLASH_AT] = ACTIONS(540),
-        [anon_sym_valuetype] = ACTIONS(543),
-        [anon_sym_struct] = ACTIONS(546),
-        [anon_sym_union] = ACTIONS(549),
-        [anon_sym_enum] = ACTIONS(552),
-        [anon_sym_const] = ACTIONS(555),
-        [anon_sym_custom] = ACTIONS(558),
-        [anon_sym_typedef] = ACTIONS(561),
-        [anon_sym_typeid] = ACTIONS(564),
-        [anon_sym_import] = ACTIONS(567),
-        [anon_sym_Object] = ACTIONS(570),
-        [anon_sym_oneway] = ACTIONS(573),
-        [sym_value_base_type] = ACTIONS(466),
-        [anon_sym_native] = ACTIONS(576),
-        [sym_identifier] = ACTIONS(579),
-        [anon_sym_SLASH_SLASH] = ACTIONS(3),
-        [anon_sym_SLASH_STAR] = ACTIONS(5),
-    },
-    [13] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
-        [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
-        [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
-        [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
-        [sym_base_type_spec] = STATE(781),
-        [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
-        [sym_op_type_spec] = STATE(1184),
-        [sym_attr_dcl] = STATE(1187),
-        [sym_readonly_attr_spec] = STATE(1183),
-        [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
-        [sym_value_dcl] = STATE(1187),
-        [sym_value_def] = STATE(1581),
-        [sym_value_kind] = STATE(1580),
-        [sym_value_header] = STATE(1579),
-        [sym_value_forward_dcl] = STATE(1581),
-        [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
-        [sym_type_id_dcl] = STATE(1187),
-        [sym_import_dcl] = STATE(1187),
-        [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
-        [sym_op_with_context] = STATE(1187),
-        [sym_value_box_def] = STATE(1581),
-        [sym_value_abs_def] = STATE(1581),
-        [sym_type_dcl] = STATE(1187),
-        [sym_constr_type_dcl] = STATE(1577),
-        [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
-        [sym_const_dcl] = STATE(1187),
-        [sym_comment] = STATE(13),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(12),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(13),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -23779,7 +23671,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(582),
+        [anon_sym_RBRACE] = ACTIONS(451),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -23805,66 +23697,181 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
+    [13] = {
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
+        [sym_integer_type] = STATE(775),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
+        [sym_floating_pt_type] = STATE(775),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
+        [sym_type_spec] = STATE(1215),
+        [sym_simple_type_spec] = STATE(693),
+        [sym_base_type_spec] = STATE(781),
+        [sym_any_type] = STATE(775),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_except_dcl] = STATE(1187),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
+        [sym_op_type_spec] = STATE(1184),
+        [sym_attr_dcl] = STATE(1187),
+        [sym_readonly_attr_spec] = STATE(1183),
+        [sym_attr_spec] = STATE(1183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
+        [sym_value_dcl] = STATE(1187),
+        [sym_value_def] = STATE(1581),
+        [sym_value_kind] = STATE(1580),
+        [sym_value_header] = STATE(1579),
+        [sym_value_forward_dcl] = STATE(1581),
+        [sym_typedef_dcl] = STATE(1577),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
+        [sym_type_id_dcl] = STATE(1187),
+        [sym_import_dcl] = STATE(1187),
+        [sym_object_type] = STATE(775),
+        [sym_op_oneway_dcl] = STATE(797),
+        [sym_op_with_context] = STATE(1187),
+        [sym_value_box_def] = STATE(1581),
+        [sym_value_abs_def] = STATE(1581),
+        [sym_type_dcl] = STATE(1187),
+        [sym_constr_type_dcl] = STATE(1577),
+        [sym_native_dcl] = STATE(1577),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
+        [sym_const_dcl] = STATE(1187),
+        [sym_comment] = STATE(13),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(13),
+        [anon_sym_short] = ACTIONS(453),
+        [anon_sym_int16] = ACTIONS(453),
+        [anon_sym_long] = ACTIONS(456),
+        [anon_sym_int32] = ACTIONS(456),
+        [anon_sym_longlong] = ACTIONS(459),
+        [anon_sym_int64] = ACTIONS(462),
+        [sym_unsigned_tiny_int] = ACTIONS(465),
+        [sym_boolean_type] = ACTIONS(468),
+        [anon_sym_fixed] = ACTIONS(471),
+        [sym_octet_type] = ACTIONS(468),
+        [sym_signed_tiny_int] = ACTIONS(474),
+        [anon_sym_unsignedshort] = ACTIONS(477),
+        [anon_sym_uint16] = ACTIONS(480),
+        [anon_sym_unsignedlong] = ACTIONS(483),
+        [anon_sym_uint32] = ACTIONS(483),
+        [anon_sym_unsignedlonglong] = ACTIONS(486),
+        [anon_sym_uint64] = ACTIONS(489),
+        [anon_sym_float] = ACTIONS(492),
+        [anon_sym_double] = ACTIONS(492),
+        [anon_sym_longdouble] = ACTIONS(495),
+        [sym_char_type] = ACTIONS(468),
+        [sym_wide_char_type] = ACTIONS(468),
+        [anon_sym_COLON_COLON] = ACTIONS(498),
+        [anon_sym_string] = ACTIONS(501),
+        [anon_sym_wstring] = ACTIONS(504),
+        [anon_sym_any] = ACTIONS(507),
+        [anon_sym_sequence] = ACTIONS(510),
+        [anon_sym_map] = ACTIONS(513),
+        [anon_sym_exception] = ACTIONS(516),
+        [anon_sym_RBRACE] = ACTIONS(519),
+        [anon_sym_abstract] = ACTIONS(521),
+        [anon_sym_void] = ACTIONS(524),
+        [anon_sym_readonly] = ACTIONS(527),
+        [anon_sym_attribute] = ACTIONS(530),
+        [anon_sym_bitset] = ACTIONS(533),
+        [anon_sym_bitmask] = ACTIONS(536),
+        [anon_sym_AT] = ACTIONS(539),
+        [anon_sym_SLASH_SLASH_AT] = ACTIONS(542),
+        [anon_sym_valuetype] = ACTIONS(545),
+        [anon_sym_struct] = ACTIONS(548),
+        [anon_sym_union] = ACTIONS(551),
+        [anon_sym_enum] = ACTIONS(554),
+        [anon_sym_const] = ACTIONS(557),
+        [anon_sym_custom] = ACTIONS(560),
+        [anon_sym_typedef] = ACTIONS(563),
+        [anon_sym_typeid] = ACTIONS(566),
+        [anon_sym_import] = ACTIONS(569),
+        [anon_sym_Object] = ACTIONS(572),
+        [anon_sym_oneway] = ACTIONS(575),
+        [sym_value_base_type] = ACTIONS(468),
+        [anon_sym_native] = ACTIONS(578),
+        [sym_identifier] = ACTIONS(581),
+        [anon_sym_SLASH_SLASH] = ACTIONS(3),
+        [anon_sym_SLASH_STAR] = ACTIONS(5),
+    },
     [14] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(14),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(12),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(20),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -23894,7 +23901,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(584),
+        [anon_sym_RBRACE] = ACTIONS(451),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -23921,65 +23928,65 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [15] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(15),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(14),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(17),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -24009,7 +24016,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(449),
+        [anon_sym_RBRACE] = ACTIONS(584),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -24036,65 +24043,65 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [16] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(16),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(12),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(13),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -24124,7 +24131,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_sequence] = ACTIONS(105),
         [anon_sym_map] = ACTIONS(107),
         [anon_sym_exception] = ACTIONS(109),
-        [anon_sym_RBRACE] = ACTIONS(586),
+        [anon_sym_RBRACE] = ACTIONS(584),
         [anon_sym_abstract] = ACTIONS(113),
         [anon_sym_void] = ACTIONS(115),
         [anon_sym_readonly] = ACTIONS(117),
@@ -24151,64 +24158,64 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [17] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(17),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
         [aux_sym_interface_body_repeat1] = STATE(13),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
@@ -24266,65 +24273,65 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [18] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(18),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(16),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(13),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -24381,65 +24388,65 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [19] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(19),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(12),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(16),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -24496,65 +24503,65 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [20] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_except_dcl] = STATE(1187),
-        [sym_export] = STATE(92),
-        [sym_op_dcl] = STATE(795),
+        [sym_export] = STATE(91),
+        [sym_op_dcl] = STATE(797),
         [sym_op_type_spec] = STATE(1184),
         [sym_attr_dcl] = STATE(1187),
         [sym_readonly_attr_spec] = STATE(1183),
         [sym_attr_spec] = STATE(1183),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
         [sym_value_dcl] = STATE(1187),
         [sym_value_def] = STATE(1581),
         [sym_value_kind] = STATE(1580),
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1187),
         [sym_import_dcl] = STATE(1187),
         [sym_object_type] = STATE(775),
-        [sym_op_oneway_dcl] = STATE(795),
+        [sym_op_oneway_dcl] = STATE(797),
         [sym_op_with_context] = STATE(1187),
         [sym_value_box_def] = STATE(1581),
         [sym_value_abs_def] = STATE(1581),
         [sym_type_dcl] = STATE(1187),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1187),
         [sym_comment] = STATE(20),
-        [aux_sym_interface_dcl_repeat1] = STATE(38),
-        [aux_sym_interface_body_repeat1] = STATE(11),
+        [aux_sym_interface_dcl_repeat1] = STATE(33),
+        [aux_sym_interface_body_repeat1] = STATE(13),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -24611,51 +24618,51 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [21] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(551),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
+        [sym_scoped_name] = STATE(554),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
         [sym_type_spec] = STATE(1087),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
         [sym_const_expr] = STATE(1087),
-        [sym_or_expr] = STATE(589),
-        [sym_xor_expr] = STATE(584),
-        [sym_and_expr] = STATE(567),
-        [sym_shift_expr] = STATE(562),
+        [sym_or_expr] = STATE(595),
+        [sym_xor_expr] = STATE(580),
+        [sym_and_expr] = STATE(579),
+        [sym_shift_expr] = STATE(563),
         [sym_add_expr] = STATE(552),
-        [sym_mult_expr] = STATE(484),
-        [sym_unary_expr] = STATE(483),
-        [sym_primary_expr] = STATE(482),
+        [sym_mult_expr] = STATE(477),
+        [sym_unary_expr] = STATE(482),
+        [sym_primary_expr] = STATE(494),
         [sym_unary_operator] = STATE(432),
-        [sym_literal] = STATE(481),
-        [sym_integer_literal] = STATE(480),
-        [sym_integer_sign] = STATE(587),
-        [sym_oct_number] = STATE(467),
-        [sym_dec_number] = STATE(454),
-        [sym_floating_pt_literal] = STATE(480),
-        [sym_fixed_pt_literal] = STATE(480),
-        [sym_string_literal] = STATE(480),
-        [sym_wide_string_literal] = STATE(480),
-        [sym_char_literal] = STATE(480),
-        [sym_wide_character_literal] = STATE(480),
-        [sym_boolean_literal] = STATE(480),
+        [sym_literal] = STATE(489),
+        [sym_integer_literal] = STATE(492),
+        [sym_integer_sign] = STATE(582),
+        [sym_oct_number] = STATE(459),
+        [sym_dec_number] = STATE(455),
+        [sym_floating_pt_literal] = STATE(492),
+        [sym_fixed_pt_literal] = STATE(492),
+        [sym_string_literal] = STATE(492),
+        [sym_wide_string_literal] = STATE(492),
+        [sym_char_literal] = STATE(492),
+        [sym_wide_character_literal] = STATE(492),
+        [sym_boolean_literal] = STATE(492),
         [sym_actual_parameters] = STATE(1252),
-        [sym_actual_parameter] = STATE(919),
+        [sym_actual_parameter] = STATE(927),
         [sym_object_type] = STATE(775),
         [sym_comment] = STATE(21),
         [anon_sym_short] = ACTIONS(67),
@@ -24708,102 +24715,6 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [22] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
-        [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
-        [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(551),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
-        [sym_type_spec] = STATE(1087),
-        [sym_simple_type_spec] = STATE(691),
-        [sym_base_type_spec] = STATE(781),
-        [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_const_expr] = STATE(1087),
-        [sym_or_expr] = STATE(589),
-        [sym_xor_expr] = STATE(584),
-        [sym_and_expr] = STATE(567),
-        [sym_shift_expr] = STATE(562),
-        [sym_add_expr] = STATE(552),
-        [sym_mult_expr] = STATE(484),
-        [sym_unary_expr] = STATE(483),
-        [sym_primary_expr] = STATE(482),
-        [sym_unary_operator] = STATE(432),
-        [sym_literal] = STATE(481),
-        [sym_integer_literal] = STATE(480),
-        [sym_integer_sign] = STATE(587),
-        [sym_oct_number] = STATE(467),
-        [sym_dec_number] = STATE(454),
-        [sym_floating_pt_literal] = STATE(480),
-        [sym_fixed_pt_literal] = STATE(480),
-        [sym_string_literal] = STATE(480),
-        [sym_wide_string_literal] = STATE(480),
-        [sym_char_literal] = STATE(480),
-        [sym_wide_character_literal] = STATE(480),
-        [sym_boolean_literal] = STATE(480),
-        [sym_actual_parameter] = STATE(1057),
-        [sym_object_type] = STATE(775),
-        [sym_comment] = STATE(22),
-        [anon_sym_short] = ACTIONS(67),
-        [anon_sym_int16] = ACTIONS(67),
-        [anon_sym_long] = ACTIONS(69),
-        [anon_sym_int32] = ACTIONS(69),
-        [anon_sym_longlong] = ACTIONS(71),
-        [anon_sym_int64] = ACTIONS(73),
-        [sym_unsigned_tiny_int] = ACTIONS(75),
-        [sym_boolean_type] = ACTIONS(77),
-        [anon_sym_fixed] = ACTIONS(79),
-        [sym_octet_type] = ACTIONS(77),
-        [sym_signed_tiny_int] = ACTIONS(81),
-        [anon_sym_unsignedshort] = ACTIONS(83),
-        [anon_sym_uint16] = ACTIONS(85),
-        [anon_sym_unsignedlong] = ACTIONS(87),
-        [anon_sym_uint32] = ACTIONS(87),
-        [anon_sym_unsignedlonglong] = ACTIONS(89),
-        [anon_sym_uint64] = ACTIONS(91),
-        [anon_sym_float] = ACTIONS(93),
-        [anon_sym_double] = ACTIONS(93),
-        [anon_sym_longdouble] = ACTIONS(95),
-        [sym_char_type] = ACTIONS(77),
-        [sym_wide_char_type] = ACTIONS(77),
-        [anon_sym_COLON_COLON] = ACTIONS(594),
-        [anon_sym_string] = ACTIONS(99),
-        [anon_sym_wstring] = ACTIONS(101),
-        [anon_sym_any] = ACTIONS(103),
-        [anon_sym_sequence] = ACTIONS(105),
-        [anon_sym_map] = ACTIONS(107),
-        [anon_sym_PLUS] = ACTIONS(596),
-        [anon_sym_DASH] = ACTIONS(596),
-        [anon_sym_LPAREN] = ACTIONS(598),
-        [anon_sym_TILDE] = ACTIONS(600),
-        [sym_bin_number] = ACTIONS(602),
-        [aux_sym_oct_number_token1] = ACTIONS(604),
-        [aux_sym_oct_number_token2] = ACTIONS(604),
-        [anon_sym_0] = ACTIONS(606),
-        [aux_sym_dec_number_token1] = ACTIONS(608),
-        [sym_hex_number] = ACTIONS(602),
-        [anon_sym_DQUOTE] = ACTIONS(610),
-        [anon_sym_L] = ACTIONS(612),
-        [anon_sym_SQUOTE] = ACTIONS(614),
-        [anon_sym_TRUE] = ACTIONS(616),
-        [anon_sym_FALSE] = ACTIONS(616),
-        [anon_sym_Object] = ACTIONS(151),
-        [sym_value_base_type] = ACTIONS(77),
-        [sym_identifier] = ACTIONS(157),
-        [anon_sym_SLASH_SLASH] = ACTIONS(618),
-        [anon_sym_SLASH_STAR] = ACTIONS(5),
-    },
-    [23] = {
         [sym_preproc_define] = STATE(420),
         [sym_preproc_call] = STATE(420),
         [sym_preproc_include] = STATE(420),
@@ -24813,13 +24724,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
-        [sym_tpl_definition] = STATE(427),
+        [sym_tpl_definition] = STATE(431),
         [sym_template_module_inst] = STATE(1587),
         [sym_template_module_ref] = STATE(1494),
         [sym_value_dcl] = STATE(1587),
@@ -24828,10 +24739,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -24853,53 +24764,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(426),
+        [sym_definition] = STATE(427),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
-        [sym_comment] = STATE(23),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [sym_comment] = STATE(22),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [aux_sym_template_module_dcl_repeat1] = STATE(23),
-        [anon_sym_POUNDdefine] = ACTIONS(620),
-        [sym_preproc_directive] = ACTIONS(623),
-        [aux_sym_preproc_include_token1] = ACTIONS(626),
-        [anon_sym_exception] = ACTIONS(629),
-        [anon_sym_RBRACE] = ACTIONS(632),
-        [anon_sym_local] = ACTIONS(634),
-        [anon_sym_abstract] = ACTIONS(637),
-        [anon_sym_interface] = ACTIONS(640),
-        [anon_sym_bitset] = ACTIONS(643),
-        [anon_sym_bitmask] = ACTIONS(646),
-        [anon_sym_ATannotation] = ACTIONS(649),
-        [anon_sym_AT] = ACTIONS(652),
-        [anon_sym_SLASH_SLASH_AT] = ACTIONS(655),
-        [anon_sym_module] = ACTIONS(658),
-        [anon_sym_valuetype] = ACTIONS(661),
-        [anon_sym_eventtype] = ACTIONS(664),
-        [anon_sym_struct] = ACTIONS(667),
-        [anon_sym_union] = ACTIONS(670),
-        [anon_sym_enum] = ACTIONS(673),
-        [anon_sym_const] = ACTIONS(676),
-        [anon_sym_alias] = ACTIONS(679),
-        [anon_sym_custom] = ACTIONS(682),
-        [anon_sym_typedef] = ACTIONS(685),
-        [anon_sym_typeid] = ACTIONS(688),
-        [anon_sym_typeprefix] = ACTIONS(691),
-        [anon_sym_import] = ACTIONS(694),
-        [anon_sym_component] = ACTIONS(697),
-        [anon_sym_home] = ACTIONS(700),
-        [anon_sym_porttype] = ACTIONS(703),
-        [anon_sym_connector] = ACTIONS(706),
-        [anon_sym_native] = ACTIONS(709),
+        [anon_sym_POUNDdefine] = ACTIONS(9),
+        [sym_preproc_directive] = ACTIONS(11),
+        [aux_sym_preproc_include_token1] = ACTIONS(13),
+        [anon_sym_exception] = ACTIONS(15),
+        [anon_sym_RBRACE] = ACTIONS(620),
+        [anon_sym_local] = ACTIONS(17),
+        [anon_sym_abstract] = ACTIONS(19),
+        [anon_sym_interface] = ACTIONS(21),
+        [anon_sym_bitset] = ACTIONS(23),
+        [anon_sym_bitmask] = ACTIONS(25),
+        [anon_sym_ATannotation] = ACTIONS(27),
+        [anon_sym_AT] = ACTIONS(29),
+        [anon_sym_SLASH_SLASH_AT] = ACTIONS(31),
+        [anon_sym_module] = ACTIONS(33),
+        [anon_sym_valuetype] = ACTIONS(35),
+        [anon_sym_eventtype] = ACTIONS(37),
+        [anon_sym_struct] = ACTIONS(39),
+        [anon_sym_union] = ACTIONS(41),
+        [anon_sym_enum] = ACTIONS(43),
+        [anon_sym_const] = ACTIONS(45),
+        [anon_sym_alias] = ACTIONS(622),
+        [anon_sym_custom] = ACTIONS(47),
+        [anon_sym_typedef] = ACTIONS(49),
+        [anon_sym_typeid] = ACTIONS(51),
+        [anon_sym_typeprefix] = ACTIONS(53),
+        [anon_sym_import] = ACTIONS(55),
+        [anon_sym_component] = ACTIONS(57),
+        [anon_sym_home] = ACTIONS(59),
+        [anon_sym_porttype] = ACTIONS(61),
+        [anon_sym_connector] = ACTIONS(63),
+        [anon_sym_native] = ACTIONS(65),
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [24] = {
+    [23] = {
         [sym_preproc_define] = STATE(420),
         [sym_preproc_call] = STATE(420),
         [sym_preproc_include] = STATE(420),
@@ -24909,13 +24820,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
-        [sym_tpl_definition] = STATE(427),
+        [sym_tpl_definition] = STATE(431),
         [sym_template_module_inst] = STATE(1587),
         [sym_template_module_ref] = STATE(1494),
         [sym_value_dcl] = STATE(1587),
@@ -24924,10 +24835,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -24949,23 +24860,23 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(426),
+        [sym_definition] = STATE(427),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
-        [sym_comment] = STATE(24),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
-        [aux_sym_template_module_dcl_repeat1] = STATE(23),
+        [sym_comment] = STATE(23),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
+        [aux_sym_template_module_dcl_repeat1] = STATE(24),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
         [aux_sym_preproc_include_token1] = ACTIONS(13),
         [anon_sym_exception] = ACTIONS(15),
-        [anon_sym_RBRACE] = ACTIONS(712),
+        [anon_sym_RBRACE] = ACTIONS(624),
         [anon_sym_local] = ACTIONS(17),
         [anon_sym_abstract] = ACTIONS(19),
         [anon_sym_interface] = ACTIONS(21),
@@ -24981,7 +24892,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_union] = ACTIONS(41),
         [anon_sym_enum] = ACTIONS(43),
         [anon_sym_const] = ACTIONS(45),
-        [anon_sym_alias] = ACTIONS(714),
+        [anon_sym_alias] = ACTIONS(622),
         [anon_sym_custom] = ACTIONS(47),
         [anon_sym_typedef] = ACTIONS(49),
         [anon_sym_typeid] = ACTIONS(51),
@@ -24995,7 +24906,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [25] = {
+    [24] = {
         [sym_preproc_define] = STATE(420),
         [sym_preproc_call] = STATE(420),
         [sym_preproc_include] = STATE(420),
@@ -25005,13 +24916,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
-        [sym_tpl_definition] = STATE(427),
+        [sym_tpl_definition] = STATE(431),
         [sym_template_module_inst] = STATE(1587),
         [sym_template_module_ref] = STATE(1494),
         [sym_value_dcl] = STATE(1587),
@@ -25020,10 +24931,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25045,52 +24956,148 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(426),
+        [sym_definition] = STATE(427),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
-        [sym_comment] = STATE(25),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [sym_comment] = STATE(24),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [aux_sym_template_module_dcl_repeat1] = STATE(24),
-        [anon_sym_POUNDdefine] = ACTIONS(9),
-        [sym_preproc_directive] = ACTIONS(11),
-        [aux_sym_preproc_include_token1] = ACTIONS(13),
-        [anon_sym_exception] = ACTIONS(15),
-        [anon_sym_RBRACE] = ACTIONS(716),
-        [anon_sym_local] = ACTIONS(17),
-        [anon_sym_abstract] = ACTIONS(19),
-        [anon_sym_interface] = ACTIONS(21),
-        [anon_sym_bitset] = ACTIONS(23),
-        [anon_sym_bitmask] = ACTIONS(25),
-        [anon_sym_ATannotation] = ACTIONS(27),
-        [anon_sym_AT] = ACTIONS(29),
-        [anon_sym_SLASH_SLASH_AT] = ACTIONS(31),
-        [anon_sym_module] = ACTIONS(33),
-        [anon_sym_valuetype] = ACTIONS(35),
-        [anon_sym_eventtype] = ACTIONS(37),
-        [anon_sym_struct] = ACTIONS(39),
-        [anon_sym_union] = ACTIONS(41),
-        [anon_sym_enum] = ACTIONS(43),
-        [anon_sym_const] = ACTIONS(45),
-        [anon_sym_alias] = ACTIONS(714),
-        [anon_sym_custom] = ACTIONS(47),
-        [anon_sym_typedef] = ACTIONS(49),
-        [anon_sym_typeid] = ACTIONS(51),
-        [anon_sym_typeprefix] = ACTIONS(53),
-        [anon_sym_import] = ACTIONS(55),
-        [anon_sym_component] = ACTIONS(57),
-        [anon_sym_home] = ACTIONS(59),
-        [anon_sym_porttype] = ACTIONS(61),
-        [anon_sym_connector] = ACTIONS(63),
-        [anon_sym_native] = ACTIONS(65),
+        [anon_sym_POUNDdefine] = ACTIONS(626),
+        [sym_preproc_directive] = ACTIONS(629),
+        [aux_sym_preproc_include_token1] = ACTIONS(632),
+        [anon_sym_exception] = ACTIONS(635),
+        [anon_sym_RBRACE] = ACTIONS(638),
+        [anon_sym_local] = ACTIONS(640),
+        [anon_sym_abstract] = ACTIONS(643),
+        [anon_sym_interface] = ACTIONS(646),
+        [anon_sym_bitset] = ACTIONS(649),
+        [anon_sym_bitmask] = ACTIONS(652),
+        [anon_sym_ATannotation] = ACTIONS(655),
+        [anon_sym_AT] = ACTIONS(658),
+        [anon_sym_SLASH_SLASH_AT] = ACTIONS(661),
+        [anon_sym_module] = ACTIONS(664),
+        [anon_sym_valuetype] = ACTIONS(667),
+        [anon_sym_eventtype] = ACTIONS(670),
+        [anon_sym_struct] = ACTIONS(673),
+        [anon_sym_union] = ACTIONS(676),
+        [anon_sym_enum] = ACTIONS(679),
+        [anon_sym_const] = ACTIONS(682),
+        [anon_sym_alias] = ACTIONS(685),
+        [anon_sym_custom] = ACTIONS(688),
+        [anon_sym_typedef] = ACTIONS(691),
+        [anon_sym_typeid] = ACTIONS(694),
+        [anon_sym_typeprefix] = ACTIONS(697),
+        [anon_sym_import] = ACTIONS(700),
+        [anon_sym_component] = ACTIONS(703),
+        [anon_sym_home] = ACTIONS(706),
+        [anon_sym_porttype] = ACTIONS(709),
+        [anon_sym_connector] = ACTIONS(712),
+        [anon_sym_native] = ACTIONS(715),
         [anon_sym_SLASH_SLASH] = ACTIONS(3),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
+    [25] = {
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
+        [sym_integer_type] = STATE(775),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
+        [sym_floating_pt_type] = STATE(775),
+        [sym_scoped_name] = STATE(554),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
+        [sym_type_spec] = STATE(1087),
+        [sym_simple_type_spec] = STATE(693),
+        [sym_base_type_spec] = STATE(781),
+        [sym_any_type] = STATE(775),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_const_expr] = STATE(1087),
+        [sym_or_expr] = STATE(595),
+        [sym_xor_expr] = STATE(580),
+        [sym_and_expr] = STATE(579),
+        [sym_shift_expr] = STATE(563),
+        [sym_add_expr] = STATE(552),
+        [sym_mult_expr] = STATE(477),
+        [sym_unary_expr] = STATE(482),
+        [sym_primary_expr] = STATE(494),
+        [sym_unary_operator] = STATE(432),
+        [sym_literal] = STATE(489),
+        [sym_integer_literal] = STATE(492),
+        [sym_integer_sign] = STATE(582),
+        [sym_oct_number] = STATE(459),
+        [sym_dec_number] = STATE(455),
+        [sym_floating_pt_literal] = STATE(492),
+        [sym_fixed_pt_literal] = STATE(492),
+        [sym_string_literal] = STATE(492),
+        [sym_wide_string_literal] = STATE(492),
+        [sym_char_literal] = STATE(492),
+        [sym_wide_character_literal] = STATE(492),
+        [sym_boolean_literal] = STATE(492),
+        [sym_actual_parameter] = STATE(1064),
+        [sym_object_type] = STATE(775),
+        [sym_comment] = STATE(25),
+        [anon_sym_short] = ACTIONS(67),
+        [anon_sym_int16] = ACTIONS(67),
+        [anon_sym_long] = ACTIONS(69),
+        [anon_sym_int32] = ACTIONS(69),
+        [anon_sym_longlong] = ACTIONS(71),
+        [anon_sym_int64] = ACTIONS(73),
+        [sym_unsigned_tiny_int] = ACTIONS(75),
+        [sym_boolean_type] = ACTIONS(77),
+        [anon_sym_fixed] = ACTIONS(79),
+        [sym_octet_type] = ACTIONS(77),
+        [sym_signed_tiny_int] = ACTIONS(81),
+        [anon_sym_unsignedshort] = ACTIONS(83),
+        [anon_sym_uint16] = ACTIONS(85),
+        [anon_sym_unsignedlong] = ACTIONS(87),
+        [anon_sym_uint32] = ACTIONS(87),
+        [anon_sym_unsignedlonglong] = ACTIONS(89),
+        [anon_sym_uint64] = ACTIONS(91),
+        [anon_sym_float] = ACTIONS(93),
+        [anon_sym_double] = ACTIONS(93),
+        [anon_sym_longdouble] = ACTIONS(95),
+        [sym_char_type] = ACTIONS(77),
+        [sym_wide_char_type] = ACTIONS(77),
+        [anon_sym_COLON_COLON] = ACTIONS(594),
+        [anon_sym_string] = ACTIONS(99),
+        [anon_sym_wstring] = ACTIONS(101),
+        [anon_sym_any] = ACTIONS(103),
+        [anon_sym_sequence] = ACTIONS(105),
+        [anon_sym_map] = ACTIONS(107),
+        [anon_sym_PLUS] = ACTIONS(596),
+        [anon_sym_DASH] = ACTIONS(596),
+        [anon_sym_LPAREN] = ACTIONS(598),
+        [anon_sym_TILDE] = ACTIONS(600),
+        [sym_bin_number] = ACTIONS(602),
+        [aux_sym_oct_number_token1] = ACTIONS(604),
+        [aux_sym_oct_number_token2] = ACTIONS(604),
+        [anon_sym_0] = ACTIONS(606),
+        [aux_sym_dec_number_token1] = ACTIONS(608),
+        [sym_hex_number] = ACTIONS(602),
+        [anon_sym_DQUOTE] = ACTIONS(610),
+        [anon_sym_L] = ACTIONS(612),
+        [anon_sym_SQUOTE] = ACTIONS(614),
+        [anon_sym_TRUE] = ACTIONS(616),
+        [anon_sym_FALSE] = ACTIONS(616),
+        [anon_sym_Object] = ACTIONS(151),
+        [sym_value_base_type] = ACTIONS(77),
+        [sym_identifier] = ACTIONS(157),
+        [anon_sym_SLASH_SLASH] = ACTIONS(618),
+        [anon_sym_SLASH_STAR] = ACTIONS(5),
+    },
     [26] = {
         [sym_preproc_define] = STATE(420),
         [sym_preproc_call] = STATE(420),
@@ -25101,11 +25108,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -25114,10 +25121,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25139,18 +25146,18 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(26),
         [aux_sym_specification_repeat1] = STATE(26),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [ts_builtin_sym_end] = ACTIONS(718),
         [anon_sym_POUNDdefine] = ACTIONS(720),
         [sym_preproc_directive] = ACTIONS(723),
@@ -25195,11 +25202,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -25208,10 +25215,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25233,18 +25240,18 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(27),
         [aux_sym_specification_repeat1] = STATE(26),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
         [aux_sym_preproc_include_token1] = ACTIONS(13),
@@ -25288,11 +25295,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -25301,10 +25308,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25326,18 +25333,18 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(28),
         [aux_sym_specification_repeat1] = STATE(26),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
         [aux_sym_preproc_include_token1] = ACTIONS(13),
@@ -25381,11 +25388,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -25394,10 +25401,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25419,23 +25426,23 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(29),
-        [aux_sym_specification_repeat1] = STATE(28),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [aux_sym_specification_repeat1] = STATE(26),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
+        [ts_builtin_sym_end] = ACTIONS(811),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
         [aux_sym_preproc_include_token1] = ACTIONS(13),
         [anon_sym_exception] = ACTIONS(15),
-        [anon_sym_RBRACE] = ACTIONS(811),
         [anon_sym_local] = ACTIONS(17),
         [anon_sym_abstract] = ACTIONS(19),
         [anon_sym_interface] = ACTIONS(21),
@@ -25474,11 +25481,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -25487,10 +25494,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25512,23 +25519,23 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(30),
-        [aux_sym_specification_repeat1] = STATE(26),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
-        [ts_builtin_sym_end] = ACTIONS(813),
+        [aux_sym_specification_repeat1] = STATE(27),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
         [aux_sym_preproc_include_token1] = ACTIONS(13),
         [anon_sym_exception] = ACTIONS(15),
+        [anon_sym_RBRACE] = ACTIONS(813),
         [anon_sym_local] = ACTIONS(17),
         [anon_sym_abstract] = ACTIONS(19),
         [anon_sym_interface] = ACTIONS(21),
@@ -25567,11 +25574,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_interface_forward_dcl] = STATE(1584),
         [sym_interface_def] = STATE(1584),
         [sym_interface_header] = STATE(1583),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_dcl] = STATE(1587),
-        [sym_annotation_appl] = STATE(548),
-        [sym_extend_annotation_appl] = STATE(536),
+        [sym_annotation_appl] = STATE(508),
+        [sym_extend_annotation_appl] = STATE(510),
         [sym_template_module_dcl] = STATE(1587),
         [sym_template_module_inst] = STATE(1587),
         [sym_value_dcl] = STATE(1587),
@@ -25580,10 +25587,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_value_header] = STATE(1579),
         [sym_value_forward_dcl] = STATE(1581),
         [sym_typedef_dcl] = STATE(1577),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_type_id_dcl] = STATE(1587),
         [sym_type_prefix_dcl] = STATE(1587),
         [sym_import_dcl] = STATE(1587),
@@ -25605,23 +25612,23 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_porttype_def] = STATE(1567),
         [sym_connector_dcl] = STATE(1587),
         [sym_connector_header] = STATE(1566),
-        [sym_definition] = STATE(429),
+        [sym_definition] = STATE(430),
         [sym_type_dcl] = STATE(1587),
         [sym_constr_type_dcl] = STATE(1577),
         [sym_native_dcl] = STATE(1577),
         [sym_module_dcl] = STATE(1587),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_const_dcl] = STATE(1587),
         [sym_comment] = STATE(31),
-        [aux_sym_specification_repeat1] = STATE(27),
-        [aux_sym_interface_dcl_repeat1] = STATE(419),
+        [aux_sym_specification_repeat1] = STATE(28),
+        [aux_sym_interface_dcl_repeat1] = STATE(422),
         [anon_sym_POUNDdefine] = ACTIONS(9),
         [sym_preproc_directive] = ACTIONS(11),
         [aux_sym_preproc_include_token1] = ACTIONS(13),
         [anon_sym_exception] = ACTIONS(15),
-        [anon_sym_RBRACE] = ACTIONS(809),
+        [anon_sym_RBRACE] = ACTIONS(807),
         [anon_sym_local] = ACTIONS(17),
         [anon_sym_abstract] = ACTIONS(19),
         [anon_sym_interface] = ACTIONS(21),
@@ -25651,44 +25658,44 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [32] = {
-        [sym_scoped_name] = STATE(637),
-        [sym_annotation_appl_custom_body] = STATE(613),
-        [sym_annotation_appl_builtin_body] = STATE(613),
-        [sym_annotation_appl_id] = STATE(982),
-        [sym_annotation_appl_autoid] = STATE(982),
-        [sym_annotation_appl_optional] = STATE(982),
-        [sym_annotation_appl_position] = STATE(982),
-        [sym_annotation_appl_value] = STATE(982),
-        [sym_annotation_appl_extensibility] = STATE(982),
-        [sym_annotation_appl_final] = STATE(982),
-        [sym_annotation_appl_appendable] = STATE(982),
-        [sym_annotation_appl_mutable] = STATE(982),
-        [sym_annotation_appl_key] = STATE(982),
-        [sym_annotation_appl_must_understand] = STATE(982),
-        [sym_annotation_appl_default_literal] = STATE(982),
-        [sym_annotation_appl_default] = STATE(982),
-        [sym_annotation_appl_range] = STATE(982),
-        [sym_annotation_appl_min] = STATE(982),
-        [sym_annotation_appl_max] = STATE(982),
-        [sym_annotation_appl_unit] = STATE(982),
-        [sym_annotation_appl_bit_bound] = STATE(982),
-        [sym_annotation_appl_external] = STATE(982),
-        [sym_annotation_appl_nested] = STATE(982),
-        [sym_annotation_appl_verbatim] = STATE(982),
-        [sym_annotation_appl_service] = STATE(982),
-        [sym_annotation_appl_oneway] = STATE(982),
-        [sym_annotation_appl_ami] = STATE(982),
-        [sym_annotation_appl_hashid] = STATE(982),
-        [sym_annotation_appl_default_nested] = STATE(982),
-        [sym_annotation_appl_ignore_literal_names] = STATE(982),
-        [sym_annotation_appl_try_construct] = STATE(982),
-        [sym_try_construct_fail_action] = STATE(982),
-        [sym_annotation_appl_non_serialized] = STATE(982),
-        [sym_annotation_appl_data_representation] = STATE(982),
-        [sym_data_representation_mask] = STATE(982),
-        [sym_annotation_appl_topic] = STATE(982),
-        [sym_annotation_appl_dds_request_topic] = STATE(982),
-        [sym_annotation_appl_dds_reply_topic] = STATE(982),
+        [sym_scoped_name] = STATE(628),
+        [sym_annotation_appl_custom_body] = STATE(846),
+        [sym_annotation_appl_builtin_body] = STATE(846),
+        [sym_annotation_appl_id] = STATE(844),
+        [sym_annotation_appl_autoid] = STATE(844),
+        [sym_annotation_appl_optional] = STATE(844),
+        [sym_annotation_appl_position] = STATE(844),
+        [sym_annotation_appl_value] = STATE(844),
+        [sym_annotation_appl_extensibility] = STATE(844),
+        [sym_annotation_appl_final] = STATE(844),
+        [sym_annotation_appl_appendable] = STATE(844),
+        [sym_annotation_appl_mutable] = STATE(844),
+        [sym_annotation_appl_key] = STATE(844),
+        [sym_annotation_appl_must_understand] = STATE(844),
+        [sym_annotation_appl_default_literal] = STATE(844),
+        [sym_annotation_appl_default] = STATE(844),
+        [sym_annotation_appl_range] = STATE(844),
+        [sym_annotation_appl_min] = STATE(844),
+        [sym_annotation_appl_max] = STATE(844),
+        [sym_annotation_appl_unit] = STATE(844),
+        [sym_annotation_appl_bit_bound] = STATE(844),
+        [sym_annotation_appl_external] = STATE(844),
+        [sym_annotation_appl_nested] = STATE(844),
+        [sym_annotation_appl_verbatim] = STATE(844),
+        [sym_annotation_appl_service] = STATE(844),
+        [sym_annotation_appl_oneway] = STATE(844),
+        [sym_annotation_appl_ami] = STATE(844),
+        [sym_annotation_appl_hashid] = STATE(844),
+        [sym_annotation_appl_default_nested] = STATE(844),
+        [sym_annotation_appl_ignore_literal_names] = STATE(844),
+        [sym_annotation_appl_try_construct] = STATE(844),
+        [sym_try_construct_fail_action] = STATE(844),
+        [sym_annotation_appl_non_serialized] = STATE(844),
+        [sym_annotation_appl_data_representation] = STATE(844),
+        [sym_data_representation_mask] = STATE(844),
+        [sym_annotation_appl_topic] = STATE(844),
+        [sym_annotation_appl_dds_request_topic] = STATE(844),
+        [sym_annotation_appl_dds_reply_topic] = STATE(844),
         [sym_comment] = STATE(32),
         [anon_sym_COLON_COLON] = ACTIONS(815),
         [aux_sym_annotation_appl_id_token1] = ACTIONS(817),
@@ -25739,45 +25746,133 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [33] = {
-        [sym_scoped_name] = STATE(646),
-        [sym_annotation_appl_custom_body] = STATE(840),
-        [sym_annotation_appl_builtin_body] = STATE(840),
-        [sym_annotation_appl_id] = STATE(839),
-        [sym_annotation_appl_autoid] = STATE(839),
-        [sym_annotation_appl_optional] = STATE(839),
-        [sym_annotation_appl_position] = STATE(839),
-        [sym_annotation_appl_value] = STATE(839),
-        [sym_annotation_appl_extensibility] = STATE(839),
-        [sym_annotation_appl_final] = STATE(839),
-        [sym_annotation_appl_appendable] = STATE(839),
-        [sym_annotation_appl_mutable] = STATE(839),
-        [sym_annotation_appl_key] = STATE(839),
-        [sym_annotation_appl_must_understand] = STATE(839),
-        [sym_annotation_appl_default_literal] = STATE(839),
-        [sym_annotation_appl_default] = STATE(839),
-        [sym_annotation_appl_range] = STATE(839),
-        [sym_annotation_appl_min] = STATE(839),
-        [sym_annotation_appl_max] = STATE(839),
-        [sym_annotation_appl_unit] = STATE(839),
-        [sym_annotation_appl_bit_bound] = STATE(839),
-        [sym_annotation_appl_external] = STATE(839),
-        [sym_annotation_appl_nested] = STATE(839),
-        [sym_annotation_appl_verbatim] = STATE(839),
-        [sym_annotation_appl_service] = STATE(839),
-        [sym_annotation_appl_oneway] = STATE(839),
-        [sym_annotation_appl_ami] = STATE(839),
-        [sym_annotation_appl_hashid] = STATE(839),
-        [sym_annotation_appl_default_nested] = STATE(839),
-        [sym_annotation_appl_ignore_literal_names] = STATE(839),
-        [sym_annotation_appl_try_construct] = STATE(839),
-        [sym_try_construct_fail_action] = STATE(839),
-        [sym_annotation_appl_non_serialized] = STATE(839),
-        [sym_annotation_appl_data_representation] = STATE(839),
-        [sym_data_representation_mask] = STATE(839),
-        [sym_annotation_appl_topic] = STATE(839),
-        [sym_annotation_appl_dds_request_topic] = STATE(839),
-        [sym_annotation_appl_dds_reply_topic] = STATE(839),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
+        [sym_integer_type] = STATE(775),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
+        [sym_floating_pt_type] = STATE(775),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
+        [sym_type_spec] = STATE(1215),
+        [sym_simple_type_spec] = STATE(693),
+        [sym_base_type_spec] = STATE(781),
+        [sym_any_type] = STATE(775),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_op_type_spec] = STATE(1275),
+        [sym_readonly_attr_spec] = STATE(1276),
+        [sym_attr_spec] = STATE(1276),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
+        [sym_annotation_appl] = STATE(176),
+        [sym_extend_annotation_appl] = STATE(181),
+        [sym_typedef_dcl] = STATE(1488),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
+        [sym_object_type] = STATE(775),
+        [sym_constr_type_dcl] = STATE(1488),
+        [sym_native_dcl] = STATE(1488),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_comment] = STATE(33),
+        [aux_sym_interface_dcl_repeat1] = STATE(99),
+        [anon_sym_short] = ACTIONS(67),
+        [anon_sym_int16] = ACTIONS(67),
+        [anon_sym_long] = ACTIONS(69),
+        [anon_sym_int32] = ACTIONS(69),
+        [anon_sym_longlong] = ACTIONS(71),
+        [anon_sym_int64] = ACTIONS(73),
+        [sym_unsigned_tiny_int] = ACTIONS(75),
+        [sym_boolean_type] = ACTIONS(77),
+        [anon_sym_fixed] = ACTIONS(79),
+        [sym_octet_type] = ACTIONS(77),
+        [sym_signed_tiny_int] = ACTIONS(81),
+        [anon_sym_unsignedshort] = ACTIONS(83),
+        [anon_sym_uint16] = ACTIONS(85),
+        [anon_sym_unsignedlong] = ACTIONS(87),
+        [anon_sym_uint32] = ACTIONS(87),
+        [anon_sym_unsignedlonglong] = ACTIONS(89),
+        [anon_sym_uint64] = ACTIONS(91),
+        [anon_sym_float] = ACTIONS(93),
+        [anon_sym_double] = ACTIONS(93),
+        [anon_sym_longdouble] = ACTIONS(95),
+        [sym_char_type] = ACTIONS(77),
+        [sym_wide_char_type] = ACTIONS(77),
+        [anon_sym_COLON_COLON] = ACTIONS(97),
+        [anon_sym_string] = ACTIONS(99),
+        [anon_sym_wstring] = ACTIONS(101),
+        [anon_sym_any] = ACTIONS(103),
+        [anon_sym_sequence] = ACTIONS(105),
+        [anon_sym_map] = ACTIONS(107),
+        [anon_sym_void] = ACTIONS(115),
+        [anon_sym_readonly] = ACTIONS(117),
+        [anon_sym_attribute] = ACTIONS(119),
+        [anon_sym_bitset] = ACTIONS(121),
+        [anon_sym_bitmask] = ACTIONS(123),
+        [anon_sym_AT] = ACTIONS(125),
+        [anon_sym_SLASH_SLASH_AT] = ACTIONS(127),
+        [anon_sym_struct] = ACTIONS(131),
+        [anon_sym_union] = ACTIONS(133),
+        [anon_sym_enum] = ACTIONS(135),
+        [anon_sym_typedef] = ACTIONS(145),
+        [anon_sym_Object] = ACTIONS(151),
+        [sym_value_base_type] = ACTIONS(77),
+        [anon_sym_native] = ACTIONS(155),
+        [sym_identifier] = ACTIONS(157),
+        [anon_sym_SLASH_SLASH] = ACTIONS(3),
+        [anon_sym_SLASH_STAR] = ACTIONS(5),
+    },
+    [34] = {
+        [sym_scoped_name] = STATE(451),
+        [sym_annotation_appl_custom_body] = STATE(531),
+        [sym_annotation_appl_builtin_body] = STATE(531),
+        [sym_annotation_appl_id] = STATE(525),
+        [sym_annotation_appl_autoid] = STATE(525),
+        [sym_annotation_appl_optional] = STATE(525),
+        [sym_annotation_appl_position] = STATE(525),
+        [sym_annotation_appl_value] = STATE(525),
+        [sym_annotation_appl_extensibility] = STATE(525),
+        [sym_annotation_appl_final] = STATE(525),
+        [sym_annotation_appl_appendable] = STATE(525),
+        [sym_annotation_appl_mutable] = STATE(525),
+        [sym_annotation_appl_key] = STATE(525),
+        [sym_annotation_appl_must_understand] = STATE(525),
+        [sym_annotation_appl_default_literal] = STATE(525),
+        [sym_annotation_appl_default] = STATE(525),
+        [sym_annotation_appl_range] = STATE(525),
+        [sym_annotation_appl_min] = STATE(525),
+        [sym_annotation_appl_max] = STATE(525),
+        [sym_annotation_appl_unit] = STATE(525),
+        [sym_annotation_appl_bit_bound] = STATE(525),
+        [sym_annotation_appl_external] = STATE(525),
+        [sym_annotation_appl_nested] = STATE(525),
+        [sym_annotation_appl_verbatim] = STATE(525),
+        [sym_annotation_appl_service] = STATE(525),
+        [sym_annotation_appl_oneway] = STATE(525),
+        [sym_annotation_appl_ami] = STATE(525),
+        [sym_annotation_appl_hashid] = STATE(525),
+        [sym_annotation_appl_default_nested] = STATE(525),
+        [sym_annotation_appl_ignore_literal_names] = STATE(525),
+        [sym_annotation_appl_try_construct] = STATE(525),
+        [sym_try_construct_fail_action] = STATE(525),
+        [sym_annotation_appl_non_serialized] = STATE(525),
+        [sym_annotation_appl_data_representation] = STATE(525),
+        [sym_data_representation_mask] = STATE(525),
+        [sym_annotation_appl_topic] = STATE(525),
+        [sym_annotation_appl_dds_request_topic] = STATE(525),
+        [sym_annotation_appl_dds_reply_topic] = STATE(525),
+        [sym_comment] = STATE(34),
         [anon_sym_COLON_COLON] = ACTIONS(891),
         [aux_sym_annotation_appl_id_token1] = ACTIONS(893),
         [aux_sym_annotation_appl_autoid_token1] = ACTIONS(895),
@@ -25826,10 +25921,98 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_SLASH] = ACTIONS(618),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [34] = {
-        [sym_scoped_name] = STATE(637),
-        [sym_annotation_appl_custom_body] = STATE(985),
-        [sym_annotation_appl_builtin_body] = STATE(985),
+    [35] = {
+        [sym_scoped_name] = STATE(113),
+        [sym_annotation_appl_custom_body] = STATE(157),
+        [sym_annotation_appl_builtin_body] = STATE(157),
+        [sym_annotation_appl_id] = STATE(122),
+        [sym_annotation_appl_autoid] = STATE(122),
+        [sym_annotation_appl_optional] = STATE(122),
+        [sym_annotation_appl_position] = STATE(122),
+        [sym_annotation_appl_value] = STATE(122),
+        [sym_annotation_appl_extensibility] = STATE(122),
+        [sym_annotation_appl_final] = STATE(122),
+        [sym_annotation_appl_appendable] = STATE(122),
+        [sym_annotation_appl_mutable] = STATE(122),
+        [sym_annotation_appl_key] = STATE(122),
+        [sym_annotation_appl_must_understand] = STATE(122),
+        [sym_annotation_appl_default_literal] = STATE(122),
+        [sym_annotation_appl_default] = STATE(122),
+        [sym_annotation_appl_range] = STATE(122),
+        [sym_annotation_appl_min] = STATE(122),
+        [sym_annotation_appl_max] = STATE(122),
+        [sym_annotation_appl_unit] = STATE(122),
+        [sym_annotation_appl_bit_bound] = STATE(122),
+        [sym_annotation_appl_external] = STATE(122),
+        [sym_annotation_appl_nested] = STATE(122),
+        [sym_annotation_appl_verbatim] = STATE(122),
+        [sym_annotation_appl_service] = STATE(122),
+        [sym_annotation_appl_oneway] = STATE(122),
+        [sym_annotation_appl_ami] = STATE(122),
+        [sym_annotation_appl_hashid] = STATE(122),
+        [sym_annotation_appl_default_nested] = STATE(122),
+        [sym_annotation_appl_ignore_literal_names] = STATE(122),
+        [sym_annotation_appl_try_construct] = STATE(122),
+        [sym_try_construct_fail_action] = STATE(122),
+        [sym_annotation_appl_non_serialized] = STATE(122),
+        [sym_annotation_appl_data_representation] = STATE(122),
+        [sym_data_representation_mask] = STATE(122),
+        [sym_annotation_appl_topic] = STATE(122),
+        [sym_annotation_appl_dds_request_topic] = STATE(122),
+        [sym_annotation_appl_dds_reply_topic] = STATE(122),
+        [sym_comment] = STATE(35),
+        [anon_sym_COLON_COLON] = ACTIONS(967),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(969),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(971),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(973),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(975),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(977),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(979),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(981),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(983),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(985),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(987),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(989),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(991),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(993),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(995),
+        [aux_sym_min_expr_token1] = ACTIONS(997),
+        [aux_sym_max_expr_token1] = ACTIONS(999),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1001),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1003),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1005),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1007),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1009),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1011),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1013),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1015),
+        [anon_sym_hashid] = ACTIONS(1017),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1019),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1021),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1023),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1025),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1025),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1025),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1027),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1029),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1031),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1031),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1031),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1031),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1033),
+        [sym_annotation_appl_choice] = ACTIONS(1035),
+        [sym_annotation_appl_empty] = ACTIONS(1035),
+        [sym_annotation_appl_dds_service] = ACTIONS(1035),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1037),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1039),
+        [sym_identifier] = ACTIONS(1041),
+        [anon_sym_SLASH_SLASH] = ACTIONS(618),
+        [anon_sym_SLASH_STAR] = ACTIONS(5),
+    },
+    [36] = {
+        [sym_scoped_name] = STATE(646),
+        [sym_annotation_appl_custom_body] = STATE(626),
+        [sym_annotation_appl_builtin_body] = STATE(626),
         [sym_annotation_appl_id] = STATE(982),
         [sym_annotation_appl_autoid] = STATE(982),
         [sym_annotation_appl_optional] = STATE(982),
@@ -25865,182 +26048,6 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_annotation_appl_topic] = STATE(982),
         [sym_annotation_appl_dds_request_topic] = STATE(982),
         [sym_annotation_appl_dds_reply_topic] = STATE(982),
-        [sym_comment] = STATE(34),
-        [anon_sym_COLON_COLON] = ACTIONS(815),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(817),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(819),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(821),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(823),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(825),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(827),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(829),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(831),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(833),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(835),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(837),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(839),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(841),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(843),
-        [aux_sym_min_expr_token1] = ACTIONS(845),
-        [aux_sym_max_expr_token1] = ACTIONS(847),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(849),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(851),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(853),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(855),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(857),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(859),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(861),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(863),
-        [anon_sym_hashid] = ACTIONS(865),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(867),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(869),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(871),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(873),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(875),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(877),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(879),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(881),
-        [sym_annotation_appl_choice] = ACTIONS(883),
-        [sym_annotation_appl_empty] = ACTIONS(883),
-        [sym_annotation_appl_dds_service] = ACTIONS(883),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(885),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(887),
-        [sym_identifier] = ACTIONS(889),
-        [anon_sym_SLASH_SLASH] = ACTIONS(618),
-        [anon_sym_SLASH_STAR] = ACTIONS(5),
-    },
-    [35] = {
-        [sym_scoped_name] = STATE(452),
-        [sym_annotation_appl_custom_body] = STATE(546),
-        [sym_annotation_appl_builtin_body] = STATE(546),
-        [sym_annotation_appl_id] = STATE(549),
-        [sym_annotation_appl_autoid] = STATE(549),
-        [sym_annotation_appl_optional] = STATE(549),
-        [sym_annotation_appl_position] = STATE(549),
-        [sym_annotation_appl_value] = STATE(549),
-        [sym_annotation_appl_extensibility] = STATE(549),
-        [sym_annotation_appl_final] = STATE(549),
-        [sym_annotation_appl_appendable] = STATE(549),
-        [sym_annotation_appl_mutable] = STATE(549),
-        [sym_annotation_appl_key] = STATE(549),
-        [sym_annotation_appl_must_understand] = STATE(549),
-        [sym_annotation_appl_default_literal] = STATE(549),
-        [sym_annotation_appl_default] = STATE(549),
-        [sym_annotation_appl_range] = STATE(549),
-        [sym_annotation_appl_min] = STATE(549),
-        [sym_annotation_appl_max] = STATE(549),
-        [sym_annotation_appl_unit] = STATE(549),
-        [sym_annotation_appl_bit_bound] = STATE(549),
-        [sym_annotation_appl_external] = STATE(549),
-        [sym_annotation_appl_nested] = STATE(549),
-        [sym_annotation_appl_verbatim] = STATE(549),
-        [sym_annotation_appl_service] = STATE(549),
-        [sym_annotation_appl_oneway] = STATE(549),
-        [sym_annotation_appl_ami] = STATE(549),
-        [sym_annotation_appl_hashid] = STATE(549),
-        [sym_annotation_appl_default_nested] = STATE(549),
-        [sym_annotation_appl_ignore_literal_names] = STATE(549),
-        [sym_annotation_appl_try_construct] = STATE(549),
-        [sym_try_construct_fail_action] = STATE(549),
-        [sym_annotation_appl_non_serialized] = STATE(549),
-        [sym_annotation_appl_data_representation] = STATE(549),
-        [sym_data_representation_mask] = STATE(549),
-        [sym_annotation_appl_topic] = STATE(549),
-        [sym_annotation_appl_dds_request_topic] = STATE(549),
-        [sym_annotation_appl_dds_reply_topic] = STATE(549),
-        [sym_comment] = STATE(35),
-        [anon_sym_COLON_COLON] = ACTIONS(967),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(969),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(971),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(973),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(975),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(977),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(979),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(981),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(983),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(985),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(987),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(989),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(991),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(993),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(995),
-        [aux_sym_min_expr_token1] = ACTIONS(997),
-        [aux_sym_max_expr_token1] = ACTIONS(999),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1001),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1003),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(1005),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1007),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1009),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(1011),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1013),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1015),
-        [anon_sym_hashid] = ACTIONS(1017),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1019),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1021),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1023),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1025),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1025),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1025),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1027),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1029),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(1031),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(1031),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(1031),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(1031),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1033),
-        [sym_annotation_appl_choice] = ACTIONS(1035),
-        [sym_annotation_appl_empty] = ACTIONS(1035),
-        [sym_annotation_appl_dds_service] = ACTIONS(1035),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1037),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1039),
-        [sym_identifier] = ACTIONS(1041),
-        [anon_sym_SLASH_SLASH] = ACTIONS(618),
-        [anon_sym_SLASH_STAR] = ACTIONS(5),
-    },
-    [36] = {
-        [sym_scoped_name] = STATE(356),
-        [sym_annotation_appl_custom_body] = STATE(368),
-        [sym_annotation_appl_builtin_body] = STATE(368),
-        [sym_annotation_appl_id] = STATE(373),
-        [sym_annotation_appl_autoid] = STATE(373),
-        [sym_annotation_appl_optional] = STATE(373),
-        [sym_annotation_appl_position] = STATE(373),
-        [sym_annotation_appl_value] = STATE(373),
-        [sym_annotation_appl_extensibility] = STATE(373),
-        [sym_annotation_appl_final] = STATE(373),
-        [sym_annotation_appl_appendable] = STATE(373),
-        [sym_annotation_appl_mutable] = STATE(373),
-        [sym_annotation_appl_key] = STATE(373),
-        [sym_annotation_appl_must_understand] = STATE(373),
-        [sym_annotation_appl_default_literal] = STATE(373),
-        [sym_annotation_appl_default] = STATE(373),
-        [sym_annotation_appl_range] = STATE(373),
-        [sym_annotation_appl_min] = STATE(373),
-        [sym_annotation_appl_max] = STATE(373),
-        [sym_annotation_appl_unit] = STATE(373),
-        [sym_annotation_appl_bit_bound] = STATE(373),
-        [sym_annotation_appl_external] = STATE(373),
-        [sym_annotation_appl_nested] = STATE(373),
-        [sym_annotation_appl_verbatim] = STATE(373),
-        [sym_annotation_appl_service] = STATE(373),
-        [sym_annotation_appl_oneway] = STATE(373),
-        [sym_annotation_appl_ami] = STATE(373),
-        [sym_annotation_appl_hashid] = STATE(373),
-        [sym_annotation_appl_default_nested] = STATE(373),
-        [sym_annotation_appl_ignore_literal_names] = STATE(373),
-        [sym_annotation_appl_try_construct] = STATE(373),
-        [sym_try_construct_fail_action] = STATE(373),
-        [sym_annotation_appl_non_serialized] = STATE(373),
-        [sym_annotation_appl_data_representation] = STATE(373),
-        [sym_data_representation_mask] = STATE(373),
-        [sym_annotation_appl_topic] = STATE(373),
-        [sym_annotation_appl_dds_request_topic] = STATE(373),
-        [sym_annotation_appl_dds_reply_topic] = STATE(373),
         [sym_comment] = STATE(36),
         [anon_sym_COLON_COLON] = ACTIONS(1043),
         [aux_sym_annotation_appl_id_token1] = ACTIONS(1045),
@@ -26091,185 +26098,97 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [37] = {
-        [sym_scoped_name] = STATE(108),
-        [sym_annotation_appl_custom_body] = STATE(123),
-        [sym_annotation_appl_builtin_body] = STATE(123),
-        [sym_annotation_appl_id] = STATE(122),
-        [sym_annotation_appl_autoid] = STATE(122),
-        [sym_annotation_appl_optional] = STATE(122),
-        [sym_annotation_appl_position] = STATE(122),
-        [sym_annotation_appl_value] = STATE(122),
-        [sym_annotation_appl_extensibility] = STATE(122),
-        [sym_annotation_appl_final] = STATE(122),
-        [sym_annotation_appl_appendable] = STATE(122),
-        [sym_annotation_appl_mutable] = STATE(122),
-        [sym_annotation_appl_key] = STATE(122),
-        [sym_annotation_appl_must_understand] = STATE(122),
-        [sym_annotation_appl_default_literal] = STATE(122),
-        [sym_annotation_appl_default] = STATE(122),
-        [sym_annotation_appl_range] = STATE(122),
-        [sym_annotation_appl_min] = STATE(122),
-        [sym_annotation_appl_max] = STATE(122),
-        [sym_annotation_appl_unit] = STATE(122),
-        [sym_annotation_appl_bit_bound] = STATE(122),
-        [sym_annotation_appl_external] = STATE(122),
-        [sym_annotation_appl_nested] = STATE(122),
-        [sym_annotation_appl_verbatim] = STATE(122),
-        [sym_annotation_appl_service] = STATE(122),
-        [sym_annotation_appl_oneway] = STATE(122),
-        [sym_annotation_appl_ami] = STATE(122),
-        [sym_annotation_appl_hashid] = STATE(122),
-        [sym_annotation_appl_default_nested] = STATE(122),
-        [sym_annotation_appl_ignore_literal_names] = STATE(122),
-        [sym_annotation_appl_try_construct] = STATE(122),
-        [sym_try_construct_fail_action] = STATE(122),
-        [sym_annotation_appl_non_serialized] = STATE(122),
-        [sym_annotation_appl_data_representation] = STATE(122),
-        [sym_data_representation_mask] = STATE(122),
-        [sym_annotation_appl_topic] = STATE(122),
-        [sym_annotation_appl_dds_request_topic] = STATE(122),
-        [sym_annotation_appl_dds_reply_topic] = STATE(122),
+        [sym_scoped_name] = STATE(646),
+        [sym_annotation_appl_custom_body] = STATE(602),
+        [sym_annotation_appl_builtin_body] = STATE(602),
+        [sym_annotation_appl_id] = STATE(982),
+        [sym_annotation_appl_autoid] = STATE(982),
+        [sym_annotation_appl_optional] = STATE(982),
+        [sym_annotation_appl_position] = STATE(982),
+        [sym_annotation_appl_value] = STATE(982),
+        [sym_annotation_appl_extensibility] = STATE(982),
+        [sym_annotation_appl_final] = STATE(982),
+        [sym_annotation_appl_appendable] = STATE(982),
+        [sym_annotation_appl_mutable] = STATE(982),
+        [sym_annotation_appl_key] = STATE(982),
+        [sym_annotation_appl_must_understand] = STATE(982),
+        [sym_annotation_appl_default_literal] = STATE(982),
+        [sym_annotation_appl_default] = STATE(982),
+        [sym_annotation_appl_range] = STATE(982),
+        [sym_annotation_appl_min] = STATE(982),
+        [sym_annotation_appl_max] = STATE(982),
+        [sym_annotation_appl_unit] = STATE(982),
+        [sym_annotation_appl_bit_bound] = STATE(982),
+        [sym_annotation_appl_external] = STATE(982),
+        [sym_annotation_appl_nested] = STATE(982),
+        [sym_annotation_appl_verbatim] = STATE(982),
+        [sym_annotation_appl_service] = STATE(982),
+        [sym_annotation_appl_oneway] = STATE(982),
+        [sym_annotation_appl_ami] = STATE(982),
+        [sym_annotation_appl_hashid] = STATE(982),
+        [sym_annotation_appl_default_nested] = STATE(982),
+        [sym_annotation_appl_ignore_literal_names] = STATE(982),
+        [sym_annotation_appl_try_construct] = STATE(982),
+        [sym_try_construct_fail_action] = STATE(982),
+        [sym_annotation_appl_non_serialized] = STATE(982),
+        [sym_annotation_appl_data_representation] = STATE(982),
+        [sym_data_representation_mask] = STATE(982),
+        [sym_annotation_appl_topic] = STATE(982),
+        [sym_annotation_appl_dds_request_topic] = STATE(982),
+        [sym_annotation_appl_dds_reply_topic] = STATE(982),
         [sym_comment] = STATE(37),
-        [anon_sym_COLON_COLON] = ACTIONS(1119),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(1121),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1123),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1125),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(1127),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(1129),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1131),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(1133),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1135),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1137),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(1139),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1141),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1143),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(1145),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(1147),
-        [aux_sym_min_expr_token1] = ACTIONS(1149),
-        [aux_sym_max_expr_token1] = ACTIONS(1151),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1153),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1155),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(1157),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1159),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1161),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(1163),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1165),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1167),
-        [anon_sym_hashid] = ACTIONS(1169),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1171),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1173),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1175),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1177),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1177),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1177),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1179),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1181),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(1183),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(1183),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(1183),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(1183),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1185),
-        [sym_annotation_appl_choice] = ACTIONS(1187),
-        [sym_annotation_appl_empty] = ACTIONS(1187),
-        [sym_annotation_appl_dds_service] = ACTIONS(1187),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1189),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1191),
-        [sym_identifier] = ACTIONS(1193),
+        [anon_sym_COLON_COLON] = ACTIONS(1043),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(1045),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1047),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1049),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(1051),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(1053),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1055),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(1057),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1059),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1061),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(1063),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1065),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1067),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(1069),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(1071),
+        [aux_sym_min_expr_token1] = ACTIONS(1073),
+        [aux_sym_max_expr_token1] = ACTIONS(1075),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1077),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1079),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1081),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1083),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1085),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1087),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1089),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1091),
+        [anon_sym_hashid] = ACTIONS(1093),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1095),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1097),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1099),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1101),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1103),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1105),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1107),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1109),
+        [sym_annotation_appl_choice] = ACTIONS(1111),
+        [sym_annotation_appl_empty] = ACTIONS(1111),
+        [sym_annotation_appl_dds_service] = ACTIONS(1111),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1113),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1115),
+        [sym_identifier] = ACTIONS(1117),
         [anon_sym_SLASH_SLASH] = ACTIONS(618),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [38] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
-        [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
-        [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
-        [sym_type_spec] = STATE(1215),
-        [sym_simple_type_spec] = STATE(691),
-        [sym_base_type_spec] = STATE(781),
-        [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_op_type_spec] = STATE(1275),
-        [sym_readonly_attr_spec] = STATE(1276),
-        [sym_attr_spec] = STATE(1276),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
-        [sym_annotation_appl] = STATE(181),
-        [sym_extend_annotation_appl] = STATE(183),
-        [sym_typedef_dcl] = STATE(1488),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
-        [sym_object_type] = STATE(775),
-        [sym_constr_type_dcl] = STATE(1488),
-        [sym_native_dcl] = STATE(1488),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
-        [sym_comment] = STATE(38),
-        [aux_sym_interface_dcl_repeat1] = STATE(98),
-        [anon_sym_short] = ACTIONS(67),
-        [anon_sym_int16] = ACTIONS(67),
-        [anon_sym_long] = ACTIONS(69),
-        [anon_sym_int32] = ACTIONS(69),
-        [anon_sym_longlong] = ACTIONS(71),
-        [anon_sym_int64] = ACTIONS(73),
-        [sym_unsigned_tiny_int] = ACTIONS(75),
-        [sym_boolean_type] = ACTIONS(77),
-        [anon_sym_fixed] = ACTIONS(79),
-        [sym_octet_type] = ACTIONS(77),
-        [sym_signed_tiny_int] = ACTIONS(81),
-        [anon_sym_unsignedshort] = ACTIONS(83),
-        [anon_sym_uint16] = ACTIONS(85),
-        [anon_sym_unsignedlong] = ACTIONS(87),
-        [anon_sym_uint32] = ACTIONS(87),
-        [anon_sym_unsignedlonglong] = ACTIONS(89),
-        [anon_sym_uint64] = ACTIONS(91),
-        [anon_sym_float] = ACTIONS(93),
-        [anon_sym_double] = ACTIONS(93),
-        [anon_sym_longdouble] = ACTIONS(95),
-        [sym_char_type] = ACTIONS(77),
-        [sym_wide_char_type] = ACTIONS(77),
-        [anon_sym_COLON_COLON] = ACTIONS(97),
-        [anon_sym_string] = ACTIONS(99),
-        [anon_sym_wstring] = ACTIONS(101),
-        [anon_sym_any] = ACTIONS(103),
-        [anon_sym_sequence] = ACTIONS(105),
-        [anon_sym_map] = ACTIONS(107),
-        [anon_sym_void] = ACTIONS(115),
-        [anon_sym_readonly] = ACTIONS(117),
-        [anon_sym_attribute] = ACTIONS(119),
-        [anon_sym_bitset] = ACTIONS(121),
-        [anon_sym_bitmask] = ACTIONS(123),
-        [anon_sym_AT] = ACTIONS(125),
-        [anon_sym_SLASH_SLASH_AT] = ACTIONS(127),
-        [anon_sym_struct] = ACTIONS(131),
-        [anon_sym_union] = ACTIONS(133),
-        [anon_sym_enum] = ACTIONS(135),
-        [anon_sym_typedef] = ACTIONS(145),
-        [anon_sym_Object] = ACTIONS(151),
-        [sym_value_base_type] = ACTIONS(77),
-        [anon_sym_native] = ACTIONS(155),
-        [sym_identifier] = ACTIONS(157),
-        [anon_sym_SLASH_SLASH] = ACTIONS(3),
-        [anon_sym_SLASH_STAR] = ACTIONS(5),
-    },
-    [39] = {
-        [sym_scoped_name] = STATE(637),
-        [sym_annotation_appl_custom_body] = STATE(597),
-        [sym_annotation_appl_builtin_body] = STATE(597),
+        [sym_scoped_name] = STATE(646),
+        [sym_annotation_appl_custom_body] = STATE(985),
+        [sym_annotation_appl_builtin_body] = STATE(985),
         [sym_annotation_appl_id] = STATE(982),
         [sym_annotation_appl_autoid] = STATE(982),
         [sym_annotation_appl_optional] = STATE(982),
@@ -26305,59 +26224,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_annotation_appl_topic] = STATE(982),
         [sym_annotation_appl_dds_request_topic] = STATE(982),
         [sym_annotation_appl_dds_reply_topic] = STATE(982),
-        [sym_comment] = STATE(39),
-        [anon_sym_COLON_COLON] = ACTIONS(815),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(817),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(819),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(821),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(823),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(825),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(827),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(829),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(831),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(833),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(835),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(837),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(839),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(841),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(843),
-        [aux_sym_min_expr_token1] = ACTIONS(845),
-        [aux_sym_max_expr_token1] = ACTIONS(847),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(849),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(851),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(853),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(855),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(857),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(859),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(861),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(863),
-        [anon_sym_hashid] = ACTIONS(865),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(867),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(869),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(871),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(873),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(875),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(877),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(879),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(881),
-        [sym_annotation_appl_choice] = ACTIONS(883),
-        [sym_annotation_appl_empty] = ACTIONS(883),
-        [sym_annotation_appl_dds_service] = ACTIONS(883),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(885),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(887),
-        [sym_identifier] = ACTIONS(889),
+        [sym_comment] = STATE(38),
+        [anon_sym_COLON_COLON] = ACTIONS(1043),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(1045),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1047),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1049),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(1051),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(1053),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1055),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(1057),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1059),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1061),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(1063),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1065),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1067),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(1069),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(1071),
+        [aux_sym_min_expr_token1] = ACTIONS(1073),
+        [aux_sym_max_expr_token1] = ACTIONS(1075),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1077),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1079),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1081),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1083),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1085),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1087),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1089),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1091),
+        [anon_sym_hashid] = ACTIONS(1093),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1095),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1097),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1099),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1101),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1103),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1105),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1107),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1109),
+        [sym_annotation_appl_choice] = ACTIONS(1111),
+        [sym_annotation_appl_empty] = ACTIONS(1111),
+        [sym_annotation_appl_dds_service] = ACTIONS(1111),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1113),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1115),
+        [sym_identifier] = ACTIONS(1117),
         [anon_sym_SLASH_SLASH] = ACTIONS(618),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [40] = {
-        [sym_scoped_name] = STATE(637),
-        [sym_annotation_appl_custom_body] = STATE(610),
-        [sym_annotation_appl_builtin_body] = STATE(610),
+    [39] = {
+        [sym_scoped_name] = STATE(646),
+        [sym_annotation_appl_custom_body] = STATE(620),
+        [sym_annotation_appl_builtin_body] = STATE(620),
         [sym_annotation_appl_id] = STATE(982),
         [sym_annotation_appl_autoid] = STATE(982),
         [sym_annotation_appl_optional] = STATE(982),
@@ -26393,59 +26312,59 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_annotation_appl_topic] = STATE(982),
         [sym_annotation_appl_dds_request_topic] = STATE(982),
         [sym_annotation_appl_dds_reply_topic] = STATE(982),
-        [sym_comment] = STATE(40),
-        [anon_sym_COLON_COLON] = ACTIONS(815),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(817),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(819),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(821),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(823),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(825),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(827),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(829),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(831),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(833),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(835),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(837),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(839),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(841),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(843),
-        [aux_sym_min_expr_token1] = ACTIONS(845),
-        [aux_sym_max_expr_token1] = ACTIONS(847),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(849),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(851),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(853),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(855),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(857),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(859),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(861),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(863),
-        [anon_sym_hashid] = ACTIONS(865),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(867),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(869),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(871),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(873),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(875),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(877),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(879),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(881),
-        [sym_annotation_appl_choice] = ACTIONS(883),
-        [sym_annotation_appl_empty] = ACTIONS(883),
-        [sym_annotation_appl_dds_service] = ACTIONS(883),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(885),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(887),
-        [sym_identifier] = ACTIONS(889),
+        [sym_comment] = STATE(39),
+        [anon_sym_COLON_COLON] = ACTIONS(1043),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(1045),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1047),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1049),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(1051),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(1053),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1055),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(1057),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1059),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1061),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(1063),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1065),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1067),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(1069),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(1071),
+        [aux_sym_min_expr_token1] = ACTIONS(1073),
+        [aux_sym_max_expr_token1] = ACTIONS(1075),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1077),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1079),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1081),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1083),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1085),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1087),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1089),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1091),
+        [anon_sym_hashid] = ACTIONS(1093),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1095),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1097),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1099),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1101),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1103),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1105),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1107),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1109),
+        [sym_annotation_appl_choice] = ACTIONS(1111),
+        [sym_annotation_appl_empty] = ACTIONS(1111),
+        [sym_annotation_appl_dds_service] = ACTIONS(1111),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1113),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1115),
+        [sym_identifier] = ACTIONS(1117),
         [anon_sym_SLASH_SLASH] = ACTIONS(618),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [41] = {
-        [sym_scoped_name] = STATE(637),
-        [sym_annotation_appl_custom_body] = STATE(618),
-        [sym_annotation_appl_builtin_body] = STATE(618),
+    [40] = {
+        [sym_scoped_name] = STATE(646),
+        [sym_annotation_appl_custom_body] = STATE(605),
+        [sym_annotation_appl_builtin_body] = STATE(605),
         [sym_annotation_appl_id] = STATE(982),
         [sym_annotation_appl_autoid] = STATE(982),
         [sym_annotation_appl_optional] = STATE(982),
@@ -26481,57 +26400,57 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_annotation_appl_topic] = STATE(982),
         [sym_annotation_appl_dds_request_topic] = STATE(982),
         [sym_annotation_appl_dds_reply_topic] = STATE(982),
-        [sym_comment] = STATE(41),
-        [anon_sym_COLON_COLON] = ACTIONS(815),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(817),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(819),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(821),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(823),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(825),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(827),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(829),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(831),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(833),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(835),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(837),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(839),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(841),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(843),
-        [aux_sym_min_expr_token1] = ACTIONS(845),
-        [aux_sym_max_expr_token1] = ACTIONS(847),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(849),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(851),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(853),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(855),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(857),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(859),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(861),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(863),
-        [anon_sym_hashid] = ACTIONS(865),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(867),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(869),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(871),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(873),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(875),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(877),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(879),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(881),
-        [sym_annotation_appl_choice] = ACTIONS(883),
-        [sym_annotation_appl_empty] = ACTIONS(883),
-        [sym_annotation_appl_dds_service] = ACTIONS(883),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(885),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(887),
-        [sym_identifier] = ACTIONS(889),
+        [sym_comment] = STATE(40),
+        [anon_sym_COLON_COLON] = ACTIONS(1043),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(1045),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1047),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1049),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(1051),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(1053),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1055),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(1057),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1059),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1061),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(1063),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1065),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1067),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(1069),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(1071),
+        [aux_sym_min_expr_token1] = ACTIONS(1073),
+        [aux_sym_max_expr_token1] = ACTIONS(1075),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1077),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1079),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1081),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1083),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1085),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1087),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1089),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1091),
+        [anon_sym_hashid] = ACTIONS(1093),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1095),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1097),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1099),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1101),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1103),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1105),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1107),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1109),
+        [sym_annotation_appl_choice] = ACTIONS(1111),
+        [sym_annotation_appl_empty] = ACTIONS(1111),
+        [sym_annotation_appl_dds_service] = ACTIONS(1111),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1113),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1115),
+        [sym_identifier] = ACTIONS(1117),
         [anon_sym_SLASH_SLASH] = ACTIONS(618),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
-    [42] = {
-        [sym_scoped_name] = STATE(637),
+    [41] = {
+        [sym_scoped_name] = STATE(646),
         [sym_annotation_appl_custom_body] = STATE(609),
         [sym_annotation_appl_builtin_body] = STATE(609),
         [sym_annotation_appl_id] = STATE(982),
@@ -26569,95 +26488,183 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [sym_annotation_appl_topic] = STATE(982),
         [sym_annotation_appl_dds_request_topic] = STATE(982),
         [sym_annotation_appl_dds_reply_topic] = STATE(982),
+        [sym_comment] = STATE(41),
+        [anon_sym_COLON_COLON] = ACTIONS(1043),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(1045),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1047),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1049),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(1051),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(1053),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1055),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(1057),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1059),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1061),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(1063),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1065),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1067),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(1069),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(1071),
+        [aux_sym_min_expr_token1] = ACTIONS(1073),
+        [aux_sym_max_expr_token1] = ACTIONS(1075),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1077),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1079),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1081),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1083),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1085),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1087),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1089),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1091),
+        [anon_sym_hashid] = ACTIONS(1093),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1095),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1097),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1099),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1101),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1101),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1103),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1105),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1107),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1107),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1109),
+        [sym_annotation_appl_choice] = ACTIONS(1111),
+        [sym_annotation_appl_empty] = ACTIONS(1111),
+        [sym_annotation_appl_dds_service] = ACTIONS(1111),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1113),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1115),
+        [sym_identifier] = ACTIONS(1117),
+        [anon_sym_SLASH_SLASH] = ACTIONS(618),
+        [anon_sym_SLASH_STAR] = ACTIONS(5),
+    },
+    [42] = {
+        [sym_scoped_name] = STATE(356),
+        [sym_annotation_appl_custom_body] = STATE(368),
+        [sym_annotation_appl_builtin_body] = STATE(368),
+        [sym_annotation_appl_id] = STATE(373),
+        [sym_annotation_appl_autoid] = STATE(373),
+        [sym_annotation_appl_optional] = STATE(373),
+        [sym_annotation_appl_position] = STATE(373),
+        [sym_annotation_appl_value] = STATE(373),
+        [sym_annotation_appl_extensibility] = STATE(373),
+        [sym_annotation_appl_final] = STATE(373),
+        [sym_annotation_appl_appendable] = STATE(373),
+        [sym_annotation_appl_mutable] = STATE(373),
+        [sym_annotation_appl_key] = STATE(373),
+        [sym_annotation_appl_must_understand] = STATE(373),
+        [sym_annotation_appl_default_literal] = STATE(373),
+        [sym_annotation_appl_default] = STATE(373),
+        [sym_annotation_appl_range] = STATE(373),
+        [sym_annotation_appl_min] = STATE(373),
+        [sym_annotation_appl_max] = STATE(373),
+        [sym_annotation_appl_unit] = STATE(373),
+        [sym_annotation_appl_bit_bound] = STATE(373),
+        [sym_annotation_appl_external] = STATE(373),
+        [sym_annotation_appl_nested] = STATE(373),
+        [sym_annotation_appl_verbatim] = STATE(373),
+        [sym_annotation_appl_service] = STATE(373),
+        [sym_annotation_appl_oneway] = STATE(373),
+        [sym_annotation_appl_ami] = STATE(373),
+        [sym_annotation_appl_hashid] = STATE(373),
+        [sym_annotation_appl_default_nested] = STATE(373),
+        [sym_annotation_appl_ignore_literal_names] = STATE(373),
+        [sym_annotation_appl_try_construct] = STATE(373),
+        [sym_try_construct_fail_action] = STATE(373),
+        [sym_annotation_appl_non_serialized] = STATE(373),
+        [sym_annotation_appl_data_representation] = STATE(373),
+        [sym_data_representation_mask] = STATE(373),
+        [sym_annotation_appl_topic] = STATE(373),
+        [sym_annotation_appl_dds_request_topic] = STATE(373),
+        [sym_annotation_appl_dds_reply_topic] = STATE(373),
         [sym_comment] = STATE(42),
-        [anon_sym_COLON_COLON] = ACTIONS(815),
-        [aux_sym_annotation_appl_id_token1] = ACTIONS(817),
-        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(819),
-        [aux_sym_annotation_appl_optional_token1] = ACTIONS(821),
-        [aux_sym_annotation_appl_position_token1] = ACTIONS(823),
-        [aux_sym_annotation_appl_value_token1] = ACTIONS(825),
-        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(827),
-        [aux_sym_annotation_appl_final_token1] = ACTIONS(829),
-        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(831),
-        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(833),
-        [aux_sym_annotation_appl_key_token1] = ACTIONS(835),
-        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(837),
-        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(839),
-        [aux_sym_annotation_appl_default_token1] = ACTIONS(841),
-        [aux_sym_annotation_appl_range_token1] = ACTIONS(843),
-        [aux_sym_min_expr_token1] = ACTIONS(845),
-        [aux_sym_max_expr_token1] = ACTIONS(847),
-        [aux_sym_annotation_appl_unit_token1] = ACTIONS(849),
-        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(851),
-        [aux_sym_annotation_appl_external_token1] = ACTIONS(853),
-        [aux_sym_annotation_appl_nested_token1] = ACTIONS(855),
-        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(857),
-        [aux_sym_annotation_appl_service_token1] = ACTIONS(859),
-        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(861),
-        [aux_sym_annotation_appl_ami_token1] = ACTIONS(863),
-        [anon_sym_hashid] = ACTIONS(865),
-        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(867),
-        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(869),
-        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(871),
-        [aux_sym_try_construct_fail_action_token1] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token2] = ACTIONS(873),
-        [aux_sym_try_construct_fail_action_token3] = ACTIONS(873),
-        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(875),
-        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(877),
-        [aux_sym_data_representation_mask_token1] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token2] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token3] = ACTIONS(879),
-        [aux_sym_data_representation_mask_token4] = ACTIONS(879),
-        [aux_sym_annotation_appl_topic_token1] = ACTIONS(881),
-        [sym_annotation_appl_choice] = ACTIONS(883),
-        [sym_annotation_appl_empty] = ACTIONS(883),
-        [sym_annotation_appl_dds_service] = ACTIONS(883),
-        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(885),
-        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(887),
-        [sym_identifier] = ACTIONS(889),
+        [anon_sym_COLON_COLON] = ACTIONS(1119),
+        [aux_sym_annotation_appl_id_token1] = ACTIONS(1121),
+        [aux_sym_annotation_appl_autoid_token1] = ACTIONS(1123),
+        [aux_sym_annotation_appl_optional_token1] = ACTIONS(1125),
+        [aux_sym_annotation_appl_position_token1] = ACTIONS(1127),
+        [aux_sym_annotation_appl_value_token1] = ACTIONS(1129),
+        [aux_sym_annotation_appl_extensibility_token1] = ACTIONS(1131),
+        [aux_sym_annotation_appl_final_token1] = ACTIONS(1133),
+        [aux_sym_annotation_appl_appendable_token1] = ACTIONS(1135),
+        [aux_sym_annotation_appl_mutable_token1] = ACTIONS(1137),
+        [aux_sym_annotation_appl_key_token1] = ACTIONS(1139),
+        [aux_sym_annotation_appl_must_understand_token1] = ACTIONS(1141),
+        [aux_sym_annotation_appl_default_literal_token1] = ACTIONS(1143),
+        [aux_sym_annotation_appl_default_token1] = ACTIONS(1145),
+        [aux_sym_annotation_appl_range_token1] = ACTIONS(1147),
+        [aux_sym_min_expr_token1] = ACTIONS(1149),
+        [aux_sym_max_expr_token1] = ACTIONS(1151),
+        [aux_sym_annotation_appl_unit_token1] = ACTIONS(1153),
+        [aux_sym_annotation_appl_bit_bound_token1] = ACTIONS(1155),
+        [aux_sym_annotation_appl_external_token1] = ACTIONS(1157),
+        [aux_sym_annotation_appl_nested_token1] = ACTIONS(1159),
+        [aux_sym_annotation_appl_verbatim_token1] = ACTIONS(1161),
+        [aux_sym_annotation_appl_service_token1] = ACTIONS(1163),
+        [aux_sym_annotation_appl_oneway_token1] = ACTIONS(1165),
+        [aux_sym_annotation_appl_ami_token1] = ACTIONS(1167),
+        [anon_sym_hashid] = ACTIONS(1169),
+        [aux_sym_annotation_appl_default_nested_token1] = ACTIONS(1171),
+        [aux_sym_annotation_appl_ignore_literal_names_token1] = ACTIONS(1173),
+        [aux_sym_annotation_appl_try_construct_token1] = ACTIONS(1175),
+        [aux_sym_try_construct_fail_action_token1] = ACTIONS(1177),
+        [aux_sym_try_construct_fail_action_token2] = ACTIONS(1177),
+        [aux_sym_try_construct_fail_action_token3] = ACTIONS(1177),
+        [aux_sym_annotation_appl_non_serialized_token1] = ACTIONS(1179),
+        [aux_sym_annotation_appl_data_representation_token1] = ACTIONS(1181),
+        [aux_sym_data_representation_mask_token1] = ACTIONS(1183),
+        [aux_sym_data_representation_mask_token2] = ACTIONS(1183),
+        [aux_sym_data_representation_mask_token3] = ACTIONS(1183),
+        [aux_sym_data_representation_mask_token4] = ACTIONS(1183),
+        [aux_sym_annotation_appl_topic_token1] = ACTIONS(1185),
+        [sym_annotation_appl_choice] = ACTIONS(1187),
+        [sym_annotation_appl_empty] = ACTIONS(1187),
+        [sym_annotation_appl_dds_service] = ACTIONS(1187),
+        [aux_sym_annotation_appl_dds_request_topic_token1] = ACTIONS(1189),
+        [aux_sym_annotation_appl_dds_reply_topic_token1] = ACTIONS(1191),
+        [sym_identifier] = ACTIONS(1193),
         [anon_sym_SLASH_SLASH] = ACTIONS(618),
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [43] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
-        [sym_type_spec] = STATE(736),
-        [sym_simple_type_spec] = STATE(691),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
+        [sym_type_spec] = STATE(739),
+        [sym_simple_type_spec] = STATE(693),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(691),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(693),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_annotation_appl] = STATE(400),
         [sym_extend_annotation_appl] = STATE(399),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_case_label] = STATE(273),
-        [sym_element_spec] = STATE(1362),
+        [sym_element_spec] = STATE(1320),
         [sym_object_type] = STATE(775),
-        [sym_constr_type_dcl] = STATE(736),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_constr_type_dcl] = STATE(739),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_comment] = STATE(43),
-        [aux_sym_interface_dcl_repeat1] = STATE(55),
-        [aux_sym_case_repeat1] = STATE(187),
+        [aux_sym_interface_dcl_repeat1] = STATE(56),
+        [aux_sym_case_repeat1] = STATE(188),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
         [anon_sym_long] = ACTIONS(69),
@@ -26702,38 +26709,38 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
         [anon_sym_SLASH_STAR] = ACTIONS(5),
     },
     [44] = {
-        [sym_signed_short_int] = STATE(626),
-        [sym_signed_long_int] = STATE(626),
-        [sym_signed_longlong_int] = STATE(626),
-        [sym_unsigned_int] = STATE(632),
+        [sym_signed_short_int] = STATE(662),
+        [sym_signed_long_int] = STATE(662),
+        [sym_signed_longlong_int] = STATE(662),
+        [sym_unsigned_int] = STATE(638),
         [sym_integer_type] = STATE(775),
-        [sym_signed_int] = STATE(632),
-        [sym_unsigned_short_int] = STATE(628),
-        [sym_unsigned_long_int] = STATE(628),
-        [sym_unsigned_longlong_int] = STATE(628),
+        [sym_signed_int] = STATE(638),
+        [sym_unsigned_short_int] = STATE(664),
+        [sym_unsigned_long_int] = STATE(664),
+        [sym_unsigned_longlong_int] = STATE(664),
         [sym_floating_pt_type] = STATE(775),
-        [sym_scoped_name] = STATE(631),
-        [sym_string_type] = STATE(779),
-        [sym_wide_string_type] = STATE(779),
-        [sym_simple_type_spec] = STATE(663),
+        [sym_scoped_name] = STATE(636),
+        [sym_string_type] = STATE(777),
+        [sym_wide_string_type] = STATE(777),
+        [sym_simple_type_spec] = STATE(630),
         [sym_base_type_spec] = STATE(781),
         [sym_any_type] = STATE(775),
-        [sym_fixed_pt_type] = STATE(779),
-        [sym_template_type_spec] = STATE(663),
-        [sym_sequence_type] = STATE(779),
-        [sym_map_type] = STATE(779),
-        [sym_bitset_dcl] = STATE(1045),
-        [sym_bitmask_dcl] = STATE(1045),
+        [sym_fixed_pt_type] = STATE(777),
+        [sym_template_type_spec] = STATE(630),
+        [sym_sequence_type] = STATE(777),
+        [sym_map_type] = STATE(777),
+        [sym_bitset_dcl] = STATE(1059),
+        [sym_bitmask_dcl] = STATE(1059),
         [sym_type_declarator] = STATE(1505),
-        [sym_enum_dcl] = STATE(1045),
-        [sym_union_dcl] = STATE(1045),
-        [sym_union_forward_dcl] = STATE(1092),
-        [sym_union_def] = STATE(1092),
+        [sym_enum_dcl] = STATE(1059),
+        [sym_union_dcl] = STATE(1059),
+        [sym_union_forward_dcl] = STATE(1045),
+        [sym_union_def] = STATE(1045),
         [sym_object_type] = STATE(775),
-        [sym_constr_type_dcl] = STATE(663),
-        [sym_struct_dcl] = STATE(1045),
-        [sym_struct_forward_dcl] = STATE(1053),
-        [sym_struct_def] = STATE(1053),
+        [sym_constr_type_dcl] = STATE(630),
+        [sym_struct_dcl] = STATE(1059),
+        [sym_struct_forward_dcl] = STATE(1057),
+        [sym_struct_def] = STATE(1057),
         [sym_comment] = STATE(44),
         [anon_sym_short] = ACTIONS(67),
         [anon_sym_int16] = ACTIONS(67),
@@ -26850,10 +26857,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(45),
     1,
     sym_comment,
-    STATE(50),
+    STATE(48),
     1,
     aux_sym_except_dcl_repeat1,
-    STATE(56),
+    STATE(57),
     1,
     aux_sym_interface_dcl_repeat1,
     STATE(340),
@@ -26865,10 +26872,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(644),
+    STATE(667),
     1,
     sym_type_spec,
     STATE(781),
@@ -26890,20 +26897,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -26921,7 +26928,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
@@ -27001,10 +27008,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(46),
     1,
     sym_comment,
-    STATE(47),
+    STATE(48),
     1,
     aux_sym_except_dcl_repeat1,
-    STATE(56),
+    STATE(57),
     1,
     aux_sym_interface_dcl_repeat1,
     STATE(340),
@@ -27016,10 +27023,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(644),
+    STATE(667),
     1,
     sym_type_spec,
     STATE(781),
@@ -27041,20 +27048,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -27072,7 +27079,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
@@ -27149,13 +27156,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1207),
     1,
     anon_sym_RBRACE,
+    STATE(45),
+    1,
+    aux_sym_except_dcl_repeat1,
     STATE(47),
     1,
     sym_comment,
-    STATE(50),
-    1,
-    aux_sym_except_dcl_repeat1,
-    STATE(56),
+    STATE(57),
     1,
     aux_sym_interface_dcl_repeat1,
     STATE(340),
@@ -27167,10 +27174,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(644),
+    STATE(667),
     1,
     sym_type_spec,
     STATE(781),
@@ -27192,20 +27199,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -27223,14 +27230,163 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
+    5,
+    sym_string_type,
+    sym_wide_string_type,
+    sym_fixed_pt_type,
+    sym_sequence_type,
+    sym_map_type,
+    [453] = 42,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(1215),
+    1,
+    anon_sym_longlong,
+    ACTIONS(1218),
+    1,
+    anon_sym_int64,
+    ACTIONS(1221),
+    1,
+    sym_unsigned_tiny_int,
+    ACTIONS(1227),
+    1,
+    anon_sym_fixed,
+    ACTIONS(1230),
+    1,
+    sym_signed_tiny_int,
+    ACTIONS(1233),
+    1,
+    anon_sym_unsignedshort,
+    ACTIONS(1236),
+    1,
+    anon_sym_uint16,
+    ACTIONS(1242),
+    1,
+    anon_sym_unsignedlonglong,
+    ACTIONS(1245),
+    1,
+    anon_sym_uint64,
+    ACTIONS(1251),
+    1,
+    anon_sym_longdouble,
+    ACTIONS(1254),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(1257),
+    1,
+    anon_sym_string,
+    ACTIONS(1260),
+    1,
+    anon_sym_wstring,
+    ACTIONS(1263),
+    1,
+    anon_sym_any,
+    ACTIONS(1266),
+    1,
+    anon_sym_sequence,
+    ACTIONS(1269),
+    1,
+    anon_sym_map,
+    ACTIONS(1272),
+    1,
+    anon_sym_RBRACE,
+    ACTIONS(1274),
+    1,
+    anon_sym_AT,
+    ACTIONS(1277),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1280),
+    1,
+    anon_sym_Object,
+    ACTIONS(1283),
+    1,
+    sym_identifier,
+    STATE(57),
+    1,
+    aux_sym_interface_dcl_repeat1,
+    STATE(340),
+    1,
+    sym_member,
+    STATE(399),
+    1,
+    sym_extend_annotation_appl,
+    STATE(400),
+    1,
+    sym_annotation_appl,
+    STATE(636),
+    1,
+    sym_scoped_name,
+    STATE(667),
+    1,
+    sym_type_spec,
+    STATE(781),
+    1,
+    sym_base_type_spec,
+    ACTIONS(1209),
+    2,
+    anon_sym_short,
+    anon_sym_int16,
+    ACTIONS(1212),
+    2,
+    anon_sym_long,
+    anon_sym_int32,
+    ACTIONS(1239),
+    2,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    ACTIONS(1248),
+    2,
+    anon_sym_float,
+    anon_sym_double,
+    STATE(48),
+    2,
+    sym_comment,
+    aux_sym_except_dcl_repeat1,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(693),
+    2,
+    sym_simple_type_spec,
+    sym_template_type_spec,
+    STATE(662),
+    3,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    STATE(775),
+    4,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_any_type,
+    sym_object_type,
+    ACTIONS(1224),
+    5,
+    sym_boolean_type,
+    sym_octet_type,
+    sym_char_type,
+    sym_wide_char_type,
+    sym_value_base_type,
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [453] = 43,
+    [602] = 43,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -27297,16 +27453,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1199),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1209),
+    ACTIONS(1286),
     1,
     anon_sym_RBRACE,
-    STATE(45),
-    1,
-    aux_sym_except_dcl_repeat1,
-    STATE(48),
+    STATE(49),
     1,
     sym_comment,
-    STATE(56),
+    STATE(51),
+    1,
+    aux_sym_except_dcl_repeat1,
+    STATE(57),
     1,
     aux_sym_interface_dcl_repeat1,
     STATE(340),
@@ -27318,10 +27474,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(644),
+    STATE(667),
     1,
     sym_type_spec,
     STATE(781),
@@ -27343,20 +27499,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -27374,14 +27530,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [604] = 43,
+    [753] = 43,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -27448,16 +27604,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1199),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1211),
+    ACTIONS(1288),
     1,
     anon_sym_RBRACE,
-    STATE(49),
+    STATE(46),
     1,
-    sym_comment,
+    aux_sym_except_dcl_repeat1,
     STATE(50),
     1,
-    aux_sym_except_dcl_repeat1,
-    STATE(56),
+    sym_comment,
+    STATE(57),
     1,
     aux_sym_interface_dcl_repeat1,
     STATE(340),
@@ -27469,10 +27625,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(644),
+    STATE(667),
     1,
     sym_type_spec,
     STATE(781),
@@ -27494,20 +27650,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -27525,156 +27681,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
-    5,
-    sym_string_type,
-    sym_wide_string_type,
-    sym_fixed_pt_type,
-    sym_sequence_type,
-    sym_map_type,
-    [755] = 42,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(1219),
-    1,
-    anon_sym_longlong,
-    ACTIONS(1222),
-    1,
-    anon_sym_int64,
-    ACTIONS(1225),
-    1,
-    sym_unsigned_tiny_int,
-    ACTIONS(1231),
-    1,
-    anon_sym_fixed,
-    ACTIONS(1234),
-    1,
-    sym_signed_tiny_int,
-    ACTIONS(1237),
-    1,
-    anon_sym_unsignedshort,
-    ACTIONS(1240),
-    1,
-    anon_sym_uint16,
-    ACTIONS(1246),
-    1,
-    anon_sym_unsignedlonglong,
-    ACTIONS(1249),
-    1,
-    anon_sym_uint64,
-    ACTIONS(1255),
-    1,
-    anon_sym_longdouble,
-    ACTIONS(1258),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(1261),
-    1,
-    anon_sym_string,
-    ACTIONS(1264),
-    1,
-    anon_sym_wstring,
-    ACTIONS(1267),
-    1,
-    anon_sym_any,
-    ACTIONS(1270),
-    1,
-    anon_sym_sequence,
-    ACTIONS(1273),
-    1,
-    anon_sym_map,
-    ACTIONS(1276),
-    1,
-    anon_sym_RBRACE,
-    ACTIONS(1278),
-    1,
-    anon_sym_AT,
-    ACTIONS(1281),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1284),
-    1,
-    anon_sym_Object,
-    ACTIONS(1287),
-    1,
-    sym_identifier,
-    STATE(56),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(340),
-    1,
-    sym_member,
-    STATE(399),
-    1,
-    sym_extend_annotation_appl,
-    STATE(400),
-    1,
-    sym_annotation_appl,
-    STATE(631),
-    1,
-    sym_scoped_name,
-    STATE(644),
-    1,
-    sym_type_spec,
-    STATE(781),
-    1,
-    sym_base_type_spec,
-    ACTIONS(1213),
-    2,
-    anon_sym_short,
-    anon_sym_int16,
-    ACTIONS(1216),
-    2,
-    anon_sym_long,
-    anon_sym_int32,
-    ACTIONS(1243),
-    2,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    ACTIONS(1252),
-    2,
-    anon_sym_float,
-    anon_sym_double,
-    STATE(50),
-    2,
-    sym_comment,
-    aux_sym_except_dcl_repeat1,
-    STATE(632),
-    2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(691),
-    2,
-    sym_simple_type_spec,
-    sym_template_type_spec,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    STATE(775),
-    4,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_any_type,
-    sym_object_type,
-    ACTIONS(1228),
-    5,
-    sym_boolean_type,
-    sym_octet_type,
-    sym_char_type,
-    sym_wide_char_type,
-    sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
@@ -27751,13 +27758,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1290),
     1,
     anon_sym_RBRACE,
-    STATE(49),
+    STATE(48),
     1,
     aux_sym_except_dcl_repeat1,
     STATE(51),
     1,
     sym_comment,
-    STATE(56),
+    STATE(57),
     1,
     aux_sym_interface_dcl_repeat1,
     STATE(340),
@@ -27769,10 +27776,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(644),
+    STATE(667),
     1,
     sym_type_spec,
     STATE(781),
@@ -27794,20 +27801,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -27825,14 +27832,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [1055] = 42,
+    [1055] = 40,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -27895,37 +27902,28 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_SLASH_SLASH,
     ACTIONS(1292),
     1,
-    anon_sym_LBRACE,
-    ACTIONS(1294),
-    1,
-    anon_sym_COLON,
-    ACTIONS(1296),
-    1,
-    anon_sym_SEMI,
-    ACTIONS(1298),
-    1,
-    anon_sym_supports,
+    anon_sym_RPAREN,
     STATE(52),
     1,
     sym_comment,
-    STATE(631),
+    STATE(88),
+    1,
+    sym_param_attribute,
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(879),
-    1,
-    sym_value_inheritance,
-    STATE(1181),
+    STATE(822),
     1,
-    sym_value_inheritance_spec,
-    STATE(1182),
+    sym_param_dcl,
+    STATE(1141),
     1,
     sym_type_spec,
-    STATE(1384),
+    STATE(1526),
     1,
-    sym_value_supports,
+    sym_parameter_dcls,
     ACTIONS(67),
     2,
     anon_sym_short,
@@ -27942,20 +27940,25 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    ACTIONS(1294),
+    3,
+    anon_sym_in,
+    anon_sym_out,
+    anon_sym_inout,
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -27973,14 +27976,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [1203] = 40,
+    [1199] = 42,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -28041,30 +28044,39 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(1296),
+    1,
+    anon_sym_LBRACE,
+    ACTIONS(1298),
+    1,
+    anon_sym_COLON,
     ACTIONS(1300),
     1,
-    anon_sym_RPAREN,
+    anon_sym_SEMI,
+    ACTIONS(1302),
+    1,
+    anon_sym_supports,
     STATE(53),
     1,
     sym_comment,
-    STATE(81),
-    1,
-    sym_param_attribute,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(820),
+    STATE(879),
     1,
-    sym_param_dcl,
-    STATE(1137),
+    sym_value_inheritance,
+    STATE(1181),
+    1,
+    sym_value_inheritance_spec,
+    STATE(1182),
     1,
     sym_type_spec,
-    STATE(1477),
+    STATE(1384),
     1,
-    sym_parameter_dcls,
+    sym_value_supports,
     ACTIONS(67),
     2,
     anon_sym_short,
@@ -28081,25 +28093,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    ACTIONS(1302),
-    3,
-    anon_sym_in,
-    anon_sym_out,
-    anon_sym_inout,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -28117,7 +28124,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
@@ -28191,22 +28198,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(54),
     1,
     sym_comment,
-    STATE(81),
+    STATE(88),
     1,
     sym_param_attribute,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(820),
+    STATE(822),
     1,
     sym_param_dcl,
-    STATE(1137),
+    STATE(1141),
     1,
     sym_type_spec,
-    STATE(1526),
+    STATE(1477),
     1,
     sym_parameter_dcls,
     ACTIONS(67),
@@ -28225,25 +28232,25 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    ACTIONS(1302),
+    ACTIONS(1294),
     3,
     anon_sym_in,
     anon_sym_out,
     anon_sym_inout,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -28261,17 +28268,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [1491] = 40,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [1491] = 38,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -28329,33 +28333,27 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(157),
     1,
     sym_identifier,
-    ACTIONS(1197),
-    1,
-    anon_sym_AT,
-    ACTIONS(1199),
+    ACTIONS(618),
     1,
-    anon_sym_SLASH_SLASH_AT,
+    anon_sym_SLASH_SLASH,
     STATE(55),
     1,
     sym_comment,
-    STATE(324),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(399),
-    1,
-    sym_extend_annotation_appl,
-    STATE(400),
+    STATE(88),
     1,
-    sym_annotation_appl,
-    STATE(631),
+    sym_param_attribute,
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(729),
-    1,
-    sym_type_spec,
     STATE(781),
     1,
     sym_base_type_spec,
+    STATE(1100),
+    1,
+    sym_param_dcl,
+    STATE(1141),
+    1,
+    sym_type_spec,
     ACTIONS(67),
     2,
     anon_sym_short,
@@ -28372,20 +28370,25 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    ACTIONS(1294),
+    3,
+    anon_sym_in,
+    anon_sym_out,
+    anon_sym_inout,
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -28403,14 +28406,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [1633] = 40,
+    [1629] = 40,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -28489,10 +28492,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_annotation_appl,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
-    STATE(662),
+    STATE(733),
     1,
     sym_type_spec,
     STATE(781),
@@ -28514,20 +28517,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -28545,14 +28548,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [1775] = 38,
+    [1771] = 40,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -28610,27 +28616,33 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(157),
     1,
     sym_identifier,
-    ACTIONS(618),
+    ACTIONS(1197),
     1,
-    anon_sym_SLASH_SLASH,
+    anon_sym_AT,
+    ACTIONS(1199),
+    1,
+    anon_sym_SLASH_SLASH_AT,
     STATE(57),
     1,
     sym_comment,
-    STATE(81),
+    STATE(324),
     1,
-    sym_param_attribute,
-    STATE(631),
+    aux_sym_interface_dcl_repeat1,
+    STATE(399),
     1,
-    sym_scoped_name,
-    STATE(781),
+    sym_extend_annotation_appl,
+    STATE(400),
     1,
-    sym_base_type_spec,
-    STATE(1095),
+    sym_annotation_appl,
+    STATE(636),
     1,
-    sym_param_dcl,
-    STATE(1137),
+    sym_scoped_name,
+    STATE(647),
     1,
     sym_type_spec,
+    STATE(781),
+    1,
+    sym_base_type_spec,
     ACTIONS(67),
     2,
     anon_sym_short,
@@ -28647,25 +28659,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    ACTIONS(1302),
-    3,
-    anon_sym_in,
-    anon_sym_out,
-    anon_sym_inout,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -28683,7 +28690,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
@@ -28763,10 +28770,10 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(58),
     1,
     sym_comment,
-    STATE(62),
+    STATE(60),
     1,
     aux_sym_annotation_dcl_repeat1,
-    STATE(386),
+    STATE(381),
     1,
     sym_annotation_member,
     STATE(390),
@@ -28794,7 +28801,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
@@ -28802,12 +28809,12 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_any_const_type,
     sym_const_type,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -28907,7 +28914,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(61),
     1,
     aux_sym_annotation_dcl_repeat1,
-    STATE(386),
+    STATE(381),
     1,
     sym_annotation_member,
     STATE(390),
@@ -28935,7 +28942,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
@@ -28943,12 +28950,12 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_any_const_type,
     sym_const_type,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -29042,154 +29049,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1316),
     1,
     anon_sym_RBRACE,
-    STATE(58),
-    1,
-    aux_sym_annotation_dcl_repeat1,
     STATE(60),
     1,
     sym_comment,
-    STATE(386),
-    1,
-    sym_annotation_member,
-    STATE(390),
-    1,
-    sym_annotation_body,
-    STATE(1144),
-    1,
-    sym_annotation_member_type,
-    STATE(1145),
-    1,
-    sym_scoped_name,
-    ACTIONS(67),
-    2,
-    anon_sym_short,
-    anon_sym_int16,
-    ACTIONS(69),
-    2,
-    anon_sym_long,
-    anon_sym_int32,
-    ACTIONS(87),
-    2,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    ACTIONS(93),
-    2,
-    anon_sym_float,
-    anon_sym_double,
-    STATE(632),
-    2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(1198),
-    2,
-    sym_any_const_type,
-    sym_const_type,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    STATE(1199),
-    3,
-    sym_typedef_dcl,
-    sym_enum_dcl,
-    sym_const_dcl,
-    ACTIONS(1306),
-    4,
-    sym_boolean_type,
-    sym_octet_type,
-    sym_char_type,
-    sym_wide_char_type,
-    STATE(1523),
-    6,
-    sym_fixed_pt_const_type,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_string_type,
-    sym_wide_string_type,
-    sym_sequence_type,
-    [2336] = 40,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(71),
-    1,
-    anon_sym_longlong,
-    ACTIONS(73),
-    1,
-    anon_sym_int64,
-    ACTIONS(75),
-    1,
-    sym_unsigned_tiny_int,
-    ACTIONS(81),
-    1,
-    sym_signed_tiny_int,
-    ACTIONS(83),
-    1,
-    anon_sym_unsignedshort,
-    ACTIONS(85),
-    1,
-    anon_sym_uint16,
-    ACTIONS(89),
-    1,
-    anon_sym_unsignedlonglong,
-    ACTIONS(91),
-    1,
-    anon_sym_uint64,
-    ACTIONS(95),
-    1,
-    anon_sym_longdouble,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(99),
-    1,
-    anon_sym_string,
-    ACTIONS(101),
-    1,
-    anon_sym_wstring,
-    ACTIONS(105),
-    1,
-    anon_sym_sequence,
-    ACTIONS(135),
-    1,
-    anon_sym_enum,
-    ACTIONS(137),
-    1,
-    anon_sym_const,
-    ACTIONS(145),
-    1,
-    anon_sym_typedef,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(1308),
-    1,
-    anon_sym_fixed,
-    ACTIONS(1310),
-    1,
-    anon_sym_any,
-    ACTIONS(1314),
-    1,
-    anon_sym_attribute,
-    ACTIONS(1318),
-    1,
-    anon_sym_RBRACE,
     STATE(61),
     1,
-    sym_comment,
-    STATE(62),
-    1,
     aux_sym_annotation_dcl_repeat1,
-    STATE(386),
+    STATE(381),
     1,
     sym_annotation_member,
     STATE(390),
@@ -29217,7 +29083,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
@@ -29225,12 +29091,12 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_any_const_type,
     sym_const_type,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -29254,77 +29120,77 @@ static const uint16_t ts_small_parse_table[] = {
     sym_string_type,
     sym_wide_string_type,
     sym_sequence_type,
-    [2477] = 39,
+    [2336] = 39,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1326),
+    ACTIONS(1324),
     1,
     anon_sym_longlong,
-    ACTIONS(1329),
+    ACTIONS(1327),
     1,
     anon_sym_int64,
-    ACTIONS(1332),
+    ACTIONS(1330),
     1,
     sym_unsigned_tiny_int,
-    ACTIONS(1338),
+    ACTIONS(1336),
     1,
     anon_sym_fixed,
-    ACTIONS(1341),
+    ACTIONS(1339),
     1,
     sym_signed_tiny_int,
-    ACTIONS(1344),
+    ACTIONS(1342),
     1,
     anon_sym_unsignedshort,
-    ACTIONS(1347),
+    ACTIONS(1345),
     1,
     anon_sym_uint16,
-    ACTIONS(1353),
+    ACTIONS(1351),
     1,
     anon_sym_unsignedlonglong,
-    ACTIONS(1356),
+    ACTIONS(1354),
     1,
     anon_sym_uint64,
-    ACTIONS(1362),
+    ACTIONS(1360),
     1,
     anon_sym_longdouble,
-    ACTIONS(1365),
+    ACTIONS(1363),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(1368),
+    ACTIONS(1366),
     1,
     anon_sym_string,
-    ACTIONS(1371),
+    ACTIONS(1369),
     1,
     anon_sym_wstring,
-    ACTIONS(1374),
+    ACTIONS(1372),
     1,
     anon_sym_any,
-    ACTIONS(1377),
+    ACTIONS(1375),
     1,
     anon_sym_sequence,
-    ACTIONS(1380),
+    ACTIONS(1378),
     1,
     anon_sym_RBRACE,
-    ACTIONS(1382),
+    ACTIONS(1380),
     1,
     anon_sym_attribute,
-    ACTIONS(1385),
+    ACTIONS(1383),
     1,
     anon_sym_enum,
-    ACTIONS(1388),
+    ACTIONS(1386),
     1,
     anon_sym_const,
-    ACTIONS(1391),
+    ACTIONS(1389),
     1,
     anon_sym_typedef,
-    ACTIONS(1394),
+    ACTIONS(1392),
     1,
     sym_identifier,
-    STATE(386),
+    STATE(381),
     1,
     sym_annotation_member,
     STATE(390),
@@ -29336,27 +29202,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1145),
     1,
     sym_scoped_name,
-    ACTIONS(1320),
+    ACTIONS(1318),
     2,
     anon_sym_short,
     anon_sym_int16,
-    ACTIONS(1323),
+    ACTIONS(1321),
     2,
     anon_sym_long,
     anon_sym_int32,
-    ACTIONS(1350),
+    ACTIONS(1348),
     2,
     anon_sym_unsignedlong,
     anon_sym_uint32,
-    ACTIONS(1359),
+    ACTIONS(1357),
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(62),
+    STATE(61),
     2,
     sym_comment,
     aux_sym_annotation_dcl_repeat1,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
@@ -29364,12 +29230,12 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_any_const_type,
     sym_const_type,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -29379,7 +29245,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_typedef_dcl,
     sym_enum_dcl,
     sym_const_dcl,
-    ACTIONS(1335),
+    ACTIONS(1333),
     4,
     sym_boolean_type,
     sym_octet_type,
@@ -29393,7 +29259,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_string_type,
     sym_wide_string_type,
     sym_sequence_type,
-    [2616] = 34,
+    [2475] = 40,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -29427,42 +29293,60 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(97),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(103),
+    ACTIONS(99),
     1,
-    anon_sym_any,
-    ACTIONS(151),
+    anon_sym_string,
+    ACTIONS(101),
     1,
-    anon_sym_Object,
+    anon_sym_wstring,
+    ACTIONS(105),
+    1,
+    anon_sym_sequence,
+    ACTIONS(135),
+    1,
+    anon_sym_enum,
+    ACTIONS(137),
+    1,
+    anon_sym_const,
+    ACTIONS(145),
+    1,
+    anon_sym_typedef,
     ACTIONS(157),
     1,
     sym_identifier,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1397),
+    ACTIONS(1308),
     1,
-    anon_sym_sequence,
-    ACTIONS(1401),
+    anon_sym_fixed,
+    ACTIONS(1310),
     1,
-    anon_sym_const,
-    STATE(63),
+    anon_sym_any,
+    ACTIONS(1314),
     1,
-    sym_comment,
-    STATE(631),
+    anon_sym_attribute,
+    ACTIONS(1395),
     1,
-    sym_scoped_name,
-    STATE(781),
+    anon_sym_RBRACE,
+    STATE(59),
     1,
-    sym_base_type_spec,
-    STATE(910),
+    aux_sym_annotation_dcl_repeat1,
+    STATE(62),
     1,
-    sym_formal_parameter,
-    STATE(1249),
+    sym_comment,
+    STATE(381),
     1,
-    sym_formal_parameters,
-    STATE(1250),
+    sym_annotation_member,
+    STATE(390),
     1,
-    sym_formal_parameter_type,
+    sym_annotation_body,
+    STATE(1144),
+    1,
+    sym_annotation_member_type,
+    STATE(1145),
+    1,
+    sym_scoped_name,
     ACTIONS(67),
     2,
     anon_sym_short,
@@ -29479,58 +29363,54 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(1248),
+    STATE(1198),
     2,
-    sym_simple_type_spec,
-    sym_sequence_type,
-    STATE(626),
+    sym_any_const_type,
+    sym_const_type,
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
     sym_unsigned_longlong_int,
-    STATE(775),
+    STATE(1199),
+    3,
+    sym_typedef_dcl,
+    sym_enum_dcl,
+    sym_const_dcl,
+    ACTIONS(1306),
     4,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_any_type,
-    sym_object_type,
-    ACTIONS(77),
-    5,
     sym_boolean_type,
     sym_octet_type,
     sym_char_type,
     sym_wide_char_type,
-    sym_value_base_type,
-    ACTIONS(1399),
-    8,
-    anon_sym_exception,
-    anon_sym_interface,
-    anon_sym_typename,
-    anon_sym_valuetype,
-    anon_sym_eventtype,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    [2743] = 5,
+    STATE(1523),
+    6,
+    sym_fixed_pt_const_type,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_string_type,
+    sym_wide_string_type,
+    sym_sequence_type,
+    [2616] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(64),
+    STATE(63),
     1,
     sym_comment,
-    ACTIONS(1405),
+    ACTIONS(1399),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -29540,7 +29420,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1403),
+    ACTIONS(1397),
     47,
     anon_sym_short,
     anon_sym_int16,
@@ -29589,17 +29469,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [2812] = 5,
+    [2685] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(65),
+    STATE(64),
     1,
     sym_comment,
-    ACTIONS(1409),
+    ACTIONS(1403),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -29609,7 +29489,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1407),
+    ACTIONS(1401),
     47,
     anon_sym_short,
     anon_sym_int16,
@@ -29658,17 +29538,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [2881] = 5,
+    [2754] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(66),
+    STATE(65),
     1,
     sym_comment,
-    ACTIONS(1413),
+    ACTIONS(1407),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -29678,7 +29558,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1411),
+    ACTIONS(1405),
     47,
     anon_sym_short,
     anon_sym_int16,
@@ -29727,17 +29607,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [2950] = 5,
+    [2823] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(67),
+    STATE(66),
     1,
     sym_comment,
-    ACTIONS(1417),
+    ACTIONS(1411),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -29747,7 +29627,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1415),
+    ACTIONS(1409),
     47,
     anon_sym_short,
     anon_sym_int16,
@@ -29796,86 +29676,144 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [3019] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [2892] = 34,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(68),
+    ACTIONS(71),
     1,
-    sym_comment,
-    ACTIONS(1421),
-    8,
     anon_sym_longlong,
+    ACTIONS(73),
+    1,
+    anon_sym_int64,
+    ACTIONS(75),
+    1,
+    sym_unsigned_tiny_int,
+    ACTIONS(81),
+    1,
+    sym_signed_tiny_int,
+    ACTIONS(83),
+    1,
     anon_sym_unsignedshort,
+    ACTIONS(85),
+    1,
+    anon_sym_uint16,
+    ACTIONS(89),
+    1,
     anon_sym_unsignedlonglong,
+    ACTIONS(91),
+    1,
+    anon_sym_uint64,
+    ACTIONS(95),
+    1,
     anon_sym_longdouble,
+    ACTIONS(97),
+    1,
     anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1419),
-    47,
+    ACTIONS(103),
+    1,
+    anon_sym_any,
+    ACTIONS(151),
+    1,
+    anon_sym_Object,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1413),
+    1,
+    anon_sym_sequence,
+    ACTIONS(1417),
+    1,
+    anon_sym_const,
+    STATE(67),
+    1,
+    sym_comment,
+    STATE(636),
+    1,
+    sym_scoped_name,
+    STATE(781),
+    1,
+    sym_base_type_spec,
+    STATE(919),
+    1,
+    sym_formal_parameter,
+    STATE(1249),
+    1,
+    sym_formal_parameters,
+    STATE(1250),
+    1,
+    sym_formal_parameter_type,
+    ACTIONS(67),
+    2,
     anon_sym_short,
     anon_sym_int16,
+    ACTIONS(69),
+    2,
     anon_sym_long,
     anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
+    ACTIONS(87),
+    2,
     anon_sym_unsignedlong,
     anon_sym_uint32,
-    anon_sym_uint64,
+    ACTIONS(93),
+    2,
     anon_sym_float,
     anon_sym_double,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(1248),
+    2,
+    sym_simple_type_spec,
+    sym_sequence_type,
+    STATE(662),
+    3,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    STATE(775),
+    4,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_any_type,
+    sym_object_type,
+    ACTIONS(77),
+    5,
+    sym_boolean_type,
+    sym_octet_type,
     sym_char_type,
     sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
+    sym_value_base_type,
+    ACTIONS(1415),
+    8,
     anon_sym_exception,
-    anon_sym_abstract,
-    anon_sym_void,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
+    anon_sym_interface,
+    anon_sym_typename,
     anon_sym_valuetype,
+    anon_sym_eventtype,
     anon_sym_struct,
     anon_sym_union,
     anon_sym_enum,
-    anon_sym_const,
-    anon_sym_custom,
-    anon_sym_public,
-    anon_sym_private,
-    anon_sym_factory,
-    anon_sym_typedef,
-    anon_sym_typeid,
-    anon_sym_import,
-    anon_sym_Object,
-    anon_sym_oneway,
-    sym_value_base_type,
-    anon_sym_native,
-    sym_identifier,
-    [3088] = 5,
+    [3019] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(69),
+    STATE(68),
     1,
     sym_comment,
-    ACTIONS(1425),
+    ACTIONS(1421),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -29885,7 +29823,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1423),
+    ACTIONS(1419),
     47,
     anon_sym_short,
     anon_sym_int16,
@@ -29934,17 +29872,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [3157] = 5,
+    [3088] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(70),
+    STATE(69),
     1,
     sym_comment,
-    ACTIONS(1429),
+    ACTIONS(1425),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -29954,7 +29892,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1427),
+    ACTIONS(1423),
     47,
     anon_sym_short,
     anon_sym_int16,
@@ -30003,17 +29941,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [3226] = 5,
+    [3157] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(71),
+    STATE(70),
     1,
     sym_comment,
-    ACTIONS(1433),
+    ACTIONS(1429),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -30023,8 +29961,8 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1431),
-    46,
+    ACTIONS(1427),
+    47,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -30061,6 +29999,8 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_const,
     anon_sym_custom,
+    anon_sym_public,
+    anon_sym_private,
     anon_sym_factory,
     anon_sym_typedef,
     anon_sym_typeid,
@@ -30068,20 +30008,19 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     anon_sym_oneway,
     sym_value_base_type,
-    anon_sym_finder,
     anon_sym_native,
     sym_identifier,
-    [3294] = 5,
+    [3226] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(72),
+    STATE(71),
     1,
     sym_comment,
-    ACTIONS(1409),
+    ACTIONS(1403),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -30091,7 +30030,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1407),
+    ACTIONS(1401),
     46,
     anon_sym_short,
     anon_sym_int16,
@@ -30139,7 +30078,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_finder,
     anon_sym_native,
     sym_identifier,
-    [3362] = 33,
+    [3294] = 33,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -30185,22 +30124,22 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1397),
+    ACTIONS(1413),
     1,
     anon_sym_sequence,
-    ACTIONS(1401),
+    ACTIONS(1417),
     1,
     anon_sym_const,
-    STATE(73),
+    STATE(72),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1056),
+    STATE(1063),
     1,
     sym_formal_parameter,
     STATE(1250),
@@ -30222,7 +30161,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
@@ -30230,12 +30169,12 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_simple_type_spec,
     sym_sequence_type,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -30253,7 +30192,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    ACTIONS(1399),
+    ACTIONS(1415),
     8,
     anon_sym_exception,
     anon_sym_interface,
@@ -30263,6 +30202,74 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_struct,
     anon_sym_union,
     anon_sym_enum,
+    [3418] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(73),
+    1,
+    sym_comment,
+    ACTIONS(1433),
+    8,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_RBRACE,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1431),
+    46,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_exception,
+    anon_sym_abstract,
+    anon_sym_void,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_valuetype,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_custom,
+    anon_sym_factory,
+    anon_sym_typedef,
+    anon_sym_typeid,
+    anon_sym_import,
+    anon_sym_Object,
+    anon_sym_oneway,
+    sym_value_base_type,
+    anon_sym_finder,
+    anon_sym_native,
+    sym_identifier,
     [3486] = 5,
     ACTIONS(3),
     1,
@@ -30454,22 +30461,22 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(151),
     1,
     anon_sym_Object,
+    ACTIONS(157),
+    1,
+    sym_identifier,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1443),
-    1,
-    sym_identifier,
     STATE(76),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1070),
+    STATE(1117),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -30488,20 +30495,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -30519,7 +30526,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
@@ -30560,7 +30567,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1445),
+    ACTIONS(1443),
     1,
     anon_sym_STAR,
     STATE(77),
@@ -30569,43 +30576,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1299),
@@ -30633,13 +30640,13 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1447),
+    ACTIONS(1445),
     4,
     aux_sym_verbatim_language_token1,
     aux_sym_verbatim_language_token2,
     aux_sym_verbatim_language_token3,
     aux_sym_verbatim_language_token4,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -30647,7 +30654,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -30657,261 +30664,138 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [3880] = 35,
+    [3880] = 37,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(71),
-    1,
-    anon_sym_longlong,
-    ACTIONS(73),
-    1,
-    anon_sym_int64,
-    ACTIONS(75),
-    1,
-    sym_unsigned_tiny_int,
-    ACTIONS(79),
-    1,
-    anon_sym_fixed,
-    ACTIONS(81),
-    1,
-    sym_signed_tiny_int,
-    ACTIONS(83),
-    1,
-    anon_sym_unsignedshort,
-    ACTIONS(85),
-    1,
-    anon_sym_uint16,
-    ACTIONS(89),
-    1,
-    anon_sym_unsignedlonglong,
-    ACTIONS(91),
-    1,
-    anon_sym_uint64,
-    ACTIONS(95),
+    ACTIONS(157),
     1,
-    anon_sym_longdouble,
-    ACTIONS(97),
+    sym_identifier,
+    ACTIONS(594),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(99),
+    ACTIONS(598),
     1,
-    anon_sym_string,
-    ACTIONS(101),
+    anon_sym_LPAREN,
+    ACTIONS(600),
     1,
-    anon_sym_wstring,
-    ACTIONS(103),
+    anon_sym_TILDE,
+    ACTIONS(606),
     1,
-    anon_sym_any,
-    ACTIONS(105),
+    anon_sym_0,
+    ACTIONS(608),
     1,
-    anon_sym_sequence,
-    ACTIONS(107),
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
     1,
-    anon_sym_map,
-    ACTIONS(151),
+    anon_sym_DQUOTE,
+    ACTIONS(612),
     1,
-    anon_sym_Object,
-    ACTIONS(157),
+    anon_sym_L,
+    ACTIONS(614),
     1,
-    sym_identifier,
+    anon_sym_SQUOTE,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(1443),
+    1,
+    anon_sym_STAR,
     STATE(78),
     1,
     sym_comment,
-    STATE(631),
-    1,
-    sym_scoped_name,
-    STATE(781),
-    1,
-    sym_base_type_spec,
-    STATE(1260),
-    1,
-    sym_type_spec,
-    ACTIONS(67),
-    2,
-    anon_sym_short,
-    anon_sym_int16,
-    ACTIONS(69),
-    2,
-    anon_sym_long,
-    anon_sym_int32,
-    ACTIONS(87),
-    2,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    ACTIONS(93),
-    2,
-    anon_sym_float,
-    anon_sym_double,
-    STATE(632),
-    2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(691),
-    2,
-    sym_simple_type_spec,
-    sym_template_type_spec,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    STATE(775),
-    4,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_any_type,
-    sym_object_type,
-    ACTIONS(77),
-    5,
-    sym_boolean_type,
-    sym_octet_type,
-    sym_char_type,
-    sym_wide_char_type,
-    sym_value_base_type,
-    STATE(779),
-    5,
-    sym_string_type,
-    sym_wide_string_type,
-    sym_fixed_pt_type,
-    sym_sequence_type,
-    sym_map_type,
-    [4007] = 35,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(71),
-    1,
-    anon_sym_longlong,
-    ACTIONS(73),
-    1,
-    anon_sym_int64,
-    ACTIONS(75),
-    1,
-    sym_unsigned_tiny_int,
-    ACTIONS(79),
-    1,
-    anon_sym_fixed,
-    ACTIONS(81),
-    1,
-    sym_signed_tiny_int,
-    ACTIONS(83),
-    1,
-    anon_sym_unsignedshort,
-    ACTIONS(85),
+    STATE(432),
     1,
-    anon_sym_uint16,
-    ACTIONS(89),
+    sym_unary_operator,
+    STATE(450),
     1,
-    anon_sym_unsignedlonglong,
-    ACTIONS(91),
+    sym_scoped_name,
+    STATE(455),
     1,
-    anon_sym_uint64,
-    ACTIONS(95),
+    sym_dec_number,
+    STATE(459),
     1,
-    anon_sym_longdouble,
-    ACTIONS(97),
+    sym_oct_number,
+    STATE(477),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(99),
+    sym_mult_expr,
+    STATE(482),
     1,
-    anon_sym_string,
-    ACTIONS(101),
+    sym_unary_expr,
+    STATE(489),
     1,
-    anon_sym_wstring,
-    ACTIONS(103),
+    sym_literal,
+    STATE(494),
     1,
-    anon_sym_any,
-    ACTIONS(105),
+    sym_primary_expr,
+    STATE(552),
     1,
-    anon_sym_sequence,
-    ACTIONS(107),
+    sym_add_expr,
+    STATE(563),
     1,
-    anon_sym_map,
-    ACTIONS(151),
+    sym_shift_expr,
+    STATE(579),
     1,
-    anon_sym_Object,
-    ACTIONS(157),
+    sym_and_expr,
+    STATE(580),
     1,
-    sym_identifier,
-    ACTIONS(618),
+    sym_xor_expr,
+    STATE(582),
     1,
-    anon_sym_SLASH_SLASH,
-    STATE(79),
+    sym_integer_sign,
+    STATE(595),
     1,
-    sym_comment,
-    STATE(631),
+    sym_or_expr,
+    STATE(1447),
     1,
-    sym_scoped_name,
-    STATE(781),
+    sym_const_expr,
+    STATE(1691),
     1,
-    sym_base_type_spec,
-    STATE(1117),
+    sym_verbatim_language,
+    STATE(1692),
     1,
-    sym_type_spec,
-    ACTIONS(67),
-    2,
-    anon_sym_short,
-    anon_sym_int16,
-    ACTIONS(69),
-    2,
-    anon_sym_long,
-    anon_sym_int32,
-    ACTIONS(87),
+    sym_placement_kind,
+    ACTIONS(596),
     2,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    ACTIONS(93),
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
     2,
-    anon_sym_float,
-    anon_sym_double,
-    STATE(632),
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
     2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(691),
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
     2,
-    sym_simple_type_spec,
-    sym_template_type_spec,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    STATE(775),
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    ACTIONS(1445),
     4,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_any_type,
-    sym_object_type,
-    ACTIONS(77),
-    5,
-    sym_boolean_type,
-    sym_octet_type,
-    sym_char_type,
-    sym_wide_char_type,
-    sym_value_base_type,
-    STATE(779),
-    5,
-    sym_string_type,
-    sym_wide_string_type,
-    sym_fixed_pt_type,
-    sym_sequence_type,
-    sym_map_type,
-    [4134] = 35,
+    aux_sym_verbatim_language_token1,
+    aux_sym_verbatim_language_token2,
+    aux_sym_verbatim_language_token3,
+    aux_sym_verbatim_language_token4,
+    ACTIONS(1447),
+    6,
+    aux_sym_placement_kind_token1,
+    aux_sym_placement_kind_token2,
+    aux_sym_placement_kind_token3,
+    aux_sym_placement_kind_token4,
+    aux_sym_placement_kind_token5,
+    aux_sym_placement_kind_token6,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [4011] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -30966,22 +30850,22 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(151),
     1,
     anon_sym_Object,
-    ACTIONS(157),
-    1,
-    sym_identifier,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(80),
+    ACTIONS(1449),
+    1,
+    sym_identifier,
+    STATE(79),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1101),
+    STATE(1070),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -31000,20 +30884,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -31031,14 +30915,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [4261] = 35,
+    [4138] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -31099,16 +30983,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(81),
+    STATE(80),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1118),
+    STATE(993),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -31127,20 +31011,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -31158,145 +31042,141 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [4388] = 37,
+    [4265] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
+    ACTIONS(71),
     1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
+    anon_sym_longlong,
+    ACTIONS(73),
     1,
-    anon_sym_L,
-    ACTIONS(614),
+    anon_sym_int64,
+    ACTIONS(75),
     1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
+    sym_unsigned_tiny_int,
+    ACTIONS(79),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(1445),
+    anon_sym_fixed,
+    ACTIONS(81),
     1,
-    anon_sym_STAR,
-    STATE(82),
+    sym_signed_tiny_int,
+    ACTIONS(83),
     1,
-    sym_comment,
-    STATE(432),
+    anon_sym_unsignedshort,
+    ACTIONS(85),
     1,
-    sym_unary_operator,
-    STATE(453),
+    anon_sym_uint16,
+    ACTIONS(89),
     1,
-    sym_scoped_name,
-    STATE(454),
+    anon_sym_unsignedlonglong,
+    ACTIONS(91),
     1,
-    sym_dec_number,
-    STATE(467),
+    anon_sym_uint64,
+    ACTIONS(95),
     1,
-    sym_oct_number,
-    STATE(481),
+    anon_sym_longdouble,
+    ACTIONS(97),
     1,
-    sym_literal,
-    STATE(482),
+    anon_sym_COLON_COLON,
+    ACTIONS(99),
     1,
-    sym_primary_expr,
-    STATE(483),
+    anon_sym_string,
+    ACTIONS(101),
     1,
-    sym_unary_expr,
-    STATE(484),
+    anon_sym_wstring,
+    ACTIONS(103),
     1,
-    sym_mult_expr,
-    STATE(552),
+    anon_sym_any,
+    ACTIONS(105),
     1,
-    sym_add_expr,
-    STATE(562),
+    anon_sym_sequence,
+    ACTIONS(107),
     1,
-    sym_shift_expr,
-    STATE(567),
+    anon_sym_map,
+    ACTIONS(151),
     1,
-    sym_and_expr,
-    STATE(584),
+    anon_sym_Object,
+    ACTIONS(157),
     1,
-    sym_xor_expr,
-    STATE(587),
+    sym_identifier,
+    ACTIONS(618),
     1,
-    sym_integer_sign,
-    STATE(589),
+    anon_sym_SLASH_SLASH,
+    STATE(81),
     1,
-    sym_or_expr,
-    STATE(1352),
+    sym_comment,
+    STATE(636),
     1,
-    sym_const_expr,
-    STATE(1651),
+    sym_scoped_name,
+    STATE(781),
     1,
-    sym_verbatim_language,
-    STATE(1652),
+    sym_base_type_spec,
+    STATE(1119),
     1,
-    sym_placement_kind,
-    ACTIONS(596),
+    sym_type_spec,
+    ACTIONS(67),
     2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
+    anon_sym_short,
+    anon_sym_int16,
+    ACTIONS(69),
     2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
+    anon_sym_long,
+    anon_sym_int32,
+    ACTIONS(87),
     2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    ACTIONS(93),
     2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    ACTIONS(1447),
+    anon_sym_float,
+    anon_sym_double,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(693),
+    2,
+    sym_simple_type_spec,
+    sym_template_type_spec,
+    STATE(662),
+    3,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    STATE(775),
     4,
-    aux_sym_verbatim_language_token1,
-    aux_sym_verbatim_language_token2,
-    aux_sym_verbatim_language_token3,
-    aux_sym_verbatim_language_token4,
-    ACTIONS(1449),
-    6,
-    aux_sym_placement_kind_token1,
-    aux_sym_placement_kind_token2,
-    aux_sym_placement_kind_token3,
-    aux_sym_placement_kind_token4,
-    aux_sym_placement_kind_token5,
-    aux_sym_placement_kind_token6,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [4519] = 35,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_any_type,
+    sym_object_type,
+    ACTIONS(77),
+    5,
+    sym_boolean_type,
+    sym_octet_type,
+    sym_char_type,
+    sym_wide_char_type,
+    sym_value_base_type,
+    STATE(777),
+    5,
+    sym_string_type,
+    sym_wide_string_type,
+    sym_fixed_pt_type,
+    sym_sequence_type,
+    sym_map_type,
+    [4392] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -31354,19 +31234,19 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1443),
+    ACTIONS(1449),
     1,
     sym_identifier,
-    STATE(83),
+    STATE(82),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1162),
+    STATE(1085),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -31385,20 +31265,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -31416,14 +31296,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [4646] = 35,
+    [4519] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -31484,15 +31364,15 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(84),
+    STATE(83),
     1,
     sym_comment,
     STATE(631),
     1,
-    sym_scoped_name,
-    STATE(651),
-    1,
     sym_type_spec,
+    STATE(636),
+    1,
+    sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
@@ -31512,20 +31392,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -31543,14 +31423,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [4773] = 35,
+    [4646] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -31611,16 +31491,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(85),
+    STATE(84),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1115),
+    STATE(1107),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -31639,20 +31519,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -31670,14 +31550,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [4900] = 35,
+    [4773] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -31738,16 +31618,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(86),
+    STATE(85),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(981),
+    STATE(798),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -31766,20 +31646,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -31797,14 +31677,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [5027] = 37,
+    [4900] = 37,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -31838,61 +31718,61 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1445),
+    ACTIONS(1443),
     1,
     anon_sym_STAR,
-    STATE(87),
+    STATE(86),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1447),
+    STATE(1352),
     1,
     sym_const_expr,
-    STATE(1691),
+    STATE(1651),
     1,
     sym_verbatim_language,
-    STATE(1692),
+    STATE(1652),
     1,
     sym_placement_kind,
     ACTIONS(596),
@@ -31911,13 +31791,13 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1447),
+    ACTIONS(1445),
     4,
     aux_sym_verbatim_language_token1,
     aux_sym_verbatim_language_token2,
     aux_sym_verbatim_language_token3,
     aux_sym_verbatim_language_token4,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -31925,7 +31805,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -31935,138 +31815,134 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [5158] = 37,
+    [5031] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
+    ACTIONS(71),
     1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
+    anon_sym_longlong,
+    ACTIONS(73),
     1,
-    anon_sym_L,
-    ACTIONS(614),
+    anon_sym_int64,
+    ACTIONS(75),
     1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
+    sym_unsigned_tiny_int,
+    ACTIONS(79),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(1445),
+    anon_sym_fixed,
+    ACTIONS(81),
     1,
-    anon_sym_STAR,
-    STATE(88),
+    sym_signed_tiny_int,
+    ACTIONS(83),
     1,
-    sym_comment,
-    STATE(432),
+    anon_sym_unsignedshort,
+    ACTIONS(85),
     1,
-    sym_unary_operator,
-    STATE(453),
+    anon_sym_uint16,
+    ACTIONS(89),
     1,
-    sym_scoped_name,
-    STATE(454),
+    anon_sym_unsignedlonglong,
+    ACTIONS(91),
     1,
-    sym_dec_number,
-    STATE(467),
+    anon_sym_uint64,
+    ACTIONS(95),
     1,
-    sym_oct_number,
-    STATE(481),
+    anon_sym_longdouble,
+    ACTIONS(97),
     1,
-    sym_literal,
-    STATE(482),
+    anon_sym_COLON_COLON,
+    ACTIONS(99),
     1,
-    sym_primary_expr,
-    STATE(483),
+    anon_sym_string,
+    ACTIONS(101),
     1,
-    sym_unary_expr,
-    STATE(484),
+    anon_sym_wstring,
+    ACTIONS(103),
     1,
-    sym_mult_expr,
-    STATE(552),
+    anon_sym_any,
+    ACTIONS(105),
     1,
-    sym_add_expr,
-    STATE(562),
+    anon_sym_sequence,
+    ACTIONS(107),
     1,
-    sym_shift_expr,
-    STATE(567),
+    anon_sym_map,
+    ACTIONS(151),
     1,
-    sym_and_expr,
-    STATE(584),
+    anon_sym_Object,
+    ACTIONS(157),
     1,
-    sym_xor_expr,
-    STATE(587),
+    sym_identifier,
+    ACTIONS(618),
     1,
-    sym_integer_sign,
-    STATE(589),
+    anon_sym_SLASH_SLASH,
+    STATE(87),
     1,
-    sym_or_expr,
-    STATE(1400),
+    sym_comment,
+    STATE(636),
     1,
-    sym_const_expr,
-    STATE(1671),
+    sym_scoped_name,
+    STATE(781),
     1,
-    sym_verbatim_language,
-    STATE(1672),
+    sym_base_type_spec,
+    STATE(1260),
     1,
-    sym_placement_kind,
-    ACTIONS(596),
+    sym_type_spec,
+    ACTIONS(67),
     2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
+    anon_sym_short,
+    anon_sym_int16,
+    ACTIONS(69),
     2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
+    anon_sym_long,
+    anon_sym_int32,
+    ACTIONS(87),
     2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    ACTIONS(93),
     2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    ACTIONS(1447),
+    anon_sym_float,
+    anon_sym_double,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(693),
+    2,
+    sym_simple_type_spec,
+    sym_template_type_spec,
+    STATE(662),
+    3,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    STATE(775),
     4,
-    aux_sym_verbatim_language_token1,
-    aux_sym_verbatim_language_token2,
-    aux_sym_verbatim_language_token3,
-    aux_sym_verbatim_language_token4,
-    ACTIONS(1449),
-    6,
-    aux_sym_placement_kind_token1,
-    aux_sym_placement_kind_token2,
-    aux_sym_placement_kind_token3,
-    aux_sym_placement_kind_token4,
-    aux_sym_placement_kind_token5,
-    aux_sym_placement_kind_token6,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [5289] = 35,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_any_type,
+    sym_object_type,
+    ACTIONS(77),
+    5,
+    sym_boolean_type,
+    sym_octet_type,
+    sym_char_type,
+    sym_wide_char_type,
+    sym_value_base_type,
+    STATE(777),
+    5,
+    sym_string_type,
+    sym_wide_string_type,
+    sym_fixed_pt_type,
+    sym_sequence_type,
+    sym_map_type,
+    [5158] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -32127,16 +32003,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(89),
+    STATE(88),
     1,
     sym_comment,
-    STATE(631),
+    STATE(636),
     1,
     sym_scoped_name,
     STATE(781),
     1,
     sym_base_type_spec,
-    STATE(1039),
+    STATE(1122),
     1,
     sym_type_spec,
     ACTIONS(67),
@@ -32155,20 +32031,20 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(691),
+    STATE(693),
     2,
     sym_simple_type_spec,
     sym_template_type_spec,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -32186,14 +32062,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_type,
     sym_wide_char_type,
     sym_value_base_type,
-    STATE(779),
+    STATE(777),
     5,
     sym_string_type,
     sym_wide_string_type,
     sym_fixed_pt_type,
     sym_sequence_type,
     sym_map_type,
-    [5416] = 37,
+    [5285] = 37,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -32227,52 +32103,183 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1445),
+    ACTIONS(1443),
     1,
     anon_sym_STAR,
-    STATE(90),
+    STATE(89),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
     sym_primary_expr,
-    STATE(483),
+    STATE(552),
     1,
-    sym_unary_expr,
-    STATE(484),
+    sym_add_expr,
+    STATE(563),
+    1,
+    sym_shift_expr,
+    STATE(579),
+    1,
+    sym_and_expr,
+    STATE(580),
+    1,
+    sym_xor_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    STATE(595),
+    1,
+    sym_or_expr,
+    STATE(1400),
+    1,
+    sym_const_expr,
+    STATE(1671),
+    1,
+    sym_verbatim_language,
+    STATE(1672),
+    1,
+    sym_placement_kind,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    ACTIONS(1445),
+    4,
+    aux_sym_verbatim_language_token1,
+    aux_sym_verbatim_language_token2,
+    aux_sym_verbatim_language_token3,
+    aux_sym_verbatim_language_token4,
+    ACTIONS(1447),
+    6,
+    aux_sym_placement_kind_token1,
+    aux_sym_placement_kind_token2,
+    aux_sym_placement_kind_token3,
+    aux_sym_placement_kind_token4,
+    aux_sym_placement_kind_token5,
+    aux_sym_placement_kind_token6,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [5416] = 37,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1443),
+    1,
+    anon_sym_STAR,
+    STATE(90),
+    1,
+    sym_comment,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(477),
     1,
     sym_mult_expr,
+    STATE(482),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1227),
@@ -32300,13 +32307,13 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1447),
+    ACTIONS(1445),
     4,
     aux_sym_verbatim_language_token1,
     aux_sym_verbatim_language_token2,
     aux_sym_verbatim_language_token3,
     aux_sym_verbatim_language_token4,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -32314,7 +32321,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -32334,7 +32341,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(91),
     1,
     sym_comment,
-    ACTIONS(1409),
+    ACTIONS(1453),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -32344,7 +32351,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1407),
+    ACTIONS(1451),
     44,
     anon_sym_short,
     anon_sym_int16,
@@ -32400,7 +32407,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(92),
     1,
     sym_comment,
-    ACTIONS(1453),
+    ACTIONS(1403),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -32410,7 +32417,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1451),
+    ACTIONS(1401),
     44,
     anon_sym_short,
     anon_sym_int16,
@@ -32496,43 +32503,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1578),
@@ -32557,7 +32564,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -32565,7 +32572,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -32615,43 +32622,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1369),
@@ -32676,7 +32683,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -32684,7 +32691,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -32734,43 +32741,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1417),
@@ -32795,7 +32802,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -32803,7 +32810,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -32853,49 +32860,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1318),
+    STATE(1464),
     1,
     sym_const_expr,
-    STATE(1636),
+    STATE(1696),
     1,
     sym_placement_kind,
     ACTIONS(596),
@@ -32914,7 +32921,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -32922,7 +32929,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -32972,49 +32979,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1464),
+    STATE(1318),
     1,
     sym_const_expr,
-    STATE(1696),
+    STATE(1636),
     1,
     sym_placement_kind,
     ACTIONS(596),
@@ -33033,7 +33040,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    ACTIONS(1449),
+    ACTIONS(1447),
     6,
     aux_sym_placement_kind_token1,
     aux_sym_placement_kind_token2,
@@ -33041,7 +33048,7 @@ static const uint16_t ts_small_parse_table[] = {
     aux_sym_placement_kind_token4,
     aux_sym_placement_kind_token5,
     aux_sym_placement_kind_token6,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -33051,75 +33058,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [6274] = 9,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(1459),
-    1,
-    anon_sym_AT,
-    ACTIONS(1462),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    STATE(181),
-    1,
-    sym_annotation_appl,
-    STATE(183),
-    1,
-    sym_extend_annotation_appl,
-    STATE(98),
-    2,
-    sym_comment,
-    aux_sym_interface_dcl_repeat1,
-    ACTIONS(1457),
-    5,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    ACTIONS(1455),
-    36,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_void,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_Object,
-    sym_value_base_type,
-    anon_sym_native,
-    sym_identifier,
-    [6342] = 31,
+    [6274] = 31,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -33174,10 +33113,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(1310),
     1,
     anon_sym_any,
-    STATE(99),
+    STATE(98),
     1,
     sym_comment,
-    STATE(1108),
+    STATE(1112),
     1,
     sym_annotation_member_type,
     STATE(1145),
@@ -33199,7 +33138,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
@@ -33207,12 +33146,12 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_any_const_type,
     sym_const_type,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -33231,89 +33170,37 @@ static const uint16_t ts_small_parse_table[] = {
     sym_string_type,
     sym_wide_string_type,
     sym_sequence_type,
-    [6454] = 6,
+    [6386] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1469),
-    1,
-    anon_sym_LPAREN,
-    STATE(100),
+    ACTIONS(1459),
     1,
-    sym_comment,
-    ACTIONS(1467),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
     anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1465),
-    36,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_void,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_Object,
-    sym_value_base_type,
-    anon_sym_native,
-    sym_identifier,
-    [6514] = 6,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(1462),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(1475),
+    anon_sym_SLASH_SLASH_AT,
+    STATE(176),
     1,
-    anon_sym_LPAREN,
-    STATE(101),
+    sym_annotation_appl,
+    STATE(181),
     1,
+    sym_extend_annotation_appl,
+    STATE(99),
+    2,
     sym_comment,
-    ACTIONS(1473),
-    7,
+    aux_sym_interface_dcl_repeat1,
+    ACTIONS(1457),
+    5,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1471),
+    ACTIONS(1455),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33351,20 +33238,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6574] = 6,
+    [6454] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1481),
+    ACTIONS(1469),
     1,
     anon_sym_LPAREN,
-    STATE(102),
+    STATE(100),
     1,
     sym_comment,
-    ACTIONS(1479),
+    ACTIONS(1467),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -33373,7 +33260,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1477),
+    ACTIONS(1465),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33411,20 +33298,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6634] = 6,
+    [6514] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1487),
+    ACTIONS(1475),
     1,
     anon_sym_LPAREN,
-    STATE(103),
+    STATE(101),
     1,
     sym_comment,
-    ACTIONS(1485),
+    ACTIONS(1473),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -33433,7 +33320,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1483),
+    ACTIONS(1471),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33471,27 +33358,29 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6694] = 5,
+    [6574] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(104),
+    ACTIONS(1481),
+    1,
+    anon_sym_LPAREN,
+    STATE(102),
     1,
     sym_comment,
-    ACTIONS(1491),
-    8,
+    ACTIONS(1479),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1489),
+    ACTIONS(1477),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33529,20 +33418,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6752] = 6,
+    [6634] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1497),
+    ACTIONS(1487),
     1,
     anon_sym_LPAREN,
-    STATE(105),
+    STATE(103),
     1,
     sym_comment,
-    ACTIONS(1495),
+    ACTIONS(1485),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -33551,7 +33440,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1493),
+    ACTIONS(1483),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33589,85 +33478,29 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6812] = 5,
+    [6694] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(106),
+    ACTIONS(1493),
     1,
-    sym_comment,
-    ACTIONS(1501),
-    8,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
     anon_sym_LPAREN,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1499),
-    36,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_void,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_Object,
-    sym_value_base_type,
-    anon_sym_native,
-    sym_identifier,
-    [6870] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(107),
+    STATE(104),
     1,
     sym_comment,
-    ACTIONS(1505),
-    8,
+    ACTIONS(1491),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1503),
+    ACTIONS(1489),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33705,20 +33538,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6928] = 6,
+    [6754] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1511),
+    ACTIONS(1499),
     1,
     anon_sym_LPAREN,
-    STATE(108),
+    STATE(105),
     1,
     sym_comment,
-    ACTIONS(1509),
+    ACTIONS(1497),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -33727,7 +33560,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1507),
+    ACTIONS(1495),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33765,20 +33598,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [6988] = 6,
+    [6814] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1517),
+    ACTIONS(1505),
     1,
     anon_sym_LPAREN,
-    STATE(109),
+    STATE(106),
     1,
     sym_comment,
-    ACTIONS(1515),
+    ACTIONS(1503),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -33787,7 +33620,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1513),
+    ACTIONS(1501),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33825,29 +33658,27 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7048] = 6,
+    [6874] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1523),
-    1,
-    anon_sym_LPAREN,
-    STATE(110),
+    STATE(107),
     1,
     sym_comment,
-    ACTIONS(1521),
-    7,
+    ACTIONS(1509),
+    8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
+    anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1519),
+    ACTIONS(1507),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33885,20 +33716,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7108] = 6,
+    [6932] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1529),
+    ACTIONS(1515),
     1,
     anon_sym_LPAREN,
-    STATE(111),
+    STATE(108),
     1,
     sym_comment,
-    ACTIONS(1527),
+    ACTIONS(1513),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -33907,7 +33738,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1525),
+    ACTIONS(1511),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -33945,29 +33776,27 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7168] = 6,
+    [6992] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1535),
-    1,
-    anon_sym_LPAREN,
-    STATE(112),
+    STATE(109),
     1,
     sym_comment,
-    ACTIONS(1533),
-    7,
+    ACTIONS(1519),
+    8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
+    anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1531),
+    ACTIONS(1517),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34005,29 +33834,27 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7228] = 6,
+    [7050] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1541),
-    1,
-    anon_sym_LPAREN,
-    STATE(113),
+    STATE(110),
     1,
     sym_comment,
-    ACTIONS(1539),
-    7,
+    ACTIONS(1523),
+    8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
+    anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1537),
+    ACTIONS(1521),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34065,20 +33892,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7288] = 6,
+    [7108] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1547),
+    ACTIONS(1529),
     1,
     anon_sym_LPAREN,
-    STATE(114),
+    STATE(111),
     1,
     sym_comment,
-    ACTIONS(1545),
+    ACTIONS(1527),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34087,7 +33914,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1543),
+    ACTIONS(1525),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34125,20 +33952,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7348] = 6,
+    [7168] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1553),
+    ACTIONS(1535),
     1,
     anon_sym_LPAREN,
-    STATE(115),
+    STATE(112),
     1,
     sym_comment,
-    ACTIONS(1551),
+    ACTIONS(1533),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34147,7 +33974,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1549),
+    ACTIONS(1531),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34185,20 +34012,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7408] = 6,
+    [7228] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1559),
+    ACTIONS(1541),
     1,
     anon_sym_LPAREN,
-    STATE(116),
+    STATE(113),
     1,
     sym_comment,
-    ACTIONS(1557),
+    ACTIONS(1539),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34207,7 +34034,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1555),
+    ACTIONS(1537),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34245,20 +34072,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7468] = 6,
+    [7288] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1565),
+    ACTIONS(1547),
     1,
     anon_sym_LPAREN,
-    STATE(117),
+    STATE(114),
     1,
     sym_comment,
-    ACTIONS(1563),
+    ACTIONS(1545),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34267,7 +34094,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1561),
+    ACTIONS(1543),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34305,20 +34132,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7528] = 6,
+    [7348] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1571),
+    ACTIONS(1553),
     1,
     anon_sym_LPAREN,
-    STATE(118),
+    STATE(115),
     1,
     sym_comment,
-    ACTIONS(1569),
+    ACTIONS(1551),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34327,7 +34154,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1567),
+    ACTIONS(1549),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34365,17 +34192,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7588] = 5,
+    [7408] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(119),
+    ACTIONS(1559),
+    1,
+    anon_sym_LPAREN,
+    STATE(116),
     1,
     sym_comment,
-    ACTIONS(1575),
+    ACTIONS(1557),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34384,7 +34214,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1573),
+    ACTIONS(1555),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34422,251 +34252,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7645] = 35,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
-    1,
-    anon_sym_L,
-    ACTIONS(614),
-    1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
+    [7468] = 6,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1577),
-    1,
-    anon_sym_STAR,
-    ACTIONS(1579),
-    1,
-    aux_sym_service_platform_token2,
-    STATE(120),
-    1,
-    sym_comment,
-    STATE(432),
-    1,
-    sym_unary_operator,
-    STATE(453),
-    1,
-    sym_scoped_name,
-    STATE(454),
-    1,
-    sym_dec_number,
-    STATE(467),
-    1,
-    sym_oct_number,
-    STATE(481),
-    1,
-    sym_literal,
-    STATE(482),
-    1,
-    sym_primary_expr,
-    STATE(483),
-    1,
-    sym_unary_expr,
-    STATE(484),
-    1,
-    sym_mult_expr,
-    STATE(552),
-    1,
-    sym_add_expr,
-    STATE(562),
-    1,
-    sym_shift_expr,
-    STATE(567),
-    1,
-    sym_and_expr,
-    STATE(584),
-    1,
-    sym_xor_expr,
-    STATE(587),
-    1,
-    sym_integer_sign,
-    STATE(589),
-    1,
-    sym_or_expr,
-    STATE(1097),
-    1,
-    sym_const_expr,
-    STATE(1411),
-    1,
-    sym_topic_platform,
-    ACTIONS(596),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
-    2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [7762] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
+    ACTIONS(1565),
     1,
     anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
-    1,
-    anon_sym_L,
-    ACTIONS(614),
-    1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(1581),
-    1,
-    anon_sym_RPAREN,
-    ACTIONS(1583),
-    1,
-    sym_identifier,
-    STATE(121),
-    1,
-    sym_comment,
-    STATE(432),
-    1,
-    sym_unary_operator,
-    STATE(453),
-    1,
-    sym_scoped_name,
-    STATE(454),
-    1,
-    sym_dec_number,
-    STATE(467),
-    1,
-    sym_oct_number,
-    STATE(481),
-    1,
-    sym_literal,
-    STATE(482),
-    1,
-    sym_primary_expr,
-    STATE(483),
-    1,
-    sym_unary_expr,
-    STATE(484),
-    1,
-    sym_mult_expr,
-    STATE(552),
-    1,
-    sym_add_expr,
-    STATE(562),
-    1,
-    sym_shift_expr,
-    STATE(567),
-    1,
-    sym_and_expr,
-    STATE(584),
-    1,
-    sym_xor_expr,
-    STATE(587),
-    1,
-    sym_integer_sign,
-    STATE(589),
-    1,
-    sym_or_expr,
-    STATE(907),
-    1,
-    sym_annotation_appl_param,
-    STATE(1246),
-    1,
-    sym_const_expr,
-    STATE(1313),
-    1,
-    sym_annotation_appl_params,
-    ACTIONS(596),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
-    2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [7879] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(122),
+    STATE(117),
     1,
     sym_comment,
-    ACTIONS(1587),
+    ACTIONS(1563),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34675,7 +34274,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1585),
+    ACTIONS(1561),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34713,17 +34312,20 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7936] = 5,
+    [7528] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(123),
+    ACTIONS(1571),
+    1,
+    anon_sym_LPAREN,
+    STATE(118),
     1,
     sym_comment,
-    ACTIONS(1591),
+    ACTIONS(1569),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34732,7 +34334,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1589),
+    ACTIONS(1567),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34770,17 +34372,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [7993] = 5,
+    [7588] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(124),
+    STATE(119),
     1,
     sym_comment,
-    ACTIONS(1595),
+    ACTIONS(1575),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34789,7 +34391,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1593),
+    ACTIONS(1573),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34827,17 +34429,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8050] = 5,
+    [7645] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(125),
+    STATE(120),
     1,
     sym_comment,
-    ACTIONS(1599),
+    ACTIONS(1579),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34846,7 +34448,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1597),
+    ACTIONS(1577),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34884,17 +34486,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8107] = 5,
+    [7702] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(126),
+    STATE(121),
     1,
     sym_comment,
-    ACTIONS(1603),
+    ACTIONS(1583),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34903,7 +34505,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1601),
+    ACTIONS(1581),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34941,17 +34543,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8164] = 5,
+    [7759] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(127),
+    STATE(122),
     1,
     sym_comment,
-    ACTIONS(1607),
+    ACTIONS(1587),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -34960,7 +34562,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1605),
+    ACTIONS(1585),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -34998,17 +34600,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8221] = 5,
+    [7816] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(128),
+    STATE(123),
     1,
     sym_comment,
-    ACTIONS(1611),
+    ACTIONS(1591),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35017,7 +34619,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1609),
+    ACTIONS(1589),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35055,17 +34657,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8278] = 5,
+    [7873] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(129),
+    STATE(124),
     1,
     sym_comment,
-    ACTIONS(1615),
+    ACTIONS(1595),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35074,7 +34676,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1613),
+    ACTIONS(1593),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35112,17 +34714,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8335] = 5,
+    [7930] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(130),
+    STATE(125),
     1,
     sym_comment,
-    ACTIONS(1619),
+    ACTIONS(1599),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35131,7 +34733,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1617),
+    ACTIONS(1597),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35169,7 +34771,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8392] = 35,
+    [7987] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -35200,64 +34802,64 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1583),
-    1,
-    sym_identifier,
-    ACTIONS(1621),
+    ACTIONS(1601),
     1,
     anon_sym_RPAREN,
-    STATE(131),
+    ACTIONS(1603),
+    1,
+    sym_identifier,
+    STATE(126),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(907),
+    STATE(786),
     1,
     sym_annotation_appl_param,
     STATE(1246),
     1,
     sym_const_expr,
-    STATE(1366),
+    STATE(1313),
     1,
     sym_annotation_appl_params,
     ACTIONS(596),
@@ -35276,7 +34878,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -35286,134 +34888,74 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [8509] = 35,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
-    1,
-    anon_sym_L,
-    ACTIONS(614),
-    1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
+    [8104] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1577),
-    1,
-    anon_sym_STAR,
-    ACTIONS(1579),
+    ACTIONS(5),
     1,
-    aux_sym_service_platform_token2,
-    STATE(132),
+    anon_sym_SLASH_STAR,
+    STATE(127),
     1,
     sym_comment,
-    STATE(432),
-    1,
-    sym_unary_operator,
-    STATE(453),
-    1,
-    sym_scoped_name,
-    STATE(454),
-    1,
-    sym_dec_number,
-    STATE(467),
-    1,
-    sym_oct_number,
-    STATE(481),
-    1,
-    sym_literal,
-    STATE(482),
-    1,
-    sym_primary_expr,
-    STATE(483),
-    1,
-    sym_unary_expr,
-    STATE(484),
-    1,
-    sym_mult_expr,
-    STATE(552),
-    1,
-    sym_add_expr,
-    STATE(562),
-    1,
-    sym_shift_expr,
-    STATE(567),
-    1,
-    sym_and_expr,
-    STATE(584),
-    1,
-    sym_xor_expr,
-    STATE(587),
-    1,
-    sym_integer_sign,
-    STATE(589),
-    1,
-    sym_or_expr,
-    STATE(1080),
-    1,
-    sym_const_expr,
-    STATE(1363),
-    1,
-    sym_topic_platform,
-    ACTIONS(596),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
-    2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [8626] = 5,
+    ACTIONS(1607),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1605),
+    36,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_void,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_Object,
+    sym_value_base_type,
+    anon_sym_native,
+    sym_identifier,
+    [8161] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(133),
+    STATE(128),
     1,
     sym_comment,
-    ACTIONS(1625),
+    ACTIONS(1611),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35422,7 +34964,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1623),
+    ACTIONS(1609),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35460,17 +35002,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8683] = 5,
+    [8218] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(134),
+    STATE(129),
     1,
     sym_comment,
-    ACTIONS(1629),
+    ACTIONS(1615),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35479,7 +35021,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1627),
+    ACTIONS(1613),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35517,17 +35059,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8740] = 5,
+    [8275] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(135),
+    STATE(130),
     1,
     sym_comment,
-    ACTIONS(1633),
+    ACTIONS(1619),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35536,7 +35078,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1631),
+    ACTIONS(1617),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35574,17 +35116,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8797] = 5,
+    [8332] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(136),
+    STATE(131),
     1,
     sym_comment,
-    ACTIONS(1637),
+    ACTIONS(1623),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35593,7 +35135,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1635),
+    ACTIONS(1621),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35631,17 +35173,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8854] = 5,
+    [8389] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(137),
+    STATE(132),
     1,
     sym_comment,
-    ACTIONS(1641),
+    ACTIONS(1627),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35650,7 +35192,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1639),
+    ACTIONS(1625),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35688,17 +35230,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8911] = 5,
+    [8446] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(138),
+    STATE(133),
     1,
     sym_comment,
-    ACTIONS(1645),
+    ACTIONS(1631),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35707,7 +35249,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1643),
+    ACTIONS(1629),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35745,17 +35287,134 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [8968] = 5,
+    [8503] = 35,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1603),
+    1,
+    sym_identifier,
+    ACTIONS(1633),
+    1,
+    anon_sym_RPAREN,
+    STATE(134),
+    1,
+    sym_comment,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(477),
+    1,
+    sym_mult_expr,
+    STATE(482),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(552),
+    1,
+    sym_add_expr,
+    STATE(563),
+    1,
+    sym_shift_expr,
+    STATE(579),
+    1,
+    sym_and_expr,
+    STATE(580),
+    1,
+    sym_xor_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    STATE(595),
+    1,
+    sym_or_expr,
+    STATE(786),
+    1,
+    sym_annotation_appl_param,
+    STATE(1246),
+    1,
+    sym_const_expr,
+    STATE(1366),
+    1,
+    sym_annotation_appl_params,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [8620] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(139),
+    STATE(135),
     1,
     sym_comment,
-    ACTIONS(1649),
+    ACTIONS(1637),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35764,7 +35423,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1647),
+    ACTIONS(1635),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35802,17 +35461,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9025] = 5,
+    [8677] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(140),
+    STATE(136),
     1,
     sym_comment,
-    ACTIONS(1653),
+    ACTIONS(1641),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35821,7 +35480,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1651),
+    ACTIONS(1639),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35859,17 +35518,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9082] = 5,
+    [8734] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(141),
+    STATE(137),
     1,
     sym_comment,
-    ACTIONS(1657),
+    ACTIONS(1645),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35878,7 +35537,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1655),
+    ACTIONS(1643),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35916,17 +35575,122 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9139] = 5,
+    [8791] = 29,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(71),
+    1,
+    anon_sym_longlong,
+    ACTIONS(73),
+    1,
+    anon_sym_int64,
+    ACTIONS(75),
+    1,
+    sym_unsigned_tiny_int,
+    ACTIONS(81),
+    1,
+    sym_signed_tiny_int,
+    ACTIONS(83),
+    1,
+    anon_sym_unsignedshort,
+    ACTIONS(85),
+    1,
+    anon_sym_uint16,
+    ACTIONS(89),
+    1,
+    anon_sym_unsignedlonglong,
+    ACTIONS(91),
+    1,
+    anon_sym_uint64,
+    ACTIONS(95),
+    1,
+    anon_sym_longdouble,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(99),
+    1,
+    anon_sym_string,
+    ACTIONS(101),
+    1,
+    anon_sym_wstring,
+    ACTIONS(105),
+    1,
+    anon_sym_sequence,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1308),
+    1,
+    anon_sym_fixed,
+    STATE(138),
+    1,
+    sym_comment,
+    STATE(1148),
+    1,
+    sym_scoped_name,
+    STATE(1490),
+    1,
+    sym_const_type,
+    ACTIONS(67),
+    2,
+    anon_sym_short,
+    anon_sym_int16,
+    ACTIONS(69),
+    2,
+    anon_sym_long,
+    anon_sym_int32,
+    ACTIONS(87),
+    2,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    ACTIONS(93),
+    2,
+    anon_sym_float,
+    anon_sym_double,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(662),
+    3,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    ACTIONS(1306),
+    4,
+    sym_boolean_type,
+    sym_octet_type,
+    sym_char_type,
+    sym_wide_char_type,
+    STATE(1523),
+    6,
+    sym_fixed_pt_const_type,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_string_type,
+    sym_wide_string_type,
+    sym_sequence_type,
+    [8896] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(142),
+    STATE(139),
     1,
     sym_comment,
-    ACTIONS(1661),
+    ACTIONS(1649),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35935,7 +35699,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1659),
+    ACTIONS(1647),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -35973,17 +35737,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9196] = 5,
+    [8953] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(143),
+    STATE(140),
     1,
     sym_comment,
-    ACTIONS(1665),
+    ACTIONS(1653),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -35992,7 +35756,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1663),
+    ACTIONS(1651),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36030,17 +35794,134 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9253] = 5,
+    [9010] = 35,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1655),
+    1,
+    anon_sym_STAR,
+    ACTIONS(1657),
+    1,
+    aux_sym_service_platform_token2,
+    STATE(141),
+    1,
+    sym_comment,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(477),
+    1,
+    sym_mult_expr,
+    STATE(482),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(552),
+    1,
+    sym_add_expr,
+    STATE(563),
+    1,
+    sym_shift_expr,
+    STATE(579),
+    1,
+    sym_and_expr,
+    STATE(580),
+    1,
+    sym_xor_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    STATE(595),
+    1,
+    sym_or_expr,
+    STATE(1103),
+    1,
+    sym_const_expr,
+    STATE(1411),
+    1,
+    sym_topic_platform,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [9127] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(144),
+    STATE(142),
     1,
     sym_comment,
-    ACTIONS(1669),
+    ACTIONS(1661),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36049,7 +35930,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1667),
+    ACTIONS(1659),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36087,17 +35968,134 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9310] = 5,
+    [9184] = 35,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1655),
+    1,
+    anon_sym_STAR,
+    ACTIONS(1657),
+    1,
+    aux_sym_service_platform_token2,
+    STATE(143),
+    1,
+    sym_comment,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(477),
+    1,
+    sym_mult_expr,
+    STATE(482),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(552),
+    1,
+    sym_add_expr,
+    STATE(563),
+    1,
+    sym_shift_expr,
+    STATE(579),
+    1,
+    sym_and_expr,
+    STATE(580),
+    1,
+    sym_xor_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    STATE(595),
+    1,
+    sym_or_expr,
+    STATE(1102),
+    1,
+    sym_const_expr,
+    STATE(1241),
+    1,
+    sym_topic_platform,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [9301] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(145),
+    STATE(144),
     1,
     sym_comment,
-    ACTIONS(1673),
+    ACTIONS(1665),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36106,7 +36104,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1671),
+    ACTIONS(1663),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36144,17 +36142,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9367] = 5,
+    [9358] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(146),
+    STATE(145),
     1,
     sym_comment,
-    ACTIONS(1677),
+    ACTIONS(1669),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36163,7 +36161,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1675),
+    ACTIONS(1667),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36201,17 +36199,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9424] = 5,
+    [9415] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(147),
+    STATE(146),
     1,
     sym_comment,
-    ACTIONS(1681),
+    ACTIONS(1673),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36220,7 +36218,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1679),
+    ACTIONS(1671),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36258,7 +36256,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9481] = 35,
+    [9472] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -36289,58 +36287,58 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1583),
+    ACTIONS(1603),
     1,
     sym_identifier,
-    ACTIONS(1683),
+    ACTIONS(1675),
     1,
     anon_sym_RPAREN,
-    STATE(148),
+    STATE(147),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(907),
+    STATE(786),
     1,
     sym_annotation_appl_param,
     STATE(1246),
@@ -36365,7 +36363,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -36375,7 +36373,64 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [9598] = 5,
+    [9589] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(148),
+    1,
+    sym_comment,
+    ACTIONS(1679),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1677),
+    36,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_void,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_Object,
+    sym_value_base_type,
+    anon_sym_native,
+    sym_identifier,
+    [9646] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -36385,7 +36440,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(149),
     1,
     sym_comment,
-    ACTIONS(1687),
+    ACTIONS(1683),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36394,7 +36449,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1685),
+    ACTIONS(1681),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36432,7 +36487,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9655] = 5,
+    [9703] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -36442,7 +36497,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(150),
     1,
     sym_comment,
-    ACTIONS(1691),
+    ACTIONS(1687),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36451,7 +36506,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1689),
+    ACTIONS(1685),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36489,7 +36544,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9712] = 5,
+    [9760] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -36499,7 +36554,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(151),
     1,
     sym_comment,
-    ACTIONS(1695),
+    ACTIONS(1691),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36508,7 +36563,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1693),
+    ACTIONS(1689),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36546,7 +36601,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9769] = 35,
+    [9817] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -36580,10 +36635,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1577),
+    ACTIONS(1655),
     1,
     anon_sym_STAR,
-    ACTIONS(1579),
+    ACTIONS(1657),
     1,
     aux_sym_service_platform_token2,
     STATE(152),
@@ -36592,46 +36647,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1049),
+    STATE(1055),
     1,
     sym_const_expr,
     STATE(1310),
@@ -36653,7 +36708,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -36663,7 +36718,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [9886] = 5,
+    [9934] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -36673,7 +36728,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(153),
     1,
     sym_comment,
-    ACTIONS(1699),
+    ACTIONS(1695),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -36682,7 +36737,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1697),
+    ACTIONS(1693),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -36720,111 +36775,63 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [9943] = 29,
+    [9991] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(71),
+    STATE(154),
     1,
+    sym_comment,
+    ACTIONS(1699),
+    7,
     anon_sym_longlong,
-    ACTIONS(73),
-    1,
-    anon_sym_int64,
-    ACTIONS(75),
-    1,
-    sym_unsigned_tiny_int,
-    ACTIONS(81),
-    1,
-    sym_signed_tiny_int,
-    ACTIONS(83),
-    1,
     anon_sym_unsignedshort,
-    ACTIONS(85),
-    1,
-    anon_sym_uint16,
-    ACTIONS(89),
-    1,
     anon_sym_unsignedlonglong,
-    ACTIONS(91),
-    1,
-    anon_sym_uint64,
-    ACTIONS(95),
-    1,
     anon_sym_longdouble,
-    ACTIONS(97),
-    1,
     anon_sym_COLON_COLON,
-    ACTIONS(99),
-    1,
-    anon_sym_string,
-    ACTIONS(101),
-    1,
-    anon_sym_wstring,
-    ACTIONS(105),
-    1,
-    anon_sym_sequence,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(1308),
-    1,
-    anon_sym_fixed,
-    STATE(154),
-    1,
-    sym_comment,
-    STATE(1141),
-    1,
-    sym_scoped_name,
-    STATE(1490),
-    1,
-    sym_const_type,
-    ACTIONS(67),
-    2,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1697),
+    36,
     anon_sym_short,
     anon_sym_int16,
-    ACTIONS(69),
-    2,
     anon_sym_long,
     anon_sym_int32,
-    ACTIONS(87),
-    2,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
     anon_sym_unsignedlong,
     anon_sym_uint32,
-    ACTIONS(93),
-    2,
+    anon_sym_uint64,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
-    2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    ACTIONS(1306),
-    4,
-    sym_boolean_type,
-    sym_octet_type,
     sym_char_type,
     sym_wide_char_type,
-    STATE(1523),
-    6,
-    sym_fixed_pt_const_type,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_string_type,
-    sym_wide_string_type,
-    sym_sequence_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_void,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_Object,
+    sym_value_base_type,
+    anon_sym_native,
+    sym_identifier,
     [10048] = 5,
     ACTIONS(3),
     1,
@@ -36916,10 +36923,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1577),
+    ACTIONS(1655),
     1,
     anon_sym_STAR,
-    ACTIONS(1579),
+    ACTIONS(1657),
     1,
     aux_sym_service_platform_token2,
     STATE(156),
@@ -36928,49 +36935,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1102),
+    STATE(1088),
     1,
     sym_const_expr,
-    STATE(1241),
+    STATE(1363),
     1,
     sym_topic_platform,
     ACTIONS(596),
@@ -36989,7 +36996,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -37113,131 +37120,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10336] = 35,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
-    1,
-    anon_sym_L,
-    ACTIONS(614),
-    1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(1577),
-    1,
-    anon_sym_STAR,
-    ACTIONS(1579),
-    1,
-    aux_sym_service_platform_token2,
-    STATE(159),
-    1,
-    sym_comment,
-    STATE(432),
-    1,
-    sym_unary_operator,
-    STATE(453),
-    1,
-    sym_scoped_name,
-    STATE(454),
-    1,
-    sym_dec_number,
-    STATE(467),
-    1,
-    sym_oct_number,
-    STATE(481),
-    1,
-    sym_literal,
-    STATE(482),
-    1,
-    sym_primary_expr,
-    STATE(483),
-    1,
-    sym_unary_expr,
-    STATE(484),
-    1,
-    sym_mult_expr,
-    STATE(552),
-    1,
-    sym_add_expr,
-    STATE(562),
-    1,
-    sym_shift_expr,
-    STATE(567),
-    1,
-    sym_and_expr,
-    STATE(584),
-    1,
-    sym_xor_expr,
-    STATE(587),
-    1,
-    sym_integer_sign,
-    STATE(589),
-    1,
-    sym_or_expr,
-    STATE(1113),
-    1,
-    sym_const_expr,
-    STATE(1458),
-    1,
-    sym_topic_platform,
-    ACTIONS(596),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
-    2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [10453] = 5,
+    [10336] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(160),
+    STATE(159),
     1,
     sym_comment,
     ACTIONS(1715),
@@ -37287,14 +37177,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10510] = 5,
+    [10393] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(161),
+    STATE(160),
     1,
     sym_comment,
     ACTIONS(1719),
@@ -37344,14 +37234,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10567] = 5,
+    [10450] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(162),
+    STATE(161),
     1,
     sym_comment,
     ACTIONS(1723),
@@ -37401,14 +37291,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10624] = 5,
+    [10507] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(163),
+    STATE(162),
     1,
     sym_comment,
     ACTIONS(1727),
@@ -37458,14 +37348,14 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10681] = 5,
+    [10564] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(164),
+    STATE(163),
     1,
     sym_comment,
     ACTIONS(1731),
@@ -37515,7 +37405,112 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10738] = 5,
+    [10621] = 29,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(71),
+    1,
+    anon_sym_longlong,
+    ACTIONS(73),
+    1,
+    anon_sym_int64,
+    ACTIONS(75),
+    1,
+    sym_unsigned_tiny_int,
+    ACTIONS(81),
+    1,
+    sym_signed_tiny_int,
+    ACTIONS(83),
+    1,
+    anon_sym_unsignedshort,
+    ACTIONS(85),
+    1,
+    anon_sym_uint16,
+    ACTIONS(89),
+    1,
+    anon_sym_unsignedlonglong,
+    ACTIONS(91),
+    1,
+    anon_sym_uint64,
+    ACTIONS(95),
+    1,
+    anon_sym_longdouble,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(99),
+    1,
+    anon_sym_string,
+    ACTIONS(101),
+    1,
+    anon_sym_wstring,
+    ACTIONS(105),
+    1,
+    anon_sym_sequence,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1308),
+    1,
+    anon_sym_fixed,
+    STATE(164),
+    1,
+    sym_comment,
+    STATE(1148),
+    1,
+    sym_scoped_name,
+    STATE(1518),
+    1,
+    sym_const_type,
+    ACTIONS(67),
+    2,
+    anon_sym_short,
+    anon_sym_int16,
+    ACTIONS(69),
+    2,
+    anon_sym_long,
+    anon_sym_int32,
+    ACTIONS(87),
+    2,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    ACTIONS(93),
+    2,
+    anon_sym_float,
+    anon_sym_double,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(662),
+    3,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    ACTIONS(1306),
+    4,
+    sym_boolean_type,
+    sym_octet_type,
+    sym_char_type,
+    sym_wide_char_type,
+    STATE(1523),
+    6,
+    sym_fixed_pt_const_type,
+    sym_integer_type,
+    sym_floating_pt_type,
+    sym_string_type,
+    sym_wide_string_type,
+    sym_sequence_type,
+    [10726] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -37572,7 +37567,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10795] = 5,
+    [10783] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -37629,7 +37624,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10852] = 5,
+    [10840] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -37686,7 +37681,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10909] = 5,
+    [10897] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -37743,7 +37738,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [10966] = 5,
+    [10954] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -37800,131 +37795,134 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [11023] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [11011] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(170),
+    ACTIONS(157),
     1,
-    sym_comment,
-    ACTIONS(1755),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1753),
-    36,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_void,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_Object,
-    sym_value_base_type,
-    anon_sym_native,
     sym_identifier,
-    [11080] = 5,
-    ACTIONS(3),
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(1655),
     1,
-    anon_sym_SLASH_STAR,
-    STATE(171),
+    anon_sym_STAR,
+    ACTIONS(1657),
+    1,
+    aux_sym_service_platform_token2,
+    STATE(170),
     1,
     sym_comment,
-    ACTIONS(1759),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1757),
-    36,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_void,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_Object,
-    sym_value_base_type,
-    anon_sym_native,
-    sym_identifier,
-    [11137] = 5,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(477),
+    1,
+    sym_mult_expr,
+    STATE(482),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(552),
+    1,
+    sym_add_expr,
+    STATE(563),
+    1,
+    sym_shift_expr,
+    STATE(579),
+    1,
+    sym_and_expr,
+    STATE(580),
+    1,
+    sym_xor_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    STATE(595),
+    1,
+    sym_or_expr,
+    STATE(1115),
+    1,
+    sym_const_expr,
+    STATE(1458),
+    1,
+    sym_topic_platform,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [11128] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(172),
+    STATE(171),
     1,
     sym_comment,
-    ACTIONS(1763),
+    ACTIONS(1755),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -37933,7 +37931,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1761),
+    ACTIONS(1753),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -37971,17 +37969,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [11194] = 5,
+    [11185] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(173),
+    STATE(172),
     1,
     sym_comment,
-    ACTIONS(1767),
+    ACTIONS(1759),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -37990,7 +37988,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1765),
+    ACTIONS(1757),
     36,
     anon_sym_short,
     anon_sym_int16,
@@ -38028,7 +38026,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     anon_sym_native,
     sym_identifier,
-    [11251] = 35,
+    [11242] = 35,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -38059,58 +38057,58 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1583),
+    ACTIONS(1603),
     1,
     sym_identifier,
-    ACTIONS(1769),
+    ACTIONS(1761),
     1,
     anon_sym_RPAREN,
-    STATE(174),
+    STATE(173),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(907),
+    STATE(786),
     1,
     sym_annotation_appl_param,
     STATE(1246),
@@ -38135,7 +38133,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -38145,111 +38143,120 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [11368] = 29,
+    [11359] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(71),
+    STATE(174),
     1,
+    sym_comment,
+    ACTIONS(1765),
+    7,
     anon_sym_longlong,
-    ACTIONS(73),
-    1,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1763),
+    36,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
     anon_sym_int64,
-    ACTIONS(75),
-    1,
     sym_unsigned_tiny_int,
-    ACTIONS(81),
-    1,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
     sym_signed_tiny_int,
-    ACTIONS(83),
-    1,
-    anon_sym_unsignedshort,
-    ACTIONS(85),
-    1,
     anon_sym_uint16,
-    ACTIONS(89),
-    1,
-    anon_sym_unsignedlonglong,
-    ACTIONS(91),
-    1,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
     anon_sym_uint64,
-    ACTIONS(95),
-    1,
-    anon_sym_longdouble,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(99),
-    1,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
     anon_sym_string,
-    ACTIONS(101),
-    1,
     anon_sym_wstring,
-    ACTIONS(105),
-    1,
+    anon_sym_any,
     anon_sym_sequence,
-    ACTIONS(157),
-    1,
+    anon_sym_map,
+    anon_sym_void,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_Object,
+    sym_value_base_type,
+    anon_sym_native,
     sym_identifier,
-    ACTIONS(618),
+    [11416] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1308),
+    ACTIONS(5),
     1,
-    anon_sym_fixed,
+    anon_sym_SLASH_STAR,
     STATE(175),
     1,
     sym_comment,
-    STATE(1141),
-    1,
-    sym_scoped_name,
-    STATE(1518),
-    1,
-    sym_const_type,
-    ACTIONS(67),
-    2,
+    ACTIONS(1769),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1767),
+    36,
     anon_sym_short,
     anon_sym_int16,
-    ACTIONS(69),
-    2,
     anon_sym_long,
     anon_sym_int32,
-    ACTIONS(87),
-    2,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
     anon_sym_unsignedlong,
     anon_sym_uint32,
-    ACTIONS(93),
-    2,
+    anon_sym_uint64,
     anon_sym_float,
     anon_sym_double,
-    STATE(632),
-    2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    ACTIONS(1306),
-    4,
-    sym_boolean_type,
-    sym_octet_type,
     sym_char_type,
     sym_wide_char_type,
-    STATE(1523),
-    6,
-    sym_fixed_pt_const_type,
-    sym_integer_type,
-    sym_floating_pt_type,
-    sym_string_type,
-    sym_wide_string_type,
-    sym_sequence_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_void,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_Object,
+    sym_value_base_type,
+    anon_sym_native,
+    sym_identifier,
     [11473] = 5,
     ACTIONS(3),
     1,
@@ -38509,7 +38516,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1583),
+    ACTIONS(1603),
     1,
     sym_identifier,
     ACTIONS(1787),
@@ -38521,46 +38528,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(907),
+    STATE(786),
     1,
     sym_annotation_appl_param,
     STATE(1246),
@@ -38585,7 +38592,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -38923,46 +38930,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1434),
@@ -38984,7 +38991,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -38994,69 +39001,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [12217] = 8,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(1815),
-    1,
-    anon_sym_default,
-    ACTIONS(1818),
-    1,
-    anon_sym_case,
-    STATE(273),
-    1,
-    sym_case_label,
-    STATE(187),
-    2,
-    sym_comment,
-    aux_sym_case_repeat1,
-    ACTIONS(1813),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1811),
-    31,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_Object,
-    sym_value_base_type,
-    sym_identifier,
-    [12279] = 34,
+    [12217] = 34,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -39090,55 +39035,55 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1821),
+    ACTIONS(1811),
     1,
     anon_sym_RPAREN,
-    STATE(188),
+    STATE(187),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1203),
@@ -39160,7 +39105,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39170,6 +39115,68 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
+    [12331] = 8,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(1817),
+    1,
+    anon_sym_default,
+    ACTIONS(1820),
+    1,
+    anon_sym_case,
+    STATE(273),
+    1,
+    sym_case_label,
+    STATE(188),
+    2,
+    sym_comment,
+    aux_sym_case_repeat1,
+    ACTIONS(1815),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1813),
+    31,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_Object,
+    sym_value_base_type,
+    sym_identifier,
     [12393] = 34,
     ACTIONS(5),
     1,
@@ -39213,49 +39220,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1286),
+    STATE(1387),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -39274,7 +39281,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39327,49 +39334,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1387),
+    STATE(1339),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -39388,7 +39395,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39441,49 +39448,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1339),
+    STATE(1286),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -39502,7 +39509,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39555,43 +39562,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1365),
@@ -39613,7 +39620,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39663,49 +39670,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1349),
+    STATE(1350),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -39724,7 +39731,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39777,43 +39784,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1460),
@@ -39835,7 +39842,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39888,43 +39895,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1459),
@@ -39946,7 +39953,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -39996,49 +40003,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1298),
+    STATE(1446),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -40057,7 +40064,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40107,49 +40114,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1297),
+    STATE(1298),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -40168,7 +40175,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40218,49 +40225,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1446),
+    STATE(1297),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -40279,7 +40286,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40329,46 +40336,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1296),
@@ -40390,7 +40397,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40440,46 +40447,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1445),
@@ -40501,7 +40508,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40551,46 +40558,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1294),
@@ -40612,7 +40619,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40662,46 +40669,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1293),
@@ -40723,7 +40730,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40773,46 +40780,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1444),
@@ -40834,7 +40841,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40884,46 +40891,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1291),
@@ -40945,7 +40952,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -40995,46 +41002,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1290),
@@ -41056,7 +41063,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41106,46 +41113,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1442),
@@ -41167,7 +41174,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41217,46 +41224,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1204),
@@ -41278,7 +41285,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41328,46 +41335,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1441),
@@ -41389,7 +41396,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41439,46 +41446,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1287),
@@ -41500,7 +41507,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41550,46 +41557,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1208),
@@ -41611,7 +41618,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41661,46 +41668,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1210),
@@ -41722,7 +41729,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41772,46 +41779,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1439),
@@ -41833,7 +41840,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41883,46 +41890,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1218),
@@ -41944,7 +41951,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -41994,46 +42001,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1219),
@@ -42055,7 +42062,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42105,46 +42112,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1438),
@@ -42166,7 +42173,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42216,46 +42223,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1222),
@@ -42277,7 +42284,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42327,46 +42334,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1223),
@@ -42388,7 +42395,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42438,46 +42445,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1224),
@@ -42499,7 +42506,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42549,46 +42556,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1435),
@@ -42610,7 +42617,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42663,43 +42670,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1413),
@@ -42721,7 +42728,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42774,43 +42781,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1412),
@@ -42832,7 +42839,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42882,46 +42889,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1399),
@@ -42943,7 +42950,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -42993,46 +43000,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1398),
@@ -43054,7 +43061,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43107,43 +43114,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1243),
@@ -43165,7 +43172,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43218,43 +43225,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1245),
@@ -43276,7 +43283,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43326,49 +43333,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1346),
+    STATE(1132),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -43387,7 +43394,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43437,46 +43444,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1397),
@@ -43498,7 +43505,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43548,46 +43555,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1395),
@@ -43609,7 +43616,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43653,57 +43660,57 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(1843),
+    1,
+    aux_sym_annotation_appl_dds_request_topic_token2,
     STATE(229),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(1311),
     1,
     sym_const_expr,
-    STATE(1394),
-    1,
-    sym_positive_int_const,
     ACTIONS(596),
     2,
     anon_sym_PLUS,
@@ -43720,7 +43727,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43764,7 +43771,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1843),
+    ACTIONS(1845),
     1,
     aux_sym_annotation_appl_dds_request_topic_token2,
     STATE(230),
@@ -43773,46 +43780,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1311),
+    STATE(1312),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -43831,7 +43838,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43875,57 +43882,57 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1845),
-    1,
-    aux_sym_annotation_appl_dds_request_topic_token2,
     STATE(231),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1312),
+    STATE(682),
     1,
     sym_const_expr,
+    STATE(1394),
+    1,
+    sym_positive_int_const,
     ACTIONS(596),
     2,
     anon_sym_PLUS,
@@ -43942,7 +43949,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -43992,46 +43999,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1392),
@@ -44053,7 +44060,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44103,46 +44110,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1391),
@@ -44164,7 +44171,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44214,46 +44221,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1388),
@@ -44275,7 +44282,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44325,46 +44332,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1551),
@@ -44386,7 +44393,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44436,46 +44443,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1256),
@@ -44497,7 +44504,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44547,46 +44554,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1257),
@@ -44608,7 +44615,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44658,49 +44665,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1553),
+    STATE(1340),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -44719,7 +44726,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44769,49 +44776,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1340),
+    STATE(1553),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -44830,7 +44837,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44880,49 +44887,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1429),
+    STATE(1343),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -44941,7 +44948,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -44991,46 +44998,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1259),
@@ -45052,7 +45059,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45102,49 +45109,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1343),
+    STATE(1344),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -45163,7 +45170,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45213,49 +45220,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1344),
+    STATE(1429),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -45274,7 +45281,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45327,43 +45334,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1364),
@@ -45385,7 +45392,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45435,49 +45442,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1131),
+    STATE(1346),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -45496,7 +45503,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45546,46 +45553,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1419),
@@ -45607,7 +45614,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45657,46 +45664,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1594),
@@ -45718,7 +45725,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45768,49 +45775,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1350),
+    STATE(1347),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -45829,7 +45836,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45879,49 +45886,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1347),
+    STATE(1508),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -45940,7 +45947,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -45990,46 +45997,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
     STATE(1351),
@@ -46051,7 +46058,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46101,49 +46108,49 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(680),
+    STATE(682),
     1,
     sym_const_expr,
-    STATE(1508),
+    STATE(1349),
     1,
     sym_positive_int_const,
     ACTIONS(596),
@@ -46162,7 +46169,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46212,46 +46219,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1568),
+    STATE(1323),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -46270,7 +46277,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46320,43 +46327,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1404),
@@ -46378,7 +46385,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46428,46 +46435,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1348),
+    STATE(1469),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -46486,7 +46493,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46536,46 +46543,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1469),
+    STATE(1354),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -46594,7 +46601,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46644,43 +46651,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1468),
@@ -46702,7 +46709,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46752,46 +46759,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1354),
+    STATE(1456),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -46810,7 +46817,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46860,43 +46867,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1465),
@@ -46918,7 +46925,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -46968,46 +46975,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1301),
+    STATE(1509),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47026,7 +47033,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47036,61 +47043,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [20259] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(260),
-    1,
-    sym_comment,
-    ACTIONS(1851),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1849),
-    33,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_default,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_case,
-    anon_sym_Object,
-    sym_value_base_type,
-    sym_identifier,
-    [20313] = 32,
+    [20259] = 32,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -47124,52 +47077,52 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(261),
+    STATE(260),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1453),
+    STATE(1301),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47188,7 +47141,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47198,6 +47151,60 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
+    [20367] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(261),
+    1,
+    sym_comment,
+    ACTIONS(1851),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1849),
+    33,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_default,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_case,
+    anon_sym_Object,
+    sym_value_base_type,
+    sym_identifier,
     [20421] = 32,
     ACTIONS(5),
     1,
@@ -47238,46 +47245,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1452),
+    STATE(1355),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47296,7 +47303,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47346,46 +47353,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1451),
+    STATE(1356),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47404,7 +47411,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47454,46 +47461,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1355),
+    STATE(1302),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47512,7 +47519,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47562,46 +47569,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1356),
+    STATE(1453),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47620,7 +47627,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47670,46 +47677,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1450),
+    STATE(1452),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47728,7 +47735,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47778,46 +47785,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1449),
+    STATE(1451),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47836,7 +47843,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47886,46 +47893,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1295),
+    STATE(1357),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -47944,7 +47951,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -47994,46 +48001,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1357),
+    STATE(1450),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -48052,7 +48059,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48102,46 +48109,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1302),
+    STATE(1503),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -48160,7 +48167,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48210,46 +48217,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1507),
+    STATE(1348),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -48268,7 +48275,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48318,43 +48325,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1576),
@@ -48376,7 +48383,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48480,43 +48487,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1569),
@@ -48538,7 +48545,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48588,46 +48595,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1303),
+    STATE(1358),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -48646,7 +48653,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48696,46 +48703,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1358),
+    STATE(1568),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -48754,7 +48761,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48804,46 +48811,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1054),
+    STATE(1060),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -48862,7 +48869,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -48912,43 +48919,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1471),
@@ -48970,7 +48977,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49020,46 +49027,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1367),
+    STATE(1362),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -49078,7 +49085,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49128,43 +49135,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1370),
@@ -49186,7 +49193,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49236,43 +49243,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1428),
@@ -49294,7 +49301,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49344,43 +49351,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1345),
@@ -49402,7 +49409,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49452,43 +49459,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1457),
@@ -49510,7 +49517,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49560,46 +49567,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1292),
+    STATE(1449),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -49618,7 +49625,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49668,46 +49675,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1341),
+    STATE(1373),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -49726,7 +49733,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49776,46 +49783,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1373),
+    STATE(1374),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -49834,7 +49841,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49884,46 +49891,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1374),
+    STATE(1295),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -49942,7 +49949,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -49992,46 +49999,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1288),
+    STATE(1341),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50050,7 +50057,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50100,46 +50107,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1443),
+    STATE(1376),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50158,7 +50165,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50208,46 +50215,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1376),
+    STATE(1326),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50266,7 +50273,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50316,46 +50323,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1326),
+    STATE(1389),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50374,7 +50381,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50424,46 +50431,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1389),
+    STATE(1303),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50482,7 +50489,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50532,46 +50539,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1323),
+    STATE(1322),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50590,7 +50597,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50640,46 +50647,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1322),
+    STATE(1393),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50698,7 +50705,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50708,7 +50715,61 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [23931] = 32,
+    [23931] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(295),
+    1,
+    sym_comment,
+    ACTIONS(1859),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1857),
+    33,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_default,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_case,
+    anon_sym_Object,
+    sym_value_base_type,
+    sym_identifier,
+    [23985] = 32,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -50742,52 +50803,52 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(295),
+    STATE(296),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1393),
+    STATE(1319),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50806,7 +50867,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50816,7 +50877,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [24039] = 32,
+    [24093] = 32,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -50850,52 +50911,52 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(296),
+    STATE(297),
     1,
     sym_comment,
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1319),
+    STATE(1396),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -50914,7 +50975,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -50924,60 +50985,6 @@ static const uint16_t ts_small_parse_table[] = {
     sym_char_literal,
     sym_wide_character_literal,
     sym_boolean_literal,
-    [24147] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(297),
-    1,
-    sym_comment,
-    ACTIONS(1859),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1857),
-    33,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_default,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_case,
-    anon_sym_Object,
-    sym_value_base_type,
-    sym_identifier,
     [24201] = 32,
     ACTIONS(5),
     1,
@@ -51018,46 +51025,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1396),
+    STATE(1305),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -51076,7 +51083,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51126,46 +51133,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1305),
+    STATE(1304),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -51184,7 +51191,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51234,46 +51241,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1304),
+    STATE(1236),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -51292,7 +51299,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51342,46 +51349,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1236),
+    STATE(1292),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -51400,7 +51407,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51450,46 +51457,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1205),
+    STATE(1288),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -51508,7 +51515,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51558,43 +51565,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1402),
@@ -51616,7 +51623,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51666,43 +51673,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1403),
@@ -51724,7 +51731,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51774,46 +51781,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1320),
+    STATE(1367),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -51832,7 +51839,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51882,43 +51889,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1405),
@@ -51940,7 +51947,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -51990,43 +51997,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1406),
@@ -52048,7 +52055,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52098,43 +52105,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1235),
@@ -52156,7 +52163,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52206,43 +52213,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1234),
@@ -52264,7 +52271,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52314,43 +52321,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1418),
@@ -52372,7 +52379,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52422,43 +52429,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1421),
@@ -52480,7 +52487,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52530,43 +52537,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
     STATE(1422),
@@ -52588,7 +52595,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52638,46 +52645,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1239),
+    STATE(1424),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -52696,7 +52703,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52746,46 +52753,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1424),
+    STATE(1233),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -52804,7 +52811,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52854,46 +52861,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1509),
+    STATE(1436),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -52912,7 +52919,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -52962,46 +52969,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1233),
+    STATE(1232),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -53020,7 +53027,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53070,46 +53077,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1436),
+    STATE(1221),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -53128,7 +53135,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53178,46 +53185,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1456),
+    STATE(1440),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -53236,7 +53243,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53286,46 +53293,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1440),
+    STATE(1443),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -53344,7 +53351,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53394,46 +53401,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1232),
+    STATE(1239),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -53452,7 +53459,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53502,46 +53509,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
-    STATE(584),
+    STATE(580),
     1,
     sym_xor_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
-    STATE(589),
+    STATE(595),
     1,
     sym_or_expr,
-    STATE(1221),
+    STATE(1205),
     1,
     sym_const_expr,
     ACTIONS(596),
@@ -53560,7 +53567,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53610,42 +53617,42 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(567),
+    STATE(579),
     1,
     sym_and_expr,
     STATE(582),
     1,
-    sym_xor_expr,
-    STATE(587),
-    1,
     sym_integer_sign,
+    STATE(583),
+    1,
+    sym_xor_expr,
     ACTIONS(596),
     2,
     anon_sym_PLUS,
@@ -53662,7 +53669,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53712,37 +53719,37 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(562),
+    STATE(563),
     1,
     sym_shift_expr,
-    STATE(566),
+    STATE(575),
     1,
     sym_and_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
     ACTIONS(596),
@@ -53761,7 +53768,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53869,34 +53876,34 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
     STATE(552),
     1,
     sym_add_expr,
-    STATE(561),
+    STATE(564),
     1,
     sym_shift_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
     ACTIONS(596),
@@ -53915,7 +53922,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -53935,7 +53942,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(326),
     1,
     sym_comment,
-    STATE(352),
+    STATE(353),
     1,
     sym_extend_annotation_appl,
     ACTIONS(1869),
@@ -53986,7 +53993,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(327),
     1,
     sym_comment,
-    STATE(353),
+    STATE(345),
     1,
     sym_extend_annotation_appl,
     ACTIONS(1873),
@@ -54037,7 +54044,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(328),
     1,
     sym_comment,
-    STATE(346),
+    STATE(347),
     1,
     sym_extend_annotation_appl,
     ACTIONS(1877),
@@ -54088,7 +54095,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(329),
     1,
     sym_comment,
-    STATE(347),
+    STATE(346),
     1,
     sym_extend_annotation_appl,
     ACTIONS(1881),
@@ -54169,31 +54176,31 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_unary_operator,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
-    STATE(467),
+    STATE(459),
     1,
     sym_oct_number,
-    STATE(481),
+    STATE(477),
     1,
-    sym_literal,
+    sym_mult_expr,
     STATE(482),
     1,
-    sym_primary_expr,
-    STATE(483),
-    1,
     sym_unary_expr,
-    STATE(484),
+    STATE(489),
     1,
-    sym_mult_expr,
-    STATE(550),
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(553),
     1,
     sym_add_expr,
-    STATE(587),
+    STATE(582),
     1,
     sym_integer_sign,
     ACTIONS(596),
@@ -54212,7 +54219,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -54235,7 +54242,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(331),
     1,
     sym_comment,
-    ACTIONS(1479),
+    ACTIONS(1485),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54244,7 +54251,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1477),
+    ACTIONS(1483),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54282,7 +54289,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(332),
     1,
     sym_comment,
-    ACTIONS(1595),
+    ACTIONS(1679),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54292,7 +54299,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1593),
+    ACTIONS(1677),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54330,7 +54337,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(333),
     1,
     sym_comment,
-    ACTIONS(1491),
+    ACTIONS(1519),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54340,7 +54347,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1489),
+    ACTIONS(1517),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54381,7 +54388,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(334),
     1,
     sym_comment,
-    ACTIONS(1539),
+    ACTIONS(1503),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54390,7 +54397,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1537),
+    ACTIONS(1501),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54428,7 +54435,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(335),
     1,
     sym_comment,
-    ACTIONS(1619),
+    ACTIONS(1807),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54438,7 +54445,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1617),
+    ACTIONS(1805),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54479,7 +54486,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(336),
     1,
     sym_comment,
-    ACTIONS(1569),
+    ACTIONS(1513),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54488,7 +54495,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1567),
+    ACTIONS(1511),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54529,7 +54536,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(337),
     1,
     sym_comment,
-    ACTIONS(1467),
+    ACTIONS(1497),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54538,7 +54545,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1465),
+    ACTIONS(1495),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54579,7 +54586,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(338),
     1,
     sym_comment,
-    ACTIONS(1557),
+    ACTIONS(1473),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54588,7 +54595,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1555),
+    ACTIONS(1471),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54626,7 +54633,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(339),
     1,
     sym_comment,
-    ACTIONS(1501),
+    ACTIONS(1523),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54636,7 +54643,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1499),
+    ACTIONS(1521),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54725,7 +54732,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(341),
     1,
     sym_comment,
-    ACTIONS(1473),
+    ACTIONS(1479),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54734,7 +54741,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1471),
+    ACTIONS(1477),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54775,7 +54782,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(342),
     1,
     sym_comment,
-    ACTIONS(1551),
+    ACTIONS(1467),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54784,7 +54791,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1549),
+    ACTIONS(1465),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54825,7 +54832,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(343),
     1,
     sym_comment,
-    ACTIONS(1533),
+    ACTIONS(1569),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54834,7 +54841,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1531),
+    ACTIONS(1567),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -54862,107 +54869,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28085] = 26,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
-    1,
-    anon_sym_L,
-    ACTIONS(614),
-    1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(344),
-    1,
-    sym_comment,
-    STATE(432),
-    1,
-    sym_unary_operator,
-    STATE(453),
-    1,
-    sym_scoped_name,
-    STATE(454),
-    1,
-    sym_dec_number,
-    STATE(463),
-    1,
-    sym_mult_expr,
-    STATE(467),
-    1,
-    sym_oct_number,
-    STATE(481),
-    1,
-    sym_literal,
-    STATE(482),
-    1,
-    sym_primary_expr,
-    STATE(483),
-    1,
-    sym_unary_expr,
-    STATE(587),
-    1,
-    sym_integer_sign,
-    ACTIONS(596),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
-    2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [28175] = 5,
+    [28085] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(345),
+    STATE(344),
     1,
     sym_comment,
-    ACTIONS(1505),
+    ACTIONS(1509),
     8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -54972,7 +54889,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1503),
+    ACTIONS(1507),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55000,14 +54917,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28223] = 5,
+    [28133] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(346),
+    STATE(345),
     1,
     sym_comment,
     ACTIONS(1905),
@@ -55048,14 +54965,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28271] = 5,
+    [28181] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(347),
+    STATE(346),
     1,
     sym_comment,
     ACTIONS(1873),
@@ -55096,29 +55013,27 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28319] = 6,
+    [28229] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1907),
-    1,
-    anon_sym_LPAREN,
-    STATE(348),
+    STATE(347),
     1,
     sym_comment,
-    ACTIONS(1545),
-    7,
+    ACTIONS(1869),
+    8,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
+    anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1543),
+    ACTIONS(1867),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55146,17 +55061,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28369] = 6,
+    [28277] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1909),
+    ACTIONS(1907),
     1,
     anon_sym_LPAREN,
-    STATE(349),
+    STATE(348),
     1,
     sym_comment,
     ACTIONS(1563),
@@ -55196,20 +55111,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28419] = 6,
+    [28327] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1911),
+    ACTIONS(1909),
     1,
     anon_sym_LPAREN,
-    STATE(350),
+    STATE(349),
     1,
     sym_comment,
-    ACTIONS(1495),
+    ACTIONS(1527),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55218,7 +55133,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1493),
+    ACTIONS(1525),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55246,20 +55161,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28469] = 6,
+    [28377] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1913),
+    ACTIONS(1911),
     1,
     anon_sym_LPAREN,
-    STATE(351),
+    STATE(350),
     1,
     sym_comment,
-    ACTIONS(1521),
+    ACTIONS(1533),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55268,7 +55183,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1519),
+    ACTIONS(1531),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55296,27 +55211,29 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28519] = 5,
+    [28427] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(352),
+    ACTIONS(1913),
+    1,
+    anon_sym_LPAREN,
+    STATE(351),
     1,
     sym_comment,
-    ACTIONS(1877),
-    8,
+    ACTIONS(1551),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1875),
+    ACTIONS(1549),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55344,6 +55261,96 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
+    [28477] = 26,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(352),
+    1,
+    sym_comment,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(460),
+    1,
+    sym_mult_expr,
+    STATE(482),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
     [28567] = 5,
     ACTIONS(3),
     1,
@@ -55405,7 +55412,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(354),
     1,
     sym_comment,
-    ACTIONS(1485),
+    ACTIONS(1491),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55414,7 +55421,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1483),
+    ACTIONS(1489),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55455,7 +55462,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(355),
     1,
     sym_comment,
-    ACTIONS(1515),
+    ACTIONS(1557),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55464,7 +55471,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1513),
+    ACTIONS(1555),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55505,7 +55512,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(356),
     1,
     sym_comment,
-    ACTIONS(1509),
+    ACTIONS(1539),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55514,7 +55521,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1507),
+    ACTIONS(1537),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55555,7 +55562,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(357),
     1,
     sym_comment,
-    ACTIONS(1527),
+    ACTIONS(1545),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55564,7 +55571,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1525),
+    ACTIONS(1543),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55602,7 +55609,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(358),
     1,
     sym_comment,
-    ACTIONS(1633),
+    ACTIONS(1661),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55611,7 +55618,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1631),
+    ACTIONS(1659),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55649,7 +55656,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(359),
     1,
     sym_comment,
-    ACTIONS(1807),
+    ACTIONS(1673),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55658,7 +55665,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1805),
+    ACTIONS(1671),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55696,7 +55703,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(360),
     1,
     sym_comment,
-    ACTIONS(1603),
+    ACTIONS(1683),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -55705,7 +55712,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1601),
+    ACTIONS(1681),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -55733,94 +55740,54 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [28956] = 25,
+    [28956] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(598),
-    1,
-    anon_sym_LPAREN,
-    ACTIONS(600),
-    1,
-    anon_sym_TILDE,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
-    ACTIONS(612),
-    1,
-    anon_sym_L,
-    ACTIONS(614),
-    1,
-    anon_sym_SQUOTE,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(361),
     1,
     sym_comment,
-    STATE(432),
-    1,
-    sym_unary_operator,
-    STATE(453),
-    1,
-    sym_scoped_name,
-    STATE(454),
-    1,
-    sym_dec_number,
-    STATE(467),
-    1,
-    sym_oct_number,
-    STATE(481),
-    1,
-    sym_literal,
-    STATE(482),
-    1,
-    sym_primary_expr,
-    STATE(494),
-    1,
-    sym_unary_expr,
-    STATE(587),
-    1,
-    sym_integer_sign,
-    ACTIONS(596),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(602),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(616),
-    2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    STATE(480),
-    8,
-    sym_integer_literal,
-    sym_floating_pt_literal,
-    sym_fixed_pt_literal,
-    sym_string_literal,
-    sym_wide_string_literal,
-    sym_char_literal,
-    sym_wide_character_literal,
-    sym_boolean_literal,
-    [29043] = 5,
+    ACTIONS(1765),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1763),
+    26,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
+    sym_identifier,
+    [29003] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -55867,26 +55834,27 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_const,
     anon_sym_typedef,
     sym_identifier,
-    [29090] = 5,
+    [29050] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(363),
     1,
     sym_comment,
-    ACTIONS(1933),
-    6,
+    ACTIONS(1755),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
-    ACTIONS(1931),
-    27,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1753),
+    26,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -55909,31 +55877,31 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_attribute,
-    anon_sym_enum,
-    anon_sym_const,
-    anon_sym_typedef,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
     sym_identifier,
-    [29137] = 5,
+    [29097] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(364),
     1,
     sym_comment,
-    ACTIONS(1937),
-    6,
+    ACTIONS(1751),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
-    ACTIONS(1935),
-    27,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1749),
+    26,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -55956,31 +55924,31 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_attribute,
-    anon_sym_enum,
-    anon_sym_const,
-    anon_sym_typedef,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
     sym_identifier,
-    [29184] = 5,
+    [29144] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(365),
     1,
     sym_comment,
-    ACTIONS(1941),
-    6,
+    ACTIONS(1747),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
-    ACTIONS(1939),
-    27,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1745),
+    26,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -56003,12 +55971,11 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_attribute,
-    anon_sym_enum,
-    anon_sym_const,
-    anon_sym_typedef,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
     sym_identifier,
-    [29231] = 5,
+    [29191] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56018,7 +55985,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(366),
     1,
     sym_comment,
-    ACTIONS(1615),
+    ACTIONS(1743),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56027,7 +55994,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1613),
+    ACTIONS(1741),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56055,7 +56022,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29278] = 5,
+    [29238] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56065,7 +56032,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(367),
     1,
     sym_comment,
-    ACTIONS(1611),
+    ACTIONS(1739),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56074,7 +56041,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1609),
+    ACTIONS(1737),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56102,7 +56069,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29325] = 5,
+    [29285] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56112,7 +56079,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(368),
     1,
     sym_comment,
-    ACTIONS(1591),
+    ACTIONS(1707),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56121,7 +56088,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1589),
+    ACTIONS(1705),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56149,7 +56116,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29372] = 5,
+    [29332] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56159,7 +56126,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(369),
     1,
     sym_comment,
-    ACTIONS(1711),
+    ACTIONS(1735),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56168,7 +56135,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1709),
+    ACTIONS(1733),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56196,7 +56163,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29419] = 5,
+    [29379] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56206,7 +56173,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(370),
     1,
     sym_comment,
-    ACTIONS(1767),
+    ACTIONS(1731),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56215,7 +56182,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1765),
+    ACTIONS(1729),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56243,7 +56210,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29466] = 5,
+    [29426] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56253,7 +56220,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(371),
     1,
     sym_comment,
-    ACTIONS(1803),
+    ACTIONS(1727),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56262,7 +56229,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1801),
+    ACTIONS(1725),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56290,7 +56257,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29513] = 5,
+    [29473] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56300,7 +56267,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(372),
     1,
     sym_comment,
-    ACTIONS(1795),
+    ACTIONS(1723),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56309,7 +56276,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1793),
+    ACTIONS(1721),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56337,7 +56304,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29560] = 5,
+    [29520] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56384,7 +56351,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29607] = 5,
+    [29567] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56394,7 +56361,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(374),
     1,
     sym_comment,
-    ACTIONS(1773),
+    ACTIONS(1799),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56403,7 +56370,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1771),
+    ACTIONS(1797),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56431,7 +56398,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29654] = 5,
+    [29614] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56441,7 +56408,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(375),
     1,
     sym_comment,
-    ACTIONS(1763),
+    ACTIONS(1719),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56450,7 +56417,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1761),
+    ACTIONS(1717),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56478,7 +56445,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29701] = 5,
+    [29661] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -56488,7 +56455,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(376),
     1,
     sym_comment,
-    ACTIONS(1759),
+    ACTIONS(1715),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56497,7 +56464,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1757),
+    ACTIONS(1713),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56525,17 +56492,64 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29748] = 5,
+    [29708] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(377),
+    1,
+    sym_comment,
+    ACTIONS(1933),
+    6,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_RBRACE,
+    ACTIONS(1931),
+    27,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_attribute,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_typedef,
+    sym_identifier,
+    [29755] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(377),
+    STATE(378),
     1,
     sym_comment,
-    ACTIONS(1755),
+    ACTIONS(1579),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56544,7 +56558,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1753),
+    ACTIONS(1577),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56572,17 +56586,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29795] = 5,
+    [29802] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(378),
+    STATE(379),
     1,
     sym_comment,
-    ACTIONS(1751),
+    ACTIONS(1703),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56591,7 +56605,54 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1749),
+    ACTIONS(1701),
+    26,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
+    sym_identifier,
+    [29849] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(380),
+    1,
+    sym_comment,
+    ACTIONS(1695),
+    7,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1693),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56615,21 +56676,68 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
+    sym_identifier,
+    [29896] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(381),
+    1,
+    sym_comment,
+    ACTIONS(1937),
+    6,
+    anon_sym_longlong,
+    anon_sym_unsignedshort,
+    anon_sym_unsignedlonglong,
+    anon_sym_longdouble,
+    anon_sym_COLON_COLON,
+    anon_sym_RBRACE,
+    ACTIONS(1935),
+    27,
+    anon_sym_short,
+    anon_sym_int16,
+    anon_sym_long,
+    anon_sym_int32,
+    anon_sym_int64,
+    sym_unsigned_tiny_int,
+    sym_boolean_type,
+    anon_sym_fixed,
+    sym_octet_type,
+    sym_signed_tiny_int,
+    anon_sym_uint16,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    anon_sym_uint64,
+    anon_sym_float,
+    anon_sym_double,
+    sym_char_type,
+    sym_wide_char_type,
+    anon_sym_string,
+    anon_sym_wstring,
+    anon_sym_any,
+    anon_sym_sequence,
+    anon_sym_attribute,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_typedef,
     sym_identifier,
-    [29842] = 5,
+    [29943] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(379),
+    STATE(382),
     1,
     sym_comment,
-    ACTIONS(1747),
+    ACTIONS(1687),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56638,7 +56746,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1745),
+    ACTIONS(1685),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56666,17 +56774,104 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29889] = 5,
+    [29990] = 25,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(598),
+    1,
+    anon_sym_LPAREN,
+    ACTIONS(600),
+    1,
+    anon_sym_TILDE,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(612),
+    1,
+    anon_sym_L,
+    ACTIONS(614),
+    1,
+    anon_sym_SQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(383),
+    1,
+    sym_comment,
+    STATE(432),
+    1,
+    sym_unary_operator,
+    STATE(450),
+    1,
+    sym_scoped_name,
+    STATE(455),
+    1,
+    sym_dec_number,
+    STATE(459),
+    1,
+    sym_oct_number,
+    STATE(465),
+    1,
+    sym_unary_expr,
+    STATE(489),
+    1,
+    sym_literal,
+    STATE(494),
+    1,
+    sym_primary_expr,
+    STATE(582),
+    1,
+    sym_integer_sign,
+    ACTIONS(596),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(602),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(616),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    STATE(492),
+    8,
+    sym_integer_literal,
+    sym_floating_pt_literal,
+    sym_fixed_pt_literal,
+    sym_string_literal,
+    sym_wide_string_literal,
+    sym_char_literal,
+    sym_wide_character_literal,
+    sym_boolean_literal,
+    [30077] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(380),
+    STATE(384),
     1,
     sym_comment,
-    ACTIONS(1743),
+    ACTIONS(1623),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56685,7 +56880,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1741),
+    ACTIONS(1621),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56713,17 +56908,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29936] = 5,
+    [30124] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(381),
+    STATE(385),
     1,
     sym_comment,
-    ACTIONS(1739),
+    ACTIONS(1803),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56732,7 +56927,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1737),
+    ACTIONS(1801),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56760,17 +56955,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [29983] = 5,
+    [30171] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(382),
+    STATE(386),
     1,
     sym_comment,
-    ACTIONS(1735),
+    ACTIONS(1669),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56779,7 +56974,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1733),
+    ACTIONS(1667),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56807,27 +57002,26 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30030] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [30218] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(383),
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(387),
     1,
     sym_comment,
-    ACTIONS(1731),
-    7,
+    ACTIONS(1941),
+    6,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1729),
-    26,
+    anon_sym_RBRACE,
+    ACTIONS(1939),
+    27,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -56850,21 +57044,22 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
+    anon_sym_attribute,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_typedef,
     sym_identifier,
-    [30077] = 5,
+    [30265] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(384),
+    STATE(388),
     1,
     sym_comment,
-    ACTIONS(1727),
+    ACTIONS(1575),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56873,7 +57068,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1725),
+    ACTIONS(1573),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56901,17 +57096,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30124] = 5,
+    [30312] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(385),
+    STATE(389),
     1,
     sym_comment,
-    ACTIONS(1723),
+    ACTIONS(1615),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -56920,7 +57115,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1721),
+    ACTIONS(1613),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -56948,14 +57143,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30171] = 5,
+    [30359] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(386),
+    STATE(390),
     1,
     sym_comment,
     ACTIONS(1945),
@@ -56995,17 +57190,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_const,
     anon_sym_typedef,
     sym_identifier,
-    [30218] = 5,
+    [30406] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(387),
+    STATE(391),
     1,
     sym_comment,
-    ACTIONS(1719),
+    ACTIONS(1769),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57014,7 +57209,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1717),
+    ACTIONS(1767),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57042,17 +57237,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30265] = 5,
+    [30453] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(388),
+    STATE(392),
     1,
     sym_comment,
-    ACTIONS(1715),
+    ACTIONS(1699),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57061,7 +57256,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1713),
+    ACTIONS(1697),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57089,17 +57284,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30312] = 5,
+    [30500] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(389),
+    STATE(393),
     1,
     sym_comment,
-    ACTIONS(1657),
+    ACTIONS(1653),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57108,7 +57303,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1655),
+    ACTIONS(1651),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57136,64 +57331,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30359] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(390),
-    1,
-    sym_comment,
-    ACTIONS(1949),
-    6,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
-    ACTIONS(1947),
-    27,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_attribute,
-    anon_sym_enum,
-    anon_sym_const,
-    anon_sym_typedef,
-    sym_identifier,
-    [30406] = 5,
+    [30547] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(391),
+    STATE(394),
     1,
     sym_comment,
-    ACTIONS(1781),
+    ACTIONS(1777),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57202,7 +57350,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1779),
+    ACTIONS(1775),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57230,14 +57378,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30453] = 5,
+    [30594] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(392),
+    STATE(395),
     1,
     sym_comment,
     ACTIONS(1599),
@@ -57277,17 +57425,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30500] = 5,
+    [30641] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(393),
+    STATE(396),
     1,
     sym_comment,
-    ACTIONS(1707),
+    ACTIONS(1711),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57296,7 +57444,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1705),
+    ACTIONS(1709),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57324,14 +57472,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30547] = 5,
+    [30688] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(394),
+    STATE(397),
     1,
     sym_comment,
     ACTIONS(1785),
@@ -57371,168 +57519,26 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [30594] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(395),
-    1,
-    sym_comment,
-    ACTIONS(1777),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1775),
-    26,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
-    sym_identifier,
-    [30641] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(396),
-    1,
-    sym_comment,
-    ACTIONS(1665),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1663),
-    26,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
-    sym_identifier,
-    [30688] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [30735] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(397),
-    1,
-    sym_comment,
-    ACTIONS(1607),
-    7,
-    anon_sym_longlong,
-    anon_sym_unsignedshort,
-    anon_sym_unsignedlonglong,
-    anon_sym_longdouble,
-    anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1605),
-    26,
-    anon_sym_short,
-    anon_sym_int16,
-    anon_sym_long,
-    anon_sym_int32,
-    anon_sym_int64,
-    sym_unsigned_tiny_int,
-    sym_boolean_type,
-    anon_sym_fixed,
-    sym_octet_type,
-    sym_signed_tiny_int,
-    anon_sym_uint16,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    anon_sym_uint64,
-    anon_sym_float,
-    anon_sym_double,
-    sym_char_type,
-    sym_wide_char_type,
-    anon_sym_string,
-    anon_sym_wstring,
-    anon_sym_any,
-    anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
-    sym_identifier,
-    [30735] = 5,
-    ACTIONS(3),
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
     STATE(398),
     1,
     sym_comment,
-    ACTIONS(1575),
-    7,
+    ACTIONS(1949),
+    6,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1573),
-    26,
+    anon_sym_RBRACE,
+    ACTIONS(1947),
+    27,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -57555,9 +57561,10 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
+    anon_sym_attribute,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_typedef,
     sym_identifier,
     [30782] = 5,
     ACTIONS(3),
@@ -57569,7 +57576,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(399),
     1,
     sym_comment,
-    ACTIONS(1799),
+    ACTIONS(1791),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57578,7 +57585,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1797),
+    ACTIONS(1789),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57616,7 +57623,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(400),
     1,
     sym_comment,
-    ACTIONS(1791),
+    ACTIONS(1773),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57625,7 +57632,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1789),
+    ACTIONS(1771),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57663,7 +57670,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(401),
     1,
     sym_comment,
-    ACTIONS(1625),
+    ACTIONS(1759),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57672,7 +57679,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1623),
+    ACTIONS(1757),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57710,7 +57717,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(402),
     1,
     sym_comment,
-    ACTIONS(1629),
+    ACTIONS(1795),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57719,7 +57726,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1627),
+    ACTIONS(1793),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57748,25 +57755,26 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     sym_identifier,
     [30970] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(403),
     1,
     sym_comment,
-    ACTIONS(1953),
-    6,
+    ACTIONS(1781),
+    7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_RBRACE,
-    ACTIONS(1951),
-    27,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1779),
+    26,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -57789,10 +57797,9 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_attribute,
-    anon_sym_enum,
-    anon_sym_const,
-    anon_sym_typedef,
+    anon_sym_map,
+    anon_sym_Object,
+    sym_value_base_type,
     sym_identifier,
     [31017] = 5,
     ACTIONS(3),
@@ -57804,7 +57811,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(404),
     1,
     sym_comment,
-    ACTIONS(1637),
+    ACTIONS(1649),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57813,7 +57820,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1635),
+    ACTIONS(1647),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57851,7 +57858,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(405),
     1,
     sym_comment,
-    ACTIONS(1703),
+    ACTIONS(1691),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57860,7 +57867,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1701),
+    ACTIONS(1689),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57898,7 +57905,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(406),
     1,
     sym_comment,
-    ACTIONS(1641),
+    ACTIONS(1665),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57907,7 +57914,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1639),
+    ACTIONS(1663),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57945,7 +57952,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(407),
     1,
     sym_comment,
-    ACTIONS(1645),
+    ACTIONS(1583),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -57954,7 +57961,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1643),
+    ACTIONS(1581),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -57992,7 +57999,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(408),
     1,
     sym_comment,
-    ACTIONS(1649),
+    ACTIONS(1591),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58001,7 +58008,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1647),
+    ACTIONS(1589),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58039,7 +58046,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(409),
     1,
     sym_comment,
-    ACTIONS(1653),
+    ACTIONS(1595),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58048,7 +58055,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1651),
+    ACTIONS(1593),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58086,7 +58093,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(410),
     1,
     sym_comment,
-    ACTIONS(1699),
+    ACTIONS(1607),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58095,7 +58102,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1697),
+    ACTIONS(1605),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58124,26 +58131,25 @@ static const uint16_t ts_small_parse_table[] = {
     sym_value_base_type,
     sym_identifier,
     [31346] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
     STATE(411),
     1,
     sym_comment,
-    ACTIONS(1661),
-    7,
+    ACTIONS(1953),
+    6,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1659),
-    26,
+    anon_sym_RBRACE,
+    ACTIONS(1951),
+    27,
     anon_sym_short,
     anon_sym_int16,
     anon_sym_long,
@@ -58166,9 +58172,10 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_wstring,
     anon_sym_any,
     anon_sym_sequence,
-    anon_sym_map,
-    anon_sym_Object,
-    sym_value_base_type,
+    anon_sym_attribute,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_typedef,
     sym_identifier,
     [31393] = 5,
     ACTIONS(3),
@@ -58180,7 +58187,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(412),
     1,
     sym_comment,
-    ACTIONS(1695),
+    ACTIONS(1611),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58189,7 +58196,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1693),
+    ACTIONS(1609),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58227,7 +58234,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(413),
     1,
     sym_comment,
-    ACTIONS(1669),
+    ACTIONS(1645),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58236,7 +58243,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1667),
+    ACTIONS(1643),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58274,7 +58281,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(414),
     1,
     sym_comment,
-    ACTIONS(1673),
+    ACTIONS(1619),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58283,7 +58290,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1671),
+    ACTIONS(1617),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58321,7 +58328,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(415),
     1,
     sym_comment,
-    ACTIONS(1677),
+    ACTIONS(1627),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58330,7 +58337,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1675),
+    ACTIONS(1625),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58368,7 +58375,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(416),
     1,
     sym_comment,
-    ACTIONS(1681),
+    ACTIONS(1631),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58377,7 +58384,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1679),
+    ACTIONS(1629),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58415,7 +58422,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(417),
     1,
     sym_comment,
-    ACTIONS(1687),
+    ACTIONS(1641),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58424,7 +58431,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1685),
+    ACTIONS(1639),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58462,7 +58469,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(418),
     1,
     sym_comment,
-    ACTIONS(1691),
+    ACTIONS(1637),
     7,
     anon_sym_longlong,
     anon_sym_unsignedshort,
@@ -58471,7 +58478,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON_COLON,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1689),
+    ACTIONS(1635),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58499,108 +58506,22 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [31722] = 25,
+    [31722] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(21),
-    1,
-    anon_sym_interface,
-    ACTIONS(23),
-    1,
-    anon_sym_bitset,
-    ACTIONS(25),
-    1,
-    anon_sym_bitmask,
-    ACTIONS(31),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(39),
-    1,
-    anon_sym_struct,
-    ACTIONS(41),
-    1,
-    anon_sym_union,
-    ACTIONS(43),
-    1,
-    anon_sym_enum,
-    ACTIONS(49),
-    1,
-    anon_sym_typedef,
-    ACTIONS(65),
-    1,
-    anon_sym_native,
-    ACTIONS(1955),
-    1,
-    anon_sym_AT,
-    ACTIONS(1957),
-    1,
-    anon_sym_module,
     STATE(419),
     1,
     sym_comment,
-    STATE(447),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
-    1,
-    sym_annotation_appl,
-    STATE(1583),
-    1,
-    sym_interface_header,
-    STATE(1585),
-    1,
-    sym_interface_kind,
-    ACTIONS(17),
-    2,
-    anon_sym_local,
-    anon_sym_abstract,
-    STATE(1053),
-    2,
-    sym_struct_forward_dcl,
-    sym_struct_def,
-    STATE(1092),
-    2,
-    sym_union_forward_dcl,
-    sym_union_def,
-    STATE(1377),
-    2,
-    sym_interface_forward_dcl,
-    sym_interface_def,
-    STATE(1488),
-    3,
-    sym_typedef_dcl,
-    sym_constr_type_dcl,
-    sym_native_dcl,
-    STATE(1045),
-    5,
-    sym_bitset_dcl,
-    sym_bitmask_dcl,
-    sym_enum_dcl,
-    sym_union_dcl,
-    sym_struct_dcl,
-    [31808] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(420),
-    1,
-    sym_comment,
-    ACTIONS(1961),
+    ACTIONS(1957),
     3,
     anon_sym_POUNDdefine,
     sym_preproc_directive,
     anon_sym_AT,
-    ACTIONS(1959),
+    ACTIONS(1955),
     29,
     ts_builtin_sym_end,
     aux_sym_preproc_include_token1,
@@ -58631,22 +58552,22 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_porttype,
     anon_sym_connector,
     anon_sym_native,
-    [31854] = 5,
+    [31768] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(421),
+    STATE(420),
     1,
     sym_comment,
-    ACTIONS(1965),
+    ACTIONS(1961),
     3,
     anon_sym_POUNDdefine,
     sym_preproc_directive,
     anon_sym_AT,
-    ACTIONS(1963),
+    ACTIONS(1959),
     29,
     ts_builtin_sym_end,
     aux_sym_preproc_include_token1,
@@ -58677,22 +58598,22 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_porttype,
     anon_sym_connector,
     anon_sym_native,
-    [31900] = 5,
+    [31814] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(422),
+    STATE(421),
     1,
     sym_comment,
-    ACTIONS(1969),
+    ACTIONS(1965),
     3,
     anon_sym_POUNDdefine,
     sym_preproc_directive,
     anon_sym_AT,
-    ACTIONS(1967),
+    ACTIONS(1963),
     29,
     ts_builtin_sym_end,
     aux_sym_preproc_include_token1,
@@ -58723,6 +58644,92 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_porttype,
     anon_sym_connector,
     anon_sym_native,
+    [31860] = 25,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(21),
+    1,
+    anon_sym_interface,
+    ACTIONS(23),
+    1,
+    anon_sym_bitset,
+    ACTIONS(25),
+    1,
+    anon_sym_bitmask,
+    ACTIONS(31),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(39),
+    1,
+    anon_sym_struct,
+    ACTIONS(41),
+    1,
+    anon_sym_union,
+    ACTIONS(43),
+    1,
+    anon_sym_enum,
+    ACTIONS(49),
+    1,
+    anon_sym_typedef,
+    ACTIONS(65),
+    1,
+    anon_sym_native,
+    ACTIONS(1967),
+    1,
+    anon_sym_AT,
+    ACTIONS(1969),
+    1,
+    anon_sym_module,
+    STATE(422),
+    1,
+    sym_comment,
+    STATE(448),
+    1,
+    aux_sym_interface_dcl_repeat1,
+    STATE(508),
+    1,
+    sym_annotation_appl,
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(1583),
+    1,
+    sym_interface_header,
+    STATE(1585),
+    1,
+    sym_interface_kind,
+    ACTIONS(17),
+    2,
+    anon_sym_local,
+    anon_sym_abstract,
+    STATE(1045),
+    2,
+    sym_union_forward_dcl,
+    sym_union_def,
+    STATE(1057),
+    2,
+    sym_struct_forward_dcl,
+    sym_struct_def,
+    STATE(1377),
+    2,
+    sym_interface_forward_dcl,
+    sym_interface_def,
+    STATE(1488),
+    3,
+    sym_typedef_dcl,
+    sym_constr_type_dcl,
+    sym_native_dcl,
+    STATE(1059),
+    5,
+    sym_bitset_dcl,
+    sym_bitmask_dcl,
+    sym_enum_dcl,
+    sym_union_dcl,
+    sym_struct_dcl,
     [31946] = 5,
     ACTIONS(3),
     1,
@@ -58861,52 +58868,88 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_porttype,
     anon_sym_connector,
     anon_sym_native,
-    [32084] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [32084] = 23,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(71),
+    1,
+    anon_sym_longlong,
+    ACTIONS(73),
+    1,
+    anon_sym_int64,
+    ACTIONS(75),
+    1,
+    sym_unsigned_tiny_int,
+    ACTIONS(81),
+    1,
+    sym_signed_tiny_int,
+    ACTIONS(83),
+    1,
+    anon_sym_unsignedshort,
+    ACTIONS(85),
+    1,
+    anon_sym_uint16,
+    ACTIONS(89),
+    1,
+    anon_sym_unsignedlonglong,
+    ACTIONS(91),
+    1,
+    anon_sym_uint64,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(157),
+    1,
+    sym_identifier,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
     STATE(426),
     1,
     sym_comment,
-    ACTIONS(1983),
+    STATE(1159),
+    1,
+    sym_scoped_name,
+    STATE(1500),
+    1,
+    sym_integer_type,
+    STATE(1501),
+    1,
+    sym_switch_type_spec,
+    ACTIONS(67),
+    2,
+    anon_sym_short,
+    anon_sym_int16,
+    ACTIONS(69),
+    2,
+    anon_sym_long,
+    anon_sym_int32,
+    ACTIONS(87),
+    2,
+    anon_sym_unsignedlong,
+    anon_sym_uint32,
+    STATE(638),
+    2,
+    sym_unsigned_int,
+    sym_signed_int,
+    STATE(662),
     3,
-    anon_sym_POUNDdefine,
-    sym_preproc_directive,
-    anon_sym_AT,
-    ACTIONS(1985),
-    28,
-    aux_sym_preproc_include_token1,
-    anon_sym_exception,
-    anon_sym_RBRACE,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_ATannotation,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_valuetype,
-    anon_sym_eventtype,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_const,
-    anon_sym_alias,
-    anon_sym_custom,
-    anon_sym_typedef,
-    anon_sym_typeid,
-    anon_sym_typeprefix,
-    anon_sym_import,
-    anon_sym_component,
-    anon_sym_home,
-    anon_sym_porttype,
-    anon_sym_connector,
-    anon_sym_native,
-    [32129] = 5,
+    sym_signed_short_int,
+    sym_signed_long_int,
+    sym_signed_longlong_int,
+    STATE(664),
+    3,
+    sym_unsigned_short_int,
+    sym_unsigned_long_int,
+    sym_unsigned_longlong_int,
+    ACTIONS(1983),
+    4,
+    sym_boolean_type,
+    sym_octet_type,
+    sym_char_type,
+    sym_wide_char_type,
+    [32165] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -58916,12 +58959,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(427),
     1,
     sym_comment,
-    ACTIONS(1987),
+    ACTIONS(1985),
     3,
     anon_sym_POUNDdefine,
     sym_preproc_directive,
     anon_sym_AT,
-    ACTIONS(1989),
+    ACTIONS(1987),
     28,
     aux_sym_preproc_include_token1,
     anon_sym_exception,
@@ -58951,7 +58994,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_porttype,
     anon_sym_connector,
     anon_sym_native,
-    [32174] = 5,
+    [32210] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -58961,14 +59004,14 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(428),
     1,
     sym_comment,
-    ACTIONS(1993),
+    ACTIONS(1991),
     5,
     anon_sym_longlong,
     anon_sym_unsignedshort,
     anon_sym_unsignedlonglong,
     anon_sym_longdouble,
     anon_sym_COLON_COLON,
-    ACTIONS(1991),
+    ACTIONS(1989),
     26,
     anon_sym_short,
     anon_sym_int16,
@@ -58996,7 +59039,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_Object,
     sym_value_base_type,
     sym_identifier,
-    [32219] = 5,
+    [32255] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -59006,13 +59049,58 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(429),
     1,
     sym_comment,
-    ACTIONS(1997),
+    ACTIONS(1993),
     3,
     anon_sym_POUNDdefine,
     sym_preproc_directive,
     anon_sym_AT,
     ACTIONS(1995),
     28,
+    aux_sym_preproc_include_token1,
+    anon_sym_exception,
+    anon_sym_RBRACE,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_ATannotation,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_valuetype,
+    anon_sym_eventtype,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_const,
+    anon_sym_alias,
+    anon_sym_custom,
+    anon_sym_typedef,
+    anon_sym_typeid,
+    anon_sym_typeprefix,
+    anon_sym_import,
+    anon_sym_component,
+    anon_sym_home,
+    anon_sym_porttype,
+    anon_sym_connector,
+    anon_sym_native,
+    [32300] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(430),
+    1,
+    sym_comment,
+    ACTIONS(1999),
+    3,
+    anon_sym_POUNDdefine,
+    sym_preproc_directive,
+    anon_sym_AT,
+    ACTIONS(1997),
+    28,
     ts_builtin_sym_end,
     aux_sym_preproc_include_token1,
     anon_sym_exception,
@@ -59041,87 +59129,6 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_porttype,
     anon_sym_connector,
     anon_sym_native,
-    [32264] = 23,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(71),
-    1,
-    anon_sym_longlong,
-    ACTIONS(73),
-    1,
-    anon_sym_int64,
-    ACTIONS(75),
-    1,
-    sym_unsigned_tiny_int,
-    ACTIONS(81),
-    1,
-    sym_signed_tiny_int,
-    ACTIONS(83),
-    1,
-    anon_sym_unsignedshort,
-    ACTIONS(85),
-    1,
-    anon_sym_uint16,
-    ACTIONS(89),
-    1,
-    anon_sym_unsignedlonglong,
-    ACTIONS(91),
-    1,
-    anon_sym_uint64,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(157),
-    1,
-    sym_identifier,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(430),
-    1,
-    sym_comment,
-    STATE(1153),
-    1,
-    sym_scoped_name,
-    STATE(1500),
-    1,
-    sym_integer_type,
-    STATE(1501),
-    1,
-    sym_switch_type_spec,
-    ACTIONS(67),
-    2,
-    anon_sym_short,
-    anon_sym_int16,
-    ACTIONS(69),
-    2,
-    anon_sym_long,
-    anon_sym_int32,
-    ACTIONS(87),
-    2,
-    anon_sym_unsignedlong,
-    anon_sym_uint32,
-    STATE(632),
-    2,
-    sym_unsigned_int,
-    sym_signed_int,
-    STATE(626),
-    3,
-    sym_signed_short_int,
-    sym_signed_long_int,
-    sym_signed_longlong_int,
-    STATE(628),
-    3,
-    sym_unsigned_short_int,
-    sym_unsigned_long_int,
-    sym_unsigned_longlong_int,
-    ACTIONS(1999),
-    4,
-    sym_boolean_type,
-    sym_octet_type,
-    sym_char_type,
-    sym_wide_char_type,
     [32345] = 5,
     ACTIONS(3),
     1,
@@ -59201,22 +59208,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(432),
     1,
     sym_comment,
-    STATE(453),
+    STATE(450),
     1,
     sym_scoped_name,
-    STATE(454),
+    STATE(455),
     1,
     sym_dec_number,
     STATE(459),
     1,
-    sym_primary_expr,
-    STATE(467),
-    1,
     sym_oct_number,
-    STATE(481),
+    STATE(489),
     1,
     sym_literal,
-    STATE(587),
+    STATE(490),
+    1,
+    sym_primary_expr,
+    STATE(582),
     1,
     sym_integer_sign,
     ACTIONS(602),
@@ -59235,7 +59242,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    STATE(480),
+    STATE(492),
     8,
     sym_integer_literal,
     sym_floating_pt_literal,
@@ -59255,7 +59262,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(31),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(1967),
     1,
     anon_sym_AT,
     ACTIONS(2007),
@@ -59288,13 +59295,13 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(434),
     1,
     aux_sym_component_body_repeat1,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(554),
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(556),
     1,
     sym_component_export,
     STATE(572),
@@ -59330,7 +59337,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(31),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(1967),
     1,
     anon_sym_AT,
     ACTIONS(2009),
@@ -59363,13 +59370,13 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(436),
     1,
     aux_sym_component_body_repeat1,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(554),
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(556),
     1,
     sym_component_export,
     STATE(572),
@@ -59446,16 +59453,16 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_boolean_type,
     sym_octet_type,
-    STATE(632),
+    STATE(638),
     2,
     sym_unsigned_int,
     sym_signed_int,
-    STATE(626),
+    STATE(662),
     3,
     sym_signed_short_int,
     sym_signed_long_int,
     sym_signed_longlong_int,
-    STATE(628),
+    STATE(664),
     3,
     sym_unsigned_short_int,
     sym_unsigned_long_int,
@@ -59497,13 +59504,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2065),
     1,
     anon_sym_consumes,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(554),
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(556),
     1,
     sym_component_export,
     STATE(572),
@@ -59540,7 +59547,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(31),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(1967),
     1,
     anon_sym_AT,
     ACTIONS(2009),
@@ -59561,24 +59568,24 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(437),
     1,
     sym_comment,
-    STATE(443),
+    STATE(441),
     1,
     aux_sym_port_body_repeat1,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
     STATE(568),
     1,
     sym_port_export,
-    STATE(569),
-    1,
-    sym_port_ref,
     STATE(572),
     1,
     aux_sym_interface_dcl_repeat1,
+    STATE(576),
+    1,
+    sym_port_ref,
     STATE(1539),
     1,
     sym_attr_dcl,
@@ -59623,16 +59630,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2090),
     1,
     anon_sym_uses,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(570),
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(566),
     1,
     sym_connector_export,
-    STATE(571),
+    STATE(567),
     1,
     sym_port_ref,
     STATE(572),
@@ -59665,55 +59672,153 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(31),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(31),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(1967),
+    1,
+    anon_sym_AT,
+    ACTIONS(2009),
+    1,
+    anon_sym_readonly,
+    ACTIONS(2011),
+    1,
+    anon_sym_attribute,
+    ACTIONS(2013),
+    1,
+    anon_sym_provides,
+    ACTIONS(2015),
+    1,
+    anon_sym_uses,
+    ACTIONS(2096),
+    1,
+    anon_sym_RBRACE,
+    STATE(438),
+    1,
+    aux_sym_connector_dcl_repeat1,
+    STATE(439),
+    1,
+    sym_comment,
+    STATE(508),
+    1,
+    sym_annotation_appl,
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(566),
+    1,
+    sym_connector_export,
+    STATE(567),
+    1,
+    sym_port_ref,
+    STATE(572),
+    1,
+    aux_sym_interface_dcl_repeat1,
+    STATE(1437),
+    1,
+    sym_attr_dcl,
+    ACTIONS(2023),
+    2,
+    anon_sym_port,
+    anon_sym_mirrorport,
+    STATE(1183),
+    2,
+    sym_readonly_attr_spec,
+    sym_attr_spec,
+    STATE(1186),
+    3,
+    sym_provides_dcl,
+    sym_uses_dcl,
+    sym_port_dcl,
+    [32946] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(440),
+    1,
+    sym_comment,
+    ACTIONS(1521),
+    3,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    anon_sym_COLON,
+    ACTIONS(1523),
+    18,
+    anon_sym_COLON_COLON,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_LBRACE,
+    anon_sym_SEMI,
+    anon_sym_supports,
+    anon_sym_RBRACK,
+    anon_sym_manages,
+    anon_sym_primarykey,
+    [32981] = 19,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2098),
     1,
-    anon_sym_AT,
-    ACTIONS(2009),
+    anon_sym_RBRACE,
+    ACTIONS(2100),
     1,
     anon_sym_readonly,
-    ACTIONS(2011),
+    ACTIONS(2103),
     1,
     anon_sym_attribute,
-    ACTIONS(2013),
+    ACTIONS(2106),
     1,
-    anon_sym_provides,
-    ACTIONS(2015),
+    anon_sym_AT,
+    ACTIONS(2109),
     1,
-    anon_sym_uses,
-    ACTIONS(2096),
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2112),
     1,
-    anon_sym_RBRACE,
-    STATE(437),
+    anon_sym_provides,
+    ACTIONS(2115),
     1,
-    aux_sym_port_body_repeat1,
-    STATE(439),
+    anon_sym_uses,
+    STATE(508),
     1,
-    sym_comment,
-    STATE(536),
+    sym_annotation_appl,
+    STATE(510),
     1,
     sym_extend_annotation_appl,
-    STATE(548),
-    1,
-    sym_annotation_appl,
     STATE(568),
     1,
     sym_port_export,
-    STATE(569),
-    1,
-    sym_port_ref,
     STATE(572),
     1,
     aux_sym_interface_dcl_repeat1,
+    STATE(576),
+    1,
+    sym_port_ref,
     STATE(1539),
     1,
     sym_attr_dcl,
-    ACTIONS(2023),
+    ACTIONS(2118),
     2,
     anon_sym_port,
     anon_sym_mirrorport,
+    STATE(441),
+    2,
+    sym_comment,
+    aux_sym_port_body_repeat1,
     STATE(1183),
     2,
     sym_readonly_attr_spec,
@@ -59723,7 +59828,7 @@ static const uint16_t ts_small_parse_table[] = {
     sym_provides_dcl,
     sym_uses_dcl,
     sym_port_dcl,
-    [32946] = 20,
+    [33044] = 20,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -59733,7 +59838,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(31),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(1967),
     1,
     anon_sym_AT,
     ACTIONS(2009),
@@ -59748,31 +59853,31 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2015),
     1,
     anon_sym_uses,
-    ACTIONS(2098),
+    ACTIONS(2121),
     1,
     anon_sym_RBRACE,
-    STATE(438),
+    STATE(437),
     1,
-    aux_sym_connector_dcl_repeat1,
-    STATE(440),
+    aux_sym_port_body_repeat1,
+    STATE(442),
     1,
     sym_comment,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(570),
+    STATE(510),
     1,
-    sym_connector_export,
-    STATE(571),
+    sym_extend_annotation_appl,
+    STATE(568),
     1,
-    sym_port_ref,
+    sym_port_export,
     STATE(572),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(1437),
+    STATE(576),
+    1,
+    sym_port_ref,
+    STATE(1539),
     1,
     sym_attr_dcl,
     ACTIONS(2023),
@@ -59788,57 +59893,22 @@ static const uint16_t ts_small_parse_table[] = {
     sym_provides_dcl,
     sym_uses_dcl,
     sym_port_dcl,
-    [33011] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(441),
-    1,
-    sym_comment,
-    ACTIONS(1499),
-    3,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    anon_sym_COLON,
-    ACTIONS(1501),
-    18,
-    anon_sym_COLON_COLON,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_LBRACE,
-    anon_sym_SEMI,
-    anon_sym_supports,
-    anon_sym_RBRACK,
-    anon_sym_manages,
-    anon_sym_primarykey,
-    [33046] = 5,
+    [33109] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(442),
+    STATE(443),
     1,
     sym_comment,
-    ACTIONS(1503),
+    ACTIONS(1517),
     3,
     anon_sym_GT,
     anon_sym_SLASH,
     anon_sym_COLON,
-    ACTIONS(1505),
+    ACTIONS(1519),
     18,
     anon_sym_COLON_COLON,
     anon_sym_COMMA,
@@ -59858,69 +59928,6 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_RBRACK,
     anon_sym_manages,
     anon_sym_primarykey,
-    [33081] = 19,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2100),
-    1,
-    anon_sym_RBRACE,
-    ACTIONS(2102),
-    1,
-    anon_sym_readonly,
-    ACTIONS(2105),
-    1,
-    anon_sym_attribute,
-    ACTIONS(2108),
-    1,
-    anon_sym_AT,
-    ACTIONS(2111),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2114),
-    1,
-    anon_sym_provides,
-    ACTIONS(2117),
-    1,
-    anon_sym_uses,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
-    1,
-    sym_annotation_appl,
-    STATE(568),
-    1,
-    sym_port_export,
-    STATE(569),
-    1,
-    sym_port_ref,
-    STATE(572),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(1539),
-    1,
-    sym_attr_dcl,
-    ACTIONS(2120),
-    2,
-    anon_sym_port,
-    anon_sym_mirrorport,
-    STATE(443),
-    2,
-    sym_comment,
-    aux_sym_port_body_repeat1,
-    STATE(1183),
-    2,
-    sym_readonly_attr_spec,
-    sym_attr_spec,
-    STATE(1186),
-    3,
-    sym_provides_dcl,
-    sym_uses_dcl,
-    sym_port_dcl,
     [33144] = 19,
     ACTIONS(3),
     1,
@@ -59931,7 +59938,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(31),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(1967),
     1,
     anon_sym_AT,
     ACTIONS(2009),
@@ -59946,22 +59953,22 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2015),
     1,
     anon_sym_uses,
-    STATE(440),
+    STATE(439),
     1,
     aux_sym_connector_dcl_repeat1,
     STATE(444),
     1,
     sym_comment,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(570),
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(566),
     1,
     sym_connector_export,
-    STATE(571),
+    STATE(567),
     1,
     sym_port_ref,
     STATE(572),
@@ -59993,12 +60000,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(445),
     1,
     sym_comment,
-    ACTIONS(1489),
+    ACTIONS(1507),
     3,
     anon_sym_GT,
     anon_sym_SLASH,
     anon_sym_COLON,
-    ACTIONS(1491),
+    ACTIONS(1509),
     17,
     anon_sym_COLON_COLON,
     anon_sym_COMMA,
@@ -60050,26 +60057,62 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33273] = 8,
+    [33273] = 7,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2131),
+    1,
+    aux_sym_floating_pt_literal_token1,
+    ACTIONS(2133),
+    1,
+    aux_sym_fixed_pt_literal_token1,
+    STATE(447),
+    1,
+    sym_comment,
+    ACTIONS(2127),
+    2,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2129),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33309] = 8,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2127),
+    ACTIONS(2135),
     1,
     anon_sym_AT,
-    ACTIONS(2130),
+    ACTIONS(2138),
     1,
     anon_sym_SLASH_SLASH_AT,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
-    STATE(447),
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
+    STATE(448),
     2,
     sym_comment,
     aux_sym_interface_dcl_repeat1,
@@ -60088,17 +60131,119 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [33311] = 4,
+    [33347] = 7,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2145),
+    1,
+    aux_sym_floating_pt_literal_token1,
+    ACTIONS(2147),
+    1,
+    aux_sym_fixed_pt_literal_token1,
+    STATE(449),
+    1,
+    sym_comment,
+    ACTIONS(2141),
+    2,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2143),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33383] = 6,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2149),
+    1,
+    anon_sym_COLON_COLON,
+    STATE(450),
+    1,
+    sym_comment,
+    ACTIONS(2151),
+    3,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    anon_sym_COLON,
+    ACTIONS(2153),
+    13,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33416] = 6,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2155),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(2157),
+    1,
+    anon_sym_LPAREN,
+    STATE(451),
+    1,
+    sym_comment,
+    ACTIONS(1539),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [33449] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(448),
+    STATE(452),
     1,
     sym_comment,
-    ACTIONS(1491),
+    ACTIONS(1519),
     17,
     anon_sym_COLON_COLON,
     anon_sym_LPAREN,
@@ -60117,24 +60262,24 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [33340] = 6,
+    [33478] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2137),
+    ACTIONS(2163),
     1,
     anon_sym_DOT,
-    STATE(449),
+    STATE(453),
     1,
     sym_comment,
-    ACTIONS(2133),
+    ACTIONS(2159),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2135),
+    ACTIONS(2161),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60150,17 +60295,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33373] = 4,
+    [33511] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(450),
+    STATE(454),
     1,
     sym_comment,
-    ACTIONS(1505),
+    ACTIONS(1523),
     17,
     anon_sym_COLON_COLON,
     anon_sym_LPAREN,
@@ -60179,17 +60324,50 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [33402] = 4,
+    [33540] = 6,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2169),
+    1,
+    anon_sym_DOT,
+    STATE(455),
+    1,
+    sym_comment,
+    ACTIONS(2165),
+    2,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2167),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33573] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(451),
+    STATE(456),
     1,
     sym_comment,
-    ACTIONS(1501),
+    ACTIONS(1509),
     17,
     anon_sym_COLON_COLON,
     anon_sym_LPAREN,
@@ -60208,23 +60386,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [33431] = 6,
+    [33602] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2139),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2141),
+    ACTIONS(2171),
     1,
     anon_sym_LPAREN,
-    STATE(452),
+    STATE(457),
     1,
     sym_comment,
-    ACTIONS(1509),
+    ACTIONS(1557),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -60241,26 +60416,22 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [33464] = 6,
+    [33632] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
-    1,
-    anon_sym_COLON_COLON,
-    STATE(453),
+    STATE(458),
     1,
     sym_comment,
-    ACTIONS(2145),
-    3,
+    ACTIONS(2173),
+    2,
     anon_sym_GT,
     anon_sym_SLASH,
-    anon_sym_COLON,
-    ACTIONS(2147),
-    13,
+    ACTIONS(2175),
+    14,
     anon_sym_COMMA,
     anon_sym_PIPE,
     anon_sym_CARET,
@@ -60272,26 +60443,24 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_STAR,
     anon_sym_PERCENT,
     anon_sym_RPAREN,
+    anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33497] = 6,
+    [33662] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2153),
-    1,
-    anon_sym_DOT,
-    STATE(454),
+    STATE(459),
     1,
     sym_comment,
-    ACTIONS(2149),
+    ACTIONS(2165),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2151),
+    ACTIONS(2167),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60307,51 +60476,115 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33530] = 5,
-    ACTIONS(3),
+    [33692] = 7,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2177),
+    1,
+    anon_sym_GT,
+    ACTIONS(2183),
+    1,
+    anon_sym_SLASH,
+    STATE(460),
+    1,
+    sym_comment,
+    ACTIONS(2181),
+    2,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    ACTIONS(2179),
+    12,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33726] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2155),
+    ACTIONS(618),
     1,
-    anon_sym_LPAREN,
-    STATE(455),
+    anon_sym_SLASH_SLASH,
+    STATE(461),
     1,
     sym_comment,
-    ACTIONS(1479),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [33560] = 5,
+    ACTIONS(2185),
+    2,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2187),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33756] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(462),
+    1,
+    sym_comment,
+    ACTIONS(2189),
+    2,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2191),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [33786] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(456),
+    STATE(463),
     1,
     sym_comment,
-    ACTIONS(2157),
+    ACTIONS(2193),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2159),
+    ACTIONS(2195),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60367,51 +60600,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33590] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2161),
-    1,
-    anon_sym_LPAREN,
-    STATE(457),
-    1,
-    sym_comment,
-    ACTIONS(1539),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [33620] = 5,
+    [33816] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(458),
+    STATE(464),
     1,
     sym_comment,
-    ACTIONS(2163),
+    ACTIONS(2197),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2165),
+    ACTIONS(2199),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60427,21 +60630,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33650] = 5,
+    [33846] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(459),
+    STATE(465),
     1,
     sym_comment,
-    ACTIONS(2167),
+    ACTIONS(2201),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2169),
+    ACTIONS(2203),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60457,54 +60660,24 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33680] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2171),
-    1,
-    anon_sym_LPAREN,
-    STATE(460),
-    1,
-    sym_comment,
-    ACTIONS(1569),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [33710] = 5,
+    [33876] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(461),
+    STATE(466),
     1,
     sym_comment,
-    ACTIONS(2175),
+    ACTIONS(2207),
     5,
     anon_sym_0,
     anon_sym_L,
     anon_sym_TRUE,
     anon_sym_FALSE,
     sym_identifier,
-    ACTIONS(2173),
+    ACTIONS(2205),
     11,
     anon_sym_COLON_COLON,
     anon_sym_PLUS,
@@ -60517,88 +60690,24 @@ static const uint16_t ts_small_parse_table[] = {
     sym_hex_number,
     anon_sym_DQUOTE,
     anon_sym_SQUOTE,
-    [33740] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2177),
-    1,
-    anon_sym_LPAREN,
-    STATE(462),
-    1,
-    sym_comment,
-    ACTIONS(1521),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [33770] = 7,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2179),
-    1,
-    anon_sym_GT,
-    ACTIONS(2185),
-    1,
-    anon_sym_SLASH,
-    STATE(463),
-    1,
-    sym_comment,
-    ACTIONS(2183),
-    2,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    ACTIONS(2181),
-    12,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [33804] = 5,
+    [33906] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(464),
+    STATE(467),
     1,
     sym_comment,
-    ACTIONS(2175),
+    ACTIONS(2207),
     5,
     anon_sym_0,
     anon_sym_L,
     anon_sym_TRUE,
     anon_sym_FALSE,
     sym_identifier,
-    ACTIONS(2173),
+    ACTIONS(2205),
     11,
     anon_sym_COLON_COLON,
     anon_sym_PLUS,
@@ -60611,21 +60720,21 @@ static const uint16_t ts_small_parse_table[] = {
     sym_hex_number,
     anon_sym_DQUOTE,
     anon_sym_SQUOTE,
-    [33834] = 5,
+    [33936] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(465),
+    STATE(468),
     1,
     sym_comment,
-    ACTIONS(2133),
+    ACTIONS(2209),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2135),
+    ACTIONS(2211),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60641,51 +60750,81 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33864] = 5,
+    [33966] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(2213),
+    1,
+    anon_sym_LPAREN,
+    STATE(469),
+    1,
+    sym_comment,
+    ACTIONS(1503),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [33996] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(466),
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2215),
+    1,
+    anon_sym_LPAREN,
+    STATE(470),
     1,
     sym_comment,
-    ACTIONS(2187),
-    2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2189),
-    14,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [33894] = 5,
+    ACTIONS(1513),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34026] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(467),
+    STATE(471),
     1,
     sym_comment,
-    ACTIONS(2149),
+    ACTIONS(2217),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2151),
+    ACTIONS(2219),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60701,21 +60840,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33924] = 5,
+    [34056] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(468),
+    STATE(472),
     1,
     sym_comment,
-    ACTIONS(2191),
+    ACTIONS(2221),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2193),
+    ACTIONS(2223),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60731,21 +60870,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33954] = 5,
+    [34086] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(469),
+    STATE(473),
     1,
     sym_comment,
-    ACTIONS(2195),
+    ACTIONS(2127),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2197),
+    ACTIONS(2129),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60761,21 +60900,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [33984] = 5,
+    [34116] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(470),
+    STATE(474),
     1,
     sym_comment,
-    ACTIONS(2199),
+    ACTIONS(2225),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2201),
+    ACTIONS(2227),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -60791,52 +60930,88 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34014] = 5,
+    [34146] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(2229),
+    1,
+    anon_sym_LPAREN,
+    STATE(475),
+    1,
+    sym_comment,
+    ACTIONS(1497),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34176] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(471),
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2231),
+    1,
+    anon_sym_LPAREN,
+    STATE(476),
     1,
     sym_comment,
-    ACTIONS(2203),
-    2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2205),
-    14,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [34044] = 5,
+    ACTIONS(1473),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34206] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(472),
+    ACTIONS(2183),
+    1,
+    anon_sym_SLASH,
+    ACTIONS(2233),
+    1,
+    anon_sym_GT,
+    STATE(477),
     1,
     sym_comment,
-    ACTIONS(2207),
+    ACTIONS(2181),
     2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2209),
-    14,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    ACTIONS(2235),
+    12,
     anon_sym_COMMA,
     anon_sym_PIPE,
     anon_sym_CARET,
@@ -60845,56 +61020,54 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LT_LT,
     anon_sym_PLUS,
     anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
     anon_sym_RPAREN,
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34074] = 5,
+    [34240] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(2237),
     1,
-    anon_sym_SLASH_SLASH,
-    STATE(473),
+    anon_sym_LPAREN,
+    STATE(478),
     1,
     sym_comment,
-    ACTIONS(2211),
-    2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2213),
-    14,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [34104] = 5,
+    ACTIONS(1485),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34270] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2215),
+    ACTIONS(2239),
     1,
     anon_sym_LPAREN,
-    STATE(474),
+    STATE(479),
     1,
     sym_comment,
-    ACTIONS(1467),
+    ACTIONS(1479),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -60911,20 +61084,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34134] = 5,
+    [34300] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2217),
+    ACTIONS(2241),
     1,
     anon_sym_LPAREN,
-    STATE(475),
+    STATE(480),
     1,
     sym_comment,
-    ACTIONS(1557),
+    ACTIONS(1467),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -60941,20 +61114,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34164] = 5,
+    [34330] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2219),
+    ACTIONS(2243),
     1,
     anon_sym_LPAREN,
-    STATE(476),
+    STATE(481),
     1,
     sym_comment,
-    ACTIONS(1533),
+    ACTIONS(1545),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -60971,21 +61144,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34194] = 5,
+    [34360] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(477),
+    STATE(482),
     1,
     sym_comment,
-    ACTIONS(2221),
+    ACTIONS(2245),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2223),
+    ACTIONS(2247),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -61001,20 +61174,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34224] = 5,
+    [34390] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2225),
+    ACTIONS(2249),
     1,
     anon_sym_LPAREN,
-    STATE(478),
+    STATE(483),
     1,
     sym_comment,
-    ACTIONS(1545),
+    ACTIONS(1491),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61031,20 +61204,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34254] = 5,
+    [34420] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2227),
+    ACTIONS(2251),
     1,
     anon_sym_LPAREN,
-    STATE(479),
+    STATE(484),
     1,
     sym_comment,
-    ACTIONS(1563),
+    ACTIONS(1533),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61061,51 +61234,81 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34284] = 5,
+    [34450] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(2253),
+    1,
+    anon_sym_LPAREN,
+    STATE(485),
+    1,
+    sym_comment,
+    ACTIONS(1527),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34480] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(480),
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2255),
+    1,
+    anon_sym_LPAREN,
+    STATE(486),
     1,
     sym_comment,
-    ACTIONS(2229),
-    2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2231),
-    14,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [34314] = 5,
+    ACTIONS(1563),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34510] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(481),
+    STATE(487),
     1,
     sym_comment,
-    ACTIONS(2145),
+    ACTIONS(2159),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2147),
+    ACTIONS(2161),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -61121,21 +61324,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34344] = 5,
+    [34540] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(482),
+    STATE(488),
     1,
     sym_comment,
-    ACTIONS(2233),
+    ACTIONS(2257),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2235),
+    ACTIONS(2259),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -61151,21 +61354,21 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34374] = 5,
+    [34570] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(483),
+    STATE(489),
     1,
     sym_comment,
-    ACTIONS(2237),
+    ACTIONS(2151),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2239),
+    ACTIONS(2153),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -61181,28 +61384,52 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34404] = 7,
+    [34600] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2185),
+    STATE(490),
     1,
+    sym_comment,
+    ACTIONS(2261),
+    2,
+    anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2241),
+    ACTIONS(2263),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [34630] = 5,
+    ACTIONS(5),
     1,
-    anon_sym_GT,
-    STATE(484),
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(491),
     1,
     sym_comment,
-    ACTIONS(2183),
+    ACTIONS(2265),
     2,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    ACTIONS(2243),
-    12,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2267),
+    14,
     anon_sym_COMMA,
     anon_sym_PIPE,
     anon_sym_CARET,
@@ -61211,25 +61438,27 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LT_LT,
     anon_sym_PLUS,
     anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
     anon_sym_RPAREN,
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34438] = 5,
+    [34660] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(485),
+    STATE(492),
     1,
     sym_comment,
-    ACTIONS(2245),
+    ACTIONS(2269),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2247),
+    ACTIONS(2271),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -61245,51 +61474,51 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34468] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [34690] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2249),
+    ACTIONS(618),
     1,
-    anon_sym_LPAREN,
-    STATE(486),
+    anon_sym_SLASH_SLASH,
+    STATE(493),
     1,
     sym_comment,
-    ACTIONS(1473),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [34498] = 5,
+    ACTIONS(2273),
+    2,
+    anon_sym_GT,
+    anon_sym_SLASH,
+    ACTIONS(2275),
+    14,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_AMP,
+    anon_sym_GT_GT,
+    anon_sym_LT_LT,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [34720] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(487),
+    STATE(494),
     1,
     sym_comment,
-    ACTIONS(2251),
+    ACTIONS(2277),
     2,
     anon_sym_GT,
     anon_sym_SLASH,
-    ACTIONS(2253),
+    ACTIONS(2279),
     14,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -61305,17 +61534,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [34528] = 5,
+    [34750] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2255),
+    ACTIONS(2281),
     1,
     anon_sym_LPAREN,
-    STATE(488),
+    STATE(495),
     1,
     sym_comment,
     ACTIONS(1551),
@@ -61335,20 +61564,20 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34558] = 5,
+    [34780] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2257),
+    ACTIONS(2283),
     1,
     anon_sym_LPAREN,
-    STATE(489),
+    STATE(496),
     1,
     sym_comment,
-    ACTIONS(1485),
+    ACTIONS(1569),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61365,50 +61594,44 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34588] = 5,
+    [34810] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(490),
+    STATE(497),
     1,
     sym_comment,
-    ACTIONS(2259),
-    2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2261),
-    14,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [34618] = 5,
+    ACTIONS(1731),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34837] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2263),
-    1,
-    anon_sym_LPAREN,
-    STATE(491),
+    STATE(498),
     1,
     sym_comment,
-    ACTIONS(1527),
+    ACTIONS(1669),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61425,20 +61648,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34648] = 5,
+    [34864] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2265),
-    1,
-    anon_sym_LPAREN,
-    STATE(492),
+    STATE(499),
     1,
     sym_comment,
-    ACTIONS(1495),
+    ACTIONS(1645),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61455,20 +61675,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34678] = 5,
+    [34891] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2267),
-    1,
-    anon_sym_LPAREN,
-    STATE(493),
+    STATE(500),
     1,
     sym_comment,
-    ACTIONS(1515),
+    ACTIONS(1641),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61485,47 +61702,44 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34708] = 5,
+    [34918] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(494),
+    STATE(501),
     1,
     sym_comment,
-    ACTIONS(2269),
-    2,
-    anon_sym_GT,
-    anon_sym_SLASH,
-    ACTIONS(2271),
-    14,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_AMP,
-    anon_sym_GT_GT,
-    anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [34738] = 4,
+    ACTIONS(1653),
+    15,
+    anon_sym_local,
+    anon_sym_abstract,
+    anon_sym_interface,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_bitset,
+    anon_sym_bitmask,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_module,
+    anon_sym_struct,
+    anon_sym_union,
+    anon_sym_enum,
+    anon_sym_typedef,
+    anon_sym_native,
+    [34945] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(495),
+    STATE(502),
     1,
     sym_comment,
-    ACTIONS(1719),
+    ACTIONS(1637),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61542,17 +61756,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34765] = 4,
+    [34972] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(496),
+    STATE(503),
     1,
     sym_comment,
-    ACTIONS(1677),
+    ACTIONS(1727),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61569,17 +61783,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34792] = 4,
+    [34999] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(497),
+    STATE(504),
     1,
     sym_comment,
-    ACTIONS(1747),
+    ACTIONS(1631),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61596,17 +61810,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34819] = 4,
+    [35026] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(498),
+    STATE(505),
     1,
     sym_comment,
-    ACTIONS(1619),
+    ACTIONS(1627),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61623,17 +61837,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34846] = 4,
+    [35053] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(499),
+    STATE(506),
     1,
     sym_comment,
-    ACTIONS(1743),
+    ACTIONS(1619),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61650,17 +61864,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34873] = 4,
+    [35080] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(500),
+    STATE(507),
     1,
     sym_comment,
-    ACTIONS(1739),
+    ACTIONS(1615),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61677,44 +61891,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34900] = 4,
+    [35107] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(501),
-    1,
-    sym_comment,
-    ACTIONS(1735),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [34927] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(502),
+    STATE(508),
     1,
     sym_comment,
-    ACTIONS(1731),
+    ACTIONS(1773),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61731,17 +61918,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34954] = 4,
+    [35134] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(503),
+    STATE(509),
     1,
     sym_comment,
-    ACTIONS(1727),
+    ACTIONS(1611),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61758,17 +61945,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [34981] = 4,
+    [35161] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(504),
+    STATE(510),
     1,
     sym_comment,
-    ACTIONS(1723),
+    ACTIONS(1791),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61785,17 +61972,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35008] = 4,
+    [35188] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(505),
+    STATE(511),
     1,
     sym_comment,
-    ACTIONS(1615),
+    ACTIONS(1607),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61812,17 +61999,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35035] = 4,
+    [35215] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(506),
+    STATE(512),
     1,
     sym_comment,
-    ACTIONS(1751),
+    ACTIONS(1683),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61839,17 +62026,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35062] = 4,
+    [35242] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(507),
+    STATE(513),
     1,
     sym_comment,
-    ACTIONS(1595),
+    ACTIONS(1575),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -61866,14 +62053,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35089] = 4,
+    [35269] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(508),
+    STATE(514),
     1,
     sym_comment,
     ACTIONS(1807),
@@ -61893,125 +62080,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35116] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(509),
-    1,
-    sym_comment,
-    ACTIONS(1715),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [35143] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(510),
-    1,
-    sym_comment,
-    ACTIONS(1707),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [35170] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(511),
-    1,
-    sym_comment,
-    ACTIONS(1803),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [35197] = 4,
+    [35296] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(512),
-    1,
-    sym_comment,
-    ACTIONS(1795),
-    15,
-    anon_sym_local,
-    anon_sym_abstract,
-    anon_sym_interface,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_bitset,
-    anon_sym_bitmask,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_module,
-    anon_sym_struct,
-    anon_sym_union,
-    anon_sym_enum,
-    anon_sym_typedef,
-    anon_sym_native,
-    [35224] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(513),
+    STATE(515),
     1,
     sym_comment,
-    ACTIONS(1575),
+    ACTIONS(1623),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62028,17 +62107,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35251] = 4,
+    [35323] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(514),
+    STATE(516),
     1,
     sym_comment,
-    ACTIONS(1703),
+    ACTIONS(1595),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62055,17 +62134,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35278] = 4,
+    [35350] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(515),
+    STATE(517),
     1,
     sym_comment,
-    ACTIONS(1699),
+    ACTIONS(1591),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62082,17 +62161,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35305] = 4,
+    [35377] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(516),
+    STATE(518),
     1,
     sym_comment,
-    ACTIONS(1695),
+    ACTIONS(1583),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62109,17 +62188,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35332] = 4,
+    [35404] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(517),
+    STATE(519),
     1,
     sym_comment,
-    ACTIONS(1711),
+    ACTIONS(1665),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62136,17 +62215,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35359] = 4,
+    [35431] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(518),
+    STATE(520),
     1,
     sym_comment,
-    ACTIONS(1773),
+    ACTIONS(1691),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62163,17 +62242,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35386] = 4,
+    [35458] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(519),
+    STATE(521),
     1,
     sym_comment,
-    ACTIONS(1763),
+    ACTIONS(1785),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62190,14 +62269,14 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35413] = 4,
+    [35485] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(520),
+    STATE(522),
     1,
     sym_comment,
     ACTIONS(1781),
@@ -62217,17 +62296,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35440] = 4,
+    [35512] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(521),
+    STATE(523),
     1,
     sym_comment,
-    ACTIONS(1691),
+    ACTIONS(1799),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62244,17 +62323,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35467] = 4,
+    [35539] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(522),
+    STATE(524),
     1,
     sym_comment,
-    ACTIONS(1687),
+    ACTIONS(1699),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62271,17 +62350,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35494] = 4,
+    [35566] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(523),
+    STATE(525),
     1,
     sym_comment,
-    ACTIONS(1681),
+    ACTIONS(1587),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62298,17 +62377,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35521] = 4,
+    [35593] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(524),
+    STATE(526),
     1,
     sym_comment,
-    ACTIONS(1607),
+    ACTIONS(1803),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62325,17 +62404,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35548] = 4,
+    [35620] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(525),
+    STATE(527),
     1,
     sym_comment,
-    ACTIONS(1673),
+    ACTIONS(1711),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62352,17 +62431,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35575] = 4,
+    [35647] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(526),
+    STATE(528),
     1,
     sym_comment,
-    ACTIONS(1669),
+    ACTIONS(1649),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62379,17 +62458,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35602] = 4,
+    [35674] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(527),
+    STATE(529),
     1,
     sym_comment,
-    ACTIONS(1661),
+    ACTIONS(1795),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62406,17 +62485,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35629] = 4,
+    [35701] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(528),
+    STATE(530),
     1,
     sym_comment,
-    ACTIONS(1611),
+    ACTIONS(1599),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62433,17 +62512,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35656] = 4,
+    [35728] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(529),
+    STATE(531),
     1,
     sym_comment,
-    ACTIONS(1759),
+    ACTIONS(1707),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62460,17 +62539,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35683] = 4,
+    [35755] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(530),
+    STATE(532),
     1,
     sym_comment,
-    ACTIONS(1657),
+    ACTIONS(1673),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62487,17 +62566,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35710] = 4,
+    [35782] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(531),
+    STATE(533),
     1,
     sym_comment,
-    ACTIONS(1653),
+    ACTIONS(1777),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62514,17 +62593,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35737] = 4,
+    [35809] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(532),
+    STATE(534),
     1,
     sym_comment,
-    ACTIONS(1649),
+    ACTIONS(1687),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62541,17 +62620,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35764] = 4,
+    [35836] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(533),
+    STATE(535),
     1,
     sym_comment,
-    ACTIONS(1645),
+    ACTIONS(1735),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62568,17 +62647,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35791] = 4,
+    [35863] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(534),
+    STATE(536),
     1,
     sym_comment,
-    ACTIONS(1641),
+    ACTIONS(1695),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62595,17 +62674,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35818] = 4,
+    [35890] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(535),
+    STATE(537),
     1,
     sym_comment,
-    ACTIONS(1637),
+    ACTIONS(1739),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62622,17 +62701,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35845] = 4,
+    [35917] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(536),
+    STATE(538),
     1,
     sym_comment,
-    ACTIONS(1799),
+    ACTIONS(1743),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62649,17 +62728,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35872] = 4,
+    [35944] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(537),
+    STATE(539),
     1,
     sym_comment,
-    ACTIONS(1767),
+    ACTIONS(1769),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62676,17 +62755,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35899] = 4,
+    [35971] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(538),
+    STATE(540),
     1,
     sym_comment,
-    ACTIONS(1755),
+    ACTIONS(1747),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62703,17 +62782,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35926] = 4,
+    [35998] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(539),
+    STATE(541),
     1,
     sym_comment,
-    ACTIONS(1785),
+    ACTIONS(1751),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62730,17 +62809,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35953] = 4,
+    [36025] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(540),
+    STATE(542),
     1,
     sym_comment,
-    ACTIONS(1777),
+    ACTIONS(1755),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62757,17 +62836,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [35980] = 4,
+    [36052] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(541),
+    STATE(543),
     1,
     sym_comment,
-    ACTIONS(1625),
+    ACTIONS(1679),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62784,17 +62863,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36007] = 4,
+    [36079] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(542),
+    STATE(544),
     1,
     sym_comment,
-    ACTIONS(1665),
+    ACTIONS(1723),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62811,17 +62890,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36034] = 4,
+    [36106] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(543),
+    STATE(545),
     1,
     sym_comment,
-    ACTIONS(1629),
+    ACTIONS(1719),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62838,17 +62917,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36061] = 4,
+    [36133] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(544),
+    STATE(546),
     1,
     sym_comment,
-    ACTIONS(1599),
+    ACTIONS(1765),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62865,17 +62944,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36088] = 4,
+    [36160] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(545),
+    STATE(547),
     1,
     sym_comment,
-    ACTIONS(1633),
+    ACTIONS(1715),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62892,17 +62971,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36115] = 4,
+    [36187] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(546),
+    STATE(548),
     1,
     sym_comment,
-    ACTIONS(1591),
+    ACTIONS(1579),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62919,17 +62998,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36142] = 4,
+    [36214] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(547),
+    STATE(549),
     1,
     sym_comment,
-    ACTIONS(1603),
+    ACTIONS(1703),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62946,17 +63025,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36169] = 4,
+    [36241] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(548),
+    STATE(550),
     1,
     sym_comment,
-    ACTIONS(1791),
+    ACTIONS(1759),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -62973,17 +63052,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36196] = 4,
+    [36268] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(549),
+    STATE(551),
     1,
     sym_comment,
-    ACTIONS(1587),
+    ACTIONS(1661),
     15,
     anon_sym_local,
     anon_sym_abstract,
@@ -63000,24 +63079,24 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_enum,
     anon_sym_typedef,
     anon_sym_native,
-    [36223] = 6,
+    [36295] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2273),
+    ACTIONS(2285),
     1,
     anon_sym_GT,
-    STATE(550),
+    STATE(552),
     1,
     sym_comment,
-    ACTIONS(2277),
+    ACTIONS(2289),
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    ACTIONS(2275),
+    ACTIONS(2287),
     10,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -63029,85 +63108,85 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [36252] = 8,
+    [36324] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2145),
-    1,
-    anon_sym_SLASH,
-    ACTIONS(2279),
+    ACTIONS(2291),
     1,
     anon_sym_GT,
-    ACTIONS(2281),
-    1,
-    anon_sym_COMMA,
-    STATE(551),
+    STATE(553),
     1,
     sym_comment,
-    ACTIONS(2147),
-    9,
+    ACTIONS(2289),
+    2,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    ACTIONS(2293),
+    10,
+    anon_sym_COMMA,
     anon_sym_PIPE,
     anon_sym_CARET,
     anon_sym_AMP,
     anon_sym_GT_GT,
     anon_sym_LT_LT,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    anon_sym_STAR,
-    anon_sym_PERCENT,
-    [36285] = 6,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [36353] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2283),
+    ACTIONS(2149),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(2151),
+    1,
+    anon_sym_SLASH,
+    ACTIONS(2295),
     1,
     anon_sym_GT,
-    STATE(552),
+    ACTIONS(2297),
     1,
-    sym_comment,
-    ACTIONS(2277),
-    2,
-    anon_sym_PLUS,
-    anon_sym_DASH,
-    ACTIONS(2285),
-    10,
     anon_sym_COMMA,
+    STATE(554),
+    1,
+    sym_comment,
+    ACTIONS(2153),
+    9,
     anon_sym_PIPE,
     anon_sym_CARET,
     anon_sym_AMP,
     anon_sym_GT_GT,
     anon_sym_LT_LT,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [36314] = 6,
+    anon_sym_PLUS,
+    anon_sym_DASH,
+    anon_sym_STAR,
+    anon_sym_PERCENT,
+    [36386] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1489),
+    ACTIONS(1507),
     1,
     anon_sym_SLASH,
-    ACTIONS(2287),
+    ACTIONS(2299),
     1,
     anon_sym_EQ,
-    STATE(553),
+    STATE(555),
     1,
     sym_comment,
-    ACTIONS(1491),
+    ACTIONS(1509),
     11,
     anon_sym_COLON_COLON,
     anon_sym_PIPE,
@@ -63120,17 +63199,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_STAR,
     anon_sym_PERCENT,
     anon_sym_RPAREN,
-    [36343] = 4,
+    [36415] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(554),
+    STATE(556),
     1,
     sym_comment,
-    ACTIONS(2289),
+    ACTIONS(2301),
     12,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63144,7 +63223,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_consumes,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36367] = 11,
+    [36439] = 11,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63157,13 +63236,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(555),
+    STATE(557),
     1,
     sym_comment,
-    STATE(579),
+    STATE(584),
     1,
     sym_integer_sign,
-    STATE(1284),
+    STATE(1337),
     1,
     sym_integer_literal,
     ACTIONS(602),
@@ -63178,11 +63257,11 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    STATE(467),
+    STATE(459),
     2,
     sym_oct_number,
     sym_dec_number,
-    [36405] = 11,
+    [36477] = 11,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63195,13 +63274,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(556),
+    STATE(558),
     1,
     sym_comment,
-    STATE(579),
+    STATE(584),
     1,
     sym_integer_sign,
-    STATE(1432),
+    STATE(1200),
     1,
     sym_integer_literal,
     ACTIONS(602),
@@ -63216,11 +63295,11 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    STATE(467),
+    STATE(459),
     2,
     sym_oct_number,
     sym_dec_number,
-    [36443] = 11,
+    [36515] = 11,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63233,10 +63312,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(557),
+    STATE(559),
     1,
     sym_comment,
-    STATE(579),
+    STATE(584),
     1,
     sym_integer_sign,
     STATE(1385),
@@ -63254,11 +63333,11 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    STATE(467),
+    STATE(459),
     2,
     sym_oct_number,
     sym_dec_number,
-    [36481] = 11,
+    [36553] = 11,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63271,13 +63350,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(558),
+    STATE(560),
     1,
     sym_comment,
-    STATE(579),
+    STATE(584),
     1,
     sym_integer_sign,
-    STATE(1337),
+    STATE(1284),
     1,
     sym_integer_literal,
     ACTIONS(602),
@@ -63292,11 +63371,11 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    STATE(467),
+    STATE(459),
     2,
     sym_oct_number,
     sym_dec_number,
-    [36519] = 11,
+    [36591] = 11,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63309,13 +63388,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(559),
+    STATE(561),
     1,
     sym_comment,
-    STATE(579),
+    STATE(584),
     1,
     sym_integer_sign,
-    STATE(1200),
+    STATE(1432),
     1,
     sym_integer_literal,
     ACTIONS(602),
@@ -63330,21 +63409,21 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     anon_sym_PLUS,
     anon_sym_DASH,
-    STATE(467),
+    STATE(459),
     2,
     sym_oct_number,
     sym_dec_number,
-    [36557] = 4,
+    [36629] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(560),
+    STATE(562),
     1,
     sym_comment,
-    ACTIONS(2291),
+    ACTIONS(2303),
     12,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63358,24 +63437,24 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_consumes,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36581] = 6,
+    [36653] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2293),
+    ACTIONS(2305),
     1,
     anon_sym_GT,
-    STATE(561),
+    STATE(563),
     1,
     sym_comment,
-    ACTIONS(2297),
+    ACTIONS(2309),
     2,
     anon_sym_GT_GT,
     anon_sym_LT_LT,
-    ACTIONS(2295),
+    ACTIONS(2307),
     8,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -63385,24 +63464,24 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [36608] = 6,
+    [36680] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2299),
+    ACTIONS(2311),
     1,
     anon_sym_GT,
-    STATE(562),
+    STATE(564),
     1,
     sym_comment,
-    ACTIONS(2297),
+    ACTIONS(2309),
     2,
     anon_sym_GT_GT,
     anon_sym_LT_LT,
-    ACTIONS(2301),
+    ACTIONS(2313),
     8,
     anon_sym_COMMA,
     anon_sym_PIPE,
@@ -63412,7 +63491,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_COLON,
     anon_sym_SEMI,
     anon_sym_RBRACK,
-    [36635] = 10,
+    [36707] = 10,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63425,13 +63504,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2015),
     1,
     anon_sym_uses,
-    ACTIONS(2303),
+    ACTIONS(2315),
     1,
     anon_sym_RBRACE,
-    STATE(439),
+    STATE(442),
     1,
     sym_port_ref,
-    STATE(563),
+    STATE(565),
     1,
     sym_comment,
     STATE(1265),
@@ -63446,38 +63525,17 @@ static const uint16_t ts_small_parse_table[] = {
     sym_provides_dcl,
     sym_uses_dcl,
     sym_port_dcl,
-    [36669] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(564),
-    1,
-    sym_comment,
-    ACTIONS(2305),
-    9,
-    anon_sym_RBRACE,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_provides,
-    anon_sym_uses,
-    anon_sym_port,
-    anon_sym_mirrorport,
-    [36690] = 4,
+    [36741] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(565),
+    STATE(566),
     1,
     sym_comment,
-    ACTIONS(2307),
+    ACTIONS(2317),
     9,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63488,63 +63546,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_uses,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36711] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2311),
-    1,
-    anon_sym_AMP,
-    STATE(566),
-    1,
-    sym_comment,
-    ACTIONS(2309),
-    8,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [36734] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2311),
-    1,
-    anon_sym_AMP,
-    STATE(567),
-    1,
-    sym_comment,
-    ACTIONS(2313),
-    8,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_CARET,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [36757] = 4,
+    [36762] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(568),
+    STATE(567),
     1,
     sym_comment,
-    ACTIONS(2315),
+    ACTIONS(2319),
     9,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63555,17 +63567,17 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_uses,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36778] = 4,
+    [36783] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(569),
+    STATE(568),
     1,
     sym_comment,
-    ACTIONS(2317),
+    ACTIONS(2321),
     9,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63576,7 +63588,44 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_uses,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36799] = 4,
+    [36804] = 12,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2323),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(2325),
+    1,
+    anon_sym_RBRACE,
+    ACTIONS(2327),
+    1,
+    anon_sym_AT,
+    ACTIONS(2329),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2331),
+    1,
+    sym_identifier,
+    STATE(569),
+    1,
+    sym_comment,
+    STATE(607),
+    1,
+    aux_sym_interface_dcl_repeat1,
+    STATE(800),
+    1,
+    sym_annotation_appl,
+    STATE(802),
+    1,
+    sym_extend_annotation_appl,
+    STATE(943),
+    1,
+    sym_enumerator,
+    [36841] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -63586,7 +63635,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(570),
     1,
     sym_comment,
-    ACTIONS(2319),
+    ACTIONS(2333),
     9,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63597,7 +63646,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_uses,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36820] = 4,
+    [36862] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -63607,7 +63656,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(571),
     1,
     sym_comment,
-    ACTIONS(2321),
+    ACTIONS(2335),
     9,
     anon_sym_RBRACE,
     anon_sym_readonly,
@@ -63618,7 +63667,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_uses,
     anon_sym_port,
     anon_sym_mirrorport,
-    [36841] = 11,
+    [36883] = 11,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -63628,7 +63677,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(31),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(1955),
+    ACTIONS(1967),
     1,
     anon_sym_AT,
     ACTIONS(2009),
@@ -63637,15 +63686,15 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2011),
     1,
     anon_sym_attribute,
-    STATE(447),
+    STATE(448),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(536),
-    1,
-    sym_extend_annotation_appl,
-    STATE(548),
+    STATE(508),
     1,
     sym_annotation_appl,
+    STATE(510),
+    1,
+    sym_extend_annotation_appl,
     STATE(572),
     1,
     sym_comment,
@@ -63653,7 +63702,7 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_readonly_attr_spec,
     sym_attr_spec,
-    [36876] = 4,
+    [36918] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63663,7 +63712,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(573),
     1,
     sym_comment,
-    ACTIONS(1505),
+    ACTIONS(1519),
     9,
     anon_sym_COLON_COLON,
     anon_sym_LT,
@@ -63674,7 +63723,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LBRACE,
     anon_sym_SEMI,
     sym_identifier,
-    [36897] = 4,
+    [36939] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63684,7 +63733,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(574),
     1,
     sym_comment,
-    ACTIONS(1501),
+    ACTIONS(1523),
     9,
     anon_sym_COLON_COLON,
     anon_sym_LT,
@@ -63695,44 +63744,72 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_LBRACE,
     anon_sym_SEMI,
     sym_identifier,
-    [36918] = 12,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [36960] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2323),
+    ACTIONS(618),
     1,
-    anon_sym_COMMA,
-    ACTIONS(2325),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2339),
     1,
-    anon_sym_RBRACE,
-    ACTIONS(2327),
+    anon_sym_AMP,
+    STATE(575),
     1,
-    anon_sym_AT,
-    ACTIONS(2329),
+    sym_comment,
+    ACTIONS(2337),
+    8,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [36983] = 4,
+    ACTIONS(3),
     1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2331),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
     1,
-    sym_identifier,
-    STATE(575),
+    anon_sym_SLASH_STAR,
+    STATE(576),
     1,
     sym_comment,
-    STATE(617),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    ACTIONS(2341),
+    9,
+    anon_sym_RBRACE,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_provides,
+    anon_sym_uses,
+    anon_sym_port,
+    anon_sym_mirrorport,
+    [37004] = 4,
+    ACTIONS(3),
     1,
-    sym_annotation_appl,
-    STATE(798),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
     1,
-    sym_extend_annotation_appl,
-    STATE(814),
+    anon_sym_SLASH_STAR,
+    STATE(577),
     1,
-    sym_bit_value,
-    [36955] = 12,
+    sym_comment,
+    ACTIONS(2343),
+    9,
+    anon_sym_RBRACE,
+    anon_sym_readonly,
+    anon_sym_attribute,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    anon_sym_provides,
+    anon_sym_uses,
+    anon_sym_port,
+    anon_sym_mirrorport,
+    [37025] = 12,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -63745,52 +63822,76 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2329),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2333),
+    ACTIONS(2345),
     1,
     anon_sym_COMMA,
-    ACTIONS(2335),
+    ACTIONS(2347),
     1,
     anon_sym_RBRACE,
-    ACTIONS(2337),
+    ACTIONS(2349),
     1,
     sym_identifier,
-    STATE(576),
+    STATE(578),
     1,
     sym_comment,
-    STATE(598),
+    STATE(614),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    STATE(800),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(802),
     1,
     sym_extend_annotation_appl,
-    STATE(934),
+    STATE(817),
     1,
-    sym_enumerator,
-    [36992] = 4,
-    ACTIONS(3),
+    sym_bit_value,
+    [37062] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2339),
+    1,
+    anon_sym_AMP,
+    STATE(579),
+    1,
+    sym_comment,
+    ACTIONS(2351),
+    8,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_CARET,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [37085] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(577),
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2355),
+    1,
+    anon_sym_CARET,
+    STATE(580),
     1,
     sym_comment,
-    ACTIONS(2339),
-    9,
-    anon_sym_RBRACE,
-    anon_sym_readonly,
-    anon_sym_attribute,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    anon_sym_provides,
-    anon_sym_uses,
-    anon_sym_port,
-    anon_sym_mirrorport,
-    [37013] = 11,
+    ACTIONS(2353),
+    7,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [37107] = 11,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -63803,28 +63904,28 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2329),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2337),
+    ACTIONS(2349),
     1,
     sym_identifier,
-    ACTIONS(2341),
+    ACTIONS(2357),
     1,
     anon_sym_RBRACE,
-    STATE(578),
+    STATE(581),
     1,
     sym_comment,
-    STATE(598),
+    STATE(614),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    STATE(800),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(802),
     1,
     sym_extend_annotation_appl,
-    STATE(1076),
+    STATE(1084),
     1,
-    sym_enumerator,
-    [37047] = 8,
+    sym_bit_value,
+    [37141] = 9,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -63837,56 +63938,108 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(579),
+    STATE(453),
+    1,
+    sym_dec_number,
+    STATE(487),
+    1,
+    sym_oct_number,
+    STATE(582),
     1,
     sym_comment,
     ACTIONS(604),
     2,
     aux_sym_oct_number_token1,
     aux_sym_oct_number_token2,
-    ACTIONS(2343),
+    ACTIONS(2359),
     2,
     sym_bin_number,
     sym_hex_number,
-    STATE(465),
+    [37171] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2355),
+    1,
+    anon_sym_CARET,
+    STATE(583),
+    1,
+    sym_comment,
+    ACTIONS(2361),
+    7,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_PIPE,
+    anon_sym_RPAREN,
+    anon_sym_COLON,
+    anon_sym_SEMI,
+    anon_sym_RBRACK,
+    [37193] = 8,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(606),
+    1,
+    anon_sym_0,
+    ACTIONS(608),
+    1,
+    aux_sym_dec_number_token1,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(584),
+    1,
+    sym_comment,
+    ACTIONS(604),
+    2,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    ACTIONS(2359),
+    2,
+    sym_bin_number,
+    sym_hex_number,
+    STATE(487),
     2,
     sym_oct_number,
     sym_dec_number,
-    [37075] = 11,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [37221] = 11,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2327),
+    ACTIONS(618),
     1,
-    anon_sym_AT,
-    ACTIONS(2329),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2363),
     1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2331),
+    anon_sym_COMMA,
+    ACTIONS(2365),
     1,
-    sym_identifier,
-    ACTIONS(2345),
+    anon_sym_SEMI,
+    ACTIONS(2367),
     1,
-    anon_sym_RBRACE,
-    STATE(580),
+    anon_sym_getraises,
+    ACTIONS(2369),
+    1,
+    anon_sym_setraises,
+    STATE(585),
     1,
     sym_comment,
-    STATE(617),
+    STATE(833),
     1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    aux_sym_readonly_attr_declarator_repeat1,
+    STATE(839),
     1,
-    sym_annotation_appl,
-    STATE(798),
+    sym_get_excep_expr,
+    STATE(1528),
     1,
-    sym_extend_annotation_appl,
-    STATE(1083),
+    sym_set_excep_expr,
+    STATE(1529),
     1,
-    sym_bit_value,
-    [37109] = 11,
+    sym_attr_raises_expr,
+    [37255] = 11,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -63902,57 +64055,35 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2331),
     1,
     sym_identifier,
-    ACTIONS(2347),
+    ACTIONS(2371),
     1,
     anon_sym_RBRACE,
-    STATE(581),
+    STATE(586),
     1,
     sym_comment,
-    STATE(617),
+    STATE(607),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    STATE(800),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(802),
     1,
     sym_extend_annotation_appl,
-    STATE(1083),
-    1,
-    sym_bit_value,
-    [37143] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2351),
-    1,
-    anon_sym_CARET,
-    STATE(582),
+    STATE(1073),
     1,
-    sym_comment,
-    ACTIONS(2349),
-    7,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [37165] = 4,
+    sym_enumerator,
+    [37289] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(583),
+    STATE(587),
     1,
     sym_comment,
-    ACTIONS(1491),
+    ACTIONS(1509),
     8,
     anon_sym_COLON_COLON,
     anon_sym_LT,
@@ -63962,63 +64093,75 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_supports,
     anon_sym_manages,
     anon_sym_primarykey,
-    [37185] = 5,
+    [37309] = 11,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(2327),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2351),
+    anon_sym_AT,
+    ACTIONS(2329),
     1,
-    anon_sym_CARET,
-    STATE(584),
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2331),
+    1,
+    sym_identifier,
+    ACTIONS(2373),
+    1,
+    anon_sym_RBRACE,
+    STATE(588),
     1,
     sym_comment,
-    ACTIONS(2353),
-    7,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_PIPE,
-    anon_sym_RPAREN,
-    anon_sym_COLON,
-    anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [37207] = 11,
-    ACTIONS(5),
+    STATE(607),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    aux_sym_interface_dcl_repeat1,
+    STATE(800),
+    1,
+    sym_annotation_appl,
+    STATE(802),
+    1,
+    sym_extend_annotation_appl,
+    STATE(1073),
+    1,
+    sym_enumerator,
+    [37343] = 11,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2355),
+    ACTIONS(5),
     1,
-    anon_sym_COMMA,
-    ACTIONS(2357),
+    anon_sym_SLASH_STAR,
+    ACTIONS(2327),
     1,
-    anon_sym_SEMI,
-    ACTIONS(2359),
+    anon_sym_AT,
+    ACTIONS(2329),
     1,
-    anon_sym_getraises,
-    ACTIONS(2361),
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2349),
     1,
-    anon_sym_setraises,
-    STATE(585),
+    sym_identifier,
+    ACTIONS(2375),
+    1,
+    anon_sym_RBRACE,
+    STATE(589),
     1,
     sym_comment,
-    STATE(829),
+    STATE(614),
     1,
-    aux_sym_readonly_attr_declarator_repeat1,
-    STATE(830),
+    aux_sym_interface_dcl_repeat1,
+    STATE(800),
     1,
-    sym_get_excep_expr,
-    STATE(1528),
+    sym_annotation_appl,
+    STATE(802),
     1,
-    sym_set_excep_expr,
-    STATE(1529),
+    sym_extend_annotation_appl,
+    STATE(1084),
     1,
-    sym_attr_raises_expr,
-    [37241] = 11,
+    sym_bit_value,
+    [37377] = 10,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -64031,123 +64174,119 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(2329),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2337),
+    ACTIONS(2331),
     1,
     sym_identifier,
-    ACTIONS(2363),
-    1,
-    anon_sym_RBRACE,
-    STATE(586),
+    STATE(590),
     1,
     sym_comment,
-    STATE(598),
+    STATE(607),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    STATE(800),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(802),
     1,
     sym_extend_annotation_appl,
-    STATE(1076),
+    STATE(1073),
     1,
     sym_enumerator,
-    [37275] = 9,
+    [37408] = 10,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(606),
-    1,
-    anon_sym_0,
-    ACTIONS(608),
-    1,
-    aux_sym_dec_number_token1,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(449),
+    ACTIONS(2377),
     1,
-    sym_dec_number,
-    STATE(465),
+    anon_sym_LBRACE,
+    ACTIONS(2379),
     1,
-    sym_oct_number,
-    STATE(587),
+    anon_sym_COLON,
+    ACTIONS(2381),
+    1,
+    anon_sym_SEMI,
+    ACTIONS(2383),
+    1,
+    anon_sym_supports,
+    STATE(591),
     1,
     sym_comment,
-    ACTIONS(604),
-    2,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    ACTIONS(2343),
-    2,
-    sym_bin_number,
-    sym_hex_number,
-    [37305] = 10,
+    STATE(879),
+    1,
+    sym_value_inheritance,
+    STATE(1193),
+    1,
+    sym_value_inheritance_spec,
+    STATE(1384),
+    1,
+    sym_value_supports,
+    [37439] = 10,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2365),
-    1,
-    anon_sym_RBRACE,
-    ACTIONS(2367),
+    ACTIONS(2379),
     1,
-    anon_sym_default,
-    ACTIONS(2369),
+    anon_sym_COLON,
+    ACTIONS(2383),
     1,
-    anon_sym_case,
-    STATE(43),
+    anon_sym_supports,
+    ACTIONS(2385),
     1,
-    aux_sym_case_repeat1,
-    STATE(273),
+    anon_sym_LBRACE,
+    ACTIONS(2387),
     1,
-    sym_case_label,
-    STATE(588),
+    anon_sym_SEMI,
+    STATE(592),
     1,
     sym_comment,
-    STATE(593),
+    STATE(879),
     1,
-    aux_sym_union_def_repeat1,
-    STATE(890),
+    sym_value_inheritance,
+    STATE(1384),
+    1,
+    sym_value_supports,
+    STATE(1427),
     1,
-    sym_case,
-    [37336] = 5,
+    sym_value_inheritance_spec,
+    [37470] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2373),
-    1,
-    anon_sym_PIPE,
-    STATE(589),
+    STATE(593),
     1,
     sym_comment,
-    ACTIONS(2371),
-    6,
-    anon_sym_GT,
+    ACTIONS(2389),
+    7,
     anon_sym_COMMA,
     anon_sym_RPAREN,
-    anon_sym_COLON,
     anon_sym_SEMI,
-    anon_sym_RBRACK,
-    [37357] = 9,
+    anon_sym_raises,
+    anon_sym_getraises,
+    anon_sym_setraises,
+    anon_sym_default,
+    [37489] = 9,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2375),
+    ACTIONS(2391),
     1,
     anon_sym_RBRACE,
-    ACTIONS(2377),
+    ACTIONS(2393),
     1,
     anon_sym_default,
-    ACTIONS(2380),
+    ACTIONS(2396),
     1,
     anon_sym_case,
     STATE(43),
@@ -64159,74 +64298,107 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(890),
     1,
     sym_case,
-    STATE(590),
+    STATE(594),
     2,
     sym_comment,
     aux_sym_union_def_repeat1,
-    [37386] = 4,
+    [37518] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(591),
+    ACTIONS(2401),
+    1,
+    anon_sym_PIPE,
+    STATE(595),
     1,
     sym_comment,
-    ACTIONS(2383),
-    7,
+    ACTIONS(2399),
+    6,
+    anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
+    anon_sym_COLON,
     anon_sym_SEMI,
-    anon_sym_raises,
-    anon_sym_getraises,
-    anon_sym_setraises,
-    anon_sym_default,
-    [37405] = 10,
+    anon_sym_RBRACK,
+    [37539] = 10,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2327),
+    1,
+    anon_sym_AT,
+    ACTIONS(2329),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2349),
+    1,
+    sym_identifier,
+    STATE(596),
+    1,
+    sym_comment,
+    STATE(614),
+    1,
+    aux_sym_interface_dcl_repeat1,
+    STATE(800),
+    1,
+    sym_annotation_appl,
+    STATE(802),
+    1,
+    sym_extend_annotation_appl,
+    STATE(1084),
+    1,
+    sym_bit_value,
+    [37570] = 10,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2385),
+    ACTIONS(2403),
     1,
-    anon_sym_LBRACE,
-    ACTIONS(2387),
+    anon_sym_RBRACE,
+    ACTIONS(2405),
     1,
-    anon_sym_COLON,
-    ACTIONS(2389),
+    anon_sym_default,
+    ACTIONS(2407),
     1,
-    anon_sym_SEMI,
-    ACTIONS(2391),
+    anon_sym_case,
+    STATE(43),
     1,
-    anon_sym_supports,
-    STATE(592),
+    aux_sym_case_repeat1,
+    STATE(273),
     1,
-    sym_comment,
-    STATE(879),
+    sym_case_label,
+    STATE(597),
     1,
-    sym_value_inheritance,
-    STATE(1384),
+    sym_comment,
+    STATE(598),
     1,
-    sym_value_supports,
-    STATE(1427),
+    aux_sym_union_def_repeat1,
+    STATE(890),
     1,
-    sym_value_inheritance_spec,
-    [37436] = 10,
+    sym_case,
+    [37601] = 10,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2367),
+    ACTIONS(2405),
     1,
     anon_sym_default,
-    ACTIONS(2369),
+    ACTIONS(2407),
     1,
     anon_sym_case,
-    ACTIONS(2393),
+    ACTIONS(2409),
     1,
     anon_sym_RBRACE,
     STATE(43),
@@ -64235,257 +64407,320 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(273),
     1,
     sym_case_label,
-    STATE(590),
+    STATE(594),
     1,
     aux_sym_union_def_repeat1,
-    STATE(593),
+    STATE(598),
     1,
     sym_comment,
     STATE(890),
     1,
     sym_case,
-    [37467] = 10,
+    [37632] = 8,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2327),
+    ACTIONS(1457),
+    1,
+    sym_identifier,
+    ACTIONS(2411),
     1,
     anon_sym_AT,
-    ACTIONS(2329),
+    ACTIONS(2414),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2331),
+    STATE(800),
     1,
-    sym_identifier,
-    STATE(594),
+    sym_annotation_appl,
+    STATE(802),
     1,
+    sym_extend_annotation_appl,
+    STATE(599),
+    2,
     sym_comment,
-    STATE(617),
-    1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    [37658] = 8,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(1455),
+    1,
+    aux_sym_extend_annotation_appl_token1,
+    ACTIONS(2417),
+    1,
+    anon_sym_AT,
+    ACTIONS(2420),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(959),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(960),
     1,
     sym_extend_annotation_appl,
-    STATE(1083),
-    1,
-    sym_bit_value,
-    [37498] = 10,
+    STATE(600),
+    2,
+    sym_comment,
+    aux_sym_interface_dcl_repeat1,
+    [37684] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2387),
-    1,
-    anon_sym_COLON,
-    ACTIONS(2391),
-    1,
-    anon_sym_supports,
-    ACTIONS(2395),
-    1,
-    anon_sym_LBRACE,
-    ACTIONS(2397),
+    ACTIONS(2427),
     1,
-    anon_sym_SEMI,
-    STATE(595),
+    anon_sym_0,
+    STATE(601),
     1,
     sym_comment,
-    STATE(879),
-    1,
-    sym_value_inheritance,
-    STATE(1193),
-    1,
-    sym_value_inheritance_spec,
-    STATE(1384),
-    1,
-    sym_value_supports,
-    [37529] = 10,
+    ACTIONS(2425),
+    5,
+    sym_bin_number,
+    aux_sym_oct_number_token1,
+    aux_sym_oct_number_token2,
+    aux_sym_dec_number_token1,
+    sym_hex_number,
+    [37704] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2327),
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2329),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2337),
+    ACTIONS(2433),
     1,
-    sym_identifier,
-    STATE(596),
+    aux_sym_extend_annotation_appl_token1,
+    STATE(602),
     1,
     sym_comment,
-    STATE(598),
+    STATE(624),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    STATE(959),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(960),
     1,
     sym_extend_annotation_appl,
-    STATE(1076),
+    [37732] = 7,
+    ACTIONS(5),
     1,
-    sym_enumerator,
-    [37560] = 9,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2435),
+    1,
+    anon_sym_allowed_kinds,
+    ACTIONS(2437),
+    1,
+    aux_sym_data_representation_mask_token1,
+    STATE(603),
+    1,
+    sym_comment,
+    STATE(874),
+    1,
+    sym_data_representation_mask,
+    ACTIONS(2439),
+    3,
+    aux_sym_data_representation_mask_token2,
+    aux_sym_data_representation_mask_token3,
+    aux_sym_data_representation_mask_token4,
+    [37756] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2403),
+    ACTIONS(2441),
     1,
     aux_sym_extend_annotation_appl_token1,
-    ACTIONS(2405),
+    STATE(600),
     1,
-    anon_sym_SLASH_STAR,
-    STATE(597),
+    aux_sym_interface_dcl_repeat1,
+    STATE(604),
     1,
     sym_comment,
-    STATE(608),
-    1,
-    aux_sym_interface_dcl_repeat1,
     STATE(959),
     1,
     sym_annotation_appl,
     STATE(960),
     1,
     sym_extend_annotation_appl,
-    [37588] = 9,
+    [37784] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2327),
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2329),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2407),
-    1,
-    sym_identifier,
-    STATE(598),
+    ACTIONS(2443),
     1,
-    sym_comment,
-    STATE(616),
+    aux_sym_extend_annotation_appl_token1,
+    STATE(604),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(797),
+    STATE(605),
+    1,
+    sym_comment,
+    STATE(959),
     1,
     sym_annotation_appl,
-    STATE(798),
+    STATE(960),
     1,
     sym_extend_annotation_appl,
-    [37616] = 7,
+    [37812] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2409),
-    1,
-    anon_sym_allowed_kinds,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    STATE(599),
+    ACTIONS(2445),
+    1,
+    anon_sym_allowed_kinds,
+    STATE(606),
     1,
     sym_comment,
-    STATE(987),
+    STATE(930),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [37640] = 7,
+    [37836] = 9,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(2327),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    anon_sym_AT,
+    ACTIONS(2329),
     1,
-    aux_sym_data_representation_mask_token1,
-    ACTIONS(2415),
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2447),
     1,
-    anon_sym_allowed_kinds,
-    STATE(600),
+    sym_identifier,
+    STATE(599),
+    1,
+    aux_sym_interface_dcl_repeat1,
+    STATE(607),
     1,
     sym_comment,
-    STATE(874),
+    STATE(800),
     1,
-    sym_data_representation_mask,
-    ACTIONS(2413),
-    3,
-    aux_sym_data_representation_mask_token2,
-    aux_sym_data_representation_mask_token3,
-    aux_sym_data_representation_mask_token4,
-    [37664] = 9,
+    sym_annotation_appl,
+    STATE(802),
+    1,
+    sym_extend_annotation_appl,
+    [37864] = 9,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(157),
+    1,
+    sym_identifier,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2417),
+    ACTIONS(2449),
     1,
-    anon_sym_LBRACE,
-    ACTIONS(2419),
+    anon_sym_Object,
+    ACTIONS(2451),
     1,
-    anon_sym_COLON,
-    ACTIONS(2421),
+    anon_sym_multiple,
+    STATE(608),
     1,
-    anon_sym_SEMI,
+    sym_comment,
+    STATE(1049),
+    1,
+    sym_scoped_name,
+    STATE(1308),
+    1,
+    sym_interface_type,
+    [37892] = 9,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(2423),
     1,
-    anon_sym_supports,
-    STATE(601),
+    anon_sym_SLASH_STAR,
+    ACTIONS(2429),
+    1,
+    anon_sym_AT,
+    ACTIONS(2431),
+    1,
+    anon_sym_SLASH_SLASH_AT,
+    ACTIONS(2453),
+    1,
+    aux_sym_extend_annotation_appl_token1,
+    STATE(609),
     1,
     sym_comment,
-    STATE(1041),
+    STATE(623),
     1,
-    sym_component_inheritance_spec,
-    STATE(1277),
+    aux_sym_interface_dcl_repeat1,
+    STATE(959),
     1,
-    sym_supported_interface_spec,
-    [37692] = 9,
+    sym_annotation_appl,
+    STATE(960),
+    1,
+    sym_extend_annotation_appl,
+    [37920] = 9,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2387),
+    ACTIONS(2379),
     1,
     anon_sym_COLON,
-    ACTIONS(2391),
+    ACTIONS(2383),
     1,
     anon_sym_supports,
-    ACTIONS(2425),
+    ACTIONS(2455),
     1,
     anon_sym_LBRACE,
-    STATE(602),
+    STATE(610),
     1,
     sym_comment,
     STATE(879),
@@ -64497,7 +64732,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1384),
     1,
     sym_value_supports,
-    [37720] = 9,
+    [37948] = 9,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -64510,13 +64745,13 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(603),
+    STATE(611),
     1,
     sym_comment,
-    STATE(1155),
+    STATE(1161),
     1,
     sym_scoped_name,
     STATE(1498),
@@ -64525,182 +64760,262 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1499),
     1,
     sym_string_literal,
-    [37748] = 5,
+    [37976] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2431),
+    ACTIONS(2461),
     1,
-    anon_sym_0,
-    STATE(604),
+    anon_sym_LBRACK,
+    STATE(612),
     1,
     sym_comment,
-    ACTIONS(2429),
-    5,
-    sym_bin_number,
-    aux_sym_oct_number_token1,
-    aux_sym_oct_number_token2,
-    aux_sym_dec_number_token1,
-    sym_hex_number,
-    [37768] = 9,
+    STATE(625),
+    1,
+    aux_sym_array_declarator_repeat1,
+    STATE(699),
+    1,
+    sym_fixed_array_size,
+    ACTIONS(2459),
+    3,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    anon_sym_default,
+    [38000] = 7,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2437),
+    1,
+    aux_sym_data_representation_mask_token1,
+    ACTIONS(2463),
+    1,
+    anon_sym_allowed_kinds,
+    STATE(613),
+    1,
+    sym_comment,
+    STATE(899),
+    1,
+    sym_data_representation_mask,
+    ACTIONS(2439),
+    3,
+    aux_sym_data_representation_mask_token2,
+    aux_sym_data_representation_mask_token3,
+    aux_sym_data_representation_mask_token4,
+    [38024] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2327),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2329),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
+    ACTIONS(2465),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2433),
+    sym_identifier,
+    STATE(599),
     1,
-    aux_sym_extend_annotation_appl_token1,
-    STATE(605),
+    aux_sym_interface_dcl_repeat1,
+    STATE(614),
     1,
     sym_comment,
-    STATE(622),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(959),
+    STATE(800),
     1,
     sym_annotation_appl,
-    STATE(960),
+    STATE(802),
     1,
     sym_extend_annotation_appl,
-    [37796] = 9,
+    [38052] = 9,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2379),
+    1,
+    anon_sym_COLON,
+    ACTIONS(2383),
+    1,
+    anon_sym_supports,
+    ACTIONS(2467),
+    1,
+    anon_sym_LBRACE,
+    STATE(615),
+    1,
+    sym_comment,
+    STATE(879),
+    1,
+    sym_value_inheritance,
+    STATE(1258),
+    1,
+    sym_value_inheritance_spec,
+    STATE(1384),
+    1,
+    sym_value_supports,
+    [38080] = 9,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2469),
+    1,
+    anon_sym_LBRACE,
+    ACTIONS(2471),
+    1,
+    anon_sym_COLON,
+    ACTIONS(2473),
+    1,
+    anon_sym_SEMI,
+    ACTIONS(2475),
+    1,
+    anon_sym_supports,
+    STATE(616),
+    1,
+    sym_comment,
+    STATE(1041),
+    1,
+    sym_component_inheritance_spec,
+    STATE(1277),
+    1,
+    sym_supported_interface_spec,
+    [38108] = 7,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2461),
+    1,
+    anon_sym_LBRACK,
+    STATE(612),
+    1,
+    aux_sym_array_declarator_repeat1,
+    STATE(617),
+    1,
+    sym_comment,
+    STATE(699),
+    1,
+    sym_fixed_array_size,
+    ACTIONS(2389),
+    3,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    anon_sym_default,
+    [38132] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2435),
+    ACTIONS(2477),
     1,
     aux_sym_extend_annotation_appl_token1,
-    STATE(606),
-    1,
-    sym_comment,
-    STATE(622),
+    STATE(600),
     1,
     aux_sym_interface_dcl_repeat1,
+    STATE(618),
+    1,
+    sym_comment,
     STATE(959),
     1,
     sym_annotation_appl,
     STATE(960),
     1,
     sym_extend_annotation_appl,
-    [37824] = 7,
+    [38160] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    ACTIONS(2437),
+    ACTIONS(2479),
     1,
     anon_sym_allowed_kinds,
-    STATE(607),
+    STATE(619),
     1,
     sym_comment,
-    STATE(892),
+    STATE(987),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [37848] = 9,
+    [38184] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
-    1,
-    anon_sym_AT,
-    ACTIONS(2401),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2439),
-    1,
-    aux_sym_extend_annotation_appl_token1,
-    STATE(608),
-    1,
-    sym_comment,
-    STATE(622),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(959),
-    1,
-    sym_annotation_appl,
-    STATE(960),
-    1,
-    sym_extend_annotation_appl,
-    [37876] = 9,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2441),
+    ACTIONS(2481),
     1,
     aux_sym_extend_annotation_appl_token1,
-    STATE(609),
-    1,
-    sym_comment,
-    STATE(619),
+    STATE(618),
     1,
     aux_sym_interface_dcl_repeat1,
+    STATE(620),
+    1,
+    sym_comment,
     STATE(959),
     1,
     sym_annotation_appl,
     STATE(960),
     1,
     sym_extend_annotation_appl,
-    [37904] = 9,
+    [38212] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2443),
+    ACTIONS(2483),
     1,
     aux_sym_extend_annotation_appl_token1,
-    STATE(606),
+    STATE(600),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(610),
+    STATE(621),
     1,
     sym_comment,
     STATE(959),
@@ -64709,78 +65024,78 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(960),
     1,
     sym_extend_annotation_appl,
-    [37932] = 7,
+    [38240] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    ACTIONS(2445),
+    ACTIONS(2485),
     1,
     anon_sym_allowed_kinds,
-    STATE(611),
+    STATE(622),
     1,
     sym_comment,
-    STATE(930),
+    STATE(911),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [37956] = 9,
+    [38264] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2447),
+    ACTIONS(2487),
     1,
     aux_sym_extend_annotation_appl_token1,
-    STATE(612),
-    1,
-    sym_comment,
-    STATE(622),
+    STATE(600),
     1,
     aux_sym_interface_dcl_repeat1,
+    STATE(623),
+    1,
+    sym_comment,
     STATE(959),
     1,
     sym_annotation_appl,
     STATE(960),
     1,
     sym_extend_annotation_appl,
-    [37984] = 9,
+    [38292] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2401),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2449),
+    ACTIONS(2489),
     1,
     aux_sym_extend_annotation_appl_token1,
-    STATE(612),
+    STATE(600),
     1,
     aux_sym_interface_dcl_repeat1,
-    STATE(613),
+    STATE(624),
     1,
     sym_comment,
     STATE(959),
@@ -64789,964 +65104,852 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(960),
     1,
     sym_extend_annotation_appl,
-    [38012] = 9,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2387),
-    1,
-    anon_sym_COLON,
-    ACTIONS(2391),
-    1,
-    anon_sym_supports,
-    ACTIONS(2451),
-    1,
-    anon_sym_LBRACE,
-    STATE(614),
-    1,
-    sym_comment,
-    STATE(879),
-    1,
-    sym_value_inheritance,
-    STATE(1258),
-    1,
-    sym_value_inheritance_spec,
-    STATE(1384),
-    1,
-    sym_value_supports,
-    [38040] = 7,
+    [38320] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2453),
+    ACTIONS(2493),
     1,
     anon_sym_LBRACK,
-    STATE(615),
+    STATE(699),
     1,
+    sym_fixed_array_size,
+    STATE(625),
+    2,
     sym_comment,
-    STATE(624),
-    1,
     aux_sym_array_declarator_repeat1,
-    STATE(697),
-    1,
-    sym_fixed_array_size,
-    ACTIONS(2383),
+    ACTIONS(2491),
     3,
     anon_sym_COMMA,
     anon_sym_SEMI,
     anon_sym_default,
-    [38064] = 8,
+    [38342] = 9,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(1457),
-    1,
-    sym_identifier,
-    ACTIONS(2455),
+    ACTIONS(2429),
     1,
     anon_sym_AT,
-    ACTIONS(2458),
+    ACTIONS(2431),
     1,
     anon_sym_SLASH_SLASH_AT,
-    STATE(797),
+    ACTIONS(2496),
     1,
-    sym_annotation_appl,
-    STATE(798),
+    aux_sym_extend_annotation_appl_token1,
+    STATE(621),
     1,
-    sym_extend_annotation_appl,
-    STATE(616),
-    2,
-    sym_comment,
     aux_sym_interface_dcl_repeat1,
-    [38090] = 9,
-    ACTIONS(3),
+    STATE(626),
     1,
-    anon_sym_SLASH_SLASH,
+    sym_comment,
+    STATE(959),
+    1,
+    sym_annotation_appl,
+    STATE(960),
+    1,
+    sym_extend_annotation_appl,
+    [38370] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2327),
+    ACTIONS(618),
     1,
-    anon_sym_AT,
-    ACTIONS(2329),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2498),
     1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2461),
+    anon_sym_LT,
+    STATE(627),
     1,
+    sym_comment,
+    ACTIONS(2500),
+    4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
     sym_identifier,
-    STATE(616),
-    1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(617),
+    [38389] = 6,
+    ACTIONS(3),
     1,
-    sym_comment,
-    STATE(797),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
     1,
-    sym_annotation_appl,
-    STATE(798),
+    anon_sym_SLASH_STAR,
+    ACTIONS(2502),
     1,
-    sym_extend_annotation_appl,
-    [38118] = 9,
-    ACTIONS(3),
+    anon_sym_COLON_COLON,
+    ACTIONS(2504),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    anon_sym_LPAREN,
+    STATE(628),
     1,
+    sym_comment,
+    ACTIONS(1539),
+    3,
     anon_sym_AT,
-    ACTIONS(2401),
-    1,
     anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
+    sym_identifier,
+    [38410] = 4,
+    ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2463),
-    1,
-    aux_sym_extend_annotation_appl_token1,
-    STATE(605),
+    ACTIONS(618),
     1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(618),
+    anon_sym_SLASH_SLASH,
+    STATE(629),
     1,
     sym_comment,
-    STATE(959),
-    1,
-    sym_annotation_appl,
-    STATE(960),
+    ACTIONS(2506),
+    5,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    anon_sym_SEMI,
+    sym_identifier,
+    [38427] = 7,
+    ACTIONS(5),
     1,
-    sym_extend_annotation_appl,
-    [38146] = 9,
-    ACTIONS(3),
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2399),
+    ACTIONS(2508),
     1,
-    anon_sym_AT,
-    ACTIONS(2401),
+    sym_identifier,
+    STATE(630),
     1,
-    anon_sym_SLASH_SLASH_AT,
-    ACTIONS(2405),
+    sym_comment,
+    STATE(941),
+    1,
+    sym_any_declarator,
+    STATE(1268),
+    1,
+    sym_any_declarators,
+    STATE(1076),
+    2,
+    sym_simple_declarator,
+    sym_array_declarator,
+    [38450] = 7,
+    ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2465),
+    ACTIONS(618),
     1,
-    aux_sym_extend_annotation_appl_token1,
-    STATE(619),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2508),
     1,
-    sym_comment,
-    STATE(622),
+    sym_identifier,
+    STATE(631),
     1,
-    aux_sym_interface_dcl_repeat1,
-    STATE(959),
+    sym_comment,
+    STATE(737),
     1,
-    sym_annotation_appl,
-    STATE(960),
+    sym_declarator,
+    STATE(1698),
     1,
-    sym_extend_annotation_appl,
-    [38174] = 7,
+    sym_declarators,
+    STATE(851),
+    2,
+    sym_simple_declarator,
+    sym_array_declarator,
+    [38473] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    ACTIONS(2467),
-    1,
-    anon_sym_allowed_kinds,
-    STATE(620),
+    STATE(632),
     1,
     sym_comment,
-    STATE(911),
+    STATE(867),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [38198] = 9,
+    [38494] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
+    STATE(633),
     1,
+    sym_comment,
+    ACTIONS(1519),
+    5,
     anon_sym_COLON_COLON,
-    ACTIONS(157),
-    1,
+    anon_sym_LPAREN,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
     sym_identifier,
+    [38511] = 6,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2469),
-    1,
-    anon_sym_Object,
-    ACTIONS(2471),
+    ACTIONS(2437),
     1,
-    anon_sym_multiple,
-    STATE(621),
+    aux_sym_data_representation_mask_token1,
+    STATE(634),
     1,
     sym_comment,
-    STATE(1104),
-    1,
-    sym_scoped_name,
-    STATE(1308),
+    STATE(954),
     1,
-    sym_interface_type,
-    [38226] = 8,
+    sym_data_representation_mask,
+    ACTIONS(2439),
+    3,
+    aux_sym_data_representation_mask_token2,
+    aux_sym_data_representation_mask_token3,
+    aux_sym_data_representation_mask_token4,
+    [38532] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1455),
-    1,
-    aux_sym_extend_annotation_appl_token1,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2473),
-    1,
-    anon_sym_AT,
-    ACTIONS(2476),
-    1,
-    anon_sym_SLASH_SLASH_AT,
-    STATE(959),
-    1,
-    sym_annotation_appl,
-    STATE(960),
-    1,
-    sym_extend_annotation_appl,
-    STATE(622),
-    2,
-    sym_comment,
-    aux_sym_interface_dcl_repeat1,
-    [38252] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2481),
-    1,
-    anon_sym_LBRACK,
-    STATE(697),
+    STATE(635),
     1,
-    sym_fixed_array_size,
-    STATE(623),
-    2,
     sym_comment,
-    aux_sym_array_declarator_repeat1,
-    ACTIONS(2479),
-    3,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    anon_sym_default,
-    [38274] = 7,
+    ACTIONS(1509),
+    5,
+    anon_sym_COLON_COLON,
+    anon_sym_LPAREN,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [38549] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2453),
-    1,
-    anon_sym_LBRACK,
-    STATE(623),
+    ACTIONS(2510),
     1,
-    aux_sym_array_declarator_repeat1,
-    STATE(624),
+    anon_sym_COLON_COLON,
+    STATE(636),
     1,
     sym_comment,
-    STATE(697),
-    1,
-    sym_fixed_array_size,
-    ACTIONS(2484),
-    3,
+    ACTIONS(2297),
+    4,
+    anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
-    anon_sym_default,
-    [38298] = 6,
+    sym_identifier,
+    [38568] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    STATE(625),
+    STATE(637),
     1,
     sym_comment,
     STATE(888),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [38319] = 4,
+    [38589] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(626),
+    STATE(638),
     1,
     sym_comment,
-    ACTIONS(2486),
+    ACTIONS(2512),
     5,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38336] = 8,
+    [38606] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2488),
+    ACTIONS(2363),
     1,
-    anon_sym_RBRACE,
-    ACTIONS(2490),
+    anon_sym_COMMA,
+    ACTIONS(2514),
     1,
-    anon_sym_bitfield,
-    STATE(627),
+    anon_sym_SEMI,
+    ACTIONS(2516),
     1,
-    sym_comment,
-    STATE(642),
+    anon_sym_raises,
+    STATE(639),
     1,
-    aux_sym_bitset_dcl_repeat1,
-    STATE(804),
+    sym_comment,
+    STATE(835),
     1,
-    sym_bitfield_spec,
-    STATE(1154),
+    aux_sym_readonly_attr_declarator_repeat1,
+    STATE(1483),
     1,
-    sym_bitfield,
-    [38361] = 4,
+    sym_raises_expr,
+    [38631] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(628),
+    STATE(640),
     1,
     sym_comment,
-    ACTIONS(2492),
+    ACTIONS(2518),
     5,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38378] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2494),
-    1,
-    anon_sym_LT,
-    STATE(629),
-    1,
-    sym_comment,
-    ACTIONS(2496),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    sym_identifier,
-    [38397] = 4,
+    [38648] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(630),
+    STATE(641),
     1,
     sym_comment,
-    ACTIONS(2498),
+    ACTIONS(2520),
     5,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38414] = 5,
+    [38665] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    STATE(631),
+    ACTIONS(2522),
     1,
-    sym_comment,
-    ACTIONS(2281),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    sym_identifier,
-    [38433] = 4,
-    ACTIONS(5),
+    anon_sym_COLON,
+    ACTIONS(2524),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    anon_sym_supports,
+    ACTIONS(2526),
     1,
-    anon_sym_SLASH_SLASH,
-    STATE(632),
+    anon_sym_manages,
+    STATE(642),
     1,
     sym_comment,
-    ACTIONS(2502),
-    5,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    anon_sym_SEMI,
-    sym_identifier,
-    [38450] = 8,
-    ACTIONS(5),
+    STATE(914),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(97),
+    sym_home_inheritance_spec,
+    STATE(1269),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(157),
+    sym_supported_interface_spec,
+    [38690] = 5,
+    ACTIONS(5),
     1,
-    sym_identifier,
+    anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2469),
+    ACTIONS(2528),
     1,
-    anon_sym_Object,
-    STATE(633),
+    anon_sym_LT,
+    STATE(643),
     1,
     sym_comment,
-    STATE(1104),
-    1,
-    sym_scoped_name,
-    STATE(1283),
-    1,
-    sym_interface_type,
-    [38475] = 4,
+    ACTIONS(2530),
+    4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    sym_identifier,
+    [38709] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    STATE(634),
+    STATE(644),
     1,
     sym_comment,
-    ACTIONS(1491),
+    ACTIONS(1507),
     5,
     anon_sym_COLON_COLON,
     anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [38492] = 4,
+    aux_sym_extend_annotation_appl_token1,
+    [38726] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(635),
+    STATE(645),
     1,
     sym_comment,
-    ACTIONS(2504),
+    ACTIONS(2532),
     5,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38509] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(636),
-    1,
-    sym_comment,
-    ACTIONS(1501),
-    5,
-    anon_sym_COLON_COLON,
-    anon_sym_LPAREN,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [38526] = 6,
+    [38743] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2506),
+    ACTIONS(2534),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(2508),
+    ACTIONS(2536),
     1,
     anon_sym_LPAREN,
-    STATE(637),
+    STATE(646),
     1,
     sym_comment,
-    ACTIONS(1507),
+    ACTIONS(1537),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [38547] = 8,
+    [38764] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2355),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2510),
-    1,
-    anon_sym_SEMI,
-    ACTIONS(2512),
+    ACTIONS(2508),
     1,
-    anon_sym_raises,
-    STATE(638),
+    sym_identifier,
+    STATE(647),
     1,
     sym_comment,
-    STATE(835),
-    1,
-    aux_sym_readonly_attr_declarator_repeat1,
-    STATE(1483),
-    1,
-    sym_raises_expr,
-    [38572] = 4,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    STATE(737),
     1,
-    anon_sym_SLASH_SLASH,
-    STATE(639),
+    sym_declarator,
+    STATE(838),
     1,
-    sym_comment,
-    ACTIONS(2514),
-    5,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    anon_sym_SEMI,
-    sym_identifier,
-    [38589] = 6,
+    sym_declarators,
+    STATE(851),
+    2,
+    sym_simple_declarator,
+    sym_array_declarator,
+    [38787] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    STATE(640),
+    STATE(648),
     1,
     sym_comment,
-    STATE(1051),
+    STATE(922),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [38610] = 4,
+    [38808] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(641),
+    STATE(649),
     1,
     sym_comment,
-    ACTIONS(1505),
+    ACTIONS(1523),
     5,
     anon_sym_COLON_COLON,
     anon_sym_LPAREN,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [38627] = 7,
+    [38825] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2516),
-    1,
-    anon_sym_RBRACE,
-    ACTIONS(2518),
-    1,
-    anon_sym_bitfield,
-    STATE(804),
-    1,
-    sym_bitfield_spec,
-    STATE(1154),
+    STATE(650),
     1,
-    sym_bitfield,
-    STATE(642),
-    2,
     sym_comment,
-    aux_sym_bitset_dcl_repeat1,
-    [38650] = 8,
+    ACTIONS(2538),
+    5,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    anon_sym_SEMI,
+    sym_identifier,
+    [38842] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2490),
+    ACTIONS(1449),
     1,
-    anon_sym_bitfield,
-    ACTIONS(2521),
+    sym_identifier,
+    ACTIONS(2540),
     1,
-    anon_sym_RBRACE,
-    STATE(643),
+    anon_sym_truncatable,
+    STATE(651),
     1,
     sym_comment,
-    STATE(660),
+    STATE(697),
     1,
-    aux_sym_bitset_dcl_repeat1,
-    STATE(804),
+    sym_scoped_name,
+    STATE(698),
     1,
-    sym_bitfield_spec,
-    STATE(1154),
+    sym_value_name,
+    [38867] = 4,
+    ACTIONS(3),
     1,
-    sym_bitfield,
-    [38675] = 7,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(652),
+    1,
+    sym_comment,
+    ACTIONS(1517),
+    5,
+    anon_sym_COLON_COLON,
+    anon_sym_LPAREN,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    aux_sym_extend_annotation_appl_token1,
+    [38884] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
+    ACTIONS(2437),
     1,
-    sym_identifier,
-    STATE(644),
+    aux_sym_data_representation_mask_token1,
+    STATE(653),
     1,
     sym_comment,
-    STATE(735),
-    1,
-    sym_declarator,
-    STATE(928),
+    STATE(1056),
     1,
-    sym_declarators,
-    STATE(851),
-    2,
-    sym_simple_declarator,
-    sym_array_declarator,
-    [38698] = 5,
+    sym_data_representation_mask,
+    ACTIONS(2439),
+    3,
+    aux_sym_data_representation_mask_token2,
+    aux_sym_data_representation_mask_token3,
+    aux_sym_data_representation_mask_token4,
+    [38905] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2525),
-    1,
-    anon_sym_LT,
-    STATE(645),
+    STATE(654),
     1,
     sym_comment,
-    ACTIONS(2527),
-    4,
+    ACTIONS(2542),
+    5,
     anon_sym_GT,
     anon_sym_COMMA,
+    anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38717] = 6,
+    [38922] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2529),
+    STATE(655),
     1,
+    sym_comment,
+    ACTIONS(1521),
+    5,
     anon_sym_COLON_COLON,
-    ACTIONS(2531),
-    1,
     anon_sym_LPAREN,
-    STATE(646),
-    1,
-    sym_comment,
-    ACTIONS(1509),
-    3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [38738] = 6,
+    aux_sym_extend_annotation_appl_token1,
+    [38939] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(157),
+    1,
+    sym_identifier,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2449),
     1,
-    aux_sym_data_representation_mask_token1,
-    STATE(647),
+    anon_sym_Object,
+    STATE(656),
     1,
     sym_comment,
-    STATE(922),
+    STATE(1049),
     1,
-    sym_data_representation_mask,
-    ACTIONS(2413),
-    3,
-    aux_sym_data_representation_mask_token2,
-    aux_sym_data_representation_mask_token3,
-    aux_sym_data_representation_mask_token4,
-    [38759] = 4,
+    sym_scoped_name,
+    STATE(1614),
+    1,
+    sym_interface_type,
+    [38964] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(648),
+    ACTIONS(2544),
+    1,
+    anon_sym_RBRACE,
+    ACTIONS(2546),
+    1,
+    anon_sym_bitfield,
+    STATE(657),
     1,
     sym_comment,
-    ACTIONS(2533),
-    5,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    anon_sym_SEMI,
-    sym_identifier,
-    [38776] = 6,
+    STATE(660),
+    1,
+    aux_sym_bitset_dcl_repeat1,
+    STATE(807),
+    1,
+    sym_bitfield_spec,
+    STATE(1154),
+    1,
+    sym_bitfield,
+    [38989] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
+    ACTIONS(2437),
     1,
     aux_sym_data_representation_mask_token1,
-    STATE(649),
+    STATE(658),
     1,
     sym_comment,
-    STATE(979),
+    STATE(908),
     1,
     sym_data_representation_mask,
-    ACTIONS(2413),
+    ACTIONS(2439),
     3,
     aux_sym_data_representation_mask_token2,
     aux_sym_data_representation_mask_token3,
     aux_sym_data_representation_mask_token4,
-    [38797] = 8,
+    [39010] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1443),
+    ACTIONS(2546),
     1,
-    sym_identifier,
-    ACTIONS(2535),
+    anon_sym_bitfield,
+    ACTIONS(2548),
     1,
-    anon_sym_truncatable,
-    STATE(650),
+    anon_sym_RBRACE,
+    STATE(659),
     1,
     sym_comment,
-    STATE(695),
+    STATE(660),
     1,
-    sym_scoped_name,
-    STATE(696),
+    aux_sym_bitset_dcl_repeat1,
+    STATE(807),
     1,
-    sym_value_name,
-    [38822] = 7,
+    sym_bitfield_spec,
+    STATE(1154),
+    1,
+    sym_bitfield,
+    [39035] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
+    ACTIONS(2550),
     1,
-    sym_identifier,
-    STATE(651),
+    anon_sym_RBRACE,
+    ACTIONS(2552),
     1,
-    sym_comment,
-    STATE(735),
+    anon_sym_bitfield,
+    STATE(807),
     1,
-    sym_declarator,
-    STATE(1698),
+    sym_bitfield_spec,
+    STATE(1154),
     1,
-    sym_declarators,
-    STATE(851),
+    sym_bitfield,
+    STATE(660),
     2,
-    sym_simple_declarator,
-    sym_array_declarator,
-    [38845] = 4,
+    sym_comment,
+    aux_sym_bitset_dcl_repeat1,
+    [39058] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(652),
+    ACTIONS(2546),
+    1,
+    anon_sym_bitfield,
+    ACTIONS(2555),
+    1,
+    anon_sym_RBRACE,
+    STATE(659),
+    1,
+    aux_sym_bitset_dcl_repeat1,
+    STATE(661),
     1,
     sym_comment,
-    ACTIONS(2537),
+    STATE(807),
+    1,
+    sym_bitfield_spec,
+    STATE(1154),
+    1,
+    sym_bitfield,
+    [39083] = 4,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(662),
+    1,
+    sym_comment,
+    ACTIONS(2557),
     5,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38862] = 8,
+    [39100] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2490),
+    ACTIONS(2546),
     1,
     anon_sym_bitfield,
-    ACTIONS(2539),
+    ACTIONS(2559),
     1,
     anon_sym_RBRACE,
-    STATE(627),
+    STATE(657),
     1,
     aux_sym_bitset_dcl_repeat1,
-    STATE(653),
+    STATE(663),
     1,
     sym_comment,
-    STATE(804),
+    STATE(807),
     1,
     sym_bitfield_spec,
     STATE(1154),
     1,
     sym_bitfield,
-    [38887] = 4,
+    [39125] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(654),
+    STATE(664),
     1,
     sym_comment,
-    ACTIONS(2541),
+    ACTIONS(2561),
     5,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_SEMI,
     sym_identifier,
-    [38904] = 7,
+    [39142] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2545),
+    ACTIONS(2565),
     1,
     anon_sym_interface,
-    ACTIONS(2547),
+    ACTIONS(2567),
     1,
     sym_identifier,
-    STATE(655),
+    STATE(665),
     1,
     sym_comment,
     STATE(1549),
     1,
     sym_interface_kind,
-    ACTIONS(2543),
+    ACTIONS(2563),
     2,
     anon_sym_local,
     anon_sym_abstract,
-    [38927] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(656),
-    1,
-    sym_comment,
-    ACTIONS(1489),
-    5,
-    anon_sym_COLON_COLON,
-    anon_sym_LPAREN,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    aux_sym_extend_annotation_appl_token1,
-    [38944] = 8,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2549),
-    1,
-    anon_sym_COLON,
-    ACTIONS(2551),
-    1,
-    anon_sym_supports,
-    ACTIONS(2553),
-    1,
-    anon_sym_manages,
-    STATE(657),
-    1,
-    sym_comment,
-    STATE(988),
-    1,
-    sym_home_inheritance_spec,
-    STATE(1269),
-    1,
-    sym_supported_interface_spec,
-    [38969] = 8,
+    [39165] = 8,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -65759,463 +65962,305 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2469),
+    ACTIONS(2449),
     1,
     anon_sym_Object,
-    STATE(658),
+    STATE(666),
     1,
     sym_comment,
-    STATE(1104),
+    STATE(1049),
     1,
     sym_scoped_name,
-    STATE(1614),
+    STATE(1283),
     1,
     sym_interface_type,
-    [38994] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(659),
-    1,
-    sym_comment,
-    ACTIONS(1503),
-    5,
-    anon_sym_COLON_COLON,
-    anon_sym_LPAREN,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    aux_sym_extend_annotation_appl_token1,
-    [39011] = 8,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2490),
-    1,
-    anon_sym_bitfield,
-    ACTIONS(2555),
-    1,
-    anon_sym_RBRACE,
-    STATE(642),
-    1,
-    aux_sym_bitset_dcl_repeat1,
-    STATE(660),
-    1,
-    sym_comment,
-    STATE(804),
-    1,
-    sym_bitfield_spec,
-    STATE(1154),
-    1,
-    sym_bitfield,
-    [39036] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(661),
-    1,
-    sym_comment,
-    ACTIONS(1499),
-    5,
-    anon_sym_COLON_COLON,
-    anon_sym_LPAREN,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    aux_sym_extend_annotation_appl_token1,
-    [39053] = 7,
+    [39190] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
+    ACTIONS(2508),
     1,
     sym_identifier,
-    STATE(662),
+    STATE(667),
     1,
     sym_comment,
-    STATE(735),
+    STATE(737),
     1,
     sym_declarator,
-    STATE(833),
+    STATE(928),
     1,
     sym_declarators,
     STATE(851),
     2,
     sym_simple_declarator,
     sym_array_declarator,
-    [39076] = 7,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
-    1,
-    sym_identifier,
-    STATE(663),
-    1,
-    sym_comment,
-    STATE(941),
-    1,
-    sym_any_declarator,
-    STATE(1268),
-    1,
-    sym_any_declarators,
-    STATE(1067),
-    2,
-    sym_simple_declarator,
-    sym_array_declarator,
-    [39099] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
-    1,
-    aux_sym_data_representation_mask_token1,
-    STATE(664),
-    1,
-    sym_comment,
-    STATE(867),
-    1,
-    sym_data_representation_mask,
-    ACTIONS(2413),
-    3,
-    aux_sym_data_representation_mask_token2,
-    aux_sym_data_representation_mask_token3,
-    aux_sym_data_representation_mask_token4,
-    [39120] = 7,
+    [39213] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2557),
+    ACTIONS(2569),
     1,
     anon_sym_LT,
-    ACTIONS(2559),
+    ACTIONS(2571),
     1,
     anon_sym_DQUOTE,
-    ACTIONS(2561),
+    ACTIONS(2573),
     1,
     sym_identifier,
-    STATE(665),
-    1,
-    sym_comment,
-    STATE(1558),
-    2,
-    sym_string_literal,
-    sym_system_lib_string,
-    [39143] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2411),
-    1,
-    aux_sym_data_representation_mask_token1,
-    STATE(666),
-    1,
-    sym_comment,
-    STATE(954),
-    1,
-    sym_data_representation_mask,
-    ACTIONS(2413),
-    3,
-    aux_sym_data_representation_mask_token2,
-    aux_sym_data_representation_mask_token3,
-    aux_sym_data_representation_mask_token4,
-    [39164] = 6,
+    STATE(668),
+    1,
+    sym_comment,
+    STATE(1558),
+    2,
+    sym_string_literal,
+    sym_system_lib_string,
+    [39236] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2516),
     1,
     anon_sym_raises,
-    STATE(667),
+    STATE(669),
     1,
     sym_comment,
-    STATE(1106),
+    STATE(1101),
     1,
     sym_raises_expr,
-    ACTIONS(2563),
+    ACTIONS(2575),
     2,
     anon_sym_SEMI,
     anon_sym_context,
-    [39184] = 4,
+    [39256] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(668),
+    STATE(670),
     1,
     sym_comment,
-    ACTIONS(2565),
+    ACTIONS(2577),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [39200] = 6,
+    [39272] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2567),
+    ACTIONS(2579),
     1,
     sym_escape_sequence,
-    ACTIONS(2570),
+    ACTIONS(2582),
     1,
     anon_sym_DQUOTE,
-    ACTIONS(2572),
+    ACTIONS(2584),
     1,
     aux_sym_string_literal_token1,
-    STATE(669),
+    STATE(671),
     2,
     sym_comment,
     aux_sym_string_literal_repeat1,
-    [39220] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2575),
-    1,
-    anon_sym_LPAREN,
-    STATE(670),
-    1,
-    sym_comment,
-    ACTIONS(1539),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [39238] = 5,
+    [39292] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2577),
+    ACTIONS(2587),
     1,
     anon_sym_LPAREN,
-    STATE(671),
+    STATE(672),
     1,
     sym_comment,
-    ACTIONS(1569),
+    ACTIONS(1503),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39256] = 5,
+    [39310] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2579),
+    ACTIONS(2589),
     1,
     anon_sym_LPAREN,
-    STATE(672),
+    STATE(673),
     1,
     sym_comment,
-    ACTIONS(1467),
+    ACTIONS(1513),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39274] = 5,
+    [39328] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2581),
+    ACTIONS(2591),
     1,
     anon_sym_LPAREN,
-    STATE(673),
+    STATE(674),
     1,
     sym_comment,
-    ACTIONS(1557),
+    ACTIONS(1497),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39292] = 5,
+    [39346] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2583),
+    ACTIONS(2593),
     1,
     anon_sym_LPAREN,
-    STATE(674),
+    STATE(675),
     1,
     sym_comment,
-    ACTIONS(1479),
+    ACTIONS(1473),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39310] = 7,
+    [39364] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2585),
+    ACTIONS(2595),
     1,
     anon_sym_RPAREN,
-    ACTIONS(2587),
+    ACTIONS(2597),
     1,
     anon_sym_in,
-    STATE(675),
+    STATE(676),
     1,
     sym_comment,
-    STATE(807),
+    STATE(809),
     1,
     sym_init_param_dcl,
     STATE(1519),
     1,
     sym_init_param_dcls,
-    [39332] = 5,
+    [39386] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2589),
+    ACTIONS(2599),
     1,
     anon_sym_LPAREN,
-    STATE(676),
+    STATE(677),
     1,
     sym_comment,
-    ACTIONS(1473),
+    ACTIONS(1485),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39350] = 5,
+    [39404] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2591),
+    ACTIONS(2601),
     1,
     anon_sym_LPAREN,
-    STATE(677),
+    STATE(678),
     1,
     sym_comment,
-    ACTIONS(1551),
+    ACTIONS(1479),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39368] = 5,
+    [39422] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2593),
+    ACTIONS(2603),
     1,
     anon_sym_LPAREN,
-    STATE(678),
+    STATE(679),
     1,
     sym_comment,
-    ACTIONS(1527),
+    ACTIONS(1467),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39386] = 5,
+    [39440] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2595),
+    ACTIONS(2605),
     1,
     anon_sym_LPAREN,
-    STATE(679),
+    STATE(680),
     1,
     sym_comment,
-    ACTIONS(1515),
+    ACTIONS(1545),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39404] = 4,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(680),
-    1,
-    sym_comment,
-    ACTIONS(2597),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    anon_sym_RBRACK,
-    [39420] = 5,
+    [39458] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2599),
+    ACTIONS(2607),
     1,
     anon_sym_LPAREN,
     STATE(681),
     1,
     sym_comment,
-    ACTIONS(1485),
+    ACTIONS(1557),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39438] = 5,
+    [39476] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -66225,223 +66270,257 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(682),
     1,
     sym_comment,
+    ACTIONS(2609),
+    4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    anon_sym_RBRACK,
+    [39492] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(683),
+    1,
+    sym_comment,
     STATE(1454),
     1,
     sym_try_construct_fail_action,
-    ACTIONS(2601),
+    ACTIONS(2611),
     3,
     aux_sym_try_construct_fail_action_token1,
     aux_sym_try_construct_fail_action_token2,
     aux_sym_try_construct_fail_action_token3,
-    [39456] = 7,
+    [39510] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2603),
+    ACTIONS(2613),
     1,
     anon_sym_RPAREN,
-    ACTIONS(2605),
+    ACTIONS(2615),
     1,
     anon_sym_in,
-    STATE(683),
+    STATE(684),
     1,
     sym_comment,
-    STATE(786),
+    STATE(787),
     1,
     sym_factory_param_dcl,
     STATE(1514),
     1,
     sym_factory_param_dcls,
-    [39478] = 7,
+    [39532] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2587),
+    ACTIONS(2597),
     1,
     anon_sym_in,
-    ACTIONS(2607),
+    ACTIONS(2617),
     1,
     anon_sym_RPAREN,
-    STATE(684),
+    STATE(685),
     1,
     sym_comment,
-    STATE(807),
+    STATE(809),
     1,
     sym_init_param_dcl,
     STATE(1512),
     1,
     sym_init_param_dcls,
-    [39500] = 6,
+    [39554] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
+    ACTIONS(2508),
     1,
     sym_identifier,
-    STATE(685),
+    STATE(686),
     1,
     sym_comment,
-    STATE(789),
+    STATE(790),
     1,
     sym_declarator,
     STATE(851),
     2,
     sym_simple_declarator,
     sym_array_declarator,
-    [39520] = 6,
+    [39574] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2609),
+    ACTIONS(2619),
     1,
     anon_sym_COMMA,
-    STATE(686),
+    STATE(687),
     1,
     sym_comment,
-    STATE(776),
+    STATE(784),
     1,
     aux_sym_declarators_repeat1,
-    ACTIONS(2611),
+    ACTIONS(2621),
     2,
     anon_sym_SEMI,
     anon_sym_default,
-    [39540] = 5,
+    [39594] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(687),
+    STATE(688),
     1,
     sym_comment,
     STATE(1448),
     1,
     sym_service_platform,
-    ACTIONS(2613),
+    ACTIONS(2623),
     3,
     anon_sym_STAR,
     aux_sym_service_platform_token1,
     aux_sym_service_platform_token2,
-    [39558] = 5,
+    [39612] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2615),
+    ACTIONS(2625),
     1,
     anon_sym_LPAREN,
-    STATE(688),
+    STATE(689),
     1,
     sym_comment,
-    ACTIONS(1495),
+    ACTIONS(1491),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39576] = 5,
+    [39630] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2617),
+    ACTIONS(2627),
     1,
     anon_sym_LPAREN,
-    STATE(689),
+    STATE(690),
     1,
     sym_comment,
-    ACTIONS(1563),
+    ACTIONS(1533),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39594] = 5,
+    [39648] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2619),
+    ACTIONS(2629),
     1,
     anon_sym_LPAREN,
-    STATE(690),
+    STATE(691),
     1,
     sym_comment,
-    ACTIONS(1545),
+    ACTIONS(1527),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [39666] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2631),
+    1,
+    anon_sym_LPAREN,
+    STATE(692),
+    1,
+    sym_comment,
+    ACTIONS(1563),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39612] = 4,
+    [39684] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(691),
+    STATE(693),
     1,
     sym_comment,
-    ACTIONS(2621),
+    ACTIONS(2633),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [39628] = 5,
+    [39700] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2623),
+    ACTIONS(2635),
     1,
     anon_sym_LPAREN,
-    STATE(692),
+    STATE(694),
     1,
     sym_comment,
-    ACTIONS(1533),
+    ACTIONS(1569),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39646] = 5,
+    [39718] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2625),
+    ACTIONS(2637),
     1,
     anon_sym_LPAREN,
-    STATE(693),
+    STATE(695),
     1,
     sym_comment,
-    ACTIONS(1521),
+    ACTIONS(1551),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [39664] = 7,
+    [39736] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -66451,199 +66530,217 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2639),
     1,
     sym_identifier,
-    STATE(694),
+    STATE(696),
     1,
     sym_comment,
-    STATE(695),
+    STATE(697),
     1,
     sym_scoped_name,
-    STATE(769),
+    STATE(771),
     1,
     sym_value_name,
-    [39686] = 5,
+    [39758] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(2149),
     1,
     anon_sym_COLON_COLON,
-    STATE(695),
+    STATE(697),
     1,
     sym_comment,
-    ACTIONS(2629),
+    ACTIONS(2641),
     3,
     anon_sym_COMMA,
     anon_sym_LBRACE,
     anon_sym_supports,
-    [39704] = 7,
+    [39776] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2631),
+    ACTIONS(2643),
     1,
     anon_sym_COMMA,
-    ACTIONS(2633),
+    ACTIONS(2645),
     1,
     anon_sym_LBRACE,
-    ACTIONS(2635),
+    ACTIONS(2647),
     1,
     anon_sym_supports,
-    STATE(696),
+    STATE(698),
     1,
     sym_comment,
-    STATE(772),
+    STATE(776),
     1,
     aux_sym_value_inheritance_spec_repeat1,
-    [39726] = 4,
+    [39798] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(697),
+    STATE(699),
     1,
     sym_comment,
-    ACTIONS(2637),
+    ACTIONS(2649),
     4,
     anon_sym_COMMA,
     anon_sym_SEMI,
     anon_sym_default,
     anon_sym_LBRACK,
-    [39742] = 6,
+    [39814] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
+    ACTIONS(2508),
     1,
     sym_identifier,
-    STATE(698),
+    STATE(700),
     1,
     sym_comment,
-    STATE(1167),
+    STATE(1090),
     1,
     sym_any_declarator,
-    STATE(1067),
+    STATE(1076),
     2,
     sym_simple_declarator,
     sym_array_declarator,
-    [39762] = 7,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2639),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2641),
-    1,
-    anon_sym_LBRACE,
-    STATE(699),
-    1,
-    sym_comment,
-    STATE(810),
-    1,
-    aux_sym_raises_expr_repeat1,
-    [39784] = 7,
+    [39834] = 7,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2643),
+    ACTIONS(2651),
     1,
     sym_escape_sequence,
-    ACTIONS(2645),
+    ACTIONS(2653),
     1,
     anon_sym_DQUOTE,
-    ACTIONS(2647),
+    ACTIONS(2655),
     1,
     aux_sym_string_literal_token1,
-    STATE(669),
+    STATE(671),
     1,
     aux_sym_string_literal_repeat1,
-    STATE(700),
+    STATE(701),
     1,
     sym_comment,
-    [39806] = 6,
+    [39856] = 6,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2651),
+    ACTIONS(2659),
     1,
     anon_sym_SQUOTE,
-    STATE(701),
+    STATE(702),
     1,
     sym_comment,
-    STATE(702),
+    STATE(703),
     1,
     aux_sym_char_literal_repeat1,
-    ACTIONS(2649),
+    ACTIONS(2657),
     2,
     sym_escape_sequence,
     aux_sym_char_literal_token1,
-    [39826] = 5,
+    [39876] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2656),
+    ACTIONS(2664),
     1,
     anon_sym_SQUOTE,
-    ACTIONS(2653),
+    ACTIONS(2661),
     2,
     sym_escape_sequence,
     aux_sym_char_literal_token1,
-    STATE(702),
+    STATE(703),
     2,
     sym_comment,
     aux_sym_char_literal_repeat1,
-    [39844] = 7,
+    [39894] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(2666),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(2668),
+    1,
+    anon_sym_LBRACE,
+    STATE(704),
+    1,
+    sym_comment,
+    STATE(810),
+    1,
+    aux_sym_raises_expr_repeat1,
+    [39916] = 7,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2149),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(2658),
+    ACTIONS(2670),
     1,
     anon_sym_LBRACE,
-    ACTIONS(2660),
+    ACTIONS(2672),
     1,
     anon_sym_primarykey,
-    STATE(703),
+    STATE(705),
     1,
     sym_comment,
     STATE(1525),
     1,
     sym_primary_key_spec,
-    [39866] = 7,
+    [39938] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(706),
+    1,
+    sym_comment,
+    STATE(1169),
+    1,
+    sym_extensibility_kind,
+    ACTIONS(2674),
+    3,
+    aux_sym_extensibility_kind_token1,
+    aux_sym_extensibility_kind_token2,
+    aux_sym_extensibility_kind_token3,
+    [39956] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -66653,209 +66750,155 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(704),
+    STATE(707),
     1,
     sym_comment,
-    STATE(923),
+    STATE(935),
     1,
     sym_scoped_name,
-    STATE(977),
+    STATE(990),
     1,
     sym_interface_name,
-    [39888] = 7,
+    [39978] = 7,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2643),
+    ACTIONS(2651),
     1,
     sym_escape_sequence,
-    ACTIONS(2647),
+    ACTIONS(2655),
     1,
     aux_sym_string_literal_token1,
-    ACTIONS(2662),
+    ACTIONS(2676),
     1,
     anon_sym_DQUOTE,
-    STATE(705),
+    STATE(708),
     1,
     sym_comment,
-    STATE(707),
+    STATE(709),
     1,
     aux_sym_string_literal_repeat1,
-    [39910] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(706),
-    1,
-    sym_comment,
-    STATE(1169),
-    1,
-    sym_extensibility_kind,
-    ACTIONS(2664),
-    3,
-    aux_sym_extensibility_kind_token1,
-    aux_sym_extensibility_kind_token2,
-    aux_sym_extensibility_kind_token3,
-    [39928] = 7,
+    [40000] = 7,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2643),
+    ACTIONS(2651),
     1,
     sym_escape_sequence,
-    ACTIONS(2647),
+    ACTIONS(2655),
     1,
     aux_sym_string_literal_token1,
-    ACTIONS(2666),
+    ACTIONS(2678),
     1,
     anon_sym_DQUOTE,
-    STATE(669),
+    STATE(671),
     1,
     aux_sym_string_literal_repeat1,
-    STATE(707),
+    STATE(709),
     1,
     sym_comment,
-    [39950] = 6,
+    [40022] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2668),
+    ACTIONS(2680),
     1,
     anon_sym_RPAREN,
-    STATE(708),
+    STATE(710),
     1,
     sym_comment,
     STATE(1285),
     1,
     sym_autoid_kind,
-    ACTIONS(2670),
+    ACTIONS(2682),
     2,
     aux_sym_autoid_kind_token1,
     aux_sym_autoid_kind_token2,
-    [39970] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2672),
-    1,
-    anon_sym_LPAREN,
-    STATE(709),
-    1,
-    sym_comment,
-    ACTIONS(1519),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    aux_sym_extend_annotation_appl_token1,
-    [39988] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(2674),
-    1,
-    anon_sym_LPAREN,
-    STATE(710),
-    1,
-    sym_comment,
-    ACTIONS(1531),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    aux_sym_extend_annotation_appl_token1,
-    [40006] = 5,
+    [40042] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2676),
+    ACTIONS(2684),
     1,
     anon_sym_LPAREN,
     STATE(711),
     1,
     sym_comment,
-    ACTIONS(1543),
+    ACTIONS(1549),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40024] = 5,
+    [40060] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2678),
+    ACTIONS(2686),
     1,
     anon_sym_LPAREN,
     STATE(712),
     1,
     sym_comment,
-    ACTIONS(1561),
+    ACTIONS(1567),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40042] = 5,
+    [40078] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2680),
+    ACTIONS(2688),
     1,
     anon_sym_LPAREN,
     STATE(713),
     1,
     sym_comment,
-    ACTIONS(1493),
+    ACTIONS(1561),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40060] = 5,
+    [40096] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2682),
+    ACTIONS(2690),
     1,
     anon_sym_LPAREN,
     STATE(714),
     1,
     sym_comment,
-    ACTIONS(1483),
+    ACTIONS(1525),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40078] = 5,
+    [40114] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -66868,48 +66911,48 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1407),
     1,
     sym_try_construct_fail_action,
-    ACTIONS(2601),
+    ACTIONS(2611),
     3,
     aux_sym_try_construct_fail_action_token1,
     aux_sym_try_construct_fail_action_token2,
     aux_sym_try_construct_fail_action_token3,
-    [40096] = 5,
+    [40132] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2684),
+    ACTIONS(2692),
     1,
     anon_sym_LPAREN,
     STATE(716),
     1,
     sym_comment,
-    ACTIONS(1513),
+    ACTIONS(1531),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40114] = 5,
+    [40150] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2686),
+    ACTIONS(2694),
     1,
     anon_sym_LPAREN,
     STATE(717),
     1,
     sym_comment,
-    ACTIONS(1525),
+    ACTIONS(1489),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40132] = 5,
+    [40168] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -66922,142 +66965,142 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1401),
     1,
     sym_service_platform,
-    ACTIONS(2613),
+    ACTIONS(2623),
     3,
     anon_sym_STAR,
     aux_sym_service_platform_token1,
     aux_sym_service_platform_token2,
-    [40150] = 5,
+    [40186] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2688),
+    ACTIONS(2696),
     1,
     anon_sym_LPAREN,
     STATE(719),
     1,
     sym_comment,
-    ACTIONS(1549),
+    ACTIONS(1555),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40168] = 5,
+    [40204] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2690),
+    ACTIONS(2698),
     1,
     anon_sym_LPAREN,
     STATE(720),
     1,
     sym_comment,
-    ACTIONS(1471),
+    ACTIONS(1543),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40186] = 5,
+    [40222] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2692),
+    ACTIONS(2700),
     1,
     anon_sym_LPAREN,
     STATE(721),
     1,
     sym_comment,
-    ACTIONS(1477),
+    ACTIONS(1465),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40204] = 5,
+    [40240] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2694),
+    ACTIONS(2702),
     1,
     anon_sym_LPAREN,
     STATE(722),
     1,
     sym_comment,
-    ACTIONS(1555),
+    ACTIONS(1477),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40222] = 7,
+    [40258] = 7,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2643),
+    ACTIONS(2651),
     1,
     sym_escape_sequence,
-    ACTIONS(2647),
+    ACTIONS(2655),
     1,
     aux_sym_string_literal_token1,
-    ACTIONS(2696),
+    ACTIONS(2704),
     1,
     anon_sym_DQUOTE,
     STATE(723),
     1,
     sym_comment,
-    STATE(755),
+    STATE(757),
     1,
     aux_sym_string_literal_repeat1,
-    [40244] = 5,
+    [40280] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2698),
+    ACTIONS(2706),
     1,
     anon_sym_LPAREN,
     STATE(724),
     1,
     sym_comment,
-    ACTIONS(1465),
+    ACTIONS(1483),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40262] = 5,
+    [40298] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2700),
+    ACTIONS(2708),
     1,
     anon_sym_LPAREN,
     STATE(725),
     1,
     sym_comment,
-    ACTIONS(1567),
+    ACTIONS(1471),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40280] = 7,
+    [40316] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67067,7 +67110,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
     STATE(726),
@@ -67076,23 +67119,23 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(821),
     1,
     sym_interface_name,
-    STATE(923),
+    STATE(935),
     1,
     sym_scoped_name,
-    [40302] = 7,
+    [40338] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2631),
+    ACTIONS(2643),
     1,
     anon_sym_COMMA,
-    ACTIONS(2702),
+    ACTIONS(2710),
     1,
     anon_sym_LBRACE,
-    ACTIONS(2704),
+    ACTIONS(2712),
     1,
     anon_sym_supports,
     STATE(727),
@@ -67101,55 +67144,53 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(730),
     1,
     aux_sym_value_inheritance_spec_repeat1,
-    [40324] = 5,
+    [40360] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2706),
+    ACTIONS(2714),
     1,
     anon_sym_LPAREN,
     STATE(728),
     1,
     sym_comment,
-    ACTIONS(1537),
+    ACTIONS(1495),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [40342] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [40378] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
+    ACTIONS(2423),
     1,
-    sym_identifier,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2716),
+    1,
+    anon_sym_LPAREN,
     STATE(729),
     1,
     sym_comment,
-    STATE(1324),
-    1,
-    sym_declarator,
-    STATE(851),
-    2,
-    sym_simple_declarator,
-    sym_array_declarator,
-    [40362] = 5,
+    ACTIONS(1511),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    aux_sym_extend_annotation_appl_token1,
+    [40396] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2708),
+    ACTIONS(2718),
     1,
     anon_sym_COMMA,
-    ACTIONS(2711),
+    ACTIONS(2721),
     2,
     anon_sym_LBRACE,
     anon_sym_supports,
@@ -67157,27 +67198,25 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_comment,
     aux_sym_value_inheritance_spec_repeat1,
-    [40380] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [40414] = 5,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2713),
+    ACTIONS(2423),
     1,
-    anon_sym_RPAREN,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2723),
+    1,
+    anon_sym_LPAREN,
     STATE(731),
     1,
     sym_comment,
-    STATE(1338),
-    1,
-    sym_autoid_kind,
-    ACTIONS(2670),
-    2,
-    aux_sym_autoid_kind_token1,
-    aux_sym_autoid_kind_token2,
-    [40400] = 7,
+    ACTIONS(1501),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    aux_sym_extend_annotation_appl_token1,
+    [40432] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67187,117 +67226,117 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
     STATE(732),
     1,
     sym_comment,
-    STATE(923),
+    STATE(935),
     1,
     sym_scoped_name,
-    STATE(1112),
+    STATE(1114),
     1,
     sym_interface_name,
-    [40422] = 7,
+    [40454] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2639),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2715),
+    ACTIONS(2508),
     1,
-    anon_sym_RPAREN,
+    sym_identifier,
     STATE(733),
     1,
     sym_comment,
-    STATE(949),
+    STATE(1324),
     1,
-    aux_sym_raises_expr_repeat1,
-    [40444] = 4,
+    sym_declarator,
+    STATE(851),
+    2,
+    sym_simple_declarator,
+    sym_array_declarator,
+    [40474] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2725),
+    1,
+    anon_sym_RPAREN,
     STATE(734),
     1,
     sym_comment,
-    ACTIONS(2717),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    sym_identifier,
-    [40460] = 6,
+    STATE(1338),
+    1,
+    sym_autoid_kind,
+    ACTIONS(2682),
+    2,
+    aux_sym_autoid_kind_token1,
+    aux_sym_autoid_kind_token2,
+    [40494] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2609),
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(2666),
     1,
     anon_sym_COMMA,
-    STATE(686),
+    ACTIONS(2727),
     1,
-    aux_sym_declarators_repeat1,
+    anon_sym_RPAREN,
     STATE(735),
     1,
     sym_comment,
-    ACTIONS(2719),
-    2,
-    anon_sym_SEMI,
-    anon_sym_default,
-    [40480] = 6,
+    STATE(949),
+    1,
+    aux_sym_raises_expr_repeat1,
+    [40516] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2523),
-    1,
-    sym_identifier,
     STATE(736),
     1,
     sym_comment,
-    STATE(1330),
-    1,
-    sym_declarator,
-    STATE(851),
-    2,
-    sym_simple_declarator,
-    sym_array_declarator,
-    [40500] = 6,
+    ACTIONS(2729),
+    4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    sym_identifier,
+    [40532] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2721),
+    ACTIONS(2619),
     1,
-    anon_sym_RPAREN,
+    anon_sym_COMMA,
+    STATE(687),
+    1,
+    aux_sym_declarators_repeat1,
     STATE(737),
     1,
     sym_comment,
-    STATE(1386),
-    1,
-    sym_autoid_kind,
-    ACTIONS(2670),
+    ACTIONS(2731),
     2,
-    aux_sym_autoid_kind_token1,
-    aux_sym_autoid_kind_token2,
-    [40520] = 5,
+    anon_sym_SEMI,
+    anon_sym_default,
+    [40552] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67310,54 +67349,52 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1390),
     1,
     sym_extensibility_kind,
-    ACTIONS(2664),
+    ACTIONS(2674),
     3,
     aux_sym_extensibility_kind_token1,
     aux_sym_extensibility_kind_token2,
     aux_sym_extensibility_kind_token3,
-    [40538] = 6,
+    [40570] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2508),
     1,
-    anon_sym_raises,
+    sym_identifier,
     STATE(739),
     1,
     sym_comment,
-    STATE(1068),
+    STATE(1330),
     1,
-    sym_raises_expr,
-    ACTIONS(2723),
+    sym_declarator,
+    STATE(851),
     2,
-    anon_sym_SEMI,
-    anon_sym_context,
-    [40558] = 7,
+    sym_simple_declarator,
+    sym_array_declarator,
+    [40590] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2639),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2725),
+    ACTIONS(2733),
     1,
     anon_sym_RPAREN,
     STATE(740),
     1,
     sym_comment,
-    STATE(936),
+    STATE(1386),
     1,
-    aux_sym_raises_expr_repeat1,
-    [40580] = 4,
+    sym_autoid_kind,
+    ACTIONS(2682),
+    2,
+    aux_sym_autoid_kind_token1,
+    aux_sym_autoid_kind_token2,
+    [40610] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67367,41 +67404,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(741),
     1,
     sym_comment,
-    ACTIONS(2727),
+    ACTIONS(2735),
     4,
     anon_sym_COMMA,
     anon_sym_SEMI,
     anon_sym_default,
     anon_sym_LBRACK,
-    [40596] = 5,
+    [40626] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
     STATE(742),
     1,
     sym_comment,
-    ACTIONS(2729),
+    ACTIONS(2737),
     3,
     anon_sym_COMMA,
     anon_sym_RPAREN,
     anon_sym_LBRACE,
-    [40614] = 5,
+    [40644] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2731),
+    ACTIONS(2739),
     1,
     anon_sym_COMMA,
-    ACTIONS(2729),
+    ACTIONS(2737),
     2,
     anon_sym_RPAREN,
     anon_sym_LBRACE,
@@ -67409,62 +67446,62 @@ static const uint16_t ts_small_parse_table[] = {
     2,
     sym_comment,
     aux_sym_raises_expr_repeat1,
-    [40632] = 6,
+    [40662] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2734),
+    ACTIONS(2516),
     1,
-    anon_sym_RPAREN,
+    anon_sym_raises,
     STATE(744),
     1,
     sym_comment,
-    STATE(1433),
+    STATE(1079),
     1,
-    sym_autoid_kind,
-    ACTIONS(2670),
+    sym_raises_expr,
+    ACTIONS(2742),
     2,
-    aux_sym_autoid_kind_token1,
-    aux_sym_autoid_kind_token2,
-    [40652] = 7,
+    anon_sym_SEMI,
+    anon_sym_context,
+    [40682] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2510),
     1,
-    sym_identifier,
+    anon_sym_COLON_COLON,
+    ACTIONS(2666),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(2744),
+    1,
+    anon_sym_RPAREN,
     STATE(745),
     1,
     sym_comment,
-    STATE(923),
-    1,
-    sym_scoped_name,
-    STATE(1253),
+    STATE(936),
     1,
-    sym_interface_name,
-    [40674] = 7,
+    aux_sym_raises_expr_repeat1,
+    [40704] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(2149),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(2660),
+    ACTIONS(2672),
     1,
     anon_sym_primarykey,
-    ACTIONS(2736),
+    ACTIONS(2746),
     1,
     anon_sym_LBRACE,
     STATE(746),
@@ -67473,213 +67510,223 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1489),
     1,
     sym_primary_key_spec,
-    [40696] = 7,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    [40726] = 6,
+    ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2643),
-    1,
-    sym_escape_sequence,
-    ACTIONS(2647),
-    1,
-    aux_sym_string_literal_token1,
-    ACTIONS(2738),
+    ACTIONS(618),
     1,
-    anon_sym_DQUOTE,
-    STATE(700),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2748),
     1,
-    aux_sym_string_literal_repeat1,
+    anon_sym_RPAREN,
     STATE(747),
     1,
     sym_comment,
-    [40718] = 5,
+    STATE(1433),
+    1,
+    sym_autoid_kind,
+    ACTIONS(2682),
+    2,
+    aux_sym_autoid_kind_token1,
+    aux_sym_autoid_kind_token2,
+    [40746] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2457),
+    1,
+    sym_identifier,
     STATE(748),
     1,
     sym_comment,
-    STATE(1359),
+    STATE(935),
     1,
-    sym_try_construct_fail_action,
-    ACTIONS(2601),
-    3,
-    aux_sym_try_construct_fail_action_token1,
-    aux_sym_try_construct_fail_action_token2,
-    aux_sym_try_construct_fail_action_token3,
-    [40736] = 6,
+    sym_scoped_name,
+    STATE(1253),
+    1,
+    sym_interface_name,
+    [40768] = 7,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(2651),
+    1,
+    sym_escape_sequence,
+    ACTIONS(2655),
+    1,
+    aux_sym_string_literal_token1,
+    ACTIONS(2750),
+    1,
+    anon_sym_DQUOTE,
+    STATE(701),
+    1,
+    aux_sym_string_literal_repeat1,
+    STATE(749),
+    1,
+    sym_comment,
+    [40790] = 6,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2740),
+    ACTIONS(2752),
     1,
     anon_sym_SQUOTE,
-    STATE(702),
+    STATE(703),
     1,
     aux_sym_char_literal_repeat1,
-    STATE(749),
+    STATE(750),
     1,
     sym_comment,
-    ACTIONS(2649),
+    ACTIONS(2657),
     2,
     sym_escape_sequence,
     aux_sym_char_literal_token1,
-    [40756] = 5,
+    [40810] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(750),
+    STATE(751),
+    1,
+    sym_comment,
+    STATE(1359),
+    1,
+    sym_try_construct_fail_action,
+    ACTIONS(2611),
+    3,
+    aux_sym_try_construct_fail_action_token1,
+    aux_sym_try_construct_fail_action_token2,
+    aux_sym_try_construct_fail_action_token3,
+    [40828] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(752),
     1,
     sym_comment,
     STATE(1237),
     1,
     sym_try_construct_fail_action,
-    ACTIONS(2601),
+    ACTIONS(2611),
     3,
     aux_sym_try_construct_fail_action_token1,
     aux_sym_try_construct_fail_action_token2,
     aux_sym_try_construct_fail_action_token3,
-    [40774] = 5,
+    [40846] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(751),
+    STATE(753),
     1,
     sym_comment,
     STATE(1231),
     1,
     sym_service_platform,
-    ACTIONS(2613),
+    ACTIONS(2623),
     3,
     anon_sym_STAR,
     aux_sym_service_platform_token1,
     aux_sym_service_platform_token2,
-    [40792] = 5,
+    [40864] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(752),
+    STATE(754),
     1,
     sym_comment,
     STATE(1207),
     1,
     sym_extensibility_kind,
-    ACTIONS(2664),
+    ACTIONS(2674),
     3,
     aux_sym_extensibility_kind_token1,
     aux_sym_extensibility_kind_token2,
     aux_sym_extensibility_kind_token3,
-    [40810] = 5,
+    [40882] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(753),
+    STATE(755),
     1,
     sym_comment,
     STATE(1289),
     1,
     sym_extensibility_kind,
-    ACTIONS(2664),
+    ACTIONS(2674),
     3,
     aux_sym_extensibility_kind_token1,
     aux_sym_extensibility_kind_token2,
     aux_sym_extensibility_kind_token3,
-    [40828] = 6,
+    [40900] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2742),
+    ACTIONS(2754),
     1,
     anon_sym_RPAREN,
-    STATE(754),
+    STATE(756),
     1,
     sym_comment,
     STATE(1202),
     1,
     sym_autoid_kind,
-    ACTIONS(2670),
+    ACTIONS(2682),
     2,
     aux_sym_autoid_kind_token1,
     aux_sym_autoid_kind_token2,
-    [40848] = 7,
+    [40920] = 7,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2643),
+    ACTIONS(2651),
     1,
     sym_escape_sequence,
-    ACTIONS(2647),
+    ACTIONS(2655),
     1,
     aux_sym_string_literal_token1,
-    ACTIONS(2744),
+    ACTIONS(2756),
     1,
     anon_sym_DQUOTE,
-    STATE(669),
+    STATE(671),
     1,
     aux_sym_string_literal_repeat1,
-    STATE(755),
-    1,
-    sym_comment,
-    [40870] = 4,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    STATE(756),
-    1,
-    sym_comment,
-    ACTIONS(2746),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    sym_identifier,
-    [40886] = 4,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(757),
     1,
     sym_comment,
-    ACTIONS(2748),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    sym_identifier,
-    [40902] = 5,
+    [40942] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67692,12 +67739,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1353),
     1,
     sym_service_platform,
-    ACTIONS(2613),
+    ACTIONS(2623),
     3,
     anon_sym_STAR,
     aux_sym_service_platform_token1,
     aux_sym_service_platform_token2,
-    [40920] = 4,
+    [40960] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67707,23 +67754,23 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(759),
     1,
     sym_comment,
-    ACTIONS(2750),
+    ACTIONS(2758),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [40936] = 7,
+    [40976] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2752),
+    ACTIONS(2760),
     1,
     anon_sym_RPAREN,
-    ACTIONS(2754),
+    ACTIONS(2762),
     1,
     anon_sym_in,
     STATE(760),
@@ -67735,27 +67782,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1479),
     1,
     sym_in_parameter_dcls,
-    [40958] = 6,
+    [40998] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2756),
+    ACTIONS(2764),
     1,
     anon_sym_LBRACE,
-    ACTIONS(2758),
+    ACTIONS(2766),
     1,
     anon_sym_COLON,
     STATE(761),
     1,
     sym_comment,
-    ACTIONS(2760),
+    ACTIONS(2768),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [40978] = 4,
+    [41018] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67765,55 +67812,65 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(762),
     1,
     sym_comment,
-    ACTIONS(2762),
+    ACTIONS(2770),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [40994] = 6,
+    [41034] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2516),
     1,
     anon_sym_raises,
     STATE(763),
     1,
     sym_comment,
-    STATE(1121),
+    STATE(1125),
     1,
     sym_raises_expr,
-    ACTIONS(2764),
+    ACTIONS(2772),
     2,
     anon_sym_SEMI,
     anon_sym_context,
-    [41014] = 7,
+    [41054] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    STATE(764),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2660),
+    sym_comment,
+    ACTIONS(2774),
+    4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    sym_identifier,
+    [41070] = 4,
+    ACTIONS(5),
     1,
-    anon_sym_primarykey,
-    ACTIONS(2766),
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
-    anon_sym_LBRACE,
-    STATE(764),
+    anon_sym_SLASH_SLASH,
+    STATE(765),
     1,
     sym_comment,
-    STATE(1543),
-    1,
-    sym_primary_key_spec,
-    [41036] = 7,
+    ACTIONS(2776),
+    4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    sym_identifier,
+    [41086] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67823,165 +67880,143 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(765),
+    STATE(766),
     1,
     sym_comment,
     STATE(886),
     1,
     sym_interface_name,
-    STATE(923),
+    STATE(935),
     1,
     sym_scoped_name,
-    [41058] = 5,
+    [41108] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(766),
+    STATE(767),
     1,
     sym_comment,
     STATE(1300),
     1,
     sym_service_platform,
-    ACTIONS(2613),
+    ACTIONS(2623),
     3,
     anon_sym_STAR,
     aux_sym_service_platform_token1,
     aux_sym_service_platform_token2,
-    [41076] = 7,
+    [41126] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2768),
-    1,
-    anon_sym_LBRACE,
-    ACTIONS(2770),
-    1,
-    anon_sym_COLON,
-    ACTIONS(2772),
-    1,
-    anon_sym_SEMI,
-    STATE(767),
-    1,
-    sym_comment,
-    STATE(1211),
+    ACTIONS(2149),
     1,
-    sym_interface_inheritance_spec,
-    [41098] = 5,
-    ACTIONS(5),
+    anon_sym_COLON_COLON,
+    ACTIONS(2672),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    anon_sym_primarykey,
+    ACTIONS(2778),
     1,
-    anon_sym_SLASH_SLASH,
+    anon_sym_LBRACE,
     STATE(768),
     1,
     sym_comment,
-    STATE(1306),
+    STATE(1543),
     1,
-    sym_try_construct_fail_action,
-    ACTIONS(2601),
-    3,
-    aux_sym_try_construct_fail_action_token1,
-    aux_sym_try_construct_fail_action_token2,
-    aux_sym_try_construct_fail_action_token3,
-    [41116] = 7,
+    sym_primary_key_spec,
+    [41148] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2631),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2774),
+    ACTIONS(2780),
     1,
     anon_sym_LBRACE,
-    ACTIONS(2776),
+    ACTIONS(2782),
     1,
-    anon_sym_supports,
-    STATE(727),
+    anon_sym_COLON,
+    ACTIONS(2784),
     1,
-    aux_sym_value_inheritance_spec_repeat1,
+    anon_sym_SEMI,
     STATE(769),
     1,
     sym_comment,
-    [41138] = 7,
+    STATE(1211),
+    1,
+    sym_interface_inheritance_spec,
+    [41170] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
-    1,
-    sym_identifier,
-    STATE(695),
-    1,
-    sym_scoped_name,
     STATE(770),
     1,
     sym_comment,
-    STATE(962),
+    STATE(1306),
     1,
-    sym_value_name,
-    [41160] = 7,
+    sym_try_construct_fail_action,
+    ACTIONS(2611),
+    3,
+    aux_sym_try_construct_fail_action_token1,
+    aux_sym_try_construct_fail_action_token2,
+    aux_sym_try_construct_fail_action_token3,
+    [41188] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2643),
     1,
-    sym_identifier,
-    STATE(771),
+    anon_sym_COMMA,
+    ACTIONS(2786),
     1,
-    sym_comment,
-    STATE(923),
+    anon_sym_LBRACE,
+    ACTIONS(2788),
     1,
-    sym_scoped_name,
-    STATE(961),
+    anon_sym_supports,
+    STATE(727),
     1,
-    sym_interface_name,
-    [41182] = 7,
+    aux_sym_value_inheritance_spec_repeat1,
+    STATE(771),
+    1,
+    sym_comment,
+    [41210] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2631),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2774),
-    1,
-    anon_sym_LBRACE,
-    ACTIONS(2776),
+    ACTIONS(2639),
     1,
-    anon_sym_supports,
-    STATE(730),
+    sym_identifier,
+    STATE(697),
     1,
-    aux_sym_value_inheritance_spec_repeat1,
+    sym_scoped_name,
     STATE(772),
     1,
     sym_comment,
-    [41204] = 5,
+    STATE(967),
+    1,
+    sym_value_name,
+    [41232] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -67994,28 +68029,34 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1342),
     1,
     sym_extensibility_kind,
-    ACTIONS(2664),
+    ACTIONS(2674),
     3,
     aux_sym_extensibility_kind_token1,
     aux_sym_extensibility_kind_token2,
     aux_sym_extensibility_kind_token3,
-    [41222] = 4,
+    [41250] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2457),
+    1,
+    sym_identifier,
     STATE(774),
     1,
     sym_comment,
-    ACTIONS(2778),
-    4,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    sym_identifier,
-    [41238] = 4,
+    STATE(935),
+    1,
+    sym_scoped_name,
+    STATE(966),
+    1,
+    sym_interface_name,
+    [41272] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68025,31 +68066,35 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(775),
     1,
     sym_comment,
-    ACTIONS(2780),
+    ACTIONS(2790),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [41254] = 5,
+    [41288] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2782),
+    ACTIONS(2643),
     1,
     anon_sym_COMMA,
-    ACTIONS(2785),
-    2,
-    anon_sym_SEMI,
-    anon_sym_default,
+    ACTIONS(2786),
+    1,
+    anon_sym_LBRACE,
+    ACTIONS(2788),
+    1,
+    anon_sym_supports,
+    STATE(730),
+    1,
+    aux_sym_value_inheritance_spec_repeat1,
     STATE(776),
-    2,
+    1,
     sym_comment,
-    aux_sym_declarators_repeat1,
-    [41272] = 4,
+    [41310] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68059,13 +68104,13 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(777),
     1,
     sym_comment,
-    ACTIONS(2787),
+    ACTIONS(2792),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [41288] = 4,
+    [41326] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68075,13 +68120,13 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(778),
     1,
     sym_comment,
-    ACTIONS(2789),
+    ACTIONS(2794),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [41304] = 4,
+    [41342] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68091,26 +68136,26 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(779),
     1,
     sym_comment,
-    ACTIONS(2791),
+    ACTIONS(2796),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [41320] = 7,
+    [41358] = 7,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(2149),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(2641),
+    ACTIONS(2668),
     1,
     anon_sym_manages,
-    ACTIONS(2793),
+    ACTIONS(2798),
     1,
     anon_sym_COMMA,
     STATE(780),
@@ -68119,7 +68164,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(958),
     1,
     aux_sym_raises_expr_repeat1,
-    [41342] = 4,
+    [41380] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68129,13 +68174,13 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(781),
     1,
     sym_comment,
-    ACTIONS(2281),
+    ACTIONS(2297),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [41358] = 4,
+    [41396] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68145,132 +68190,170 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(782),
     1,
     sym_comment,
-    ACTIONS(2795),
+    ACTIONS(2800),
     4,
     anon_sym_GT,
     anon_sym_COMMA,
     anon_sym_SEMI,
     sym_identifier,
-    [41374] = 5,
+    [41412] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2797),
+    STATE(783),
     1,
+    sym_comment,
+    ACTIONS(2802),
+    4,
+    anon_sym_GT,
     anon_sym_COMMA,
-    ACTIONS(2800),
+    anon_sym_SEMI,
+    sym_identifier,
+    [41428] = 5,
+    ACTIONS(5),
     1,
-    anon_sym_RPAREN,
-    STATE(783),
-    2,
-    sym_comment,
-    aux_sym_factory_param_dcls_repeat1,
-    [41391] = 4,
-    ACTIONS(3),
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2804),
     1,
-    anon_sym_SLASH_STAR,
+    anon_sym_COMMA,
+    ACTIONS(2807),
+    2,
+    anon_sym_SEMI,
+    anon_sym_default,
     STATE(784),
-    1,
+    2,
     sym_comment,
-    ACTIONS(1759),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [41406] = 5,
+    aux_sym_declarators_repeat1,
+    [41446] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2802),
+    ACTIONS(2809),
     1,
     anon_sym_COMMA,
-    ACTIONS(2805),
+    ACTIONS(2812),
     1,
-    anon_sym_SEMI,
+    anon_sym_RPAREN,
     STATE(785),
     2,
     sym_comment,
-    aux_sym_any_declarators_repeat1,
-    [41423] = 6,
+    aux_sym_factory_param_dcls_repeat1,
+    [41463] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2807),
+    ACTIONS(2814),
     1,
     anon_sym_COMMA,
-    ACTIONS(2809),
+    ACTIONS(2816),
     1,
     anon_sym_RPAREN,
     STATE(786),
     1,
     sym_comment,
+    STATE(827),
+    1,
+    aux_sym_annotation_appl_params_repeat1,
+    [41482] = 6,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2818),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(2820),
+    1,
+    anon_sym_RPAREN,
+    STATE(787),
+    1,
+    sym_comment,
     STATE(866),
     1,
     aux_sym_factory_param_dcls_repeat1,
-    [41442] = 6,
+    [41501] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2516),
     1,
     anon_sym_raises,
-    ACTIONS(2811),
+    ACTIONS(2822),
     1,
     anon_sym_SEMI,
-    STATE(787),
+    STATE(788),
     1,
     sym_comment,
     STATE(1470),
     1,
     sym_raises_expr,
-    [41461] = 5,
+    [41520] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(2149),
     1,
     anon_sym_COLON_COLON,
-    STATE(788),
+    STATE(789),
     1,
     sym_comment,
-    ACTIONS(2729),
+    ACTIONS(2737),
     2,
     anon_sym_COMMA,
     anon_sym_manages,
-    [41478] = 4,
+    [41537] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(789),
+    STATE(790),
     1,
     sym_comment,
-    ACTIONS(2785),
+    ACTIONS(2807),
     3,
     anon_sym_COMMA,
     anon_sym_SEMI,
     anon_sym_default,
-    [41493] = 6,
+    [41552] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2824),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(2827),
+    1,
+    anon_sym_SEMI,
+    STATE(791),
+    2,
+    sym_comment,
+    aux_sym_any_declarators_repeat1,
+    [41569] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68280,33 +68363,33 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(790),
+    STATE(792),
     1,
     sym_comment,
-    STATE(1043),
+    STATE(1053),
     1,
     sym_scoped_name,
-    [41512] = 5,
+    [41588] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(791),
+    STATE(793),
     1,
     sym_comment,
     STATE(1321),
     1,
     sym_topic_platform,
-    ACTIONS(1577),
+    ACTIONS(1655),
     2,
     anon_sym_STAR,
     aux_sym_service_platform_token2,
-    [41529] = 6,
+    [41605] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68316,16 +68399,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    STATE(792),
+    STATE(794),
     1,
     sym_comment,
     STATE(1331),
     1,
     sym_string_literal,
-    [41548] = 6,
+    [41624] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68335,16 +68418,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(793),
+    STATE(795),
     1,
     sym_comment,
-    STATE(1047),
+    STATE(1054),
     1,
     sym_scoped_name,
-    [41567] = 6,
+    [41643] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68354,84 +68437,54 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(794),
+    STATE(796),
     1,
     sym_comment,
-    STATE(1105),
+    STATE(1050),
     1,
     sym_scoped_name,
-    [41586] = 6,
+    [41662] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2813),
+    ACTIONS(2829),
     1,
     anon_sym_SEMI,
-    ACTIONS(2815),
+    ACTIONS(2831),
     1,
     anon_sym_context,
-    STATE(795),
+    STATE(797),
     1,
     sym_comment,
     STATE(1272),
     1,
     sym_context_expr,
-    [41605] = 6,
+    [41681] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2819),
-    1,
-    anon_sym_LBRACE,
-    STATE(796),
-    1,
-    sym_comment,
-    STATE(869),
-    1,
-    aux_sym_interface_inheritance_spec_repeat1,
-    [41624] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(797),
+    ACTIONS(2833),
     1,
-    sym_comment,
-    ACTIONS(1791),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [41639] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    STATE(639),
     1,
-    anon_sym_SLASH_STAR,
+    sym_simple_declarator,
     STATE(798),
     1,
     sym_comment,
-    ACTIONS(1799),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [41654] = 6,
+    STATE(1534),
+    1,
+    sym_readonly_attr_declarator,
+    [41700] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68441,7 +68494,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
     STATE(799),
@@ -68450,45 +68503,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1329),
     1,
     sym_string_literal,
-    [41673] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [41719] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2363),
-    1,
-    anon_sym_RBRACE,
-    ACTIONS(2821),
+    ACTIONS(5),
     1,
-    anon_sym_COMMA,
+    anon_sym_SLASH_STAR,
     STATE(800),
     1,
     sym_comment,
-    STATE(929),
-    1,
-    aux_sym_enum_dcl_repeat1,
-    [41692] = 6,
+    ACTIONS(1773),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [41734] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2823),
+    ACTIONS(2373),
     1,
-    anon_sym_RPAREN,
+    anon_sym_RBRACE,
+    ACTIONS(2835),
+    1,
+    anon_sym_COMMA,
     STATE(801),
     1,
     sym_comment,
-    STATE(828),
+    STATE(933),
     1,
-    sym_string_literal,
-    [41711] = 4,
+    aux_sym_enum_dcl_repeat1,
+    [41753] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -68498,46 +68547,46 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(802),
     1,
     sym_comment,
-    ACTIONS(1665),
+    ACTIONS(1791),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [41726] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [41768] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2837),
+    1,
+    anon_sym_RPAREN,
     STATE(803),
     1,
     sym_comment,
-    ACTIONS(1777),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [41741] = 6,
-    ACTIONS(5),
+    STATE(830),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    sym_string_literal,
+    [41787] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2825),
-    1,
-    anon_sym_SEMI,
-    ACTIONS(2827),
+    ACTIONS(5),
     1,
-    sym_identifier,
+    anon_sym_SLASH_STAR,
     STATE(804),
     1,
     sym_comment,
-    STATE(893),
-    1,
-    aux_sym_bitfield_repeat1,
-    [41760] = 5,
+    ACTIONS(1711),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [41802] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68550,11 +68599,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1307),
     1,
     sym_boolean_literal,
-    ACTIONS(2829),
+    ACTIONS(2839),
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    [41777] = 4,
+    [41819] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -68564,79 +68613,79 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(806),
     1,
     sym_comment,
-    ACTIONS(1785),
+    ACTIONS(1599),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [41792] = 6,
+    [41834] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2831),
+    ACTIONS(2841),
     1,
-    anon_sym_COMMA,
-    ACTIONS(2833),
+    anon_sym_SEMI,
+    ACTIONS(2843),
     1,
-    anon_sym_RPAREN,
+    sym_identifier,
     STATE(807),
     1,
     sym_comment,
-    STATE(861),
+    STATE(893),
     1,
-    aux_sym_init_param_dcls_repeat1,
-    [41811] = 6,
+    aux_sym_bitfield_repeat1,
+    [41853] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2516),
     1,
-    sym_identifier,
-    STATE(742),
+    anon_sym_raises,
+    ACTIONS(2845),
     1,
-    sym_scoped_name,
+    anon_sym_SEMI,
     STATE(808),
     1,
     sym_comment,
-    [41830] = 6,
+    STATE(1475),
+    1,
+    sym_raises_expr,
+    [41872] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2847),
     1,
-    anon_sym_raises,
-    ACTIONS(2835),
+    anon_sym_COMMA,
+    ACTIONS(2849),
     1,
-    anon_sym_SEMI,
+    anon_sym_RPAREN,
     STATE(809),
     1,
     sym_comment,
-    STATE(1476),
+    STATE(861),
     1,
-    sym_raises_expr,
-    [41849] = 6,
+    aux_sym_init_param_dcls_repeat1,
+    [41891] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2639),
+    ACTIONS(2666),
     1,
     anon_sym_COMMA,
-    ACTIONS(2837),
+    ACTIONS(2851),
     1,
     anon_sym_LBRACE,
     STATE(743),
@@ -68645,93 +68694,89 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(810),
     1,
     sym_comment,
-    [41868] = 6,
+    [41910] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2841),
+    ACTIONS(2855),
     1,
     anon_sym_RPAREN,
     STATE(811),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [41887] = 6,
+    [41929] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2843),
+    ACTIONS(2857),
     1,
     anon_sym_GT,
-    ACTIONS(2845),
+    ACTIONS(2859),
     1,
     anon_sym_COMMA,
     STATE(812),
     1,
     sym_comment,
-    STATE(966),
+    STATE(969),
     1,
     aux_sym_actual_parameters_repeat1,
-    [41906] = 6,
+    [41948] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2516),
     1,
-    sym_identifier,
+    anon_sym_raises,
+    ACTIONS(2861),
+    1,
+    anon_sym_SEMI,
     STATE(813),
     1,
     sym_comment,
-    STATE(1103),
-    1,
-    sym_scoped_name,
-    [41925] = 6,
-    ACTIONS(5),
+    STATE(1476),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    sym_raises_expr,
+    [41967] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2847),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2849),
+    ACTIONS(5),
     1,
-    anon_sym_RBRACE,
+    anon_sym_SLASH_STAR,
     STATE(814),
     1,
     sym_comment,
-    STATE(889),
-    1,
-    aux_sym_bitmask_dcl_repeat1,
-    [41944] = 6,
+    ACTIONS(1777),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [41982] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2851),
+    ACTIONS(2863),
     1,
     anon_sym_LBRACE,
-    ACTIONS(2853),
+    ACTIONS(2865),
     1,
     anon_sym_COLON,
     STATE(815),
@@ -68740,7 +68785,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1267),
     1,
     sym_connector_inherit_spec,
-    [41963] = 6,
+    [42001] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -68750,96 +68795,98 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2639),
     1,
     sym_identifier,
     STATE(816),
     1,
     sym_comment,
-    STATE(1109),
+    STATE(1044),
     1,
     sym_scoped_name,
-    [41982] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [42020] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2867),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(2869),
+    1,
+    anon_sym_RBRACE,
     STATE(817),
     1,
     sym_comment,
-    ACTIONS(1781),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [41997] = 5,
+    STATE(889),
+    1,
+    aux_sym_bitmask_dcl_repeat1,
+    [42039] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2457),
+    1,
+    sym_identifier,
     STATE(818),
     1,
     sym_comment,
-    STATE(1467),
+    STATE(1092),
     1,
-    sym_topic_platform,
-    ACTIONS(1577),
-    2,
-    anon_sym_STAR,
-    aux_sym_service_platform_token2,
-    [42014] = 6,
+    sym_scoped_name,
+    [42058] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2855),
+    ACTIONS(2871),
     1,
     anon_sym_GT,
-    ACTIONS(2857),
+    ACTIONS(2873),
     1,
     anon_sym_COMMA,
     STATE(819),
     1,
     sym_comment,
-    STATE(969),
+    STATE(971),
     1,
     aux_sym_formal_parameters_repeat1,
-    [42033] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [42077] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2859),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2861),
+    ACTIONS(5),
     1,
-    anon_sym_RPAREN,
+    anon_sym_SLASH_STAR,
     STATE(820),
     1,
     sym_comment,
-    STATE(853),
-    1,
-    aux_sym_parameter_dcls_repeat1,
-    [42052] = 6,
+    ACTIONS(1769),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [42092] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
-    ACTIONS(2863),
+    ACTIONS(2877),
     1,
     anon_sym_LBRACE,
     STATE(821),
@@ -68848,229 +68895,229 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(885),
     1,
     aux_sym_interface_inheritance_spec_repeat1,
-    [42071] = 6,
+    [42111] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2865),
-    1,
-    anon_sym_SEMI,
-    ACTIONS(2867),
+    ACTIONS(2879),
     1,
-    anon_sym_switch,
-    ACTIONS(2869),
+    anon_sym_COMMA,
+    ACTIONS(2881),
     1,
-    sym_identifier,
+    anon_sym_RPAREN,
     STATE(822),
     1,
     sym_comment,
-    [42090] = 6,
+    STATE(853),
+    1,
+    aux_sym_parameter_dcls_repeat1,
+    [42130] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
-    ACTIONS(2863),
+    ACTIONS(2877),
     1,
     anon_sym_LBRACE,
     STATE(823),
     1,
     sym_comment,
-    STATE(869),
+    STATE(875),
     1,
     aux_sym_interface_inheritance_spec_repeat1,
-    [42109] = 6,
+    [42149] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2871),
-    1,
-    anon_sym_interface,
-    ACTIONS(2873),
-    1,
-    anon_sym_valuetype,
-    ACTIONS(2875),
-    1,
-    anon_sym_eventtype,
     STATE(824),
     1,
     sym_comment,
-    [42128] = 5,
-    ACTIONS(3),
+    STATE(1467),
+    1,
+    sym_topic_platform,
+    ACTIONS(1655),
+    2,
+    anon_sym_STAR,
+    aux_sym_service_platform_token2,
+    [42166] = 6,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2883),
     1,
-    anon_sym_SLASH_STAR,
-    STATE(749),
+    anon_sym_SEMI,
+    ACTIONS(2885),
     1,
-    aux_sym_char_literal_repeat1,
+    anon_sym_switch,
+    ACTIONS(2887),
+    1,
+    sym_identifier,
     STATE(825),
     1,
     sym_comment,
-    ACTIONS(2649),
-    2,
-    sym_escape_sequence,
-    aux_sym_char_literal_token1,
-    [42145] = 6,
+    [42185] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2877),
+    ACTIONS(2889),
     1,
-    sym_identifier,
+    anon_sym_interface,
+    ACTIONS(2891),
+    1,
+    anon_sym_valuetype,
+    ACTIONS(2893),
+    1,
+    anon_sym_eventtype,
     STATE(826),
     1,
     sym_comment,
-    STATE(1134),
-    1,
-    sym_scoped_name,
-    [42164] = 6,
+    [42204] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2879),
+    ACTIONS(2814),
     1,
     anon_sym_COMMA,
-    ACTIONS(2881),
+    ACTIONS(2895),
     1,
     anon_sym_RPAREN,
     STATE(827),
     1,
     sym_comment,
-    STATE(971),
+    STATE(973),
     1,
     aux_sym_annotation_appl_params_repeat1,
-    [42183] = 6,
+    [42223] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2883),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2885),
+    ACTIONS(2897),
     1,
-    anon_sym_RPAREN,
+    sym_identifier,
     STATE(828),
     1,
     sym_comment,
-    STATE(848),
+    STATE(1135),
     1,
-    aux_sym_context_expr_repeat1,
-    [42202] = 6,
+    sym_scoped_name,
+    [42242] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2355),
+    ACTIONS(2639),
     1,
-    anon_sym_COMMA,
-    ACTIONS(2887),
+    sym_identifier,
+    STATE(746),
     1,
-    anon_sym_SEMI,
+    sym_scoped_name,
     STATE(829),
     1,
     sym_comment,
-    STATE(841),
-    1,
-    aux_sym_readonly_attr_declarator_repeat1,
-    [42221] = 6,
+    [42261] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2361),
+    ACTIONS(2899),
     1,
-    anon_sym_setraises,
-    ACTIONS(2889),
+    anon_sym_COMMA,
+    ACTIONS(2901),
     1,
-    anon_sym_SEMI,
+    anon_sym_RPAREN,
     STATE(830),
     1,
     sym_comment,
-    STATE(1480),
+    STATE(848),
     1,
-    sym_set_excep_expr,
-    [42240] = 5,
-    ACTIONS(5),
+    aux_sym_context_expr_repeat1,
+    [42280] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    STATE(750),
     1,
-    anon_sym_SLASH_SLASH,
+    aux_sym_char_literal_repeat1,
     STATE(831),
     1,
     sym_comment,
-    STATE(1455),
-    1,
-    sym_boolean_literal,
-    ACTIONS(2829),
+    ACTIONS(2657),
     2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    [42257] = 5,
+    sym_escape_sequence,
+    aux_sym_char_literal_token1,
+    [42297] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(2893),
+    ACTIONS(2905),
     1,
     aux_sym_string_literal_token1,
     STATE(832),
     1,
     sym_comment,
-    ACTIONS(2891),
+    ACTIONS(2903),
     2,
     sym_escape_sequence,
     anon_sym_DQUOTE,
-    [42274] = 6,
+    [42314] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2895),
+    ACTIONS(2363),
     1,
-    anon_sym_SEMI,
-    ACTIONS(2897),
+    anon_sym_COMMA,
+    ACTIONS(2907),
     1,
-    anon_sym_default,
+    anon_sym_SEMI,
     STATE(833),
     1,
     sym_comment,
-    STATE(1506),
+    STATE(841),
     1,
-    sym_default,
-    [42293] = 6,
+    aux_sym_readonly_attr_declarator_repeat1,
+    [42333] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -69080,7 +69127,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
     STATE(834),
@@ -69089,17 +69136,17 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1152),
     1,
     sym_scoped_name,
-    [42312] = 6,
+    [42352] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2355),
+    ACTIONS(2363),
     1,
     anon_sym_COMMA,
-    ACTIONS(2899),
+    ACTIONS(2909),
     1,
     anon_sym_SEMI,
     STATE(835),
@@ -69108,26 +69155,24 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(841),
     1,
     aux_sym_readonly_attr_declarator_repeat1,
-    [42331] = 6,
+    [42371] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
-    1,
-    sym_identifier,
-    STATE(792),
-    1,
-    sym_scoped_name,
     STATE(836),
     1,
     sym_comment,
-    [42350] = 6,
+    STATE(1455),
+    1,
+    sym_boolean_literal,
+    ACTIONS(2839),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    [42388] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -69137,95 +69182,107 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(740),
+    STATE(745),
     1,
     sym_scoped_name,
     STATE(837),
     1,
     sym_comment,
-    [42369] = 5,
+    [42407] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2901),
+    ACTIONS(2911),
     1,
     anon_sym_SEMI,
-    ACTIONS(2903),
+    ACTIONS(2913),
     1,
-    sym_identifier,
+    anon_sym_default,
     STATE(838),
-    2,
+    1,
     sym_comment,
-    aux_sym_bitfield_repeat1,
-    [42386] = 4,
-    ACTIONS(3),
+    STATE(1507),
     1,
-    anon_sym_SLASH_SLASH,
+    sym_default,
+    [42426] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2369),
+    1,
+    anon_sym_setraises,
+    ACTIONS(2915),
+    1,
+    anon_sym_SEMI,
     STATE(839),
     1,
     sym_comment,
-    ACTIONS(1587),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [42401] = 4,
-    ACTIONS(3),
+    STATE(1480),
     1,
-    anon_sym_SLASH_SLASH,
+    sym_set_excep_expr,
+    [42445] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2457),
+    1,
+    sym_identifier,
+    STATE(794),
+    1,
+    sym_scoped_name,
     STATE(840),
     1,
     sym_comment,
-    ACTIONS(1591),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [42416] = 5,
+    [42464] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2906),
+    ACTIONS(2917),
     1,
     anon_sym_COMMA,
-    ACTIONS(2909),
+    ACTIONS(2920),
     1,
     anon_sym_SEMI,
     STATE(841),
     2,
     sym_comment,
     aux_sym_readonly_attr_declarator_repeat1,
-    [42433] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [42481] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(842),
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2922),
+    1,
+    anon_sym_SEMI,
+    ACTIONS(2924),
     1,
-    sym_comment,
-    ACTIONS(1595),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42448] = 5,
+    STATE(842),
+    2,
+    sym_comment,
+    aux_sym_bitfield_repeat1,
+    [42498] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -69238,11 +69295,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1502),
     1,
     sym_topic_platform,
-    ACTIONS(1577),
+    ACTIONS(1655),
     2,
     anon_sym_STAR,
     aux_sym_service_platform_token2,
-    [42465] = 4,
+    [42515] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69252,22 +69309,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(844),
     1,
     sym_comment,
-    ACTIONS(1603),
+    ACTIONS(1587),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42480] = 6,
+    [42530] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2911),
+    ACTIONS(2927),
     1,
     anon_sym_COMMA,
-    ACTIONS(2913),
+    ACTIONS(2929),
     1,
     anon_sym_RPAREN,
     STATE(845),
@@ -69276,7 +69333,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(900),
     1,
     aux_sym_in_parameter_dcls_repeat1,
-    [42499] = 4,
+    [42549] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69286,12 +69343,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(846),
     1,
     sym_comment,
-    ACTIONS(1599),
+    ACTIONS(1707),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42514] = 4,
+    [42564] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69301,22 +69358,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(847),
     1,
     sym_comment,
-    ACTIONS(1607),
+    ACTIONS(1679),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42529] = 6,
+    [42579] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2883),
+    ACTIONS(2899),
     1,
     anon_sym_COMMA,
-    ACTIONS(2915),
+    ACTIONS(2931),
     1,
     anon_sym_RPAREN,
     STATE(848),
@@ -69325,7 +69382,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(903),
     1,
     aux_sym_context_expr_repeat1,
-    [42548] = 4,
+    [42598] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69335,12 +69392,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(849),
     1,
     sym_comment,
-    ACTIONS(1619),
+    ACTIONS(1683),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42563] = 4,
+    [42613] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69350,12 +69407,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(850),
     1,
     sym_comment,
-    ACTIONS(1625),
+    ACTIONS(1699),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42578] = 4,
+    [42628] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -69365,12 +69422,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(851),
     1,
     sym_comment,
-    ACTIONS(2917),
+    ACTIONS(2933),
     3,
     anon_sym_COMMA,
     anon_sym_SEMI,
     anon_sym_default,
-    [42593] = 4,
+    [42643] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69380,22 +69437,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(852),
     1,
     sym_comment,
-    ACTIONS(1629),
+    ACTIONS(1785),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42608] = 6,
+    [42658] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2859),
+    ACTIONS(2879),
     1,
     anon_sym_COMMA,
-    ACTIONS(2919),
+    ACTIONS(2935),
     1,
     anon_sym_RPAREN,
     STATE(853),
@@ -69404,7 +69461,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(906),
     1,
     aux_sym_parameter_dcls_repeat1,
-    [42627] = 4,
+    [42677] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69414,67 +69471,59 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(854),
     1,
     sym_comment,
-    ACTIONS(1633),
+    ACTIONS(1807),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42642] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(618),
+    [42692] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
-    1,
-    sym_identifier,
-    STATE(746),
+    ACTIONS(5),
     1,
-    sym_scoped_name,
+    anon_sym_SLASH_STAR,
     STATE(855),
     1,
     sym_comment,
-    [42661] = 5,
+    ACTIONS(1759),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [42707] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    STATE(449),
+    1,
+    sym_dec_number,
     STATE(856),
     1,
     sym_comment,
-    STATE(1059),
-    1,
-    sym_dec_number,
     ACTIONS(608),
     2,
     anon_sym_0,
     aux_sym_dec_number_token1,
-    [42678] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [42724] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1491),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(2921),
-    1,
-    anon_sym_LT,
-    ACTIONS(2923),
+    ACTIONS(5),
     1,
-    anon_sym_LBRACE,
+    anon_sym_SLASH_STAR,
     STATE(857),
     1,
     sym_comment,
-    [42697] = 4,
+    ACTIONS(1661),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [42739] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69484,22 +69533,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(858),
     1,
     sym_comment,
-    ACTIONS(1637),
+    ACTIONS(1795),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42712] = 6,
+    [42754] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2516),
     1,
     anon_sym_raises,
-    ACTIONS(2925),
+    ACTIONS(2937),
     1,
     anon_sym_SEMI,
     STATE(859),
@@ -69508,7 +69557,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1410),
     1,
     sym_raises_expr,
-    [42731] = 4,
+    [42773] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69518,22 +69567,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(860),
     1,
     sym_comment,
-    ACTIONS(1641),
+    ACTIONS(1781),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42746] = 6,
+    [42788] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2831),
+    ACTIONS(2847),
     1,
     anon_sym_COMMA,
-    ACTIONS(2927),
+    ACTIONS(2939),
     1,
     anon_sym_RPAREN,
     STATE(861),
@@ -69542,26 +69591,26 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(913),
     1,
     aux_sym_init_param_dcls_repeat1,
-    [42765] = 6,
+    [42807] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2929),
+    ACTIONS(2941),
     1,
     anon_sym_RPAREN,
     STATE(862),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [42784] = 4,
+    [42826] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69571,22 +69620,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(863),
     1,
     sym_comment,
-    ACTIONS(1645),
+    ACTIONS(1691),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42799] = 6,
+    [42841] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2516),
     1,
     anon_sym_raises,
-    ACTIONS(2931),
+    ACTIONS(2943),
     1,
     anon_sym_SEMI,
     STATE(864),
@@ -69595,7 +69644,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1409),
     1,
     sym_raises_expr,
-    [42818] = 4,
+    [42860] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69605,41 +69654,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(865),
     1,
     sym_comment,
-    ACTIONS(1649),
+    ACTIONS(1665),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42833] = 6,
+    [42875] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2807),
+    ACTIONS(2818),
     1,
     anon_sym_COMMA,
-    ACTIONS(2933),
+    ACTIONS(2945),
     1,
     anon_sym_RPAREN,
-    STATE(783),
+    STATE(785),
     1,
     aux_sym_factory_param_dcls_repeat1,
     STATE(866),
     1,
     sym_comment,
-    [42852] = 6,
+    [42894] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2935),
+    ACTIONS(2947),
     1,
     anon_sym_RPAREN,
     STATE(862),
@@ -69648,17 +69697,17 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(867),
     1,
     sym_comment,
-    [42871] = 6,
+    [42913] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
+    ACTIONS(2516),
     1,
     anon_sym_raises,
-    ACTIONS(2937),
+    ACTIONS(2949),
     1,
     anon_sym_SEMI,
     STATE(868),
@@ -69667,75 +69716,77 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1383),
     1,
     sym_raises_expr,
-    [42890] = 5,
+    [42932] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2939),
+    ACTIONS(1509),
     1,
-    anon_sym_COMMA,
-    ACTIONS(2942),
+    anon_sym_COLON_COLON,
+    ACTIONS(2951),
+    1,
+    anon_sym_LT,
+    ACTIONS(2953),
     1,
     anon_sym_LBRACE,
     STATE(869),
-    2,
+    1,
     sym_comment,
-    aux_sym_interface_inheritance_spec_repeat1,
-    [42907] = 4,
+    [42951] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(870),
     1,
     sym_comment,
-    ACTIONS(2944),
+    ACTIONS(2955),
     3,
     sym_escape_sequence,
     anon_sym_SQUOTE,
     aux_sym_char_literal_token1,
-    [42922] = 5,
+    [42966] = 5,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    STATE(701),
+    STATE(702),
     1,
     aux_sym_char_literal_repeat1,
     STATE(871),
     1,
     sym_comment,
-    ACTIONS(2649),
+    ACTIONS(2657),
     2,
     sym_escape_sequence,
     aux_sym_char_literal_token1,
-    [42939] = 6,
+    [42983] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2946),
+    ACTIONS(2957),
     1,
     anon_sym_RPAREN,
     STATE(872),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [42958] = 4,
+    [43002] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69745,22 +69796,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(873),
     1,
     sym_comment,
-    ACTIONS(1653),
+    ACTIONS(1583),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [42973] = 6,
+    [43017] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2948),
+    ACTIONS(2959),
     1,
     anon_sym_RPAREN,
     STATE(872),
@@ -69769,81 +69820,83 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(874),
     1,
     sym_comment,
-    [42992] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    STATE(875),
-    1,
-    sym_comment,
-    ACTIONS(1657),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43007] = 5,
+    [43036] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(876),
+    ACTIONS(2961),
     1,
-    sym_comment,
-    STATE(1238),
+    anon_sym_COMMA,
+    ACTIONS(2964),
     1,
-    sym_boolean_literal,
-    ACTIONS(2829),
+    anon_sym_LBRACE,
+    STATE(875),
     2,
-    anon_sym_TRUE,
-    anon_sym_FALSE,
-    [43024] = 5,
+    sym_comment,
+    aux_sym_interface_inheritance_spec_repeat1,
+    [43053] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(877),
+    STATE(876),
     1,
     sym_comment,
-    STATE(1360),
+    STATE(1238),
     1,
     sym_boolean_literal,
-    ACTIONS(2829),
+    ACTIONS(2839),
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    [43041] = 4,
+    [43070] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(878),
+    STATE(877),
     1,
     sym_comment,
-    ACTIONS(1661),
+    ACTIONS(1591),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43056] = 6,
+    [43085] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2391),
+    STATE(878),
+    1,
+    sym_comment,
+    STATE(1360),
+    1,
+    sym_boolean_literal,
+    ACTIONS(2839),
+    2,
+    anon_sym_TRUE,
+    anon_sym_FALSE,
+    [43102] = 6,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2383),
     1,
     anon_sym_supports,
-    ACTIONS(2950),
+    ACTIONS(2966),
     1,
     anon_sym_LBRACE,
     STATE(879),
@@ -69852,7 +69905,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1254),
     1,
     sym_value_supports,
-    [43075] = 4,
+    [43121] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69862,27 +69915,31 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(880),
     1,
     sym_comment,
-    ACTIONS(1669),
+    ACTIONS(1595),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43090] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [43136] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2457),
+    1,
+    sym_identifier,
+    STATE(742),
+    1,
+    sym_scoped_name,
     STATE(881),
     1,
     sym_comment,
-    ACTIONS(1673),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43105] = 4,
+    [43155] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69892,31 +69949,31 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(882),
     1,
     sym_comment,
-    ACTIONS(1677),
+    ACTIONS(1607),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43120] = 6,
+    [43170] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2952),
+    ACTIONS(2968),
     1,
     anon_sym_RPAREN,
     STATE(883),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [43139] = 4,
+    [43189] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69926,41 +69983,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(884),
     1,
     sym_comment,
-    ACTIONS(1681),
+    ACTIONS(1611),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43154] = 6,
+    [43204] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
-    ACTIONS(2954),
+    ACTIONS(2970),
     1,
     anon_sym_LBRACE,
-    STATE(869),
+    STATE(875),
     1,
     aux_sym_interface_inheritance_spec_repeat1,
     STATE(885),
     1,
     sym_comment,
-    [43173] = 6,
+    [43223] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
-    ACTIONS(2954),
+    ACTIONS(2970),
     1,
     anon_sym_LBRACE,
     STATE(886),
@@ -69969,7 +70026,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(924),
     1,
     aux_sym_interface_inheritance_spec_repeat1,
-    [43192] = 4,
+    [43242] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -69979,22 +70036,22 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(887),
     1,
     sym_comment,
-    ACTIONS(1687),
+    ACTIONS(1615),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43207] = 6,
+    [43257] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2956),
+    ACTIONS(2972),
     1,
     anon_sym_RPAREN,
     STATE(883),
@@ -70003,26 +70060,26 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(888),
     1,
     sym_comment,
-    [43226] = 6,
+    [43276] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2347),
+    ACTIONS(2375),
     1,
     anon_sym_RBRACE,
-    ACTIONS(2958),
+    ACTIONS(2974),
     1,
     anon_sym_COMMA,
     STATE(889),
     1,
     sym_comment,
-    STATE(920),
+    STATE(929),
     1,
     aux_sym_bitmask_dcl_repeat1,
-    [43245] = 4,
+    [43295] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -70032,12 +70089,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(890),
     1,
     sym_comment,
-    ACTIONS(2960),
+    ACTIONS(2976),
     3,
     anon_sym_RBRACE,
     anon_sym_default,
     anon_sym_case,
-    [43260] = 4,
+    [43310] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70047,69 +70104,65 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(891),
     1,
     sym_comment,
-    ACTIONS(1691),
+    ACTIONS(1619),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43275] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [43325] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
-    1,
-    anon_sym_PIPE,
-    ACTIONS(2962),
+    ACTIONS(5),
     1,
-    anon_sym_RPAREN,
+    anon_sym_SLASH_STAR,
     STATE(892),
     1,
     sym_comment,
-    STATE(931),
-    1,
-    aux_sym_annotation_appl_data_representation_repeat1,
-    [43294] = 6,
+    ACTIONS(1627),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [43340] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2827),
+    ACTIONS(2843),
     1,
     sym_identifier,
-    ACTIONS(2964),
+    ACTIONS(2978),
     1,
     anon_sym_SEMI,
-    STATE(838),
+    STATE(842),
     1,
     aux_sym_bitfield_repeat1,
     STATE(893),
     1,
     sym_comment,
-    [43313] = 6,
+    [43359] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2966),
+    ACTIONS(2980),
     1,
     anon_sym_RPAREN,
     STATE(894),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [43332] = 6,
+    [43378] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -70119,31 +70172,35 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(733),
+    STATE(735),
     1,
     sym_scoped_name,
     STATE(895),
     1,
     sym_comment,
-    [43351] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [43397] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2853),
+    1,
+    anon_sym_PIPE,
+    ACTIONS(2982),
+    1,
+    anon_sym_RPAREN,
     STATE(896),
     1,
     sym_comment,
-    ACTIONS(1695),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43366] = 4,
+    STATE(979),
+    1,
+    aux_sym_annotation_appl_data_representation_repeat1,
+    [43416] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70153,12 +70210,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(897),
     1,
     sym_comment,
-    ACTIONS(1699),
+    ACTIONS(1631),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43381] = 4,
+    [43431] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70168,37 +70225,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(898),
     1,
     sym_comment,
-    ACTIONS(1703),
+    ACTIONS(1637),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43396] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [43446] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2853),
+    1,
+    anon_sym_PIPE,
+    ACTIONS(2984),
+    1,
+    anon_sym_RPAREN,
+    STATE(896),
+    1,
+    aux_sym_annotation_appl_data_representation_repeat1,
     STATE(899),
     1,
     sym_comment,
-    ACTIONS(1575),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43411] = 6,
+    [43465] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2911),
+    ACTIONS(2927),
     1,
     anon_sym_COMMA,
-    ACTIONS(2968),
+    ACTIONS(2986),
     1,
     anon_sym_RPAREN,
     STATE(900),
@@ -70207,7 +70268,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(939),
     1,
     aux_sym_in_parameter_dcls_repeat1,
-    [43430] = 4,
+    [43484] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70217,12 +70278,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(901),
     1,
     sym_comment,
-    ACTIONS(1707),
+    ACTIONS(1641),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43445] = 4,
+    [43499] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70232,29 +70293,29 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(902),
     1,
     sym_comment,
-    ACTIONS(1715),
+    ACTIONS(1645),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43460] = 5,
+    [43514] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2970),
+    ACTIONS(2988),
     1,
     anon_sym_COMMA,
-    ACTIONS(2973),
+    ACTIONS(2991),
     1,
     anon_sym_RPAREN,
     STATE(903),
     2,
     sym_comment,
     aux_sym_context_expr_repeat1,
-    [43477] = 4,
+    [43531] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70264,12 +70325,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(904),
     1,
     sym_comment,
-    ACTIONS(1719),
+    ACTIONS(1649),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43492] = 4,
+    [43546] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70279,107 +70340,103 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(905),
     1,
     sym_comment,
-    ACTIONS(1723),
+    ACTIONS(1653),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43507] = 5,
+    [43561] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2975),
+    ACTIONS(2993),
     1,
     anon_sym_COMMA,
-    ACTIONS(2978),
+    ACTIONS(2996),
     1,
     anon_sym_RPAREN,
     STATE(906),
     2,
     sym_comment,
     aux_sym_parameter_dcls_repeat1,
-    [43524] = 6,
+    [43578] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(907),
+    1,
+    sym_comment,
+    ACTIONS(1575),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [43593] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2879),
+    ACTIONS(2853),
     1,
-    anon_sym_COMMA,
-    ACTIONS(2980),
+    anon_sym_PIPE,
+    ACTIONS(2998),
     1,
     anon_sym_RPAREN,
-    STATE(827),
+    STATE(811),
     1,
-    aux_sym_annotation_appl_params_repeat1,
-    STATE(907),
+    aux_sym_annotation_appl_data_representation_repeat1,
+    STATE(908),
     1,
     sym_comment,
-    [43543] = 4,
+    [43612] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(908),
+    STATE(909),
     1,
     sym_comment,
-    ACTIONS(1727),
+    ACTIONS(1669),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43558] = 4,
+    [43627] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(909),
+    STATE(910),
     1,
     sym_comment,
-    ACTIONS(1731),
+    ACTIONS(1673),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43573] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2857),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2982),
-    1,
-    anon_sym_GT,
-    STATE(819),
-    1,
-    aux_sym_formal_parameters_repeat1,
-    STATE(910),
-    1,
-    sym_comment,
-    [43592] = 6,
+    [43642] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2984),
+    ACTIONS(3000),
     1,
     anon_sym_RPAREN,
     STATE(894),
@@ -70388,7 +70445,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(911),
     1,
     sym_comment,
-    [43611] = 4,
+    [43661] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70398,44 +70455,48 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(912),
     1,
     sym_comment,
-    ACTIONS(1735),
+    ACTIONS(1687),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43626] = 5,
+    [43676] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2986),
+    ACTIONS(3002),
     1,
     anon_sym_COMMA,
-    ACTIONS(2989),
+    ACTIONS(3005),
     1,
     anon_sym_RPAREN,
     STATE(913),
     2,
     sym_comment,
     aux_sym_init_param_dcls_repeat1,
-    [43643] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [43693] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2524),
+    1,
+    anon_sym_supports,
+    ACTIONS(3007),
+    1,
+    anon_sym_manages,
     STATE(914),
     1,
     sym_comment,
-    ACTIONS(1739),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43658] = 6,
+    STATE(1189),
+    1,
+    sym_supported_interface_spec,
+    [43712] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -70445,7 +70506,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
     STATE(915),
@@ -70454,7 +70515,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1077),
     1,
     sym_scoped_name,
-    [43677] = 4,
+    [43731] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70464,12 +70525,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(916),
     1,
     sym_comment,
-    ACTIONS(1743),
+    ACTIONS(1695),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43692] = 6,
+    [43746] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -70479,98 +70540,94 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
     STATE(917),
     1,
     sym_comment,
-    STATE(1044),
+    STATE(1051),
     1,
     sym_scoped_name,
-    [43711] = 5,
+    [43765] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(918),
     1,
     sym_comment,
-    STATE(1372),
-    1,
-    sym_topic_platform,
-    ACTIONS(1577),
-    2,
-    anon_sym_STAR,
-    aux_sym_service_platform_token2,
-    [43728] = 6,
+    ACTIONS(1703),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [43780] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2845),
+    ACTIONS(2873),
     1,
     anon_sym_COMMA,
-    ACTIONS(2991),
+    ACTIONS(3009),
     1,
     anon_sym_GT,
-    STATE(812),
+    STATE(819),
     1,
-    aux_sym_actual_parameters_repeat1,
+    aux_sym_formal_parameters_repeat1,
     STATE(919),
     1,
     sym_comment,
-    [43747] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [43799] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2993),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(2996),
+    ACTIONS(5),
     1,
-    anon_sym_RBRACE,
+    anon_sym_SLASH_STAR,
     STATE(920),
-    2,
+    1,
     sym_comment,
-    aux_sym_bitmask_dcl_repeat1,
-    [43764] = 6,
+    ACTIONS(1579),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [43814] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(2998),
+    ACTIONS(3011),
     1,
     anon_sym_RPAREN,
     STATE(921),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [43783] = 6,
+    [43833] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3000),
+    ACTIONS(3013),
     1,
     anon_sym_RPAREN,
     STATE(921),
@@ -70579,62 +70636,60 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(922),
     1,
     sym_comment,
-    [43802] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [43852] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(5),
     1,
-    anon_sym_COLON_COLON,
+    anon_sym_SLASH_STAR,
     STATE(923),
     1,
     sym_comment,
-    ACTIONS(3002),
-    2,
-    anon_sym_COMMA,
-    anon_sym_LBRACE,
-    [43819] = 6,
+    ACTIONS(1715),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [43867] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
-    ACTIONS(3004),
+    ACTIONS(3015),
     1,
     anon_sym_LBRACE,
-    STATE(869),
+    STATE(875),
     1,
     aux_sym_interface_inheritance_spec_repeat1,
     STATE(924),
     1,
     sym_comment,
-    [43838] = 6,
+    [43886] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3006),
+    ACTIONS(3017),
     1,
     anon_sym_RPAREN,
     STATE(925),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [43857] = 4,
+    [43905] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70644,37 +70699,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(926),
     1,
     sym_comment,
-    ACTIONS(1747),
+    ACTIONS(1719),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [43872] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [43920] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2859),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(3019),
+    1,
+    anon_sym_GT,
+    STATE(812),
+    1,
+    aux_sym_actual_parameters_repeat1,
     STATE(927),
     1,
     sym_comment,
-    ACTIONS(1751),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43887] = 6,
+    [43939] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2897),
+    ACTIONS(2913),
     1,
     anon_sym_default,
-    ACTIONS(3008),
+    ACTIONS(3021),
     1,
     anon_sym_SEMI,
     STATE(928),
@@ -70683,34 +70742,34 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1603),
     1,
     sym_default,
-    [43906] = 5,
+    [43958] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3010),
+    ACTIONS(3023),
     1,
     anon_sym_COMMA,
-    ACTIONS(3013),
+    ACTIONS(3026),
     1,
     anon_sym_RBRACE,
     STATE(929),
     2,
     sym_comment,
-    aux_sym_enum_dcl_repeat1,
-    [43923] = 6,
+    aux_sym_bitmask_dcl_repeat1,
+    [43975] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3015),
+    ACTIONS(3028),
     1,
     anon_sym_RPAREN,
     STATE(925),
@@ -70719,36 +70778,34 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(930),
     1,
     sym_comment,
-    [43942] = 6,
+    [43994] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
-    1,
-    anon_sym_PIPE,
-    ACTIONS(3017),
-    1,
-    anon_sym_RPAREN,
     STATE(931),
     1,
     sym_comment,
-    STATE(976),
+    STATE(1372),
     1,
-    aux_sym_annotation_appl_data_representation_repeat1,
-    [43961] = 6,
+    sym_topic_platform,
+    ACTIONS(1655),
+    2,
+    anon_sym_STAR,
+    aux_sym_service_platform_token2,
+    [44011] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2815),
+    ACTIONS(2831),
     1,
     anon_sym_context,
-    ACTIONS(3019),
+    ACTIONS(3030),
     1,
     anon_sym_SEMI,
     STATE(932),
@@ -70757,70 +70814,70 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1272),
     1,
     sym_context_expr,
-    [43980] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [44030] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(933),
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(3032),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(3035),
     1,
+    anon_sym_RBRACE,
+    STATE(933),
+    2,
     sym_comment,
-    ACTIONS(1755),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [43995] = 6,
+    aux_sym_enum_dcl_repeat1,
+    [44047] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3021),
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
-    ACTIONS(3023),
+    ACTIONS(3037),
     1,
-    anon_sym_RBRACE,
-    STATE(800),
+    anon_sym_LBRACE,
+    STATE(875),
     1,
-    aux_sym_enum_dcl_repeat1,
+    aux_sym_interface_inheritance_spec_repeat1,
     STATE(934),
     1,
     sym_comment,
-    [44014] = 6,
+    [44066] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2512),
-    1,
-    anon_sym_raises,
-    ACTIONS(3025),
+    ACTIONS(2510),
     1,
-    anon_sym_SEMI,
+    anon_sym_COLON_COLON,
     STATE(935),
     1,
     sym_comment,
-    STATE(1475),
-    1,
-    sym_raises_expr,
-    [44033] = 6,
+    ACTIONS(3039),
+    2,
+    anon_sym_COMMA,
+    anon_sym_LBRACE,
+    [44083] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2639),
+    ACTIONS(2666),
     1,
     anon_sym_COMMA,
-    ACTIONS(3027),
+    ACTIONS(3041),
     1,
     anon_sym_RPAREN,
     STATE(743),
@@ -70829,7 +70886,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(936),
     1,
     sym_comment,
-    [44052] = 4,
+    [44102] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70839,12 +70896,12 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(937),
     1,
     sym_comment,
-    ACTIONS(1763),
+    ACTIONS(1723),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [44067] = 4,
+    [44117] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70854,29 +70911,29 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(938),
     1,
     sym_comment,
-    ACTIONS(1773),
+    ACTIONS(1727),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [44082] = 5,
+    [44132] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3029),
+    ACTIONS(3043),
     1,
     anon_sym_COMMA,
-    ACTIONS(3032),
+    ACTIONS(3046),
     1,
     anon_sym_RPAREN,
     STATE(939),
     2,
     sym_comment,
     aux_sym_in_parameter_dcls_repeat1,
-    [44099] = 4,
+    [44149] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -70886,41 +70943,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(940),
     1,
     sym_comment,
-    ACTIONS(1795),
+    ACTIONS(1731),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [44114] = 6,
+    [44164] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3034),
+    ACTIONS(3048),
     1,
     anon_sym_COMMA,
-    ACTIONS(3036),
+    ACTIONS(3050),
     1,
     anon_sym_SEMI,
     STATE(941),
     1,
     sym_comment,
-    STATE(947),
+    STATE(962),
     1,
     aux_sym_any_declarators_repeat1,
-    [44133] = 6,
+    [44183] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3038),
+    ACTIONS(3052),
     1,
     anon_sym_GT,
-    ACTIONS(3040),
+    ACTIONS(3054),
     1,
     anon_sym_COMMA,
     STATE(942),
@@ -70929,41 +70986,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(952),
     1,
     aux_sym_formal_parameter_names_repeat1,
-    [44152] = 4,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
+    [44202] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(943),
+    ACTIONS(618),
     1,
-    sym_comment,
-    ACTIONS(1803),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [44167] = 6,
-    ACTIONS(5),
+    anon_sym_SLASH_SLASH,
+    ACTIONS(3056),
     1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(97),
+    anon_sym_COMMA,
+    ACTIONS(3058),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(618),
+    anon_sym_RBRACE,
+    STATE(801),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    aux_sym_enum_dcl_repeat1,
+    STATE(943),
     1,
-    sym_identifier,
-    STATE(799),
+    sym_comment,
+    [44221] = 4,
+    ACTIONS(3),
     1,
-    sym_scoped_name,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
     STATE(944),
     1,
     sym_comment,
-    [44186] = 6,
+    ACTIONS(1735),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44236] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -70973,16 +71030,16 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2639),
     1,
     sym_identifier,
     STATE(945),
     1,
     sym_comment,
-    STATE(948),
+    STATE(970),
     1,
     sym_scoped_name,
-    [44205] = 4,
+    [44255] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -70992,58 +71049,52 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(946),
     1,
     sym_comment,
-    ACTIONS(3042),
+    ACTIONS(3060),
     3,
     anon_sym_RBRACE,
     anon_sym_default,
     anon_sym_case,
-    [44220] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [44270] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3034),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(3044),
-    1,
-    anon_sym_SEMI,
-    STATE(785),
+    ACTIONS(5),
     1,
-    aux_sym_any_declarators_repeat1,
+    anon_sym_SLASH_STAR,
     STATE(947),
     1,
     sym_comment,
-    [44239] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(1739),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44285] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(5),
     1,
-    anon_sym_COLON_COLON,
+    anon_sym_SLASH_STAR,
     STATE(948),
     1,
     sym_comment,
-    ACTIONS(3046),
-    2,
-    anon_sym_LBRACE,
-    anon_sym_supports,
-    [44256] = 6,
+    ACTIONS(1743),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44300] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2639),
+    ACTIONS(2666),
     1,
     anon_sym_COMMA,
-    ACTIONS(3048),
+    ACTIONS(3062),
     1,
     anon_sym_RPAREN,
     STATE(743),
@@ -71052,53 +71103,51 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(949),
     1,
     sym_comment,
-    [44275] = 5,
+    [44319] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
     STATE(950),
     1,
     sym_comment,
-    STATE(1157),
-    1,
-    sym_dec_number,
-    ACTIONS(608),
-    2,
-    anon_sym_0,
-    aux_sym_dec_number_token1,
-    [44292] = 6,
+    ACTIONS(1747),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44334] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3050),
+    ACTIONS(3064),
     1,
     anon_sym_RPAREN,
     STATE(951),
     1,
     sym_comment,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
-    [44311] = 6,
+    [44353] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3040),
+    ACTIONS(3054),
     1,
     anon_sym_COMMA,
-    ACTIONS(3052),
+    ACTIONS(3066),
     1,
     anon_sym_GT,
     STATE(952),
@@ -71107,34 +71156,34 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(957),
     1,
     aux_sym_formal_parameter_names_repeat1,
-    [44330] = 5,
+    [44372] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2729),
+    ACTIONS(2737),
     1,
     anon_sym_manages,
-    ACTIONS(3054),
+    ACTIONS(3068),
     1,
     anon_sym_COMMA,
     STATE(953),
     2,
     sym_comment,
     aux_sym_raises_expr_repeat1,
-    [44347] = 6,
+    [44389] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3057),
+    ACTIONS(3071),
     1,
     anon_sym_RPAREN,
     STATE(951),
@@ -71143,7 +71192,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(954),
     1,
     sym_comment,
-    [44366] = 4,
+    [44408] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
@@ -71153,56 +71202,58 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(955),
     1,
     sym_comment,
-    ACTIONS(1807),
+    ACTIONS(1751),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [44381] = 5,
+    [44423] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2143),
+    ACTIONS(2457),
     1,
-    anon_sym_COLON_COLON,
+    sym_identifier,
+    STATE(799),
+    1,
+    sym_scoped_name,
     STATE(956),
     1,
     sym_comment,
-    ACTIONS(3059),
-    2,
-    anon_sym_supports,
-    anon_sym_manages,
-    [44398] = 5,
+    [44442] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3061),
+    ACTIONS(3073),
     1,
     anon_sym_GT,
-    ACTIONS(3063),
+    ACTIONS(3075),
     1,
     anon_sym_COMMA,
     STATE(957),
     2,
     sym_comment,
     aux_sym_formal_parameter_names_repeat1,
-    [44415] = 6,
+    [44459] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2793),
+    ACTIONS(2798),
     1,
     anon_sym_COMMA,
-    ACTIONS(2837),
+    ACTIONS(2851),
     1,
     anon_sym_manages,
     STATE(953),
@@ -71211,386 +71262,384 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(958),
     1,
     sym_comment,
-    [44434] = 4,
+    [44478] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(959),
     1,
     sym_comment,
-    ACTIONS(1789),
+    ACTIONS(1771),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44449] = 4,
+    [44493] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(960),
     1,
     sym_comment,
-    ACTIONS(1797),
+    ACTIONS(1789),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44464] = 6,
+    [44508] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2702),
-    1,
-    anon_sym_LBRACE,
-    ACTIONS(2817),
-    1,
-    anon_sym_COMMA,
-    STATE(823),
+    STATE(447),
     1,
-    aux_sym_interface_inheritance_spec_repeat1,
+    sym_dec_number,
     STATE(961),
     1,
     sym_comment,
-    [44483] = 4,
+    ACTIONS(608),
+    2,
+    anon_sym_0,
+    aux_sym_dec_number_token1,
+    [44525] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3048),
+    1,
+    anon_sym_COMMA,
+    ACTIONS(3078),
+    1,
+    anon_sym_SEMI,
+    STATE(791),
+    1,
+    aux_sym_any_declarators_repeat1,
     STATE(962),
     1,
     sym_comment,
-    ACTIONS(2711),
-    3,
-    anon_sym_COMMA,
-    anon_sym_LBRACE,
-    anon_sym_supports,
-    [44498] = 4,
+    [44544] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(963),
     1,
     sym_comment,
-    ACTIONS(1663),
+    ACTIONS(1709),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44513] = 4,
+    [44559] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(964),
     1,
     sym_comment,
-    ACTIONS(1775),
+    ACTIONS(1597),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44528] = 4,
+    [44574] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(965),
     1,
     sym_comment,
-    ACTIONS(1783),
+    ACTIONS(1775),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44543] = 5,
+    [44589] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3066),
+    ACTIONS(2710),
     1,
-    anon_sym_GT,
-    ACTIONS(3068),
+    anon_sym_LBRACE,
+    ACTIONS(2875),
     1,
     anon_sym_COMMA,
+    STATE(823),
+    1,
+    aux_sym_interface_inheritance_spec_repeat1,
     STATE(966),
-    2,
+    1,
     sym_comment,
-    aux_sym_actual_parameters_repeat1,
-    [44560] = 6,
+    [44608] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(594),
+    ACTIONS(618),
     1,
-    anon_sym_COLON_COLON,
+    anon_sym_SLASH_SLASH,
+    STATE(967),
+    1,
+    sym_comment,
+    ACTIONS(2721),
+    3,
+    anon_sym_COMMA,
+    anon_sym_LBRACE,
+    anon_sym_supports,
+    [44623] = 4,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2423),
+    1,
+    anon_sym_SLASH_STAR,
+    STATE(968),
+    1,
+    sym_comment,
+    ACTIONS(1767),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    aux_sym_extend_annotation_appl_token1,
+    [44638] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(3080),
     1,
-    sym_identifier,
-    STATE(764),
+    anon_sym_GT,
+    ACTIONS(3082),
     1,
-    sym_scoped_name,
-    STATE(967),
+    anon_sym_COMMA,
+    STATE(969),
+    2,
+    sym_comment,
+    aux_sym_actual_parameters_repeat1,
+    [44655] = 5,
+    ACTIONS(5),
     1,
-    sym_comment,
-    [44579] = 4,
-    ACTIONS(3),
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2149),
     1,
-    anon_sym_SLASH_STAR,
-    STATE(968),
+    anon_sym_COLON_COLON,
+    STATE(970),
     1,
     sym_comment,
-    ACTIONS(1779),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    aux_sym_extend_annotation_appl_token1,
-    [44594] = 5,
+    ACTIONS(3085),
+    2,
+    anon_sym_LBRACE,
+    anon_sym_supports,
+    [44672] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3071),
+    ACTIONS(3087),
     1,
     anon_sym_GT,
-    ACTIONS(3073),
+    ACTIONS(3089),
     1,
     anon_sym_COMMA,
-    STATE(969),
+    STATE(971),
     2,
     sym_comment,
     aux_sym_formal_parameters_repeat1,
-    [44611] = 4,
+    [44689] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(970),
+    STATE(972),
     1,
     sym_comment,
-    ACTIONS(1767),
+    ACTIONS(1755),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [44626] = 5,
+    [44704] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3076),
+    ACTIONS(3092),
     1,
     anon_sym_COMMA,
-    ACTIONS(3079),
+    ACTIONS(3095),
     1,
     anon_sym_RPAREN,
-    STATE(971),
+    STATE(973),
     2,
     sym_comment,
     aux_sym_annotation_appl_params_repeat1,
-    [44643] = 4,
-    ACTIONS(3),
+    [44721] = 5,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2149),
+    1,
+    anon_sym_COLON_COLON,
+    STATE(974),
+    1,
+    sym_comment,
+    ACTIONS(3097),
+    2,
+    anon_sym_supports,
+    anon_sym_manages,
+    [44738] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(972),
+    ACTIONS(594),
     1,
-    sym_comment,
-    ACTIONS(1711),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [44658] = 4,
-    ACTIONS(3),
+    anon_sym_COLON_COLON,
+    ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(5),
+    ACTIONS(2639),
     1,
-    anon_sym_SLASH_STAR,
-    STATE(973),
+    sym_identifier,
+    STATE(768),
+    1,
+    sym_scoped_name,
+    STATE(975),
     1,
     sym_comment,
-    ACTIONS(1611),
-    3,
-    anon_sym_AT,
-    anon_sym_SLASH_SLASH_AT,
-    sym_identifier,
-    [44673] = 4,
+    [44757] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    STATE(974),
+    STATE(976),
     1,
     sym_comment,
-    ACTIONS(1615),
+    ACTIONS(1765),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     sym_identifier,
-    [44688] = 5,
+    [44772] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(975),
+    STATE(977),
     1,
     sym_comment,
     STATE(1408),
     1,
     sym_boolean_literal,
-    ACTIONS(2829),
+    ACTIONS(2839),
     2,
     anon_sym_TRUE,
     anon_sym_FALSE,
-    [44705] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(3081),
-    1,
-    anon_sym_PIPE,
-    ACTIONS(3084),
-    1,
-    anon_sym_RPAREN,
-    STATE(976),
-    2,
-    sym_comment,
-    aux_sym_annotation_appl_data_representation_repeat1,
-    [44722] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2817),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(3086),
-    1,
-    anon_sym_LBRACE,
-    STATE(796),
-    1,
-    aux_sym_interface_inheritance_spec_repeat1,
-    STATE(977),
-    1,
-    sym_comment,
-    [44741] = 4,
+    [44789] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(978),
     1,
     sym_comment,
-    ACTIONS(1609),
+    ACTIONS(1621),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44756] = 6,
+    [44804] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(3099),
     1,
     anon_sym_PIPE,
-    ACTIONS(3088),
+    ACTIONS(3102),
     1,
     anon_sym_RPAREN,
-    STATE(811),
-    1,
-    aux_sym_annotation_appl_data_representation_repeat1,
     STATE(979),
-    1,
+    2,
     sym_comment,
-    [44775] = 4,
+    aux_sym_annotation_appl_data_representation_repeat1,
+    [44821] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(980),
     1,
     sym_comment,
-    ACTIONS(1613),
+    ACTIONS(1797),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44790] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [44836] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
-    STATE(585),
+    ACTIONS(5),
     1,
-    sym_simple_declarator,
+    anon_sym_SLASH_STAR,
     STATE(981),
     1,
     sym_comment,
-    STATE(1574),
-    1,
-    sym_attr_declarator,
-    [44809] = 4,
+    ACTIONS(1803),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44851] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(982),
@@ -71601,7 +71650,7 @@ static const uint16_t ts_small_parse_table[] = {
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44824] = 6,
+    [44866] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -71611,79 +71660,75 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2639),
     1,
     sym_identifier,
-    STATE(788),
+    STATE(789),
     1,
     sym_scoped_name,
     STATE(983),
     1,
     sym_comment,
-    [44843] = 6,
+    [44885] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3092),
+    ACTIONS(3104),
     1,
     anon_sym_RPAREN,
-    STATE(976),
+    STATE(979),
     1,
     aux_sym_annotation_appl_data_representation_repeat1,
     STATE(984),
     1,
     sym_comment,
-    [44862] = 4,
+    [44904] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(985),
     1,
     sym_comment,
-    ACTIONS(1589),
+    ACTIONS(1705),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44877] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(97),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(618),
+    [44919] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(5),
     1,
-    sym_identifier,
+    anon_sym_SLASH_STAR,
     STATE(986),
     1,
     sym_comment,
-    STATE(1052),
-    1,
-    sym_scoped_name,
-    [44896] = 6,
+    ACTIONS(1623),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44934] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2839),
+    ACTIONS(2853),
     1,
     anon_sym_PIPE,
-    ACTIONS(3094),
+    ACTIONS(3106),
     1,
     anon_sym_RPAREN,
     STATE(984),
@@ -71692,766 +71737,764 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(987),
     1,
     sym_comment,
-    [44915] = 6,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    [44953] = 4,
+    ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2551),
-    1,
-    anon_sym_supports,
-    ACTIONS(3096),
+    ACTIONS(5),
     1,
-    anon_sym_manages,
+    anon_sym_SLASH_STAR,
     STATE(988),
     1,
     sym_comment,
-    STATE(1263),
-    1,
-    sym_supported_interface_spec,
-    [44934] = 4,
+    ACTIONS(1799),
+    3,
+    anon_sym_AT,
+    anon_sym_SLASH_SLASH_AT,
+    sym_identifier,
+    [44968] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(989),
     1,
     sym_comment,
-    ACTIONS(1593),
+    ACTIONS(1677),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44949] = 6,
+    [44983] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2875),
     1,
-    sym_identifier,
-    STATE(703),
+    anon_sym_COMMA,
+    ACTIONS(3108),
     1,
-    sym_scoped_name,
+    anon_sym_LBRACE,
+    STATE(934),
+    1,
+    aux_sym_interface_inheritance_spec_repeat1,
     STATE(990),
     1,
     sym_comment,
-    [44968] = 4,
+    [45002] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(991),
     1,
     sym_comment,
-    ACTIONS(1601),
+    ACTIONS(1681),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44983] = 4,
+    [45017] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(992),
     1,
     sym_comment,
-    ACTIONS(1597),
+    ACTIONS(1697),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [44998] = 6,
+    [45032] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(594),
-    1,
-    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2833),
     1,
     sym_identifier,
-    STATE(956),
+    STATE(585),
     1,
-    sym_scoped_name,
+    sym_simple_declarator,
     STATE(993),
     1,
     sym_comment,
-    [45017] = 4,
+    STATE(1574),
+    1,
+    sym_attr_declarator,
+    [45051] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(994),
     1,
     sym_comment,
-    ACTIONS(1605),
+    ACTIONS(1783),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45032] = 4,
+    [45066] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(995),
     1,
     sym_comment,
-    ACTIONS(1617),
+    ACTIONS(1805),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45047] = 5,
+    [45081] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(97),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2457),
+    1,
+    sym_identifier,
     STATE(996),
     1,
     sym_comment,
-    STATE(1420),
+    STATE(1052),
     1,
-    sym_topic_platform,
-    ACTIONS(1577),
-    2,
-    anon_sym_STAR,
-    aux_sym_service_platform_token2,
-    [45064] = 4,
+    sym_scoped_name,
+    [45100] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(997),
     1,
     sym_comment,
-    ACTIONS(1623),
+    ACTIONS(1757),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45079] = 4,
+    [45115] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(998),
     1,
     sym_comment,
-    ACTIONS(1627),
+    ACTIONS(1659),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45094] = 4,
+    [45130] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(999),
     1,
     sym_comment,
-    ACTIONS(1631),
+    ACTIONS(1793),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45109] = 4,
+    [45145] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1000),
     1,
     sym_comment,
-    ACTIONS(1635),
+    ACTIONS(1779),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45124] = 4,
+    [45160] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1001),
     1,
     sym_comment,
-    ACTIONS(1639),
+    ACTIONS(1689),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45139] = 4,
+    [45175] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1002),
     1,
     sym_comment,
-    ACTIONS(1643),
+    ACTIONS(1663),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45154] = 4,
+    [45190] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1003),
     1,
     sym_comment,
-    ACTIONS(1647),
+    ACTIONS(1581),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45169] = 4,
+    [45205] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1004),
     1,
     sym_comment,
-    ACTIONS(1651),
+    ACTIONS(1589),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45184] = 4,
+    [45220] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1005),
     1,
     sym_comment,
-    ACTIONS(1655),
+    ACTIONS(1593),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45199] = 4,
+    [45235] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1006),
     1,
     sym_comment,
-    ACTIONS(1659),
+    ACTIONS(1605),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45214] = 4,
+    [45250] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1007),
     1,
     sym_comment,
-    ACTIONS(1667),
+    ACTIONS(1609),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45229] = 4,
+    [45265] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1008),
     1,
     sym_comment,
-    ACTIONS(1671),
+    ACTIONS(1613),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45244] = 4,
+    [45280] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1009),
     1,
     sym_comment,
-    ACTIONS(1675),
+    ACTIONS(1617),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45259] = 4,
+    [45295] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1010),
     1,
     sym_comment,
-    ACTIONS(1679),
+    ACTIONS(1625),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45274] = 4,
+    [45310] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1011),
     1,
     sym_comment,
-    ACTIONS(1685),
+    ACTIONS(1629),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45289] = 4,
+    [45325] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1012),
     1,
     sym_comment,
-    ACTIONS(1689),
+    ACTIONS(1635),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45304] = 4,
+    [45340] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1013),
     1,
     sym_comment,
-    ACTIONS(1693),
+    ACTIONS(1639),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45319] = 4,
+    [45355] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1014),
     1,
     sym_comment,
-    ACTIONS(1697),
+    ACTIONS(1643),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45334] = 4,
+    [45370] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1015),
     1,
     sym_comment,
-    ACTIONS(1701),
+    ACTIONS(1647),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45349] = 4,
+    [45385] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1016),
     1,
     sym_comment,
-    ACTIONS(1573),
+    ACTIONS(1651),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45364] = 4,
+    [45400] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1017),
     1,
     sym_comment,
-    ACTIONS(1705),
+    ACTIONS(1573),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45379] = 4,
+    [45415] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1018),
     1,
     sym_comment,
-    ACTIONS(1713),
+    ACTIONS(1667),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45394] = 4,
+    [45430] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1019),
     1,
     sym_comment,
-    ACTIONS(1717),
+    ACTIONS(1671),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45409] = 4,
+    [45445] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1020),
     1,
     sym_comment,
-    ACTIONS(1721),
+    ACTIONS(1685),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45424] = 4,
+    [45460] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1021),
     1,
     sym_comment,
-    ACTIONS(1725),
+    ACTIONS(1693),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45439] = 4,
+    [45475] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1022),
     1,
     sym_comment,
-    ACTIONS(1729),
+    ACTIONS(1701),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45454] = 4,
+    [45490] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1023),
     1,
     sym_comment,
-    ACTIONS(1733),
+    ACTIONS(1577),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45469] = 4,
+    [45505] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1024),
     1,
     sym_comment,
-    ACTIONS(1737),
+    ACTIONS(1713),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45484] = 4,
+    [45520] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1025),
     1,
     sym_comment,
-    ACTIONS(1741),
+    ACTIONS(1717),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45499] = 4,
+    [45535] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1026),
     1,
     sym_comment,
-    ACTIONS(1745),
+    ACTIONS(1721),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45514] = 4,
+    [45550] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1027),
     1,
     sym_comment,
-    ACTIONS(1749),
+    ACTIONS(1725),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45529] = 4,
+    [45565] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1028),
     1,
     sym_comment,
-    ACTIONS(1753),
+    ACTIONS(1729),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45544] = 4,
+    [45580] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1029),
     1,
     sym_comment,
-    ACTIONS(1757),
+    ACTIONS(1733),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45559] = 4,
+    [45595] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1030),
     1,
     sym_comment,
-    ACTIONS(1761),
+    ACTIONS(1737),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45574] = 4,
+    [45610] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1031),
     1,
     sym_comment,
-    ACTIONS(1771),
+    ACTIONS(1741),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45589] = 4,
+    [45625] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1032),
     1,
     sym_comment,
-    ACTIONS(1793),
+    ACTIONS(1745),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45604] = 4,
+    [45640] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1033),
     1,
     sym_comment,
-    ACTIONS(1801),
+    ACTIONS(1749),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45619] = 4,
+    [45655] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1034),
     1,
     sym_comment,
-    ACTIONS(1805),
+    ACTIONS(1753),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45634] = 4,
+    [45670] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1035),
     1,
     sym_comment,
-    ACTIONS(1765),
+    ACTIONS(1763),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45649] = 4,
+    [45685] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1036),
     1,
     sym_comment,
-    ACTIONS(1709),
+    ACTIONS(1801),
     3,
     anon_sym_AT,
     anon_sym_SLASH_SLASH_AT,
     aux_sym_extend_annotation_appl_token1,
-    [45664] = 6,
+    [45700] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2815),
+    ACTIONS(2831),
     1,
     anon_sym_context,
-    ACTIONS(3098),
+    ACTIONS(3110),
     1,
     anon_sym_SEMI,
     STATE(1037),
@@ -72460,7 +72503,7 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1272),
     1,
     sym_context_expr,
-    [45683] = 6,
+    [45719] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72470,7 +72513,7 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2627),
+    ACTIONS(2639),
     1,
     sym_identifier,
     STATE(780),
@@ -72479,26 +72522,24 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1038),
     1,
     sym_comment,
-    [45702] = 6,
+    [45738] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
-    STATE(638),
-    1,
-    sym_simple_declarator,
     STATE(1039),
     1,
     sym_comment,
-    STATE(1533),
+    STATE(1420),
     1,
-    sym_readonly_attr_declarator,
-    [45721] = 6,
+    sym_topic_platform,
+    ACTIONS(1655),
+    2,
+    anon_sym_STAR,
+    aux_sym_service_platform_token2,
+    [45755] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72508,26 +72549,26 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2427),
+    ACTIONS(2457),
     1,
     sym_identifier,
-    STATE(699),
+    STATE(704),
     1,
     sym_scoped_name,
     STATE(1040),
     1,
     sym_comment,
-    [45740] = 6,
+    [45774] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2423),
+    ACTIONS(2475),
     1,
     anon_sym_supports,
-    ACTIONS(3100),
+    ACTIONS(3112),
     1,
     anon_sym_LBRACE,
     STATE(1041),
@@ -72536,53 +72577,61 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1261),
     1,
     sym_supported_interface_spec,
-    [45759] = 4,
+    [45793] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2639),
+    1,
+    sym_identifier,
+    STATE(974),
+    1,
+    sym_scoped_name,
     STATE(1042),
     1,
     sym_comment,
-    ACTIONS(3102),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [45773] = 5,
+    [45812] = 6,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(594),
+    1,
+    anon_sym_COLON_COLON,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3104),
+    ACTIONS(2639),
     1,
     sym_identifier,
+    STATE(705),
+    1,
+    sym_scoped_name,
     STATE(1043),
     1,
     sym_comment,
-    [45789] = 5,
+    [45831] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(3106),
+    ACTIONS(3114),
     1,
-    sym_identifier,
+    anon_sym_LT,
     STATE(1044),
     1,
     sym_comment,
-    [45805] = 4,
+    [45847] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72592,161 +72641,169 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1045),
     1,
     sym_comment,
-    ACTIONS(3108),
+    ACTIONS(3116),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [45819] = 4,
+    [45861] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3118),
+    1,
+    aux_sym_max_expr_token1,
     STATE(1046),
     1,
     sym_comment,
-    ACTIONS(3110),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [45833] = 5,
+    STATE(1416),
+    1,
+    sym_max_expr,
+    [45877] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3112),
+    ACTIONS(3120),
     1,
-    sym_identifier,
+    aux_sym_min_expr_token1,
     STATE(1047),
     1,
     sym_comment,
-    [45849] = 5,
+    STATE(1690),
+    1,
+    sym_min_expr,
+    [45893] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
     STATE(1048),
     1,
     sym_comment,
-    STATE(1493),
-    1,
-    sym_simple_declarator,
-    [45865] = 5,
+    ACTIONS(3122),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [45907] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3114),
+    ACTIONS(2510),
     1,
-    anon_sym_COMMA,
-    ACTIONS(3116),
+    anon_sym_COLON_COLON,
+    ACTIONS(3124),
     1,
-    anon_sym_RPAREN,
+    sym_identifier,
     STATE(1049),
     1,
     sym_comment,
-    [45881] = 5,
+    [45923] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3118),
+    ACTIONS(2510),
     1,
-    aux_sym_max_expr_token1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3126),
+    1,
+    sym_identifier,
     STATE(1050),
     1,
     sym_comment,
-    STATE(1416),
-    1,
-    sym_max_expr,
-    [45897] = 4,
+    [45939] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3128),
+    1,
+    sym_identifier,
     STATE(1051),
     1,
     sym_comment,
-    ACTIONS(3084),
-    2,
-    anon_sym_PIPE,
-    anon_sym_RPAREN,
-    [45911] = 5,
+    [45955] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(3120),
+    ACTIONS(3130),
     1,
     anon_sym_LBRACE,
     STATE(1052),
     1,
     sym_comment,
-    [45927] = 4,
+    [45971] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3132),
+    1,
+    sym_identifier,
     STATE(1053),
     1,
     sym_comment,
-    ACTIONS(3122),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [45941] = 4,
+    [45987] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3134),
+    1,
+    sym_identifier,
     STATE(1054),
     1,
     sym_comment,
-    ACTIONS(3124),
-    2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [45955] = 4,
+    [46003] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(1055),
+    ACTIONS(3136),
     1,
-    sym_comment,
-    ACTIONS(3079),
-    2,
     anon_sym_COMMA,
+    ACTIONS(3138),
+    1,
     anon_sym_RPAREN,
-    [45969] = 4,
+    STATE(1055),
+    1,
+    sym_comment,
+    [46019] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72756,11 +72813,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1056),
     1,
     sym_comment,
-    ACTIONS(3071),
+    ACTIONS(3102),
     2,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    [45983] = 4,
+    anon_sym_PIPE,
+    anon_sym_RPAREN,
+    [46033] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72770,11 +72827,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1057),
     1,
     sym_comment,
-    ACTIONS(3066),
+    ACTIONS(3140),
     2,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    [45997] = 4,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46047] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72784,27 +72841,25 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1058),
     1,
     sym_comment,
-    ACTIONS(1615),
+    ACTIONS(1799),
     2,
     anon_sym_PIPE,
     anon_sym_RPAREN,
-    [46011] = 5,
+    [46061] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3126),
-    1,
-    aux_sym_floating_pt_literal_token1,
-    ACTIONS(3128),
-    1,
-    aux_sym_fixed_pt_literal_token1,
     STATE(1059),
     1,
     sym_comment,
-    [46027] = 4,
+    ACTIONS(3142),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46075] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72814,11 +72869,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1060),
     1,
     sym_comment,
-    ACTIONS(3061),
+    ACTIONS(3144),
     2,
-    anon_sym_GT,
     anon_sym_COMMA,
-    [46041] = 4,
+    anon_sym_RPAREN,
+    [46089] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72828,25 +72883,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1061),
     1,
     sym_comment,
-    ACTIONS(3130),
+    ACTIONS(3095),
     2,
-    anon_sym_SEMI,
-    anon_sym_context,
-    [46055] = 4,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46103] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2833),
+    1,
+    sym_identifier,
     STATE(1062),
     1,
     sym_comment,
-    ACTIONS(3132),
-    2,
-    anon_sym_SEMI,
-    anon_sym_setraises,
-    [46069] = 4,
+    STATE(1493),
+    1,
+    sym_simple_declarator,
+    [46119] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72856,11 +72913,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1063),
     1,
     sym_comment,
-    ACTIONS(3134),
+    ACTIONS(3087),
     2,
-    anon_sym_SEMI,
-    anon_sym_context,
-    [46083] = 4,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    [46133] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72870,43 +72927,41 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1064),
     1,
     sym_comment,
-    ACTIONS(3136),
+    ACTIONS(3080),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46097] = 5,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    [46147] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3138),
-    1,
-    anon_sym_LBRACE,
-    ACTIONS(3140),
-    1,
-    anon_sym_COLON,
     STATE(1065),
     1,
     sym_comment,
-    [46113] = 5,
+    ACTIONS(3146),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46161] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3142),
+    ACTIONS(3148),
     1,
-    anon_sym_SEMI,
-    ACTIONS(3144),
+    anon_sym_LBRACE,
+    ACTIONS(3150),
     1,
-    anon_sym_default,
+    anon_sym_COLON,
     STATE(1066),
     1,
     sym_comment,
-    [46129] = 4,
+    [46177] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72916,11 +72971,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1067),
     1,
     sym_comment,
-    ACTIONS(3146),
+    ACTIONS(3073),
     2,
+    anon_sym_GT,
     anon_sym_COMMA,
-    anon_sym_SEMI,
-    [46143] = 4,
+    [46191] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72930,11 +72985,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1068),
     1,
     sym_comment,
-    ACTIONS(3148),
+    ACTIONS(3152),
     2,
     anon_sym_SEMI,
     anon_sym_context,
-    [46157] = 4,
+    [46205] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72944,27 +72999,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1069),
     1,
     sym_comment,
-    ACTIONS(3032),
+    ACTIONS(3154),
     2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46171] = 5,
+    anon_sym_SEMI,
+    anon_sym_setraises,
+    [46219] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3150),
+    ACTIONS(3156),
     1,
     anon_sym_GT,
-    ACTIONS(3152),
+    ACTIONS(3158),
     1,
     anon_sym_COMMA,
     STATE(1070),
     1,
     sym_comment,
-    [46187] = 4,
+    [46235] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72974,11 +73029,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1071),
     1,
     sym_comment,
-    ACTIONS(3154),
+    ACTIONS(3160),
     2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46201] = 4,
+    anon_sym_SEMI,
+    anon_sym_context,
+    [46249] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -72988,11 +73043,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1072),
     1,
     sym_comment,
-    ACTIONS(3156),
+    ACTIONS(3162),
     2,
     anon_sym_SEMI,
-    anon_sym_setraises,
-    [46215] = 4,
+    sym_identifier,
+    [46263] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73002,11 +73057,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1073),
     1,
     sym_comment,
-    ACTIONS(3158),
+    ACTIONS(3035),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46229] = 4,
+    anon_sym_COMMA,
+    anon_sym_RBRACE,
+    [46277] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73016,11 +73071,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1074),
     1,
     sym_comment,
-    ACTIONS(3160),
+    ACTIONS(3164),
     2,
     anon_sym_COMMA,
     anon_sym_RBRACE,
-    [46243] = 4,
+    [46291] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73030,11 +73085,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1075),
     1,
     sym_comment,
-    ACTIONS(3162),
+    ACTIONS(3166),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [46257] = 4,
+    [46305] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73044,27 +73099,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1076),
     1,
     sym_comment,
-    ACTIONS(3013),
+    ACTIONS(3168),
     2,
     anon_sym_COMMA,
-    anon_sym_RBRACE,
-    [46271] = 5,
+    anon_sym_SEMI,
+    [46319] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(3164),
+    ACTIONS(3170),
     1,
     anon_sym_LBRACE,
     STATE(1077),
     1,
     sym_comment,
-    [46287] = 4,
+    [46335] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73074,11 +73129,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1078),
     1,
     sym_comment,
-    ACTIONS(3166),
+    ACTIONS(3172),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [46301] = 4,
+    [46349] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73088,57 +73143,55 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1079),
     1,
     sym_comment,
-    ACTIONS(3168),
+    ACTIONS(3174),
     2,
     anon_sym_SEMI,
-    sym_identifier,
-    [46315] = 5,
+    anon_sym_context,
+    [46363] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3170),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(3172),
-    1,
-    anon_sym_RPAREN,
     STATE(1080),
     1,
     sym_comment,
-    [46331] = 5,
+    ACTIONS(3046),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46377] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3174),
-    1,
-    sym_identifier,
     STATE(1081),
     1,
     sym_comment,
-    STATE(1334),
-    1,
-    sym_formal_parameter_names,
-    [46347] = 4,
+    ACTIONS(3176),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46391] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3178),
+    1,
+    anon_sym_SEMI,
+    ACTIONS(3180),
+    1,
+    anon_sym_default,
     STATE(1082),
     1,
     sym_comment,
-    ACTIONS(3176),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46361] = 4,
+    [46407] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73148,11 +73201,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1083),
     1,
     sym_comment,
-    ACTIONS(2996),
+    ACTIONS(3182),
     2,
-    anon_sym_COMMA,
-    anon_sym_RBRACE,
-    [46375] = 4,
+    anon_sym_SEMI,
+    anon_sym_setraises,
+    [46421] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73162,25 +73215,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1084),
     1,
     sym_comment,
-    ACTIONS(3178),
+    ACTIONS(3026),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46389] = 4,
+    anon_sym_COMMA,
+    anon_sym_RBRACE,
+    [46435] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3184),
+    1,
+    anon_sym_GT,
+    ACTIONS(3186),
+    1,
+    anon_sym_COMMA,
     STATE(1085),
     1,
     sym_comment,
-    ACTIONS(3180),
-    2,
-    anon_sym_RBRACE,
-    anon_sym_bitfield,
-    [46403] = 4,
+    [46451] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73190,11 +73245,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1086),
     1,
     sym_comment,
-    ACTIONS(2800),
+    ACTIONS(3188),
     2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46417] = 4,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46465] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73204,39 +73259,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1087),
     1,
     sym_comment,
-    ACTIONS(3182),
+    ACTIONS(3190),
     2,
     anon_sym_GT,
     anon_sym_COMMA,
-    [46431] = 4,
+    [46479] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(1088),
+    ACTIONS(3192),
     1,
-    sym_comment,
-    ACTIONS(3184),
-    2,
     anon_sym_COMMA,
+    ACTIONS(3194),
+    1,
     anon_sym_RPAREN,
-    [46445] = 4,
+    STATE(1088),
+    1,
+    sym_comment,
+    [46495] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3196),
+    1,
+    sym_identifier,
     STATE(1089),
     1,
     sym_comment,
-    ACTIONS(2989),
-    2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46459] = 4,
+    STATE(1334),
+    1,
+    sym_formal_parameter_names,
+    [46511] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73246,11 +73305,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1090),
     1,
     sym_comment,
-    ACTIONS(3186),
+    ACTIONS(2827),
     2,
     anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46473] = 4,
+    anon_sym_SEMI,
+    [46525] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73260,41 +73319,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1091),
     1,
     sym_comment,
-    ACTIONS(3188),
+    ACTIONS(3198),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46487] = 4,
+    anon_sym_RBRACE,
+    anon_sym_bitfield,
+    [46539] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3200),
+    1,
+    anon_sym_LBRACE,
     STATE(1092),
     1,
     sym_comment,
-    ACTIONS(3190),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46501] = 5,
+    [46555] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3192),
+    ACTIONS(3202),
     1,
     anon_sym_LT,
-    ACTIONS(3194),
+    ACTIONS(3204),
     1,
     sym_identifier,
     STATE(1093),
     1,
     sym_comment,
-    [46517] = 4,
+    [46571] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73304,11 +73365,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1094),
     1,
     sym_comment,
-    ACTIONS(3196),
+    ACTIONS(2812),
     2,
     anon_sym_COMMA,
     anon_sym_RPAREN,
-    [46531] = 4,
+    [46585] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73318,11 +73379,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1095),
     1,
     sym_comment,
-    ACTIONS(2978),
+    ACTIONS(3206),
     2,
     anon_sym_COMMA,
     anon_sym_RPAREN,
-    [46545] = 4,
+    [46599] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73332,27 +73393,25 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1096),
     1,
     sym_comment,
-    ACTIONS(3198),
+    ACTIONS(3005),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [46559] = 5,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46613] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3200),
-    1,
-    anon_sym_COMMA,
-    ACTIONS(3202),
-    1,
-    anon_sym_RPAREN,
     STATE(1097),
     1,
     sym_comment,
-    [46575] = 4,
+    ACTIONS(3208),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46627] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73362,27 +73421,25 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1098),
     1,
     sym_comment,
-    ACTIONS(2973),
+    ACTIONS(3210),
     2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46589] = 5,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46641] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2754),
-    1,
-    anon_sym_in,
-    STATE(1069),
-    1,
-    sym_in_param_dcl,
     STATE(1099),
     1,
     sym_comment,
-    [46605] = 4,
+    ACTIONS(3212),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46655] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73392,91 +73449,87 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1100),
     1,
     sym_comment,
-    ACTIONS(3204),
+    ACTIONS(2996),
     2,
-    anon_sym_SEMI,
-    anon_sym_context,
-    [46619] = 5,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46669] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
-    STATE(1071),
-    1,
-    sym_simple_declarator,
     STATE(1101),
     1,
     sym_comment,
-    [46635] = 5,
+    ACTIONS(2742),
+    2,
+    anon_sym_SEMI,
+    anon_sym_context,
+    [46683] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3206),
+    ACTIONS(3214),
     1,
     anon_sym_COMMA,
-    ACTIONS(3208),
+    ACTIONS(3216),
     1,
     anon_sym_RPAREN,
     STATE(1102),
     1,
     sym_comment,
-    [46651] = 5,
+    [46699] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(3218),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3210),
+    anon_sym_COMMA,
+    ACTIONS(3220),
     1,
-    anon_sym_LBRACE,
+    anon_sym_RPAREN,
     STATE(1103),
     1,
     sym_comment,
-    [46667] = 5,
+    [46715] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3212),
-    1,
-    sym_identifier,
     STATE(1104),
     1,
     sym_comment,
-    [46683] = 5,
+    ACTIONS(2991),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [46729] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2762),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3214),
+    anon_sym_in,
+    STATE(1080),
     1,
-    sym_identifier,
+    sym_in_param_dcl,
     STATE(1105),
     1,
     sym_comment,
-    [46699] = 4,
+    [46745] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73486,291 +73539,287 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1106),
     1,
     sym_comment,
-    ACTIONS(2723),
+    ACTIONS(3222),
     2,
     anon_sym_SEMI,
     anon_sym_context,
-    [46713] = 4,
+    [46759] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2833),
+    1,
+    sym_identifier,
+    STATE(1081),
+    1,
+    sym_simple_declarator,
     STATE(1107),
     1,
     sym_comment,
-    ACTIONS(3216),
-    2,
-    anon_sym_COMMA,
-    anon_sym_RBRACE,
-    [46727] = 5,
+    [46775] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
-    STATE(1066),
-    1,
-    sym_simple_declarator,
     STATE(1108),
     1,
     sym_comment,
-    [46743] = 5,
+    ACTIONS(3224),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46789] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3218),
-    1,
-    anon_sym_LT,
     STATE(1109),
     1,
     sym_comment,
-    [46759] = 5,
+    ACTIONS(3226),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46803] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3220),
-    1,
-    anon_sym_SEMI,
-    ACTIONS(3222),
-    1,
-    anon_sym_default,
     STATE(1110),
     1,
     sym_comment,
-    [46775] = 5,
+    ACTIONS(3228),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [46817] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3118),
-    1,
-    aux_sym_max_expr_token1,
     STATE(1111),
     1,
     sym_comment,
-    STATE(1368),
-    1,
-    sym_max_expr,
-    [46791] = 4,
+    ACTIONS(3230),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RBRACE,
+    [46831] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2833),
+    1,
+    sym_identifier,
+    STATE(1082),
+    1,
+    sym_simple_declarator,
     STATE(1112),
     1,
     sym_comment,
-    ACTIONS(2942),
-    2,
-    anon_sym_COMMA,
-    anon_sym_LBRACE,
-    [46805] = 5,
+    [46847] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3224),
+    ACTIONS(3232),
     1,
-    anon_sym_COMMA,
-    ACTIONS(3226),
+    anon_sym_SEMI,
+    ACTIONS(3234),
     1,
-    anon_sym_RPAREN,
+    anon_sym_default,
     STATE(1113),
     1,
     sym_comment,
-    [46821] = 5,
+    [46863] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2605),
-    1,
-    anon_sym_in,
-    STATE(1086),
-    1,
-    sym_factory_param_dcl,
     STATE(1114),
     1,
     sym_comment,
-    [46837] = 5,
+    ACTIONS(2964),
+    2,
+    anon_sym_COMMA,
+    anon_sym_LBRACE,
+    [46877] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
+    ACTIONS(3236),
     1,
-    sym_identifier,
-    STATE(1088),
+    anon_sym_COMMA,
+    ACTIONS(3238),
     1,
-    sym_simple_declarator,
+    anon_sym_RPAREN,
     STATE(1115),
     1,
     sym_comment,
-    [46853] = 5,
+    [46893] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2587),
+    ACTIONS(2615),
     1,
     anon_sym_in,
-    STATE(1089),
+    STATE(1094),
     1,
-    sym_init_param_dcl,
+    sym_factory_param_dcl,
     STATE(1116),
     1,
     sym_comment,
-    [46869] = 5,
+    [46909] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
+    ACTIONS(2833),
     1,
     sym_identifier,
-    STATE(1090),
+    STATE(1095),
     1,
     sym_simple_declarator,
     STATE(1117),
     1,
     sym_comment,
-    [46885] = 5,
+    [46925] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
+    ACTIONS(2597),
     1,
-    sym_identifier,
-    STATE(1094),
+    anon_sym_in,
+    STATE(1096),
     1,
-    sym_simple_declarator,
+    sym_init_param_dcl,
     STATE(1118),
     1,
     sym_comment,
-    [46901] = 5,
+    [46941] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3118),
+    ACTIONS(2833),
     1,
-    aux_sym_max_expr_token1,
+    sym_identifier,
+    STATE(1097),
+    1,
+    sym_simple_declarator,
     STATE(1119),
     1,
     sym_comment,
-    STATE(1586),
-    1,
-    sym_max_expr,
-    [46917] = 4,
+    [46957] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2833),
+    1,
+    sym_identifier,
     STATE(1120),
     1,
     sym_comment,
-    ACTIONS(3228),
-    2,
-    anon_sym_COMMA,
-    anon_sym_RPAREN,
-    [46931] = 4,
+    STATE(1137),
+    1,
+    sym_simple_declarator,
+    [46973] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3240),
+    1,
+    anon_sym_LPAREN,
     STATE(1121),
     1,
     sym_comment,
-    ACTIONS(2563),
-    2,
-    anon_sym_SEMI,
-    anon_sym_context,
-    [46945] = 5,
+    STATE(1136),
+    1,
+    sym_exception_list,
+    [46989] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3230),
+    ACTIONS(2833),
     1,
-    aux_sym_min_expr_token1,
+    sym_identifier,
+    STATE(1099),
+    1,
+    sym_simple_declarator,
     STATE(1122),
     1,
     sym_comment,
-    STATE(1217),
-    1,
-    sym_min_expr,
-    [46961] = 5,
+    [47005] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(610),
-    1,
-    anon_sym_DQUOTE,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(1098),
+    ACTIONS(3118),
     1,
-    sym_string_literal,
+    aux_sym_max_expr_token1,
     STATE(1123),
     1,
     sym_comment,
-    [46977] = 5,
+    STATE(1586),
+    1,
+    sym_max_expr,
+    [47021] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
     STATE(1124),
     1,
-    sym_comment,
-    STATE(1132),
-    1,
-    sym_simple_declarator,
-    [46993] = 4,
+    sym_comment,
+    ACTIONS(3242),
+    2,
+    anon_sym_COMMA,
+    anon_sym_RPAREN,
+    [47035] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73780,43 +73829,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1125),
     1,
     sym_comment,
-    ACTIONS(3232),
+    ACTIONS(2575),
     2,
     anon_sym_SEMI,
     anon_sym_context,
-    [47007] = 5,
+    [47049] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3234),
+    ACTIONS(3120),
     1,
-    anon_sym_LPAREN,
+    aux_sym_min_expr_token1,
     STATE(1126),
     1,
     sym_comment,
-    STATE(1129),
+    STATE(1217),
     1,
-    sym_exception_list,
-    [47023] = 5,
+    sym_min_expr,
+    [47065] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
+    ACTIONS(610),
+    1,
+    anon_sym_DQUOTE,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3234),
+    STATE(1104),
     1,
-    anon_sym_LPAREN,
+    sym_string_literal,
     STATE(1127),
     1,
     sym_comment,
-    STATE(1482),
-    1,
-    sym_exception_list,
-    [47039] = 4,
+    [47081] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73826,11 +73875,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1128),
     1,
     sym_comment,
-    ACTIONS(3236),
+    ACTIONS(3244),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [47053] = 4,
+    [47095] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73840,103 +73889,103 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1129),
     1,
     sym_comment,
-    ACTIONS(3238),
+    ACTIONS(3246),
     2,
     anon_sym_SEMI,
-    anon_sym_setraises,
-    [47067] = 4,
+    sym_identifier,
+    [47109] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3240),
+    1,
+    anon_sym_LPAREN,
     STATE(1130),
     1,
     sym_comment,
-    ACTIONS(3240),
+    STATE(1482),
+    1,
+    sym_exception_list,
+    [47125] = 4,
+    ACTIONS(5),
+    1,
+    anon_sym_SLASH_STAR,
+    ACTIONS(618),
+    1,
+    anon_sym_SLASH_SLASH,
+    STATE(1131),
+    1,
+    sym_comment,
+    ACTIONS(3248),
     2,
     anon_sym_RBRACE,
     anon_sym_bitfield,
-    [47081] = 5,
+    [47139] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3242),
+    ACTIONS(3250),
     1,
     anon_sym_GT,
-    ACTIONS(3244),
+    ACTIONS(3252),
     1,
     anon_sym_COMMA,
-    STATE(1131),
+    STATE(1132),
     1,
     sym_comment,
-    [47097] = 4,
+    [47155] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    STATE(1132),
+    STATE(1133),
     1,
     sym_comment,
-    ACTIONS(2909),
+    ACTIONS(3254),
     2,
-    anon_sym_COMMA,
     anon_sym_SEMI,
-    [47111] = 5,
+    anon_sym_context,
+    [47169] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3246),
+    ACTIONS(3256),
     1,
     anon_sym_valuetype,
-    ACTIONS(3248),
+    ACTIONS(3258),
     1,
     anon_sym_eventtype,
-    STATE(1133),
+    STATE(1134),
     1,
     sym_comment,
-    [47127] = 5,
+    [47185] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(3250),
+    ACTIONS(3260),
     1,
     anon_sym_LT,
-    STATE(1134),
-    1,
-    sym_comment,
-    [47143] = 5,
-    ACTIONS(5),
-    1,
-    anon_sym_SLASH_STAR,
-    ACTIONS(618),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(3252),
-    1,
-    sym_identifier,
-    STATE(1055),
-    1,
-    sym_annotation_appl_param,
     STATE(1135),
     1,
     sym_comment,
-    [47159] = 4,
+    [47201] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -73946,105 +73995,103 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1136),
     1,
     sym_comment,
-    ACTIONS(3254),
+    ACTIONS(3262),
     2,
     anon_sym_SEMI,
-    sym_identifier,
-    [47173] = 5,
+    anon_sym_setraises,
+    [47215] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
-    1,
-    sym_identifier,
-    STATE(1120),
-    1,
-    sym_simple_declarator,
     STATE(1137),
     1,
     sym_comment,
-    [47189] = 5,
+    ACTIONS(2920),
+    2,
+    anon_sym_COMMA,
+    anon_sym_SEMI,
+    [47229] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3256),
+    ACTIONS(3264),
     1,
     anon_sym_DQUOTE,
-    ACTIONS(3258),
+    ACTIONS(3266),
     1,
     anon_sym_SQUOTE,
     STATE(1138),
     1,
     sym_comment,
-    [47205] = 5,
+    [47245] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3118),
+    ACTIONS(3268),
     1,
-    aux_sym_max_expr_token1,
+    sym_identifier,
+    STATE(1061),
+    1,
+    sym_annotation_appl_param,
     STATE(1139),
     1,
     sym_comment,
-    STATE(1463),
-    1,
-    sym_max_expr,
-    [47221] = 4,
+    [47261] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3118),
+    1,
+    aux_sym_max_expr_token1,
     STATE(1140),
     1,
     sym_comment,
-    ACTIONS(3260),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [47235] = 5,
+    STATE(1463),
+    1,
+    sym_max_expr,
+    [47277] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3262),
+    ACTIONS(2833),
     1,
     sym_identifier,
+    STATE(1124),
+    1,
+    sym_simple_declarator,
     STATE(1141),
     1,
     sym_comment,
-    [47251] = 5,
-    ACTIONS(3),
-    1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    [47293] = 4,
+    ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(3264),
-    1,
-    aux_sym_preproc_call_token1,
-    ACTIONS(3266),
+    ACTIONS(618),
     1,
-    sym_preproc_arg,
+    anon_sym_SLASH_SLASH,
     STATE(1142),
     1,
     sym_comment,
-    [47267] = 4,
+    ACTIONS(3270),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [47307] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74054,91 +74101,91 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1143),
     1,
     sym_comment,
-    ACTIONS(3268),
+    ACTIONS(3272),
     2,
-    anon_sym_GT,
-    anon_sym_COMMA,
-    [47281] = 5,
+    anon_sym_SEMI,
+    sym_identifier,
+    [47321] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3090),
+    ACTIONS(2833),
     1,
     sym_identifier,
-    STATE(1110),
+    STATE(1113),
     1,
     sym_simple_declarator,
     STATE(1144),
     1,
     sym_comment,
-    [47297] = 5,
+    [47337] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(3270),
+    ACTIONS(3274),
     1,
     sym_identifier,
     STATE(1145),
     1,
     sym_comment,
-    [47313] = 5,
-    ACTIONS(5),
+    [47353] = 5,
+    ACTIONS(3),
+    1,
+    anon_sym_SLASH_SLASH,
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(618),
+    ACTIONS(3276),
     1,
-    anon_sym_SLASH_SLASH,
-    ACTIONS(3230),
+    aux_sym_preproc_call_token1,
+    ACTIONS(3278),
     1,
-    aux_sym_min_expr_token1,
+    sym_preproc_arg,
     STATE(1146),
     1,
     sym_comment,
-    STATE(1630),
-    1,
-    sym_min_expr,
-    [47329] = 5,
+    [47369] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3230),
+    ACTIONS(3120),
     1,
     aux_sym_min_expr_token1,
     STATE(1147),
     1,
     sym_comment,
-    STATE(1650),
+    STATE(1630),
     1,
     sym_min_expr,
-    [47345] = 5,
+    [47385] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3272),
+    ACTIONS(2510),
     1,
-    anon_sym_LBRACE,
-    ACTIONS(3274),
+    anon_sym_COLON_COLON,
+    ACTIONS(3280),
     1,
-    anon_sym_SEMI,
+    sym_identifier,
     STATE(1148),
     1,
     sym_comment,
-    [47361] = 4,
+    [47401] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74148,11 +74195,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1149),
     1,
     sym_comment,
-    ACTIONS(3276),
+    ACTIONS(3282),
     2,
     anon_sym_COMMA,
     anon_sym_RBRACE,
-    [47375] = 4,
+    [47415] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74162,11 +74209,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1150),
     1,
     sym_comment,
-    ACTIONS(3278),
+    ACTIONS(3284),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [47389] = 4,
+    [47429] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74176,43 +74223,43 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1151),
     1,
     sym_comment,
-    ACTIONS(3280),
+    ACTIONS(3286),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [47403] = 5,
+    anon_sym_GT,
+    anon_sym_COMMA,
+    [47443] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(2510),
     1,
     anon_sym_COLON_COLON,
-    ACTIONS(3282),
+    ACTIONS(3288),
     1,
     anon_sym_LBRACE,
     STATE(1152),
     1,
     sym_comment,
-    [47419] = 5,
+    [47459] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
+    ACTIONS(3290),
     1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3284),
+    anon_sym_LBRACE,
+    ACTIONS(3292),
     1,
-    anon_sym_RPAREN,
+    anon_sym_SEMI,
     STATE(1153),
     1,
     sym_comment,
-    [47435] = 4,
+    [47475] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74222,27 +74269,27 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1154),
     1,
     sym_comment,
-    ACTIONS(3286),
+    ACTIONS(3294),
     2,
     anon_sym_RBRACE,
     anon_sym_bitfield,
-    [47449] = 5,
+    [47489] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2500),
-    1,
-    anon_sym_COLON_COLON,
-    ACTIONS(3288),
+    ACTIONS(3118),
     1,
-    anon_sym_SEMI,
+    aux_sym_max_expr_token1,
     STATE(1155),
     1,
     sym_comment,
-    [47465] = 4,
+    STATE(1368),
+    1,
+    sym_max_expr,
+    [47505] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74252,103 +74299,103 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1156),
     1,
     sym_comment,
-    ACTIONS(3290),
+    ACTIONS(3296),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [47479] = 5,
+    [47519] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3292),
-    1,
-    aux_sym_floating_pt_literal_token1,
-    ACTIONS(3294),
-    1,
-    aux_sym_fixed_pt_literal_token1,
     STATE(1157),
     1,
     sym_comment,
-    [47495] = 4,
+    ACTIONS(3298),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [47533] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3120),
+    1,
+    aux_sym_min_expr_token1,
     STATE(1158),
     1,
     sym_comment,
-    ACTIONS(3296),
-    2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [47509] = 5,
+    STATE(1650),
+    1,
+    sym_min_expr,
+    [47549] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3230),
+    ACTIONS(2510),
     1,
-    aux_sym_min_expr_token1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3300),
+    1,
+    anon_sym_RPAREN,
     STATE(1159),
     1,
     sym_comment,
-    STATE(1670),
-    1,
-    sym_min_expr,
-    [47525] = 5,
+    [47565] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3230),
+    ACTIONS(3120),
     1,
     aux_sym_min_expr_token1,
     STATE(1160),
     1,
     sym_comment,
-    STATE(1690),
+    STATE(1670),
     1,
     sym_min_expr,
-    [47541] = 4,
+    [47581] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(2510),
+    1,
+    anon_sym_COLON_COLON,
+    ACTIONS(3302),
+    1,
+    anon_sym_SEMI,
     STATE(1161),
     1,
     sym_comment,
-    ACTIONS(3298),
-    2,
-    anon_sym_COMMA,
-    anon_sym_RBRACE,
-    [47555] = 5,
+    [47597] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3300),
-    1,
-    anon_sym_GT,
-    ACTIONS(3302),
-    1,
-    anon_sym_COMMA,
     STATE(1162),
     1,
     sym_comment,
-    [47571] = 4,
+    ACTIONS(3304),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [47611] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74358,11 +74405,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1163),
     1,
     sym_comment,
-    ACTIONS(3304),
+    ACTIONS(3306),
     2,
-    anon_sym_SEMI,
-    sym_identifier,
-    [47585] = 4,
+    anon_sym_COMMA,
+    anon_sym_RBRACE,
+    [47625] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74372,11 +74419,11 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1164),
     1,
     sym_comment,
-    ACTIONS(3306),
+    ACTIONS(3308),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [47599] = 4,
+    [47639] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
@@ -74386,7001 +74433,7001 @@ static const uint16_t ts_small_parse_table[] = {
     STATE(1165),
     1,
     sym_comment,
-    ACTIONS(3308),
+    ACTIONS(3310),
     2,
     anon_sym_SEMI,
     sym_identifier,
-    [47613] = 5,
+    [47653] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3118),
-    1,
-    aux_sym_max_expr_token1,
     STATE(1166),
     1,
     sym_comment,
-    STATE(1317),
-    1,
-    sym_max_expr,
-    [47629] = 4,
+    ACTIONS(3312),
+    2,
+    anon_sym_SEMI,
+    sym_identifier,
+    [47667] = 5,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
+    ACTIONS(3118),
+    1,
+    aux_sym_max_expr_token1,
     STATE(1167),
     1,
     sym_comment,
-    ACTIONS(2805),
-    2,
-    anon_sym_COMMA,
-    anon_sym_SEMI,
-    [47643] = 4,
+    STATE(1317),
+    1,
+    sym_max_expr,
+    [47683] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3310),
+    ACTIONS(3314),
     1,
     anon_sym_RBRACE,
     STATE(1168),
     1,
     sym_comment,
-    [47656] = 4,
+    [47696] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3312),
+    ACTIONS(3316),
     1,
     anon_sym_RPAREN,
     STATE(1169),
     1,
     sym_comment,
-    [47669] = 4,
+    [47709] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3314),
+    ACTIONS(3318),
     1,
     anon_sym_SEMI,
     STATE(1170),
     1,
     sym_comment,
-    [47682] = 4,
+    [47722] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3316),
+    ACTIONS(3320),
     1,
     anon_sym_SEMI,
     STATE(1171),
     1,
     sym_comment,
-    [47695] = 4,
+    [47735] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3318),
+    ACTIONS(3322),
     1,
     anon_sym_RBRACE,
     STATE(1172),
     1,
     sym_comment,
-    [47708] = 4,
+    [47748] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3320),
+    ACTIONS(3324),
     1,
     sym_identifier,
     STATE(1173),
     1,
     sym_comment,
-    [47721] = 4,
+    [47761] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3322),
+    ACTIONS(3326),
     1,
     sym_identifier,
     STATE(1174),
     1,
     sym_comment,
-    [47734] = 4,
+    [47774] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3324),
+    ACTIONS(3328),
     1,
     anon_sym_SEMI,
     STATE(1175),
     1,
     sym_comment,
-    [47747] = 4,
+    [47787] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3326),
+    ACTIONS(3330),
     1,
     anon_sym_RBRACE,
     STATE(1176),
     1,
     sym_comment,
-    [47760] = 4,
+    [47800] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3328),
+    ACTIONS(3332),
     1,
     anon_sym_SEMI,
     STATE(1177),
     1,
     sym_comment,
-    [47773] = 4,
+    [47813] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3330),
+    ACTIONS(3334),
     1,
     anon_sym_SEMI,
     STATE(1178),
     1,
     sym_comment,
-    [47786] = 4,
+    [47826] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3332),
+    ACTIONS(3336),
     1,
     sym_identifier,
     STATE(1179),
     1,
     sym_comment,
-    [47799] = 4,
+    [47839] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3334),
+    ACTIONS(3338),
     1,
     anon_sym_SEMI,
     STATE(1180),
     1,
     sym_comment,
-    [47812] = 4,
+    [47852] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3336),
+    ACTIONS(3340),
     1,
     anon_sym_LBRACE,
     STATE(1181),
     1,
     sym_comment,
-    [47825] = 4,
+    [47865] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3338),
+    ACTIONS(3342),
     1,
     anon_sym_SEMI,
     STATE(1182),
     1,
     sym_comment,
-    [47838] = 4,
+    [47878] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3340),
+    ACTIONS(3344),
     1,
     anon_sym_SEMI,
     STATE(1183),
     1,
     sym_comment,
-    [47851] = 4,
+    [47891] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3342),
+    ACTIONS(3346),
     1,
     sym_identifier,
     STATE(1184),
     1,
     sym_comment,
-    [47864] = 4,
+    [47904] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(3344),
+    ACTIONS(3348),
     1,
     aux_sym_preproc_call_token1,
     STATE(1185),
     1,
     sym_comment,
-    [47877] = 4,
+    [47917] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3346),
+    ACTIONS(3350),
     1,
     anon_sym_SEMI,
     STATE(1186),
     1,
     sym_comment,
-    [47890] = 4,
+    [47930] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2813),
+    ACTIONS(2829),
     1,
     anon_sym_SEMI,
     STATE(1187),
     1,
     sym_comment,
-    [47903] = 4,
+    [47943] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3348),
+    ACTIONS(3352),
     1,
     anon_sym_LBRACE,
     STATE(1188),
     1,
     sym_comment,
-    [47916] = 4,
+    [47956] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3350),
+    ACTIONS(3354),
     1,
-    anon_sym_SEMI,
+    anon_sym_manages,
     STATE(1189),
     1,
     sym_comment,
-    [47929] = 4,
+    [47969] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2253),
+    ACTIONS(2175),
     1,
     aux_sym_preproc_call_token1,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1190),
     1,
     sym_comment,
-    [47942] = 4,
+    [47982] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3352),
+    ACTIONS(3356),
     1,
     anon_sym_SEMI,
     STATE(1191),
     1,
     sym_comment,
-    [47955] = 4,
+    [47995] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3354),
+    ACTIONS(3358),
     1,
     anon_sym_LBRACE,
     STATE(1192),
     1,
     sym_comment,
-    [47968] = 4,
+    [48008] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3356),
+    ACTIONS(3360),
     1,
     anon_sym_LBRACE,
     STATE(1193),
     1,
     sym_comment,
-    [47981] = 4,
+    [48021] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3358),
+    ACTIONS(3362),
     1,
     anon_sym_LT,
     STATE(1194),
     1,
     sym_comment,
-    [47994] = 4,
+    [48034] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2849),
+    ACTIONS(2869),
     1,
     anon_sym_RBRACE,
     STATE(1195),
     1,
     sym_comment,
-    [48007] = 4,
+    [48047] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3360),
+    ACTIONS(3364),
     1,
     sym_identifier,
     STATE(1196),
     1,
     sym_comment,
-    [48020] = 4,
+    [48060] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3362),
+    ACTIONS(3366),
     1,
     anon_sym_SEMI,
     STATE(1197),
     1,
     sym_comment,
-    [48033] = 4,
+    [48073] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3270),
+    ACTIONS(3274),
     1,
     sym_identifier,
     STATE(1198),
     1,
     sym_comment,
-    [48046] = 4,
+    [48086] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3364),
+    ACTIONS(3368),
     1,
     anon_sym_SEMI,
     STATE(1199),
     1,
     sym_comment,
-    [48059] = 4,
+    [48099] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3366),
+    ACTIONS(3370),
     1,
     anon_sym_RPAREN,
     STATE(1200),
     1,
     sym_comment,
-    [48072] = 4,
+    [48112] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3368),
+    ACTIONS(3372),
     1,
     anon_sym_RPAREN,
     STATE(1201),
     1,
     sym_comment,
-    [48085] = 4,
+    [48125] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3370),
+    ACTIONS(3374),
     1,
     anon_sym_RPAREN,
     STATE(1202),
     1,
     sym_comment,
-    [48098] = 4,
+    [48138] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3372),
+    ACTIONS(3376),
     1,
     anon_sym_RPAREN,
     STATE(1203),
     1,
     sym_comment,
-    [48111] = 4,
+    [48151] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3374),
+    ACTIONS(3378),
     1,
     anon_sym_RPAREN,
     STATE(1204),
     1,
     sym_comment,
-    [48124] = 4,
+    [48164] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3376),
+    ACTIONS(3380),
     1,
     anon_sym_RPAREN,
     STATE(1205),
     1,
     sym_comment,
-    [48137] = 4,
+    [48177] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3378),
+    ACTIONS(3382),
     1,
     anon_sym_RPAREN,
     STATE(1206),
     1,
     sym_comment,
-    [48150] = 4,
+    [48190] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3380),
+    ACTIONS(3384),
     1,
     anon_sym_RPAREN,
     STATE(1207),
     1,
     sym_comment,
-    [48163] = 4,
+    [48203] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3382),
+    ACTIONS(3386),
     1,
     anon_sym_RPAREN,
     STATE(1208),
     1,
     sym_comment,
-    [48176] = 4,
+    [48216] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3384),
+    ACTIONS(3388),
     1,
     anon_sym_void,
     STATE(1209),
     1,
     sym_comment,
-    [48189] = 4,
+    [48229] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3386),
+    ACTIONS(3390),
     1,
     anon_sym_RPAREN,
     STATE(1210),
     1,
     sym_comment,
-    [48202] = 4,
+    [48242] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3388),
+    ACTIONS(3392),
     1,
     anon_sym_LBRACE,
     STATE(1211),
     1,
     sym_comment,
-    [48215] = 4,
+    [48255] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3246),
+    ACTIONS(3256),
     1,
     anon_sym_valuetype,
     STATE(1212),
     1,
     sym_comment,
-    [48228] = 4,
+    [48268] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3390),
+    ACTIONS(3394),
     1,
     anon_sym_attribute,
     STATE(1213),
     1,
     sym_comment,
-    [48241] = 4,
+    [48281] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3392),
+    ACTIONS(3396),
     1,
     anon_sym_EQ,
     STATE(1214),
     1,
     sym_comment,
-    [48254] = 4,
+    [48294] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3394),
+    ACTIONS(3398),
     1,
     sym_identifier,
     STATE(1215),
     1,
     sym_comment,
-    [48267] = 4,
+    [48307] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2873),
+    ACTIONS(2891),
     1,
     anon_sym_valuetype,
     STATE(1216),
     1,
     sym_comment,
-    [48280] = 4,
+    [48320] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3396),
+    ACTIONS(3400),
     1,
     anon_sym_COMMA,
     STATE(1217),
     1,
     sym_comment,
-    [48293] = 4,
+    [48333] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3398),
+    ACTIONS(3402),
     1,
     anon_sym_RPAREN,
     STATE(1218),
     1,
     sym_comment,
-    [48306] = 4,
+    [48346] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3400),
+    ACTIONS(3404),
     1,
     anon_sym_RPAREN,
     STATE(1219),
     1,
     sym_comment,
-    [48319] = 4,
+    [48359] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3402),
+    ACTIONS(3406),
     1,
     anon_sym_SEMI,
     STATE(1220),
     1,
     sym_comment,
-    [48332] = 4,
+    [48372] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3404),
+    ACTIONS(3408),
     1,
     anon_sym_RPAREN,
     STATE(1221),
     1,
     sym_comment,
-    [48345] = 4,
+    [48385] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3406),
+    ACTIONS(3410),
     1,
     anon_sym_RPAREN,
     STATE(1222),
     1,
     sym_comment,
-    [48358] = 4,
+    [48398] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3408),
+    ACTIONS(3412),
     1,
     anon_sym_RPAREN,
     STATE(1223),
     1,
     sym_comment,
-    [48371] = 4,
+    [48411] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3410),
+    ACTIONS(3414),
     1,
     anon_sym_RPAREN,
     STATE(1224),
     1,
     sym_comment,
-    [48384] = 4,
+    [48424] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3412),
+    ACTIONS(3416),
     1,
     anon_sym_COMMA,
     STATE(1225),
     1,
     sym_comment,
-    [48397] = 4,
+    [48437] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3414),
+    ACTIONS(3418),
     1,
     anon_sym_COMMA,
     STATE(1226),
     1,
     sym_comment,
-    [48410] = 4,
+    [48450] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3416),
+    ACTIONS(3420),
     1,
     anon_sym_RPAREN,
     STATE(1227),
     1,
     sym_comment,
-    [48423] = 4,
+    [48463] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3418),
+    ACTIONS(3422),
     1,
     anon_sym_COMMA,
     STATE(1228),
     1,
     sym_comment,
-    [48436] = 4,
+    [48476] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3420),
+    ACTIONS(3424),
     1,
     anon_sym_COMMA,
     STATE(1229),
     1,
     sym_comment,
-    [48449] = 4,
+    [48489] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3422),
+    ACTIONS(3426),
     1,
     anon_sym_RPAREN,
     STATE(1230),
     1,
     sym_comment,
-    [48462] = 4,
+    [48502] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3424),
+    ACTIONS(3428),
     1,
     anon_sym_RPAREN,
     STATE(1231),
     1,
     sym_comment,
-    [48475] = 4,
+    [48515] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3426),
+    ACTIONS(3430),
     1,
     anon_sym_RPAREN,
     STATE(1232),
     1,
     sym_comment,
-    [48488] = 4,
+    [48528] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3428),
+    ACTIONS(3432),
     1,
     anon_sym_RPAREN,
     STATE(1233),
     1,
     sym_comment,
-    [48501] = 4,
+    [48541] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3430),
+    ACTIONS(3434),
     1,
     anon_sym_RPAREN,
     STATE(1234),
     1,
     sym_comment,
-    [48514] = 4,
+    [48554] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3432),
+    ACTIONS(3436),
     1,
     anon_sym_RPAREN,
     STATE(1235),
     1,
     sym_comment,
-    [48527] = 4,
+    [48567] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3434),
+    ACTIONS(3438),
     1,
     anon_sym_RPAREN,
     STATE(1236),
     1,
     sym_comment,
-    [48540] = 4,
+    [48580] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3436),
+    ACTIONS(3440),
     1,
     anon_sym_RPAREN,
     STATE(1237),
     1,
     sym_comment,
-    [48553] = 4,
+    [48593] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3438),
+    ACTIONS(3442),
     1,
     anon_sym_RPAREN,
     STATE(1238),
     1,
     sym_comment,
-    [48566] = 4,
+    [48606] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3440),
+    ACTIONS(3444),
     1,
     anon_sym_RPAREN,
     STATE(1239),
     1,
     sym_comment,
-    [48579] = 4,
+    [48619] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3442),
+    ACTIONS(3446),
     1,
     anon_sym_RPAREN,
     STATE(1240),
     1,
     sym_comment,
-    [48592] = 4,
+    [48632] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3444),
+    ACTIONS(3448),
     1,
     anon_sym_RPAREN,
     STATE(1241),
     1,
     sym_comment,
-    [48605] = 4,
+    [48645] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3446),
+    ACTIONS(3450),
     1,
     anon_sym_EQ,
     STATE(1242),
     1,
     sym_comment,
-    [48618] = 4,
+    [48658] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3448),
+    ACTIONS(3452),
     1,
     anon_sym_RPAREN,
     STATE(1243),
     1,
     sym_comment,
-    [48631] = 4,
+    [48671] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3450),
+    ACTIONS(3454),
     1,
     anon_sym_EQ,
     STATE(1244),
     1,
     sym_comment,
-    [48644] = 4,
+    [48684] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3452),
+    ACTIONS(3456),
     1,
     anon_sym_RPAREN,
     STATE(1245),
     1,
     sym_comment,
-    [48657] = 4,
+    [48697] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2980),
+    ACTIONS(2816),
     1,
     anon_sym_RPAREN,
     STATE(1246),
     1,
     sym_comment,
-    [48670] = 4,
+    [48710] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3454),
+    ACTIONS(3458),
     1,
     anon_sym_RPAREN,
     STATE(1247),
     1,
     sym_comment,
-    [48683] = 4,
+    [48723] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3194),
+    ACTIONS(3204),
     1,
     sym_identifier,
     STATE(1248),
     1,
     sym_comment,
-    [48696] = 4,
+    [48736] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3456),
+    ACTIONS(3460),
     1,
     anon_sym_GT,
     STATE(1249),
     1,
     sym_comment,
-    [48709] = 4,
+    [48749] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3458),
+    ACTIONS(3462),
     1,
     sym_identifier,
     STATE(1250),
     1,
     sym_comment,
-    [48722] = 4,
+    [48762] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3460),
+    ACTIONS(3464),
     1,
     anon_sym_SEMI,
     STATE(1251),
     1,
     sym_comment,
-    [48735] = 4,
+    [48775] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3462),
+    ACTIONS(3466),
     1,
     anon_sym_GT,
     STATE(1252),
     1,
     sym_comment,
-    [48748] = 4,
+    [48788] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3464),
+    ACTIONS(3468),
     1,
     anon_sym_LBRACE,
     STATE(1253),
     1,
     sym_comment,
-    [48761] = 4,
+    [48801] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2633),
+    ACTIONS(2645),
     1,
     anon_sym_LBRACE,
     STATE(1254),
     1,
     sym_comment,
-    [48774] = 4,
+    [48814] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3023),
+    ACTIONS(3058),
     1,
     anon_sym_RBRACE,
     STATE(1255),
     1,
     sym_comment,
-    [48787] = 4,
+    [48827] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3466),
+    ACTIONS(3470),
     1,
     anon_sym_GT,
     STATE(1256),
     1,
     sym_comment,
-    [48800] = 4,
+    [48840] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3468),
+    ACTIONS(3472),
     1,
     anon_sym_GT,
     STATE(1257),
     1,
     sym_comment,
-    [48813] = 4,
+    [48853] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3470),
+    ACTIONS(3474),
     1,
     anon_sym_LBRACE,
     STATE(1258),
     1,
     sym_comment,
-    [48826] = 4,
+    [48866] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3472),
+    ACTIONS(3476),
     1,
     anon_sym_COMMA,
     STATE(1259),
     1,
     sym_comment,
-    [48839] = 4,
+    [48879] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3474),
+    ACTIONS(3478),
     1,
     anon_sym_COMMA,
     STATE(1260),
     1,
     sym_comment,
-    [48852] = 4,
+    [48892] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3476),
+    ACTIONS(3480),
     1,
     anon_sym_LBRACE,
     STATE(1261),
     1,
     sym_comment,
-    [48865] = 4,
+    [48905] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1611),
+    ACTIONS(1623),
     1,
     anon_sym_RPAREN,
     STATE(1262),
     1,
     sym_comment,
-    [48878] = 4,
+    [48918] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3478),
+    ACTIONS(3482),
     1,
-    anon_sym_manages,
+    anon_sym_SEMI,
     STATE(1263),
     1,
     sym_comment,
-    [48891] = 4,
+    [48931] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3480),
+    ACTIONS(3484),
     1,
     anon_sym_SEMI,
     STATE(1264),
     1,
     sym_comment,
-    [48904] = 4,
+    [48944] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3482),
+    ACTIONS(3486),
     1,
     anon_sym_RBRACE,
     STATE(1265),
     1,
     sym_comment,
-    [48917] = 4,
+    [48957] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3484),
+    ACTIONS(3488),
     1,
     sym_identifier,
     STATE(1266),
     1,
     sym_comment,
-    [48930] = 4,
+    [48970] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3486),
+    ACTIONS(3490),
     1,
     anon_sym_LBRACE,
     STATE(1267),
     1,
     sym_comment,
-    [48943] = 4,
+    [48983] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3488),
+    ACTIONS(3492),
     1,
     anon_sym_SEMI,
     STATE(1268),
     1,
     sym_comment,
-    [48956] = 4,
+    [48996] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3096),
+    ACTIONS(3007),
     1,
     anon_sym_manages,
     STATE(1269),
     1,
     sym_comment,
-    [48969] = 4,
+    [49009] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3490),
+    ACTIONS(3494),
     1,
     anon_sym_SEMI,
     STATE(1270),
     1,
     sym_comment,
-    [48982] = 4,
+    [49022] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3492),
+    ACTIONS(3496),
     1,
     anon_sym_LPAREN,
     STATE(1271),
     1,
     sym_comment,
-    [48995] = 4,
+    [49035] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3494),
+    ACTIONS(3498),
     1,
     anon_sym_SEMI,
     STATE(1272),
     1,
     sym_comment,
-    [49008] = 4,
+    [49048] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3496),
+    ACTIONS(3500),
     1,
     sym_identifier,
     STATE(1273),
     1,
     sym_comment,
-    [49021] = 4,
+    [49061] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3498),
+    ACTIONS(3502),
     1,
     anon_sym_LPAREN,
     STATE(1274),
     1,
     sym_comment,
-    [49034] = 4,
+    [49074] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3500),
+    ACTIONS(3504),
     1,
     sym_identifier,
     STATE(1275),
     1,
     sym_comment,
-    [49047] = 4,
+    [49087] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3502),
+    ACTIONS(3506),
     1,
     anon_sym_SEMI,
     STATE(1276),
     1,
     sym_comment,
-    [49060] = 4,
+    [49100] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3100),
+    ACTIONS(3112),
     1,
     anon_sym_LBRACE,
     STATE(1277),
     1,
     sym_comment,
-    [49073] = 4,
+    [49113] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3504),
+    ACTIONS(3508),
     1,
     sym_identifier,
     STATE(1278),
     1,
     sym_comment,
-    [49086] = 4,
+    [49126] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3506),
+    ACTIONS(3510),
     1,
     anon_sym_LPAREN,
     STATE(1279),
     1,
     sym_comment,
-    [49099] = 4,
+    [49139] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3508),
+    ACTIONS(3512),
     1,
     anon_sym_SEMI,
     STATE(1280),
     1,
     sym_comment,
-    [49112] = 4,
+    [49152] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3212),
+    ACTIONS(3124),
     1,
     sym_identifier,
     STATE(1281),
     1,
     sym_comment,
-    [49125] = 4,
+    [49165] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3098),
+    ACTIONS(3110),
     1,
     anon_sym_SEMI,
     STATE(1282),
     1,
     sym_comment,
-    [49138] = 4,
+    [49178] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3510),
+    ACTIONS(3514),
     1,
     sym_identifier,
     STATE(1283),
     1,
     sym_comment,
-    [49151] = 4,
+    [49191] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3512),
+    ACTIONS(3516),
     1,
     anon_sym_RPAREN,
     STATE(1284),
     1,
     sym_comment,
-    [49164] = 4,
+    [49204] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3514),
+    ACTIONS(3518),
     1,
     anon_sym_RPAREN,
     STATE(1285),
     1,
     sym_comment,
-    [49177] = 4,
+    [49217] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3516),
+    ACTIONS(3520),
     1,
     anon_sym_RPAREN,
     STATE(1286),
     1,
     sym_comment,
-    [49190] = 4,
+    [49230] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3518),
+    ACTIONS(3522),
     1,
     anon_sym_RPAREN,
     STATE(1287),
     1,
     sym_comment,
-    [49203] = 4,
+    [49243] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3520),
+    ACTIONS(3524),
     1,
     anon_sym_RPAREN,
     STATE(1288),
     1,
     sym_comment,
-    [49216] = 4,
+    [49256] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3522),
+    ACTIONS(3526),
     1,
     anon_sym_RPAREN,
     STATE(1289),
     1,
     sym_comment,
-    [49229] = 4,
+    [49269] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3524),
+    ACTIONS(3528),
     1,
     anon_sym_RPAREN,
     STATE(1290),
     1,
     sym_comment,
-    [49242] = 4,
+    [49282] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3526),
+    ACTIONS(3530),
     1,
     anon_sym_RPAREN,
     STATE(1291),
     1,
     sym_comment,
-    [49255] = 4,
+    [49295] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3528),
+    ACTIONS(3532),
     1,
     anon_sym_RPAREN,
     STATE(1292),
     1,
     sym_comment,
-    [49268] = 4,
+    [49308] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3530),
+    ACTIONS(3534),
     1,
     anon_sym_RPAREN,
     STATE(1293),
     1,
     sym_comment,
-    [49281] = 4,
+    [49321] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3532),
+    ACTIONS(3536),
     1,
     anon_sym_RPAREN,
     STATE(1294),
     1,
     sym_comment,
-    [49294] = 4,
+    [49334] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3534),
+    ACTIONS(3538),
     1,
     anon_sym_RPAREN,
     STATE(1295),
     1,
     sym_comment,
-    [49307] = 4,
+    [49347] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3536),
+    ACTIONS(3540),
     1,
     anon_sym_RPAREN,
     STATE(1296),
     1,
     sym_comment,
-    [49320] = 4,
+    [49360] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3538),
+    ACTIONS(3542),
     1,
     anon_sym_RPAREN,
     STATE(1297),
     1,
     sym_comment,
-    [49333] = 4,
+    [49373] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3540),
+    ACTIONS(3544),
     1,
     anon_sym_RPAREN,
     STATE(1298),
     1,
     sym_comment,
-    [49346] = 4,
+    [49386] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3542),
+    ACTIONS(3546),
     1,
     anon_sym_RPAREN,
     STATE(1299),
     1,
     sym_comment,
-    [49359] = 4,
+    [49399] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3544),
+    ACTIONS(3548),
     1,
     anon_sym_RPAREN,
     STATE(1300),
     1,
     sym_comment,
-    [49372] = 4,
+    [49412] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3546),
+    ACTIONS(3550),
     1,
     anon_sym_RPAREN,
     STATE(1301),
     1,
     sym_comment,
-    [49385] = 4,
+    [49425] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3548),
+    ACTIONS(3552),
     1,
     anon_sym_RPAREN,
     STATE(1302),
     1,
     sym_comment,
-    [49398] = 4,
+    [49438] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3550),
+    ACTIONS(3554),
     1,
     anon_sym_RPAREN,
     STATE(1303),
     1,
     sym_comment,
-    [49411] = 4,
+    [49451] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3552),
+    ACTIONS(3556),
     1,
     anon_sym_RPAREN,
     STATE(1304),
     1,
     sym_comment,
-    [49424] = 4,
+    [49464] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3554),
+    ACTIONS(3558),
     1,
     anon_sym_RPAREN,
     STATE(1305),
     1,
     sym_comment,
-    [49437] = 4,
+    [49477] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3556),
+    ACTIONS(3560),
     1,
     anon_sym_RPAREN,
     STATE(1306),
     1,
     sym_comment,
-    [49450] = 4,
+    [49490] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3558),
+    ACTIONS(3562),
     1,
     anon_sym_RPAREN,
     STATE(1307),
     1,
     sym_comment,
-    [49463] = 4,
+    [49503] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3560),
+    ACTIONS(3564),
     1,
     sym_identifier,
     STATE(1308),
     1,
     sym_comment,
-    [49476] = 4,
+    [49516] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3562),
+    ACTIONS(3566),
     1,
     anon_sym_SEMI,
     STATE(1309),
     1,
     sym_comment,
-    [49489] = 4,
+    [49529] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3564),
+    ACTIONS(3568),
     1,
     anon_sym_RPAREN,
     STATE(1310),
     1,
     sym_comment,
-    [49502] = 4,
+    [49542] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3566),
+    ACTIONS(3570),
     1,
     anon_sym_RPAREN,
     STATE(1311),
     1,
     sym_comment,
-    [49515] = 4,
+    [49555] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3568),
+    ACTIONS(3572),
     1,
     anon_sym_RPAREN,
     STATE(1312),
     1,
     sym_comment,
-    [49528] = 4,
+    [49568] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3570),
+    ACTIONS(3574),
     1,
     anon_sym_RPAREN,
     STATE(1313),
     1,
     sym_comment,
-    [49541] = 4,
+    [49581] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3572),
+    ACTIONS(3576),
     1,
     anon_sym_LPAREN,
     STATE(1314),
     1,
     sym_comment,
-    [49554] = 4,
+    [49594] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3574),
+    ACTIONS(3578),
     1,
     anon_sym_LPAREN,
     STATE(1315),
     1,
     sym_comment,
-    [49567] = 4,
+    [49607] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3576),
+    ACTIONS(3580),
     1,
     anon_sym_EQ,
     STATE(1316),
     1,
     sym_comment,
-    [49580] = 4,
+    [49620] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3578),
+    ACTIONS(3582),
     1,
     anon_sym_RPAREN,
     STATE(1317),
     1,
     sym_comment,
-    [49593] = 4,
+    [49633] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3580),
+    ACTIONS(3584),
     1,
     anon_sym_RPAREN,
     STATE(1318),
     1,
     sym_comment,
-    [49606] = 4,
+    [49646] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3582),
+    ACTIONS(3586),
     1,
     anon_sym_RPAREN,
     STATE(1319),
     1,
     sym_comment,
-    [49619] = 4,
+    [49659] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3584),
+    ACTIONS(3588),
     1,
-    anon_sym_COLON,
+    anon_sym_SEMI,
     STATE(1320),
     1,
     sym_comment,
-    [49632] = 4,
+    [49672] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3586),
+    ACTIONS(3590),
     1,
     anon_sym_RPAREN,
     STATE(1321),
     1,
     sym_comment,
-    [49645] = 4,
+    [49685] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3588),
+    ACTIONS(3592),
     1,
     anon_sym_RPAREN,
     STATE(1322),
     1,
     sym_comment,
-    [49658] = 4,
+    [49698] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3590),
+    ACTIONS(3594),
     1,
     anon_sym_RPAREN,
     STATE(1323),
     1,
     sym_comment,
-    [49671] = 4,
+    [49711] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3592),
+    ACTIONS(3596),
     1,
     anon_sym_SEMI,
     STATE(1324),
     1,
     sym_comment,
-    [49684] = 4,
+    [49724] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3594),
+    ACTIONS(3598),
     1,
     sym_identifier,
     STATE(1325),
     1,
     sym_comment,
-    [49697] = 4,
+    [49737] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3596),
+    ACTIONS(3600),
     1,
     anon_sym_RPAREN,
     STATE(1326),
     1,
     sym_comment,
-    [49710] = 4,
+    [49750] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3598),
+    ACTIONS(3602),
     1,
     sym_identifier,
     STATE(1327),
     1,
     sym_comment,
-    [49723] = 4,
+    [49763] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3600),
+    ACTIONS(3604),
     1,
     sym_identifier,
     STATE(1328),
     1,
     sym_comment,
-    [49736] = 4,
+    [49776] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3602),
+    ACTIONS(3606),
     1,
     anon_sym_SEMI,
     STATE(1329),
     1,
     sym_comment,
-    [49749] = 4,
+    [49789] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3604),
+    ACTIONS(3608),
     1,
     anon_sym_SEMI,
     STATE(1330),
     1,
     sym_comment,
-    [49762] = 4,
+    [49802] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3606),
+    ACTIONS(3610),
     1,
     anon_sym_SEMI,
     STATE(1331),
     1,
     sym_comment,
-    [49775] = 4,
+    [49815] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3608),
+    ACTIONS(3612),
     1,
     sym_identifier,
     STATE(1332),
     1,
     sym_comment,
-    [49788] = 4,
+    [49828] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3610),
+    ACTIONS(3614),
     1,
     anon_sym_SEMI,
     STATE(1333),
     1,
     sym_comment,
-    [49801] = 4,
+    [49841] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3612),
+    ACTIONS(3616),
     1,
     anon_sym_GT,
     STATE(1334),
     1,
     sym_comment,
-    [49814] = 4,
+    [49854] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3019),
+    ACTIONS(3030),
     1,
     anon_sym_SEMI,
     STATE(1335),
     1,
     sym_comment,
-    [49827] = 4,
+    [49867] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3614),
+    ACTIONS(3618),
     1,
     anon_sym_SEMI,
     STATE(1336),
     1,
     sym_comment,
-    [49840] = 4,
+    [49880] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3616),
+    ACTIONS(3620),
     1,
     anon_sym_RPAREN,
     STATE(1337),
     1,
     sym_comment,
-    [49853] = 4,
+    [49893] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3618),
+    ACTIONS(3622),
     1,
     anon_sym_RPAREN,
     STATE(1338),
     1,
     sym_comment,
-    [49866] = 4,
+    [49906] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3620),
+    ACTIONS(3624),
     1,
     anon_sym_RPAREN,
     STATE(1339),
     1,
     sym_comment,
-    [49879] = 4,
+    [49919] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3622),
+    ACTIONS(3626),
     1,
     anon_sym_RPAREN,
     STATE(1340),
     1,
     sym_comment,
-    [49892] = 4,
+    [49932] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3624),
+    ACTIONS(3628),
     1,
     anon_sym_RPAREN,
     STATE(1341),
     1,
     sym_comment,
-    [49905] = 4,
+    [49945] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3626),
+    ACTIONS(3630),
     1,
     anon_sym_RPAREN,
     STATE(1342),
     1,
     sym_comment,
-    [49918] = 4,
+    [49958] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3628),
+    ACTIONS(3632),
     1,
     anon_sym_RPAREN,
     STATE(1343),
     1,
     sym_comment,
-    [49931] = 4,
+    [49971] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3630),
+    ACTIONS(3634),
     1,
     anon_sym_RPAREN,
     STATE(1344),
     1,
     sym_comment,
-    [49944] = 4,
+    [49984] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3632),
+    ACTIONS(3636),
     1,
     anon_sym_RPAREN,
     STATE(1345),
     1,
     sym_comment,
-    [49957] = 4,
+    [49997] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3634),
+    ACTIONS(3638),
     1,
     anon_sym_RPAREN,
     STATE(1346),
     1,
     sym_comment,
-    [49970] = 4,
+    [50010] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3636),
+    ACTIONS(3640),
     1,
     anon_sym_RPAREN,
     STATE(1347),
     1,
     sym_comment,
-    [49983] = 4,
+    [50023] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3638),
+    ACTIONS(3642),
     1,
     anon_sym_RPAREN,
     STATE(1348),
     1,
     sym_comment,
-    [49996] = 4,
+    [50036] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3640),
+    ACTIONS(3644),
     1,
     anon_sym_RPAREN,
     STATE(1349),
     1,
     sym_comment,
-    [50009] = 4,
+    [50049] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3642),
+    ACTIONS(3646),
     1,
     anon_sym_RPAREN,
     STATE(1350),
     1,
     sym_comment,
-    [50022] = 4,
+    [50062] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3644),
+    ACTIONS(3648),
     1,
     anon_sym_RPAREN,
     STATE(1351),
     1,
     sym_comment,
-    [50035] = 4,
+    [50075] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3646),
+    ACTIONS(3650),
     1,
     anon_sym_RPAREN,
     STATE(1352),
     1,
     sym_comment,
-    [50048] = 4,
+    [50088] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3648),
+    ACTIONS(3652),
     1,
     anon_sym_RPAREN,
     STATE(1353),
     1,
     sym_comment,
-    [50061] = 4,
+    [50101] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3650),
+    ACTIONS(3654),
     1,
     anon_sym_RPAREN,
     STATE(1354),
     1,
     sym_comment,
-    [50074] = 4,
+    [50114] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3652),
+    ACTIONS(3656),
     1,
     anon_sym_RPAREN,
     STATE(1355),
     1,
     sym_comment,
-    [50087] = 4,
+    [50127] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3654),
+    ACTIONS(3658),
     1,
     anon_sym_RPAREN,
     STATE(1356),
     1,
     sym_comment,
-    [50100] = 4,
+    [50140] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3656),
+    ACTIONS(3660),
     1,
     anon_sym_RPAREN,
     STATE(1357),
     1,
     sym_comment,
-    [50113] = 4,
+    [50153] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3658),
+    ACTIONS(3662),
     1,
     anon_sym_RPAREN,
     STATE(1358),
     1,
     sym_comment,
-    [50126] = 4,
+    [50166] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3660),
+    ACTIONS(3664),
     1,
     anon_sym_RPAREN,
     STATE(1359),
     1,
     sym_comment,
-    [50139] = 4,
+    [50179] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3662),
+    ACTIONS(3666),
     1,
     anon_sym_RPAREN,
     STATE(1360),
     1,
     sym_comment,
-    [50152] = 4,
+    [50192] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3664),
+    ACTIONS(3668),
     1,
     anon_sym_SEMI,
     STATE(1361),
     1,
     sym_comment,
-    [50165] = 4,
+    [50205] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3666),
+    ACTIONS(3670),
     1,
-    anon_sym_SEMI,
+    anon_sym_RPAREN,
     STATE(1362),
     1,
     sym_comment,
-    [50178] = 4,
+    [50218] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3668),
+    ACTIONS(3672),
     1,
     anon_sym_RPAREN,
     STATE(1363),
     1,
     sym_comment,
-    [50191] = 4,
+    [50231] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3670),
+    ACTIONS(3674),
     1,
     anon_sym_RPAREN,
     STATE(1364),
     1,
     sym_comment,
-    [50204] = 4,
+    [50244] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3672),
+    ACTIONS(3676),
     1,
     anon_sym_RPAREN,
     STATE(1365),
     1,
     sym_comment,
-    [50217] = 4,
+    [50257] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3674),
+    ACTIONS(3678),
     1,
     anon_sym_RPAREN,
     STATE(1366),
     1,
     sym_comment,
-    [50230] = 4,
+    [50270] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3676),
+    ACTIONS(3680),
     1,
-    anon_sym_RPAREN,
+    anon_sym_COLON,
     STATE(1367),
     1,
     sym_comment,
-    [50243] = 4,
+    [50283] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3678),
+    ACTIONS(3682),
     1,
     anon_sym_RPAREN,
     STATE(1368),
     1,
     sym_comment,
-    [50256] = 4,
+    [50296] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3680),
+    ACTIONS(3684),
     1,
     anon_sym_RPAREN,
     STATE(1369),
     1,
     sym_comment,
-    [50269] = 4,
+    [50309] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3682),
+    ACTIONS(3686),
     1,
     anon_sym_RPAREN,
     STATE(1370),
     1,
     sym_comment,
-    [50282] = 4,
+    [50322] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3684),
+    ACTIONS(3688),
     1,
     anon_sym_SEMI,
     STATE(1371),
     1,
     sym_comment,
-    [50295] = 4,
+    [50335] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3686),
+    ACTIONS(3690),
     1,
     anon_sym_RPAREN,
     STATE(1372),
     1,
     sym_comment,
-    [50308] = 4,
+    [50348] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3688),
+    ACTIONS(3692),
     1,
     anon_sym_RPAREN,
     STATE(1373),
     1,
     sym_comment,
-    [50321] = 4,
+    [50361] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3690),
+    ACTIONS(3694),
     1,
     anon_sym_RPAREN,
     STATE(1374),
     1,
     sym_comment,
-    [50334] = 4,
+    [50374] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3692),
+    ACTIONS(3696),
     1,
     anon_sym_SEMI,
     STATE(1375),
     1,
     sym_comment,
-    [50347] = 4,
+    [50387] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3694),
+    ACTIONS(3698),
     1,
     anon_sym_RPAREN,
     STATE(1376),
     1,
     sym_comment,
-    [50360] = 4,
+    [50400] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3696),
+    ACTIONS(3700),
     1,
     anon_sym_SEMI,
     STATE(1377),
     1,
     sym_comment,
-    [50373] = 4,
+    [50413] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3698),
+    ACTIONS(3702),
     1,
     sym_identifier,
     STATE(1378),
     1,
     sym_comment,
-    [50386] = 4,
+    [50426] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3700),
+    ACTIONS(3704),
     1,
     anon_sym_EQ,
     STATE(1379),
     1,
     sym_comment,
-    [50399] = 4,
+    [50439] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3702),
+    ACTIONS(3706),
     1,
     anon_sym_SEMI,
     STATE(1380),
     1,
     sym_comment,
-    [50412] = 4,
+    [50452] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3704),
+    ACTIONS(3708),
     1,
     anon_sym_LPAREN,
     STATE(1381),
     1,
     sym_comment,
-    [50425] = 4,
+    [50465] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3706),
+    ACTIONS(3710),
     1,
     sym_identifier,
     STATE(1382),
     1,
     sym_comment,
-    [50438] = 4,
+    [50478] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3708),
+    ACTIONS(3712),
     1,
     anon_sym_SEMI,
     STATE(1383),
     1,
     sym_comment,
-    [50451] = 4,
+    [50491] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2950),
+    ACTIONS(2966),
     1,
     anon_sym_LBRACE,
     STATE(1384),
     1,
     sym_comment,
-    [50464] = 4,
+    [50504] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3710),
+    ACTIONS(3714),
     1,
     anon_sym_RPAREN,
     STATE(1385),
     1,
     sym_comment,
-    [50477] = 4,
+    [50517] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3712),
+    ACTIONS(3716),
     1,
     anon_sym_RPAREN,
     STATE(1386),
     1,
     sym_comment,
-    [50490] = 4,
+    [50530] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3714),
+    ACTIONS(3718),
     1,
     anon_sym_RPAREN,
     STATE(1387),
     1,
     sym_comment,
-    [50503] = 4,
+    [50543] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3716),
+    ACTIONS(3720),
     1,
     anon_sym_RPAREN,
     STATE(1388),
     1,
     sym_comment,
-    [50516] = 4,
+    [50556] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3718),
+    ACTIONS(3722),
     1,
     anon_sym_RPAREN,
     STATE(1389),
     1,
     sym_comment,
-    [50529] = 4,
+    [50569] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3720),
+    ACTIONS(3724),
     1,
     anon_sym_RPAREN,
     STATE(1390),
     1,
     sym_comment,
-    [50542] = 4,
+    [50582] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3722),
+    ACTIONS(3726),
     1,
     anon_sym_RPAREN,
     STATE(1391),
     1,
     sym_comment,
-    [50555] = 4,
+    [50595] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3724),
+    ACTIONS(3728),
     1,
     anon_sym_RPAREN,
     STATE(1392),
     1,
     sym_comment,
-    [50568] = 4,
+    [50608] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3726),
+    ACTIONS(3730),
     1,
     anon_sym_RPAREN,
     STATE(1393),
     1,
     sym_comment,
-    [50581] = 4,
+    [50621] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3728),
+    ACTIONS(3732),
     1,
     anon_sym_RPAREN,
     STATE(1394),
     1,
     sym_comment,
-    [50594] = 4,
+    [50634] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3730),
+    ACTIONS(3734),
     1,
     anon_sym_RPAREN,
     STATE(1395),
     1,
     sym_comment,
-    [50607] = 4,
+    [50647] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3732),
+    ACTIONS(3736),
     1,
     anon_sym_RPAREN,
     STATE(1396),
     1,
     sym_comment,
-    [50620] = 4,
+    [50660] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3734),
+    ACTIONS(3738),
     1,
     anon_sym_RPAREN,
     STATE(1397),
     1,
     sym_comment,
-    [50633] = 4,
+    [50673] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3736),
+    ACTIONS(3740),
     1,
     anon_sym_RPAREN,
     STATE(1398),
     1,
     sym_comment,
-    [50646] = 4,
+    [50686] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3738),
+    ACTIONS(3742),
     1,
     anon_sym_RPAREN,
     STATE(1399),
     1,
     sym_comment,
-    [50659] = 4,
+    [50699] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3740),
+    ACTIONS(3744),
     1,
     anon_sym_RPAREN,
     STATE(1400),
     1,
     sym_comment,
-    [50672] = 4,
+    [50712] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3742),
+    ACTIONS(3746),
     1,
     anon_sym_RPAREN,
     STATE(1401),
     1,
     sym_comment,
-    [50685] = 4,
+    [50725] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3744),
+    ACTIONS(3748),
     1,
     anon_sym_RPAREN,
     STATE(1402),
     1,
     sym_comment,
-    [50698] = 4,
+    [50738] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3746),
+    ACTIONS(3750),
     1,
     anon_sym_RPAREN,
     STATE(1403),
     1,
     sym_comment,
-    [50711] = 4,
+    [50751] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3748),
+    ACTIONS(3752),
     1,
     anon_sym_RPAREN,
     STATE(1404),
     1,
     sym_comment,
-    [50724] = 4,
+    [50764] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3750),
+    ACTIONS(3754),
     1,
     anon_sym_RPAREN,
     STATE(1405),
     1,
     sym_comment,
-    [50737] = 4,
+    [50777] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3752),
+    ACTIONS(3756),
     1,
     anon_sym_RPAREN,
     STATE(1406),
     1,
     sym_comment,
-    [50750] = 4,
+    [50790] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3754),
+    ACTIONS(3758),
     1,
     anon_sym_RPAREN,
     STATE(1407),
     1,
     sym_comment,
-    [50763] = 4,
+    [50803] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3756),
+    ACTIONS(3760),
     1,
     anon_sym_RPAREN,
     STATE(1408),
     1,
     sym_comment,
-    [50776] = 4,
+    [50816] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3758),
+    ACTIONS(3762),
     1,
     anon_sym_SEMI,
     STATE(1409),
     1,
     sym_comment,
-    [50789] = 4,
+    [50829] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3760),
+    ACTIONS(3764),
     1,
     anon_sym_SEMI,
     STATE(1410),
     1,
     sym_comment,
-    [50802] = 4,
+    [50842] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3762),
+    ACTIONS(3766),
     1,
     anon_sym_RPAREN,
     STATE(1411),
     1,
     sym_comment,
-    [50815] = 4,
+    [50855] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3764),
+    ACTIONS(3768),
     1,
     anon_sym_RPAREN,
     STATE(1412),
     1,
     sym_comment,
-    [50828] = 4,
+    [50868] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3766),
+    ACTIONS(3770),
     1,
     anon_sym_RPAREN,
     STATE(1413),
     1,
     sym_comment,
-    [50841] = 4,
+    [50881] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3768),
+    ACTIONS(3772),
     1,
     anon_sym_RPAREN,
     STATE(1414),
     1,
     sym_comment,
-    [50854] = 4,
+    [50894] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3770),
+    ACTIONS(3774),
     1,
     anon_sym_SEMI,
     STATE(1415),
     1,
     sym_comment,
-    [50867] = 4,
+    [50907] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3772),
+    ACTIONS(3776),
     1,
     anon_sym_RPAREN,
     STATE(1416),
     1,
     sym_comment,
-    [50880] = 4,
+    [50920] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3774),
+    ACTIONS(3778),
     1,
     anon_sym_RPAREN,
     STATE(1417),
     1,
     sym_comment,
-    [50893] = 4,
+    [50933] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3776),
+    ACTIONS(3780),
     1,
     anon_sym_RPAREN,
     STATE(1418),
     1,
     sym_comment,
-    [50906] = 4,
+    [50946] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3778),
+    ACTIONS(3782),
     1,
     anon_sym_GT,
     STATE(1419),
     1,
     sym_comment,
-    [50919] = 4,
+    [50959] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3780),
+    ACTIONS(3784),
     1,
     anon_sym_RPAREN,
     STATE(1420),
     1,
     sym_comment,
-    [50932] = 4,
+    [50972] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3782),
+    ACTIONS(3786),
     1,
     anon_sym_RPAREN,
     STATE(1421),
     1,
     sym_comment,
-    [50945] = 4,
+    [50985] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3784),
+    ACTIONS(3788),
     1,
     anon_sym_RPAREN,
     STATE(1422),
     1,
     sym_comment,
-    [50958] = 4,
+    [50998] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3786),
+    ACTIONS(3790),
     1,
     anon_sym_COLON,
     STATE(1423),
     1,
     sym_comment,
-    [50971] = 4,
+    [51011] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3788),
+    ACTIONS(3792),
     1,
     anon_sym_RPAREN,
     STATE(1424),
     1,
     sym_comment,
-    [50984] = 4,
+    [51024] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3790),
+    ACTIONS(3794),
     1,
     anon_sym_SEMI,
     STATE(1425),
     1,
     sym_comment,
-    [50997] = 4,
+    [51037] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3792),
+    ACTIONS(3796),
     1,
     sym_identifier,
     STATE(1426),
     1,
     sym_comment,
-    [51010] = 4,
+    [51050] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2451),
+    ACTIONS(2467),
     1,
     anon_sym_LBRACE,
     STATE(1427),
     1,
     sym_comment,
-    [51023] = 4,
+    [51063] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3794),
+    ACTIONS(3798),
     1,
     anon_sym_RPAREN,
     STATE(1428),
     1,
     sym_comment,
-    [51036] = 4,
+    [51076] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3796),
+    ACTIONS(3800),
     1,
     anon_sym_RPAREN,
     STATE(1429),
     1,
     sym_comment,
-    [51049] = 4,
+    [51089] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3798),
+    ACTIONS(3802),
     1,
     sym_identifier,
     STATE(1430),
     1,
     sym_comment,
-    [51062] = 4,
+    [51102] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3800),
+    ACTIONS(3804),
     1,
     anon_sym_SEMI,
     STATE(1431),
     1,
     sym_comment,
-    [51075] = 4,
+    [51115] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3802),
+    ACTIONS(3806),
     1,
     anon_sym_RPAREN,
     STATE(1432),
     1,
     sym_comment,
-    [51088] = 4,
+    [51128] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3804),
+    ACTIONS(3808),
     1,
     anon_sym_RPAREN,
     STATE(1433),
     1,
     sym_comment,
-    [51101] = 4,
+    [51141] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3806),
+    ACTIONS(3810),
     1,
     anon_sym_RPAREN,
     STATE(1434),
     1,
     sym_comment,
-    [51114] = 4,
+    [51154] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3808),
+    ACTIONS(3812),
     1,
     anon_sym_RPAREN,
     STATE(1435),
     1,
     sym_comment,
-    [51127] = 4,
+    [51167] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3810),
+    ACTIONS(3814),
     1,
     anon_sym_RPAREN,
     STATE(1436),
     1,
     sym_comment,
-    [51140] = 4,
+    [51180] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3812),
+    ACTIONS(3816),
     1,
     anon_sym_SEMI,
     STATE(1437),
     1,
     sym_comment,
-    [51153] = 4,
+    [51193] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3814),
+    ACTIONS(3818),
     1,
     anon_sym_RPAREN,
     STATE(1438),
     1,
     sym_comment,
-    [51166] = 4,
+    [51206] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3816),
+    ACTIONS(3820),
     1,
     anon_sym_RPAREN,
     STATE(1439),
     1,
     sym_comment,
-    [51179] = 4,
+    [51219] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3818),
+    ACTIONS(3822),
     1,
     anon_sym_RPAREN,
     STATE(1440),
     1,
     sym_comment,
-    [51192] = 4,
+    [51232] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3820),
+    ACTIONS(3824),
     1,
     anon_sym_RPAREN,
     STATE(1441),
     1,
     sym_comment,
-    [51205] = 4,
+    [51245] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3822),
+    ACTIONS(3826),
     1,
     anon_sym_RPAREN,
     STATE(1442),
     1,
     sym_comment,
-    [51218] = 4,
+    [51258] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3824),
+    ACTIONS(3828),
     1,
     anon_sym_RPAREN,
     STATE(1443),
     1,
     sym_comment,
-    [51231] = 4,
+    [51271] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3826),
+    ACTIONS(3830),
     1,
     anon_sym_RPAREN,
     STATE(1444),
     1,
     sym_comment,
-    [51244] = 4,
+    [51284] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3828),
+    ACTIONS(3832),
     1,
     anon_sym_RPAREN,
     STATE(1445),
     1,
     sym_comment,
-    [51257] = 4,
+    [51297] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3830),
+    ACTIONS(3834),
     1,
     anon_sym_RPAREN,
     STATE(1446),
     1,
     sym_comment,
-    [51270] = 4,
+    [51310] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3832),
+    ACTIONS(3836),
     1,
     anon_sym_RPAREN,
     STATE(1447),
     1,
     sym_comment,
-    [51283] = 4,
+    [51323] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3834),
+    ACTIONS(3838),
     1,
     anon_sym_RPAREN,
     STATE(1448),
     1,
     sym_comment,
-    [51296] = 4,
+    [51336] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3836),
+    ACTIONS(3840),
     1,
     anon_sym_RPAREN,
     STATE(1449),
     1,
     sym_comment,
-    [51309] = 4,
+    [51349] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3838),
+    ACTIONS(3842),
     1,
     anon_sym_RPAREN,
     STATE(1450),
     1,
     sym_comment,
-    [51322] = 4,
+    [51362] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3840),
+    ACTIONS(3844),
     1,
     anon_sym_RPAREN,
     STATE(1451),
     1,
     sym_comment,
-    [51335] = 4,
+    [51375] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3842),
+    ACTIONS(3846),
     1,
     anon_sym_RPAREN,
     STATE(1452),
     1,
     sym_comment,
-    [51348] = 4,
+    [51388] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3844),
+    ACTIONS(3848),
     1,
     anon_sym_RPAREN,
     STATE(1453),
     1,
     sym_comment,
-    [51361] = 4,
+    [51401] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3846),
+    ACTIONS(3850),
     1,
     anon_sym_RPAREN,
     STATE(1454),
     1,
     sym_comment,
-    [51374] = 4,
+    [51414] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3848),
+    ACTIONS(3852),
     1,
     anon_sym_RPAREN,
     STATE(1455),
     1,
     sym_comment,
-    [51387] = 4,
+    [51427] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3850),
+    ACTIONS(3854),
     1,
     anon_sym_SEMI,
     STATE(1456),
     1,
     sym_comment,
-    [51400] = 4,
+    [51440] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3852),
+    ACTIONS(3856),
     1,
     anon_sym_SEMI,
     STATE(1457),
     1,
     sym_comment,
-    [51413] = 4,
+    [51453] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3854),
+    ACTIONS(3858),
     1,
     anon_sym_RPAREN,
     STATE(1458),
     1,
     sym_comment,
-    [51426] = 4,
+    [51466] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3856),
+    ACTIONS(3860),
     1,
     anon_sym_RPAREN,
     STATE(1459),
     1,
     sym_comment,
-    [51439] = 4,
+    [51479] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3858),
+    ACTIONS(3862),
     1,
     anon_sym_RPAREN,
     STATE(1460),
     1,
     sym_comment,
-    [51452] = 4,
+    [51492] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3860),
+    ACTIONS(3864),
     1,
     anon_sym_RPAREN,
     STATE(1461),
     1,
     sym_comment,
-    [51465] = 4,
+    [51505] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3862),
+    ACTIONS(3866),
     1,
     anon_sym_GT,
     STATE(1462),
     1,
     sym_comment,
-    [51478] = 4,
+    [51518] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3864),
+    ACTIONS(3868),
     1,
     anon_sym_RPAREN,
     STATE(1463),
     1,
     sym_comment,
-    [51491] = 4,
+    [51531] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3866),
+    ACTIONS(3870),
     1,
     anon_sym_RPAREN,
     STATE(1464),
     1,
     sym_comment,
-    [51504] = 4,
+    [51544] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3868),
+    ACTIONS(3872),
     1,
     anon_sym_RPAREN,
     STATE(1465),
     1,
     sym_comment,
-    [51517] = 4,
+    [51557] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3870),
+    ACTIONS(3874),
     1,
     anon_sym_GT,
     STATE(1466),
     1,
     sym_comment,
-    [51530] = 4,
+    [51570] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3872),
+    ACTIONS(3876),
     1,
     anon_sym_RPAREN,
     STATE(1467),
     1,
     sym_comment,
-    [51543] = 4,
+    [51583] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3874),
+    ACTIONS(3878),
     1,
     anon_sym_RPAREN,
     STATE(1468),
     1,
     sym_comment,
-    [51556] = 4,
+    [51596] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3876),
+    ACTIONS(3880),
     1,
     anon_sym_RPAREN,
     STATE(1469),
     1,
     sym_comment,
-    [51569] = 4,
+    [51609] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2937),
+    ACTIONS(2949),
     1,
     anon_sym_SEMI,
     STATE(1470),
     1,
     sym_comment,
-    [51582] = 4,
+    [51622] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3878),
+    ACTIONS(3882),
     1,
     anon_sym_RPAREN,
     STATE(1471),
     1,
     sym_comment,
-    [51595] = 4,
+    [51635] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3880),
+    ACTIONS(3884),
     1,
     sym_identifier,
     STATE(1472),
     1,
     sym_comment,
-    [51608] = 4,
+    [51648] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3882),
+    ACTIONS(3886),
     1,
     sym_identifier,
     STATE(1473),
     1,
     sym_comment,
-    [51621] = 4,
+    [51661] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3884),
+    ACTIONS(3888),
     1,
     sym_identifier,
     STATE(1474),
     1,
     sym_comment,
-    [51634] = 4,
+    [51674] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2931),
+    ACTIONS(2943),
     1,
     anon_sym_SEMI,
     STATE(1475),
     1,
     sym_comment,
-    [51647] = 4,
+    [51687] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2925),
+    ACTIONS(2937),
     1,
     anon_sym_SEMI,
     STATE(1476),
     1,
     sym_comment,
-    [51660] = 4,
+    [51700] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3886),
+    ACTIONS(3890),
     1,
     anon_sym_RPAREN,
     STATE(1477),
     1,
     sym_comment,
-    [51673] = 4,
+    [51713] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3888),
+    ACTIONS(3892),
     1,
     anon_sym_SEMI,
     STATE(1478),
     1,
     sym_comment,
-    [51686] = 4,
+    [51726] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3890),
+    ACTIONS(3894),
     1,
     anon_sym_RPAREN,
     STATE(1479),
     1,
     sym_comment,
-    [51699] = 4,
+    [51739] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3892),
+    ACTIONS(3896),
     1,
     anon_sym_SEMI,
     STATE(1480),
     1,
     sym_comment,
-    [51712] = 4,
+    [51752] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3894),
+    ACTIONS(3898),
     1,
     anon_sym_LBRACE,
     STATE(1481),
     1,
     sym_comment,
-    [51725] = 4,
+    [51765] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3896),
+    ACTIONS(3900),
     1,
     anon_sym_SEMI,
     STATE(1482),
     1,
     sym_comment,
-    [51738] = 4,
+    [51778] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2899),
+    ACTIONS(2909),
     1,
     anon_sym_SEMI,
     STATE(1483),
     1,
     sym_comment,
-    [51751] = 4,
+    [51791] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2261),
+    ACTIONS(2259),
     1,
     aux_sym_preproc_call_token1,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
     STATE(1484),
     1,
     sym_comment,
-    [51764] = 4,
+    [51804] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3898),
+    ACTIONS(3902),
     1,
     anon_sym_LPAREN,
     STATE(1485),
     1,
     sym_comment,
-    [51777] = 4,
+    [51817] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3900),
+    ACTIONS(3904),
     1,
     anon_sym_GT,
     STATE(1486),
     1,
     sym_comment,
-    [51790] = 4,
+    [51830] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3902),
+    ACTIONS(3906),
     1,
     anon_sym_LPAREN,
     STATE(1487),
     1,
     sym_comment,
-    [51803] = 4,
+    [51843] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3904),
+    ACTIONS(3908),
     1,
     anon_sym_SEMI,
     STATE(1488),
     1,
     sym_comment,
-    [51816] = 4,
+    [51856] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3906),
+    ACTIONS(3910),
     1,
     anon_sym_LBRACE,
     STATE(1489),
     1,
     sym_comment,
-    [51829] = 4,
+    [51869] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3908),
+    ACTIONS(3912),
     1,
     sym_identifier,
     STATE(1490),
     1,
     sym_comment,
-    [51842] = 4,
+    [51882] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3910),
+    ACTIONS(3914),
     1,
     sym_identifier,
     STATE(1491),
     1,
     sym_comment,
-    [51855] = 4,
+    [51895] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3912),
+    ACTIONS(3916),
     1,
     anon_sym_LBRACE,
     STATE(1492),
     1,
     sym_comment,
-    [51868] = 4,
+    [51908] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3914),
+    ACTIONS(3918),
     1,
     anon_sym_SEMI,
     STATE(1493),
     1,
     sym_comment,
-    [51881] = 4,
+    [51921] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3916),
+    ACTIONS(3920),
     1,
     anon_sym_SEMI,
     STATE(1494),
     1,
     sym_comment,
-    [51894] = 4,
+    [51934] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3918),
+    ACTIONS(3922),
     1,
     anon_sym_SEMI,
     STATE(1495),
     1,
     sym_comment,
-    [51907] = 4,
+    [51947] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3920),
+    ACTIONS(3924),
     1,
     anon_sym_SEMI,
     STATE(1496),
     1,
     sym_comment,
-    [51920] = 4,
+    [51960] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3922),
+    ACTIONS(3926),
     1,
     sym_identifier,
     STATE(1497),
     1,
     sym_comment,
-    [51933] = 4,
+    [51973] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3924),
+    ACTIONS(3928),
     1,
     anon_sym_SEMI,
     STATE(1498),
     1,
     sym_comment,
-    [51946] = 4,
+    [51986] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3288),
+    ACTIONS(3302),
     1,
     anon_sym_SEMI,
     STATE(1499),
     1,
     sym_comment,
-    [51959] = 4,
+    [51999] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3284),
+    ACTIONS(3300),
     1,
     anon_sym_RPAREN,
     STATE(1500),
     1,
     sym_comment,
-    [51972] = 4,
+    [52012] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3926),
+    ACTIONS(3930),
     1,
     anon_sym_RPAREN,
     STATE(1501),
     1,
     sym_comment,
-    [51985] = 4,
+    [52025] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3928),
+    ACTIONS(3932),
     1,
     anon_sym_RPAREN,
     STATE(1502),
     1,
     sym_comment,
-    [51998] = 4,
+    [52038] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3930),
+    ACTIONS(3934),
     1,
     anon_sym_SEMI,
     STATE(1503),
     1,
     sym_comment,
-    [52011] = 4,
+    [52051] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3932),
+    ACTIONS(3936),
     1,
     anon_sym_SEMI,
     STATE(1504),
     1,
     sym_comment,
-    [52024] = 4,
+    [52064] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3934),
+    ACTIONS(3938),
     1,
     anon_sym_SEMI,
     STATE(1505),
     1,
     sym_comment,
-    [52037] = 4,
+    [52077] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3936),
+    ACTIONS(3940),
     1,
     anon_sym_SEMI,
     STATE(1506),
     1,
     sym_comment,
-    [52050] = 4,
+    [52090] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3938),
+    ACTIONS(3942),
     1,
     anon_sym_SEMI,
     STATE(1507),
     1,
     sym_comment,
-    [52063] = 4,
+    [52103] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3940),
+    ACTIONS(3944),
     1,
     anon_sym_RBRACK,
     STATE(1508),
     1,
     sym_comment,
-    [52076] = 4,
+    [52116] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3942),
+    ACTIONS(3946),
     1,
     anon_sym_SEMI,
     STATE(1509),
     1,
     sym_comment,
-    [52089] = 4,
+    [52129] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3944),
+    ACTIONS(3948),
     1,
     anon_sym_SEMI,
     STATE(1510),
     1,
     sym_comment,
-    [52102] = 4,
+    [52142] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3946),
+    ACTIONS(3950),
     1,
     anon_sym_LT,
     STATE(1511),
     1,
     sym_comment,
-    [52115] = 4,
+    [52155] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3948),
+    ACTIONS(3952),
     1,
     anon_sym_RPAREN,
     STATE(1512),
     1,
     sym_comment,
-    [52128] = 4,
+    [52168] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3950),
+    ACTIONS(3954),
     1,
     anon_sym_LT,
     STATE(1513),
     1,
     sym_comment,
-    [52141] = 4,
+    [52181] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3952),
+    ACTIONS(3956),
     1,
     anon_sym_RPAREN,
     STATE(1514),
     1,
     sym_comment,
-    [52154] = 4,
+    [52194] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3954),
+    ACTIONS(3958),
     1,
     sym_identifier,
     STATE(1515),
     1,
     sym_comment,
-    [52167] = 4,
+    [52207] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3956),
+    ACTIONS(3960),
     1,
     anon_sym_SEMI,
     STATE(1516),
     1,
     sym_comment,
-    [52180] = 4,
+    [52220] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3958),
+    ACTIONS(3962),
     1,
     sym_identifier,
     STATE(1517),
     1,
     sym_comment,
-    [52193] = 4,
+    [52233] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3960),
+    ACTIONS(3964),
     1,
     sym_identifier,
     STATE(1518),
     1,
     sym_comment,
-    [52206] = 4,
+    [52246] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3962),
+    ACTIONS(3966),
     1,
     anon_sym_RPAREN,
     STATE(1519),
     1,
     sym_comment,
-    [52219] = 4,
+    [52259] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3192),
+    ACTIONS(3202),
     1,
     anon_sym_LT,
     STATE(1520),
     1,
     sym_comment,
-    [52232] = 4,
+    [52272] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(3964),
+    ACTIONS(3968),
     1,
     aux_sym_comment_token1,
     STATE(1521),
     1,
     sym_comment,
-    [52245] = 4,
+    [52285] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3966),
+    ACTIONS(3970),
     1,
     sym_identifier,
     STATE(1522),
     1,
     sym_comment,
-    [52258] = 4,
+    [52298] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3262),
+    ACTIONS(3280),
     1,
     sym_identifier,
     STATE(1523),
     1,
     sym_comment,
-    [52271] = 4,
+    [52311] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3968),
+    ACTIONS(3972),
     1,
     anon_sym_LBRACE,
     STATE(1524),
     1,
     sym_comment,
-    [52284] = 4,
+    [52324] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2766),
+    ACTIONS(2778),
     1,
     anon_sym_LBRACE,
     STATE(1525),
     1,
     sym_comment,
-    [52297] = 4,
+    [52337] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(1300),
+    ACTIONS(1304),
     1,
     anon_sym_RPAREN,
     STATE(1526),
     1,
     sym_comment,
-    [52310] = 4,
+    [52350] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3970),
+    ACTIONS(3974),
     1,
     anon_sym_SEMI,
     STATE(1527),
     1,
     sym_comment,
-    [52323] = 4,
+    [52363] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2889),
+    ACTIONS(2915),
     1,
     anon_sym_SEMI,
     STATE(1528),
     1,
     sym_comment,
-    [52336] = 4,
+    [52376] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2887),
+    ACTIONS(2907),
     1,
     anon_sym_SEMI,
     STATE(1529),
     1,
     sym_comment,
-    [52349] = 4,
+    [52389] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3972),
+    ACTIONS(3976),
     1,
     anon_sym_LPAREN,
     STATE(1530),
     1,
     sym_comment,
-    [52362] = 4,
+    [52402] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3974),
+    ACTIONS(3978),
     1,
     anon_sym_LPAREN,
     STATE(1531),
     1,
     sym_comment,
-    [52375] = 4,
+    [52415] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3976),
+    ACTIONS(3980),
     1,
     anon_sym_LPAREN,
     STATE(1532),
     1,
     sym_comment,
-    [52388] = 4,
+    [52428] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3978),
+    ACTIONS(3982),
     1,
     anon_sym_SEMI,
     STATE(1533),
     1,
     sym_comment,
-    [52401] = 4,
+    [52441] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3980),
+    ACTIONS(3984),
     1,
     anon_sym_SEMI,
     STATE(1534),
     1,
     sym_comment,
-    [52414] = 4,
+    [52454] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3982),
+    ACTIONS(3986),
     1,
     anon_sym_LPAREN,
     STATE(1535),
     1,
     sym_comment,
-    [52427] = 4,
+    [52467] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3984),
+    ACTIONS(3988),
     1,
     anon_sym_LPAREN,
     STATE(1536),
     1,
     sym_comment,
-    [52440] = 4,
+    [52480] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3986),
+    ACTIONS(3990),
     1,
     anon_sym_LPAREN,
     STATE(1537),
     1,
     sym_comment,
-    [52453] = 4,
+    [52493] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3988),
+    ACTIONS(3992),
     1,
     anon_sym_LPAREN,
     STATE(1538),
     1,
     sym_comment,
-    [52466] = 4,
+    [52506] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3990),
+    ACTIONS(3994),
     1,
     anon_sym_SEMI,
     STATE(1539),
     1,
     sym_comment,
-    [52479] = 4,
+    [52519] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3992),
+    ACTIONS(3996),
     1,
     anon_sym_LPAREN,
     STATE(1540),
     1,
     sym_comment,
-    [52492] = 4,
+    [52532] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3994),
+    ACTIONS(3998),
     1,
     anon_sym_LPAREN,
     STATE(1541),
     1,
     sym_comment,
-    [52505] = 4,
+    [52545] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3996),
+    ACTIONS(4000),
     1,
     anon_sym_LPAREN,
     STATE(1542),
     1,
     sym_comment,
-    [52518] = 4,
+    [52558] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2736),
+    ACTIONS(2746),
     1,
     anon_sym_LBRACE,
     STATE(1543),
     1,
     sym_comment,
-    [52531] = 4,
+    [52571] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(3998),
+    ACTIONS(4002),
     1,
     anon_sym_LPAREN,
     STATE(1544),
     1,
     sym_comment,
-    [52544] = 4,
+    [52584] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4000),
+    ACTIONS(4004),
     1,
     anon_sym_LPAREN,
     STATE(1545),
     1,
     sym_comment,
-    [52557] = 4,
+    [52597] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4002),
+    ACTIONS(4006),
     1,
     anon_sym_LPAREN,
     STATE(1546),
     1,
     sym_comment,
-    [52570] = 4,
+    [52610] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4004),
+    ACTIONS(4008),
     1,
     anon_sym_LPAREN,
     STATE(1547),
     1,
     sym_comment,
-    [52583] = 4,
+    [52623] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4006),
+    ACTIONS(4010),
     1,
     sym_identifier,
     STATE(1548),
     1,
     sym_comment,
-    [52596] = 4,
+    [52636] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4008),
+    ACTIONS(4012),
     1,
     sym_identifier,
     STATE(1549),
     1,
     sym_comment,
-    [52609] = 4,
+    [52649] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4010),
+    ACTIONS(4014),
     1,
     anon_sym_LBRACE,
     STATE(1550),
     1,
     sym_comment,
-    [52622] = 4,
+    [52662] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4012),
+    ACTIONS(4016),
     1,
     anon_sym_GT,
     STATE(1551),
     1,
     sym_comment,
-    [52635] = 4,
+    [52675] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4014),
+    ACTIONS(4018),
     1,
     anon_sym_LBRACE,
     STATE(1552),
     1,
     sym_comment,
-    [52648] = 4,
+    [52688] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4016),
+    ACTIONS(4020),
     1,
     anon_sym_GT,
     STATE(1553),
     1,
     sym_comment,
-    [52661] = 4,
+    [52701] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4018),
+    ACTIONS(4022),
     1,
     sym_identifier,
     STATE(1554),
     1,
     sym_comment,
-    [52674] = 4,
+    [52714] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4020),
+    ACTIONS(4024),
     1,
     sym_identifier,
     STATE(1555),
     1,
     sym_comment,
-    [52687] = 4,
+    [52727] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4022),
+    ACTIONS(4026),
     1,
     sym_identifier,
     STATE(1556),
     1,
     sym_comment,
-    [52700] = 4,
+    [52740] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4024),
+    ACTIONS(4028),
     1,
     anon_sym_LBRACE,
     STATE(1557),
     1,
     sym_comment,
-    [52713] = 4,
+    [52753] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(4026),
+    ACTIONS(4030),
     1,
     aux_sym_preproc_call_token1,
     STATE(1558),
     1,
     sym_comment,
-    [52726] = 4,
+    [52766] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4028),
+    ACTIONS(4032),
     1,
     anon_sym_LBRACE,
     STATE(1559),
     1,
     sym_comment,
-    [52739] = 4,
+    [52779] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(4030),
+    ACTIONS(4034),
     1,
     sym_system_lib_path,
     STATE(1560),
     1,
     sym_comment,
-    [52752] = 4,
+    [52792] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(4032),
+    ACTIONS(4036),
     1,
     aux_sym_preproc_call_token1,
     STATE(1561),
     1,
     sym_comment,
-    [52765] = 4,
+    [52805] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4034),
+    ACTIONS(4038),
     1,
     anon_sym_SEMI,
     STATE(1562),
     1,
     sym_comment,
-    [52778] = 4,
+    [52818] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4036),
+    ACTIONS(4040),
     1,
     anon_sym_SLASH,
     STATE(1563),
     1,
     sym_comment,
-    [52791] = 4,
+    [52831] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4038),
+    ACTIONS(4042),
     1,
     anon_sym_LPAREN,
     STATE(1564),
     1,
     sym_comment,
-    [52804] = 4,
+    [52844] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2287),
+    ACTIONS(2299),
     1,
     anon_sym_EQ,
     STATE(1565),
     1,
     sym_comment,
-    [52817] = 4,
+    [52857] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4040),
+    ACTIONS(4044),
     1,
     anon_sym_LBRACE,
     STATE(1566),
     1,
     sym_comment,
-    [52830] = 4,
+    [52870] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4042),
+    ACTIONS(4046),
     1,
     anon_sym_SEMI,
     STATE(1567),
     1,
     sym_comment,
-    [52843] = 4,
+    [52883] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4044),
+    ACTIONS(4048),
     1,
     anon_sym_RPAREN,
     STATE(1568),
     1,
     sym_comment,
-    [52856] = 4,
+    [52896] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4046),
+    ACTIONS(4050),
     1,
     anon_sym_RPAREN,
     STATE(1569),
     1,
     sym_comment,
-    [52869] = 4,
+    [52909] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4048),
+    ACTIONS(4052),
     1,
     anon_sym_LBRACE,
     STATE(1570),
     1,
     sym_comment,
-    [52882] = 4,
+    [52922] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4050),
+    ACTIONS(4054),
     1,
     anon_sym_SEMI,
     STATE(1571),
     1,
     sym_comment,
-    [52895] = 4,
+    [52935] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4052),
+    ACTIONS(4056),
     1,
     anon_sym_LBRACE,
     STATE(1572),
     1,
     sym_comment,
-    [52908] = 4,
+    [52948] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4054),
+    ACTIONS(4058),
     1,
     anon_sym_LBRACE,
     STATE(1573),
     1,
     sym_comment,
-    [52921] = 4,
+    [52961] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4056),
+    ACTIONS(4060),
     1,
     anon_sym_SEMI,
     STATE(1574),
     1,
     sym_comment,
-    [52934] = 4,
+    [52974] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4058),
+    ACTIONS(4062),
     1,
     anon_sym_SEMI,
     STATE(1575),
     1,
     sym_comment,
-    [52947] = 4,
+    [52987] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4060),
+    ACTIONS(4064),
     1,
     anon_sym_RPAREN,
     STATE(1576),
     1,
     sym_comment,
-    [52960] = 4,
+    [53000] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4062),
+    ACTIONS(4066),
     1,
     anon_sym_SEMI,
     STATE(1577),
     1,
     sym_comment,
-    [52973] = 4,
+    [53013] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4064),
+    ACTIONS(4068),
     1,
     anon_sym_COMMA,
     STATE(1578),
     1,
     sym_comment,
-    [52986] = 4,
+    [53026] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4066),
+    ACTIONS(4070),
     1,
     anon_sym_LBRACE,
     STATE(1579),
     1,
     sym_comment,
-    [52999] = 4,
+    [53039] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4068),
+    ACTIONS(4072),
     1,
     sym_identifier,
     STATE(1580),
     1,
     sym_comment,
-    [53012] = 4,
+    [53052] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4070),
+    ACTIONS(4074),
     1,
     anon_sym_SEMI,
     STATE(1581),
     1,
     sym_comment,
-    [53025] = 4,
+    [53065] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4072),
+    ACTIONS(4076),
     1,
     anon_sym_RPAREN,
     STATE(1582),
     1,
     sym_comment,
-    [53038] = 4,
+    [53078] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4074),
+    ACTIONS(4078),
     1,
     anon_sym_LBRACE,
     STATE(1583),
     1,
     sym_comment,
-    [53051] = 4,
+    [53091] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4076),
+    ACTIONS(4080),
     1,
     anon_sym_SEMI,
     STATE(1584),
     1,
     sym_comment,
-    [53064] = 4,
+    [53104] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4078),
+    ACTIONS(4082),
     1,
     sym_identifier,
     STATE(1585),
     1,
     sym_comment,
-    [53077] = 4,
+    [53117] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4080),
+    ACTIONS(4084),
     1,
     anon_sym_RPAREN,
     STATE(1586),
     1,
     sym_comment,
-    [53090] = 4,
+    [53130] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4082),
+    ACTIONS(4086),
     1,
     anon_sym_SEMI,
     STATE(1587),
     1,
     sym_comment,
-    [53103] = 4,
+    [53143] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4084),
+    ACTIONS(4088),
     1,
     ts_builtin_sym_end,
     STATE(1588),
     1,
     sym_comment,
-    [53116] = 4,
+    [53156] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4086),
+    ACTIONS(4090),
     1,
     anon_sym_EQ,
     STATE(1589),
     1,
     sym_comment,
-    [53129] = 4,
+    [53169] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4088),
+    ACTIONS(4092),
     1,
     sym_identifier,
     STATE(1590),
     1,
     sym_comment,
-    [53142] = 4,
+    [53182] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4090),
+    ACTIONS(4094),
     1,
     sym_identifier,
     STATE(1591),
     1,
     sym_comment,
-    [53155] = 4,
+    [53195] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4092),
+    ACTIONS(4096),
     1,
     sym_identifier,
     STATE(1592),
     1,
     sym_comment,
-    [53168] = 4,
+    [53208] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4094),
+    ACTIONS(4098),
     1,
     sym_identifier,
     STATE(1593),
     1,
     sym_comment,
-    [53181] = 4,
+    [53221] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4096),
+    ACTIONS(4100),
     1,
     anon_sym_COMMA,
     STATE(1594),
     1,
     sym_comment,
-    [53194] = 4,
+    [53234] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4098),
+    ACTIONS(4102),
     1,
     anon_sym_SEMI,
     STATE(1595),
     1,
     sym_comment,
-    [53207] = 4,
+    [53247] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4100),
+    ACTIONS(4104),
     1,
     anon_sym_SEMI,
     STATE(1596),
     1,
     sym_comment,
-    [53220] = 4,
+    [53260] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4102),
+    ACTIONS(4106),
     1,
     anon_sym_SEMI,
     STATE(1597),
     1,
     sym_comment,
-    [53233] = 4,
+    [53273] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4104),
+    ACTIONS(4108),
     1,
     sym_identifier,
     STATE(1598),
     1,
     sym_comment,
-    [53246] = 4,
+    [53286] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4106),
+    ACTIONS(4110),
     1,
     sym_identifier,
     STATE(1599),
     1,
     sym_comment,
-    [53259] = 4,
+    [53299] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4108),
+    ACTIONS(4112),
     1,
     sym_identifier,
     STATE(1600),
     1,
     sym_comment,
-    [53272] = 4,
+    [53312] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4110),
+    ACTIONS(4114),
     1,
     sym_identifier,
     STATE(1601),
     1,
     sym_comment,
-    [53285] = 4,
+    [53325] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4112),
+    ACTIONS(4116),
     1,
     sym_identifier,
     STATE(1602),
     1,
     sym_comment,
-    [53298] = 4,
+    [53338] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4114),
+    ACTIONS(4118),
     1,
     anon_sym_SEMI,
     STATE(1603),
     1,
     sym_comment,
-    [53311] = 4,
+    [53351] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4116),
+    ACTIONS(4120),
     1,
     anon_sym_SEMI,
     STATE(1604),
     1,
     sym_comment,
-    [53324] = 4,
+    [53364] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4118),
+    ACTIONS(4122),
     1,
     anon_sym_SEMI,
     STATE(1605),
     1,
     sym_comment,
-    [53337] = 4,
+    [53377] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4120),
+    ACTIONS(4124),
     1,
     sym_identifier,
     STATE(1606),
     1,
     sym_comment,
-    [53350] = 4,
+    [53390] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4122),
+    ACTIONS(4126),
     1,
     sym_identifier,
     STATE(1607),
     1,
     sym_comment,
-    [53363] = 4,
+    [53403] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4124),
+    ACTIONS(4128),
     1,
     sym_identifier,
     STATE(1608),
     1,
     sym_comment,
-    [53376] = 4,
+    [53416] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4126),
+    ACTIONS(4130),
     1,
     anon_sym_SEMI,
     STATE(1609),
     1,
     sym_comment,
-    [53389] = 4,
+    [53429] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4128),
+    ACTIONS(4132),
     1,
     anon_sym_SEMI,
     STATE(1610),
     1,
     sym_comment,
-    [53402] = 4,
+    [53442] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2871),
+    ACTIONS(2889),
     1,
     anon_sym_interface,
     STATE(1611),
     1,
     sym_comment,
-    [53415] = 4,
+    [53455] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4130),
+    ACTIONS(4134),
     1,
     sym_identifier,
     STATE(1612),
     1,
     sym_comment,
-    [53428] = 4,
+    [53468] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4132),
+    ACTIONS(4136),
     1,
     anon_sym_SEMI,
     STATE(1613),
     1,
     sym_comment,
-    [53441] = 4,
+    [53481] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4134),
+    ACTIONS(4138),
     1,
     sym_identifier,
     STATE(1614),
     1,
     sym_comment,
-    [53454] = 4,
+    [53494] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(4136),
+    ACTIONS(4140),
     1,
     aux_sym_preproc_define_token1,
     STATE(1615),
     1,
     sym_comment,
-    [53467] = 4,
+    [53507] = 4,
     ACTIONS(3),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(2405),
+    ACTIONS(2423),
     1,
     anon_sym_SLASH_STAR,
-    ACTIONS(4138),
+    ACTIONS(4142),
     1,
     aux_sym_comment_token2,
     STATE(1616),
     1,
     sym_comment,
-    [53480] = 4,
+    [53520] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4140),
+    ACTIONS(4144),
     1,
     anon_sym_LPAREN,
     STATE(1617),
     1,
     sym_comment,
-    [53493] = 4,
+    [53533] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4142),
+    ACTIONS(4146),
     1,
     anon_sym_LPAREN,
     STATE(1618),
     1,
     sym_comment,
-    [53506] = 4,
+    [53546] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4144),
+    ACTIONS(4148),
     1,
     anon_sym_LPAREN,
     STATE(1619),
     1,
     sym_comment,
-    [53519] = 4,
+    [53559] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4146),
+    ACTIONS(4150),
     1,
     anon_sym_LPAREN,
     STATE(1620),
     1,
     sym_comment,
-    [53532] = 4,
+    [53572] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4148),
+    ACTIONS(4152),
     1,
     anon_sym_LPAREN,
     STATE(1621),
     1,
     sym_comment,
-    [53545] = 4,
+    [53585] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4150),
+    ACTIONS(4154),
     1,
     anon_sym_LPAREN,
     STATE(1622),
     1,
     sym_comment,
-    [53558] = 4,
+    [53598] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4152),
+    ACTIONS(4156),
     1,
     anon_sym_LPAREN,
     STATE(1623),
     1,
     sym_comment,
-    [53571] = 4,
+    [53611] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4154),
+    ACTIONS(4158),
     1,
     anon_sym_LPAREN,
     STATE(1624),
     1,
     sym_comment,
-    [53584] = 4,
+    [53624] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4156),
+    ACTIONS(4160),
     1,
     anon_sym_LPAREN,
     STATE(1625),
     1,
     sym_comment,
-    [53597] = 4,
+    [53637] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4158),
+    ACTIONS(4162),
     1,
     anon_sym_LPAREN,
     STATE(1626),
     1,
     sym_comment,
-    [53610] = 4,
+    [53650] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4160),
+    ACTIONS(4164),
     1,
     anon_sym_LPAREN,
     STATE(1627),
     1,
     sym_comment,
-    [53623] = 4,
+    [53663] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4162),
+    ACTIONS(4166),
     1,
     anon_sym_LPAREN,
     STATE(1628),
     1,
     sym_comment,
-    [53636] = 4,
+    [53676] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4164),
+    ACTIONS(4168),
     1,
     anon_sym_LPAREN,
     STATE(1629),
     1,
     sym_comment,
-    [53649] = 4,
+    [53689] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4166),
+    ACTIONS(4170),
     1,
     anon_sym_COMMA,
     STATE(1630),
     1,
     sym_comment,
-    [53662] = 4,
+    [53702] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4168),
+    ACTIONS(4172),
     1,
     anon_sym_COMMA,
     STATE(1631),
     1,
     sym_comment,
-    [53675] = 4,
+    [53715] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4170),
+    ACTIONS(4174),
     1,
     anon_sym_COMMA,
     STATE(1632),
     1,
     sym_comment,
-    [53688] = 4,
+    [53728] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4172),
+    ACTIONS(4176),
     1,
     anon_sym_EQ,
     STATE(1633),
     1,
     sym_comment,
-    [53701] = 4,
+    [53741] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4174),
+    ACTIONS(4178),
     1,
     anon_sym_EQ,
     STATE(1634),
     1,
     sym_comment,
-    [53714] = 4,
+    [53754] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4176),
+    ACTIONS(4180),
     1,
     anon_sym_EQ,
     STATE(1635),
     1,
     sym_comment,
-    [53727] = 4,
+    [53767] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4178),
+    ACTIONS(4182),
     1,
     anon_sym_COMMA,
     STATE(1636),
     1,
     sym_comment,
-    [53740] = 4,
+    [53780] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4180),
+    ACTIONS(4184),
     1,
     anon_sym_LPAREN,
     STATE(1637),
     1,
     sym_comment,
-    [53753] = 4,
+    [53793] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4182),
+    ACTIONS(4186),
     1,
     anon_sym_LPAREN,
     STATE(1638),
     1,
     sym_comment,
-    [53766] = 4,
+    [53806] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4184),
+    ACTIONS(4188),
     1,
     anon_sym_LPAREN,
     STATE(1639),
     1,
     sym_comment,
-    [53779] = 4,
+    [53819] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4186),
+    ACTIONS(4190),
     1,
     anon_sym_LPAREN,
     STATE(1640),
     1,
     sym_comment,
-    [53792] = 4,
+    [53832] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4188),
+    ACTIONS(4192),
     1,
     anon_sym_LPAREN,
     STATE(1641),
     1,
     sym_comment,
-    [53805] = 4,
+    [53845] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4190),
+    ACTIONS(4194),
     1,
     anon_sym_LPAREN,
     STATE(1642),
     1,
     sym_comment,
-    [53818] = 4,
+    [53858] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4192),
+    ACTIONS(4196),
     1,
     anon_sym_LPAREN,
     STATE(1643),
     1,
     sym_comment,
-    [53831] = 4,
+    [53871] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4194),
+    ACTIONS(4198),
     1,
     anon_sym_LPAREN,
     STATE(1644),
     1,
     sym_comment,
-    [53844] = 4,
+    [53884] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4196),
+    ACTIONS(4200),
     1,
     anon_sym_LPAREN,
     STATE(1645),
     1,
     sym_comment,
-    [53857] = 4,
+    [53897] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4198),
+    ACTIONS(4202),
     1,
     anon_sym_LPAREN,
     STATE(1646),
     1,
     sym_comment,
-    [53870] = 4,
+    [53910] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4200),
+    ACTIONS(4204),
     1,
     anon_sym_LPAREN,
     STATE(1647),
     1,
     sym_comment,
-    [53883] = 4,
+    [53923] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4202),
+    ACTIONS(4206),
     1,
     anon_sym_LPAREN,
     STATE(1648),
     1,
     sym_comment,
-    [53896] = 4,
+    [53936] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4204),
+    ACTIONS(4208),
     1,
     anon_sym_LPAREN,
     STATE(1649),
     1,
     sym_comment,
-    [53909] = 4,
+    [53949] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4206),
+    ACTIONS(4210),
     1,
     anon_sym_COMMA,
     STATE(1650),
     1,
     sym_comment,
-    [53922] = 4,
+    [53962] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4208),
+    ACTIONS(4212),
     1,
     anon_sym_COMMA,
     STATE(1651),
     1,
     sym_comment,
-    [53935] = 4,
+    [53975] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4210),
+    ACTIONS(4214),
     1,
     anon_sym_COMMA,
     STATE(1652),
     1,
     sym_comment,
-    [53948] = 4,
+    [53988] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4212),
+    ACTIONS(4216),
     1,
     anon_sym_EQ,
     STATE(1653),
     1,
     sym_comment,
-    [53961] = 4,
+    [54001] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4214),
+    ACTIONS(4218),
     1,
     anon_sym_EQ,
     STATE(1654),
     1,
     sym_comment,
-    [53974] = 4,
+    [54014] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4216),
+    ACTIONS(4220),
     1,
     anon_sym_EQ,
     STATE(1655),
     1,
     sym_comment,
-    [53987] = 4,
+    [54027] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4218),
+    ACTIONS(4222),
     1,
     anon_sym_COMMA,
     STATE(1656),
     1,
     sym_comment,
-    [54000] = 4,
+    [54040] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4220),
+    ACTIONS(4224),
     1,
     anon_sym_LPAREN,
     STATE(1657),
     1,
     sym_comment,
-    [54013] = 4,
+    [54053] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4222),
+    ACTIONS(4226),
     1,
     anon_sym_LPAREN,
     STATE(1658),
     1,
     sym_comment,
-    [54026] = 4,
+    [54066] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4224),
+    ACTIONS(4228),
     1,
     anon_sym_LPAREN,
     STATE(1659),
     1,
     sym_comment,
-    [54039] = 4,
+    [54079] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4226),
+    ACTIONS(4230),
     1,
     anon_sym_LPAREN,
     STATE(1660),
     1,
     sym_comment,
-    [54052] = 4,
+    [54092] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4228),
+    ACTIONS(4232),
     1,
     anon_sym_LPAREN,
     STATE(1661),
     1,
     sym_comment,
-    [54065] = 4,
+    [54105] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4230),
+    ACTIONS(4234),
     1,
     anon_sym_LPAREN,
     STATE(1662),
     1,
     sym_comment,
-    [54078] = 4,
+    [54118] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4232),
+    ACTIONS(4236),
     1,
     anon_sym_LPAREN,
     STATE(1663),
     1,
     sym_comment,
-    [54091] = 4,
+    [54131] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4234),
+    ACTIONS(4238),
     1,
     anon_sym_LPAREN,
     STATE(1664),
     1,
     sym_comment,
-    [54104] = 4,
+    [54144] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4236),
+    ACTIONS(4240),
     1,
     anon_sym_LPAREN,
     STATE(1665),
     1,
     sym_comment,
-    [54117] = 4,
+    [54157] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4238),
+    ACTIONS(4242),
     1,
     anon_sym_LPAREN,
     STATE(1666),
     1,
     sym_comment,
-    [54130] = 4,
+    [54170] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4240),
+    ACTIONS(4244),
     1,
     anon_sym_LPAREN,
     STATE(1667),
     1,
     sym_comment,
-    [54143] = 4,
+    [54183] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4242),
+    ACTIONS(4246),
     1,
     anon_sym_LPAREN,
     STATE(1668),
     1,
     sym_comment,
-    [54156] = 4,
+    [54196] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4244),
+    ACTIONS(4248),
     1,
     anon_sym_LPAREN,
     STATE(1669),
     1,
     sym_comment,
-    [54169] = 4,
+    [54209] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4246),
+    ACTIONS(4250),
     1,
     anon_sym_COMMA,
     STATE(1670),
     1,
     sym_comment,
-    [54182] = 4,
+    [54222] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4248),
+    ACTIONS(4252),
     1,
     anon_sym_COMMA,
     STATE(1671),
     1,
     sym_comment,
-    [54195] = 4,
+    [54235] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4250),
+    ACTIONS(4254),
     1,
     anon_sym_COMMA,
     STATE(1672),
     1,
     sym_comment,
-    [54208] = 4,
+    [54248] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4252),
+    ACTIONS(4256),
     1,
     anon_sym_EQ,
     STATE(1673),
     1,
     sym_comment,
-    [54221] = 4,
+    [54261] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4254),
+    ACTIONS(4258),
     1,
     anon_sym_EQ,
     STATE(1674),
     1,
     sym_comment,
-    [54234] = 4,
+    [54274] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4256),
+    ACTIONS(4260),
     1,
     anon_sym_EQ,
     STATE(1675),
     1,
     sym_comment,
-    [54247] = 4,
+    [54287] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4258),
+    ACTIONS(4262),
     1,
     anon_sym_COMMA,
     STATE(1676),
     1,
     sym_comment,
-    [54260] = 4,
+    [54300] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4260),
+    ACTIONS(4264),
     1,
     anon_sym_LPAREN,
     STATE(1677),
     1,
     sym_comment,
-    [54273] = 4,
+    [54313] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4262),
+    ACTIONS(4266),
     1,
     anon_sym_LPAREN,
     STATE(1678),
     1,
     sym_comment,
-    [54286] = 4,
+    [54326] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4264),
+    ACTIONS(4268),
     1,
     anon_sym_LPAREN,
     STATE(1679),
     1,
     sym_comment,
-    [54299] = 4,
+    [54339] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4266),
+    ACTIONS(4270),
     1,
     anon_sym_LPAREN,
     STATE(1680),
     1,
     sym_comment,
-    [54312] = 4,
+    [54352] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4268),
+    ACTIONS(4272),
     1,
     anon_sym_LPAREN,
     STATE(1681),
     1,
     sym_comment,
-    [54325] = 4,
+    [54365] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4270),
+    ACTIONS(4274),
     1,
     anon_sym_LPAREN,
     STATE(1682),
     1,
     sym_comment,
-    [54338] = 4,
+    [54378] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4272),
+    ACTIONS(4276),
     1,
     anon_sym_LPAREN,
     STATE(1683),
     1,
     sym_comment,
-    [54351] = 4,
+    [54391] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4274),
+    ACTIONS(4278),
     1,
     anon_sym_LPAREN,
     STATE(1684),
     1,
     sym_comment,
-    [54364] = 4,
+    [54404] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4276),
+    ACTIONS(4280),
     1,
     anon_sym_LPAREN,
     STATE(1685),
     1,
     sym_comment,
-    [54377] = 4,
+    [54417] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4278),
+    ACTIONS(4282),
     1,
     anon_sym_LPAREN,
     STATE(1686),
     1,
     sym_comment,
-    [54390] = 4,
+    [54430] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4280),
+    ACTIONS(4284),
     1,
     anon_sym_LPAREN,
     STATE(1687),
     1,
     sym_comment,
-    [54403] = 4,
+    [54443] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4282),
+    ACTIONS(4286),
     1,
     anon_sym_LPAREN,
     STATE(1688),
     1,
     sym_comment,
-    [54416] = 4,
+    [54456] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4284),
+    ACTIONS(4288),
     1,
     anon_sym_LPAREN,
     STATE(1689),
     1,
     sym_comment,
-    [54429] = 4,
+    [54469] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4286),
+    ACTIONS(4290),
     1,
     anon_sym_COMMA,
     STATE(1690),
     1,
     sym_comment,
-    [54442] = 4,
+    [54482] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4288),
+    ACTIONS(4292),
     1,
     anon_sym_COMMA,
     STATE(1691),
     1,
     sym_comment,
-    [54455] = 4,
+    [54495] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4290),
+    ACTIONS(4294),
     1,
     anon_sym_COMMA,
     STATE(1692),
     1,
     sym_comment,
-    [54468] = 4,
+    [54508] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4292),
+    ACTIONS(4296),
     1,
     anon_sym_EQ,
     STATE(1693),
     1,
     sym_comment,
-    [54481] = 4,
+    [54521] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4294),
+    ACTIONS(4298),
     1,
     anon_sym_EQ,
     STATE(1694),
     1,
     sym_comment,
-    [54494] = 4,
+    [54534] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4296),
+    ACTIONS(4300),
     1,
     anon_sym_EQ,
     STATE(1695),
     1,
     sym_comment,
-    [54507] = 4,
+    [54547] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4298),
+    ACTIONS(4302),
     1,
     anon_sym_COMMA,
     STATE(1696),
     1,
     sym_comment,
-    [54520] = 4,
+    [54560] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4300),
+    ACTIONS(4304),
     1,
     anon_sym_SEMI,
     STATE(1697),
     1,
     sym_comment,
-    [54533] = 4,
+    [54573] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4302),
+    ACTIONS(4306),
     1,
     anon_sym_SEMI,
     STATE(1698),
     1,
     sym_comment,
-    [54546] = 4,
+    [54586] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4304),
+    ACTIONS(4308),
     1,
     anon_sym_LPAREN,
     STATE(1699),
     1,
     sym_comment,
-    [54559] = 4,
+    [54599] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4306),
+    ACTIONS(4310),
     1,
     anon_sym_LPAREN,
     STATE(1700),
     1,
     sym_comment,
-    [54572] = 4,
+    [54612] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4308),
+    ACTIONS(4312),
     1,
     anon_sym_LPAREN,
     STATE(1701),
     1,
     sym_comment,
-    [54585] = 4,
+    [54625] = 4,
     ACTIONS(5),
     1,
     anon_sym_SLASH_STAR,
     ACTIONS(618),
     1,
     anon_sym_SLASH_SLASH,
-    ACTIONS(4310),
+    ACTIONS(4314),
     1,
     anon_sym_LPAREN,
     STATE(1702),
     1,
     sym_comment,
-    [54598] = 1,
-    ACTIONS(4312),
+    [54638] = 1,
+    ACTIONS(4316),
     1,
     ts_builtin_sym_end,
-    [54602] = 1,
-    ACTIONS(4314),
+    [54642] = 1,
+    ACTIONS(4318),
     1,
     ts_builtin_sym_end,
 };
@@ -81390,47 +81437,47 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(46)] = 151,
     [SMALL_STATE(47)] = 302,
     [SMALL_STATE(48)] = 453,
-    [SMALL_STATE(49)] = 604,
-    [SMALL_STATE(50)] = 755,
+    [SMALL_STATE(49)] = 602,
+    [SMALL_STATE(50)] = 753,
     [SMALL_STATE(51)] = 904,
     [SMALL_STATE(52)] = 1055,
-    [SMALL_STATE(53)] = 1203,
+    [SMALL_STATE(53)] = 1199,
     [SMALL_STATE(54)] = 1347,
     [SMALL_STATE(55)] = 1491,
-    [SMALL_STATE(56)] = 1633,
-    [SMALL_STATE(57)] = 1775,
+    [SMALL_STATE(56)] = 1629,
+    [SMALL_STATE(57)] = 1771,
     [SMALL_STATE(58)] = 1913,
     [SMALL_STATE(59)] = 2054,
     [SMALL_STATE(60)] = 2195,
     [SMALL_STATE(61)] = 2336,
-    [SMALL_STATE(62)] = 2477,
+    [SMALL_STATE(62)] = 2475,
     [SMALL_STATE(63)] = 2616,
-    [SMALL_STATE(64)] = 2743,
-    [SMALL_STATE(65)] = 2812,
-    [SMALL_STATE(66)] = 2881,
-    [SMALL_STATE(67)] = 2950,
+    [SMALL_STATE(64)] = 2685,
+    [SMALL_STATE(65)] = 2754,
+    [SMALL_STATE(66)] = 2823,
+    [SMALL_STATE(67)] = 2892,
     [SMALL_STATE(68)] = 3019,
     [SMALL_STATE(69)] = 3088,
     [SMALL_STATE(70)] = 3157,
     [SMALL_STATE(71)] = 3226,
     [SMALL_STATE(72)] = 3294,
-    [SMALL_STATE(73)] = 3362,
+    [SMALL_STATE(73)] = 3418,
     [SMALL_STATE(74)] = 3486,
     [SMALL_STATE(75)] = 3554,
     [SMALL_STATE(76)] = 3622,
     [SMALL_STATE(77)] = 3749,
     [SMALL_STATE(78)] = 3880,
-    [SMALL_STATE(79)] = 4007,
-    [SMALL_STATE(80)] = 4134,
-    [SMALL_STATE(81)] = 4261,
-    [SMALL_STATE(82)] = 4388,
+    [SMALL_STATE(79)] = 4011,
+    [SMALL_STATE(80)] = 4138,
+    [SMALL_STATE(81)] = 4265,
+    [SMALL_STATE(82)] = 4392,
     [SMALL_STATE(83)] = 4519,
     [SMALL_STATE(84)] = 4646,
     [SMALL_STATE(85)] = 4773,
     [SMALL_STATE(86)] = 4900,
-    [SMALL_STATE(87)] = 5027,
+    [SMALL_STATE(87)] = 5031,
     [SMALL_STATE(88)] = 5158,
-    [SMALL_STATE(89)] = 5289,
+    [SMALL_STATE(89)] = 5285,
     [SMALL_STATE(90)] = 5416,
     [SMALL_STATE(91)] = 5547,
     [SMALL_STATE(92)] = 5613,
@@ -81440,18 +81487,18 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(96)] = 6036,
     [SMALL_STATE(97)] = 6155,
     [SMALL_STATE(98)] = 6274,
-    [SMALL_STATE(99)] = 6342,
+    [SMALL_STATE(99)] = 6386,
     [SMALL_STATE(100)] = 6454,
     [SMALL_STATE(101)] = 6514,
     [SMALL_STATE(102)] = 6574,
     [SMALL_STATE(103)] = 6634,
     [SMALL_STATE(104)] = 6694,
-    [SMALL_STATE(105)] = 6752,
-    [SMALL_STATE(106)] = 6812,
-    [SMALL_STATE(107)] = 6870,
-    [SMALL_STATE(108)] = 6928,
-    [SMALL_STATE(109)] = 6988,
-    [SMALL_STATE(110)] = 7048,
+    [SMALL_STATE(105)] = 6754,
+    [SMALL_STATE(106)] = 6814,
+    [SMALL_STATE(107)] = 6874,
+    [SMALL_STATE(108)] = 6932,
+    [SMALL_STATE(109)] = 6992,
+    [SMALL_STATE(110)] = 7050,
     [SMALL_STATE(111)] = 7108,
     [SMALL_STATE(112)] = 7168,
     [SMALL_STATE(113)] = 7228,
@@ -81462,61 +81509,61 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(118)] = 7528,
     [SMALL_STATE(119)] = 7588,
     [SMALL_STATE(120)] = 7645,
-    [SMALL_STATE(121)] = 7762,
-    [SMALL_STATE(122)] = 7879,
-    [SMALL_STATE(123)] = 7936,
-    [SMALL_STATE(124)] = 7993,
-    [SMALL_STATE(125)] = 8050,
-    [SMALL_STATE(126)] = 8107,
-    [SMALL_STATE(127)] = 8164,
-    [SMALL_STATE(128)] = 8221,
-    [SMALL_STATE(129)] = 8278,
-    [SMALL_STATE(130)] = 8335,
-    [SMALL_STATE(131)] = 8392,
-    [SMALL_STATE(132)] = 8509,
-    [SMALL_STATE(133)] = 8626,
-    [SMALL_STATE(134)] = 8683,
-    [SMALL_STATE(135)] = 8740,
-    [SMALL_STATE(136)] = 8797,
-    [SMALL_STATE(137)] = 8854,
-    [SMALL_STATE(138)] = 8911,
-    [SMALL_STATE(139)] = 8968,
-    [SMALL_STATE(140)] = 9025,
-    [SMALL_STATE(141)] = 9082,
-    [SMALL_STATE(142)] = 9139,
-    [SMALL_STATE(143)] = 9196,
-    [SMALL_STATE(144)] = 9253,
-    [SMALL_STATE(145)] = 9310,
-    [SMALL_STATE(146)] = 9367,
-    [SMALL_STATE(147)] = 9424,
-    [SMALL_STATE(148)] = 9481,
-    [SMALL_STATE(149)] = 9598,
-    [SMALL_STATE(150)] = 9655,
-    [SMALL_STATE(151)] = 9712,
-    [SMALL_STATE(152)] = 9769,
-    [SMALL_STATE(153)] = 9886,
-    [SMALL_STATE(154)] = 9943,
+    [SMALL_STATE(121)] = 7702,
+    [SMALL_STATE(122)] = 7759,
+    [SMALL_STATE(123)] = 7816,
+    [SMALL_STATE(124)] = 7873,
+    [SMALL_STATE(125)] = 7930,
+    [SMALL_STATE(126)] = 7987,
+    [SMALL_STATE(127)] = 8104,
+    [SMALL_STATE(128)] = 8161,
+    [SMALL_STATE(129)] = 8218,
+    [SMALL_STATE(130)] = 8275,
+    [SMALL_STATE(131)] = 8332,
+    [SMALL_STATE(132)] = 8389,
+    [SMALL_STATE(133)] = 8446,
+    [SMALL_STATE(134)] = 8503,
+    [SMALL_STATE(135)] = 8620,
+    [SMALL_STATE(136)] = 8677,
+    [SMALL_STATE(137)] = 8734,
+    [SMALL_STATE(138)] = 8791,
+    [SMALL_STATE(139)] = 8896,
+    [SMALL_STATE(140)] = 8953,
+    [SMALL_STATE(141)] = 9010,
+    [SMALL_STATE(142)] = 9127,
+    [SMALL_STATE(143)] = 9184,
+    [SMALL_STATE(144)] = 9301,
+    [SMALL_STATE(145)] = 9358,
+    [SMALL_STATE(146)] = 9415,
+    [SMALL_STATE(147)] = 9472,
+    [SMALL_STATE(148)] = 9589,
+    [SMALL_STATE(149)] = 9646,
+    [SMALL_STATE(150)] = 9703,
+    [SMALL_STATE(151)] = 9760,
+    [SMALL_STATE(152)] = 9817,
+    [SMALL_STATE(153)] = 9934,
+    [SMALL_STATE(154)] = 9991,
     [SMALL_STATE(155)] = 10048,
     [SMALL_STATE(156)] = 10105,
     [SMALL_STATE(157)] = 10222,
     [SMALL_STATE(158)] = 10279,
     [SMALL_STATE(159)] = 10336,
-    [SMALL_STATE(160)] = 10453,
-    [SMALL_STATE(161)] = 10510,
-    [SMALL_STATE(162)] = 10567,
-    [SMALL_STATE(163)] = 10624,
-    [SMALL_STATE(164)] = 10681,
-    [SMALL_STATE(165)] = 10738,
-    [SMALL_STATE(166)] = 10795,
-    [SMALL_STATE(167)] = 10852,
-    [SMALL_STATE(168)] = 10909,
-    [SMALL_STATE(169)] = 10966,
-    [SMALL_STATE(170)] = 11023,
-    [SMALL_STATE(171)] = 11080,
-    [SMALL_STATE(172)] = 11137,
-    [SMALL_STATE(173)] = 11194,
-    [SMALL_STATE(174)] = 11251,
-    [SMALL_STATE(175)] = 11368,
+    [SMALL_STATE(160)] = 10393,
+    [SMALL_STATE(161)] = 10450,
+    [SMALL_STATE(162)] = 10507,
+    [SMALL_STATE(163)] = 10564,
+    [SMALL_STATE(164)] = 10621,
+    [SMALL_STATE(165)] = 10726,
+    [SMALL_STATE(166)] = 10783,
+    [SMALL_STATE(167)] = 10840,
+    [SMALL_STATE(168)] = 10897,
+    [SMALL_STATE(169)] = 10954,
+    [SMALL_STATE(170)] = 11011,
+    [SMALL_STATE(171)] = 11128,
+    [SMALL_STATE(172)] = 11185,
+    [SMALL_STATE(173)] = 11242,
+    [SMALL_STATE(174)] = 11359,
+    [SMALL_STATE(175)] = 11416,
     [SMALL_STATE(176)] = 11473,
     [SMALL_STATE(177)] = 11530,
     [SMALL_STATE(178)] = 11587,
@@ -81529,7 +81576,7 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(185)] = 12046,
     [SMALL_STATE(186)] = 12103,
     [SMALL_STATE(187)] = 12217,
-    [SMALL_STATE(188)] = 12279,
+    [SMALL_STATE(188)] = 12331,
     [SMALL_STATE(189)] = 12393,
     [SMALL_STATE(190)] = 12507,
     [SMALL_STATE(191)] = 12621,
@@ -81602,7 +81649,7 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(258)] = 20043,
     [SMALL_STATE(259)] = 20151,
     [SMALL_STATE(260)] = 20259,
-    [SMALL_STATE(261)] = 20313,
+    [SMALL_STATE(261)] = 20367,
     [SMALL_STATE(262)] = 20421,
     [SMALL_STATE(263)] = 20529,
     [SMALL_STATE(264)] = 20637,
@@ -81637,8 +81684,8 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(293)] = 23715,
     [SMALL_STATE(294)] = 23823,
     [SMALL_STATE(295)] = 23931,
-    [SMALL_STATE(296)] = 24039,
-    [SMALL_STATE(297)] = 24147,
+    [SMALL_STATE(296)] = 23985,
+    [SMALL_STATE(297)] = 24093,
     [SMALL_STATE(298)] = 24201,
     [SMALL_STATE(299)] = 24309,
     [SMALL_STATE(300)] = 24417,
@@ -81686,14 +81733,14 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(342)] = 27985,
     [SMALL_STATE(343)] = 28035,
     [SMALL_STATE(344)] = 28085,
-    [SMALL_STATE(345)] = 28175,
-    [SMALL_STATE(346)] = 28223,
-    [SMALL_STATE(347)] = 28271,
-    [SMALL_STATE(348)] = 28319,
-    [SMALL_STATE(349)] = 28369,
-    [SMALL_STATE(350)] = 28419,
-    [SMALL_STATE(351)] = 28469,
-    [SMALL_STATE(352)] = 28519,
+    [SMALL_STATE(345)] = 28133,
+    [SMALL_STATE(346)] = 28181,
+    [SMALL_STATE(347)] = 28229,
+    [SMALL_STATE(348)] = 28277,
+    [SMALL_STATE(349)] = 28327,
+    [SMALL_STATE(350)] = 28377,
+    [SMALL_STATE(351)] = 28427,
+    [SMALL_STATE(352)] = 28477,
     [SMALL_STATE(353)] = 28567,
     [SMALL_STATE(354)] = 28615,
     [SMALL_STATE(355)] = 28665,
@@ -81703,28 +81750,28 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(359)] = 28862,
     [SMALL_STATE(360)] = 28909,
     [SMALL_STATE(361)] = 28956,
-    [SMALL_STATE(362)] = 29043,
-    [SMALL_STATE(363)] = 29090,
-    [SMALL_STATE(364)] = 29137,
-    [SMALL_STATE(365)] = 29184,
-    [SMALL_STATE(366)] = 29231,
-    [SMALL_STATE(367)] = 29278,
-    [SMALL_STATE(368)] = 29325,
-    [SMALL_STATE(369)] = 29372,
-    [SMALL_STATE(370)] = 29419,
-    [SMALL_STATE(371)] = 29466,
-    [SMALL_STATE(372)] = 29513,
-    [SMALL_STATE(373)] = 29560,
-    [SMALL_STATE(374)] = 29607,
-    [SMALL_STATE(375)] = 29654,
-    [SMALL_STATE(376)] = 29701,
-    [SMALL_STATE(377)] = 29748,
-    [SMALL_STATE(378)] = 29795,
-    [SMALL_STATE(379)] = 29842,
-    [SMALL_STATE(380)] = 29889,
-    [SMALL_STATE(381)] = 29936,
-    [SMALL_STATE(382)] = 29983,
-    [SMALL_STATE(383)] = 30030,
+    [SMALL_STATE(362)] = 29003,
+    [SMALL_STATE(363)] = 29050,
+    [SMALL_STATE(364)] = 29097,
+    [SMALL_STATE(365)] = 29144,
+    [SMALL_STATE(366)] = 29191,
+    [SMALL_STATE(367)] = 29238,
+    [SMALL_STATE(368)] = 29285,
+    [SMALL_STATE(369)] = 29332,
+    [SMALL_STATE(370)] = 29379,
+    [SMALL_STATE(371)] = 29426,
+    [SMALL_STATE(372)] = 29473,
+    [SMALL_STATE(373)] = 29520,
+    [SMALL_STATE(374)] = 29567,
+    [SMALL_STATE(375)] = 29614,
+    [SMALL_STATE(376)] = 29661,
+    [SMALL_STATE(377)] = 29708,
+    [SMALL_STATE(378)] = 29755,
+    [SMALL_STATE(379)] = 29802,
+    [SMALL_STATE(380)] = 29849,
+    [SMALL_STATE(381)] = 29896,
+    [SMALL_STATE(382)] = 29943,
+    [SMALL_STATE(383)] = 29990,
     [SMALL_STATE(384)] = 30077,
     [SMALL_STATE(385)] = 30124,
     [SMALL_STATE(386)] = 30171,
@@ -81761,17 +81808,17 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(417)] = 31628,
     [SMALL_STATE(418)] = 31675,
     [SMALL_STATE(419)] = 31722,
-    [SMALL_STATE(420)] = 31808,
-    [SMALL_STATE(421)] = 31854,
-    [SMALL_STATE(422)] = 31900,
+    [SMALL_STATE(420)] = 31768,
+    [SMALL_STATE(421)] = 31814,
+    [SMALL_STATE(422)] = 31860,
     [SMALL_STATE(423)] = 31946,
     [SMALL_STATE(424)] = 31992,
     [SMALL_STATE(425)] = 32038,
     [SMALL_STATE(426)] = 32084,
-    [SMALL_STATE(427)] = 32129,
-    [SMALL_STATE(428)] = 32174,
-    [SMALL_STATE(429)] = 32219,
-    [SMALL_STATE(430)] = 32264,
+    [SMALL_STATE(427)] = 32165,
+    [SMALL_STATE(428)] = 32210,
+    [SMALL_STATE(429)] = 32255,
+    [SMALL_STATE(430)] = 32300,
     [SMALL_STATE(431)] = 32345,
     [SMALL_STATE(432)] = 32390,
     [SMALL_STATE(433)] = 32468,
@@ -81782,1270 +81829,1270 @@ static const uint32_t ts_small_parse_table_map[] = {
     [SMALL_STATE(438)] = 32818,
     [SMALL_STATE(439)] = 32881,
     [SMALL_STATE(440)] = 32946,
-    [SMALL_STATE(441)] = 33011,
-    [SMALL_STATE(442)] = 33046,
-    [SMALL_STATE(443)] = 33081,
+    [SMALL_STATE(441)] = 32981,
+    [SMALL_STATE(442)] = 33044,
+    [SMALL_STATE(443)] = 33109,
     [SMALL_STATE(444)] = 33144,
     [SMALL_STATE(445)] = 33206,
     [SMALL_STATE(446)] = 33240,
     [SMALL_STATE(447)] = 33273,
-    [SMALL_STATE(448)] = 33311,
-    [SMALL_STATE(449)] = 33340,
-    [SMALL_STATE(450)] = 33373,
-    [SMALL_STATE(451)] = 33402,
-    [SMALL_STATE(452)] = 33431,
-    [SMALL_STATE(453)] = 33464,
-    [SMALL_STATE(454)] = 33497,
-    [SMALL_STATE(455)] = 33530,
-    [SMALL_STATE(456)] = 33560,
-    [SMALL_STATE(457)] = 33590,
-    [SMALL_STATE(458)] = 33620,
-    [SMALL_STATE(459)] = 33650,
-    [SMALL_STATE(460)] = 33680,
-    [SMALL_STATE(461)] = 33710,
-    [SMALL_STATE(462)] = 33740,
-    [SMALL_STATE(463)] = 33770,
-    [SMALL_STATE(464)] = 33804,
-    [SMALL_STATE(465)] = 33834,
-    [SMALL_STATE(466)] = 33864,
-    [SMALL_STATE(467)] = 33894,
-    [SMALL_STATE(468)] = 33924,
-    [SMALL_STATE(469)] = 33954,
-    [SMALL_STATE(470)] = 33984,
-    [SMALL_STATE(471)] = 34014,
-    [SMALL_STATE(472)] = 34044,
-    [SMALL_STATE(473)] = 34074,
-    [SMALL_STATE(474)] = 34104,
-    [SMALL_STATE(475)] = 34134,
-    [SMALL_STATE(476)] = 34164,
-    [SMALL_STATE(477)] = 34194,
-    [SMALL_STATE(478)] = 34224,
-    [SMALL_STATE(479)] = 34254,
-    [SMALL_STATE(480)] = 34284,
-    [SMALL_STATE(481)] = 34314,
-    [SMALL_STATE(482)] = 34344,
-    [SMALL_STATE(483)] = 34374,
-    [SMALL_STATE(484)] = 34404,
-    [SMALL_STATE(485)] = 34438,
-    [SMALL_STATE(486)] = 34468,
-    [SMALL_STATE(487)] = 34498,
-    [SMALL_STATE(488)] = 34528,
-    [SMALL_STATE(489)] = 34558,
-    [SMALL_STATE(490)] = 34588,
-    [SMALL_STATE(491)] = 34618,
-    [SMALL_STATE(492)] = 34648,
-    [SMALL_STATE(493)] = 34678,
-    [SMALL_STATE(494)] = 34708,
-    [SMALL_STATE(495)] = 34738,
-    [SMALL_STATE(496)] = 34765,
-    [SMALL_STATE(497)] = 34792,
-    [SMALL_STATE(498)] = 34819,
-    [SMALL_STATE(499)] = 34846,
-    [SMALL_STATE(500)] = 34873,
-    [SMALL_STATE(501)] = 34900,
-    [SMALL_STATE(502)] = 34927,
-    [SMALL_STATE(503)] = 34954,
-    [SMALL_STATE(504)] = 34981,
-    [SMALL_STATE(505)] = 35008,
-    [SMALL_STATE(506)] = 35035,
-    [SMALL_STATE(507)] = 35062,
-    [SMALL_STATE(508)] = 35089,
-    [SMALL_STATE(509)] = 35116,
-    [SMALL_STATE(510)] = 35143,
-    [SMALL_STATE(511)] = 35170,
-    [SMALL_STATE(512)] = 35197,
-    [SMALL_STATE(513)] = 35224,
-    [SMALL_STATE(514)] = 35251,
-    [SMALL_STATE(515)] = 35278,
-    [SMALL_STATE(516)] = 35305,
-    [SMALL_STATE(517)] = 35332,
-    [SMALL_STATE(518)] = 35359,
-    [SMALL_STATE(519)] = 35386,
-    [SMALL_STATE(520)] = 35413,
-    [SMALL_STATE(521)] = 35440,
-    [SMALL_STATE(522)] = 35467,
-    [SMALL_STATE(523)] = 35494,
-    [SMALL_STATE(524)] = 35521,
-    [SMALL_STATE(525)] = 35548,
-    [SMALL_STATE(526)] = 35575,
-    [SMALL_STATE(527)] = 35602,
-    [SMALL_STATE(528)] = 35629,
-    [SMALL_STATE(529)] = 35656,
-    [SMALL_STATE(530)] = 35683,
-    [SMALL_STATE(531)] = 35710,
-    [SMALL_STATE(532)] = 35737,
-    [SMALL_STATE(533)] = 35764,
-    [SMALL_STATE(534)] = 35791,
-    [SMALL_STATE(535)] = 35818,
-    [SMALL_STATE(536)] = 35845,
-    [SMALL_STATE(537)] = 35872,
-    [SMALL_STATE(538)] = 35899,
-    [SMALL_STATE(539)] = 35926,
-    [SMALL_STATE(540)] = 35953,
-    [SMALL_STATE(541)] = 35980,
-    [SMALL_STATE(542)] = 36007,
-    [SMALL_STATE(543)] = 36034,
-    [SMALL_STATE(544)] = 36061,
-    [SMALL_STATE(545)] = 36088,
-    [SMALL_STATE(546)] = 36115,
-    [SMALL_STATE(547)] = 36142,
-    [SMALL_STATE(548)] = 36169,
-    [SMALL_STATE(549)] = 36196,
-    [SMALL_STATE(550)] = 36223,
-    [SMALL_STATE(551)] = 36252,
-    [SMALL_STATE(552)] = 36285,
-    [SMALL_STATE(553)] = 36314,
-    [SMALL_STATE(554)] = 36343,
-    [SMALL_STATE(555)] = 36367,
-    [SMALL_STATE(556)] = 36405,
-    [SMALL_STATE(557)] = 36443,
-    [SMALL_STATE(558)] = 36481,
-    [SMALL_STATE(559)] = 36519,
-    [SMALL_STATE(560)] = 36557,
-    [SMALL_STATE(561)] = 36581,
-    [SMALL_STATE(562)] = 36608,
-    [SMALL_STATE(563)] = 36635,
-    [SMALL_STATE(564)] = 36669,
-    [SMALL_STATE(565)] = 36690,
-    [SMALL_STATE(566)] = 36711,
-    [SMALL_STATE(567)] = 36734,
-    [SMALL_STATE(568)] = 36757,
-    [SMALL_STATE(569)] = 36778,
-    [SMALL_STATE(570)] = 36799,
-    [SMALL_STATE(571)] = 36820,
-    [SMALL_STATE(572)] = 36841,
-    [SMALL_STATE(573)] = 36876,
-    [SMALL_STATE(574)] = 36897,
-    [SMALL_STATE(575)] = 36918,
-    [SMALL_STATE(576)] = 36955,
-    [SMALL_STATE(577)] = 36992,
-    [SMALL_STATE(578)] = 37013,
-    [SMALL_STATE(579)] = 37047,
-    [SMALL_STATE(580)] = 37075,
-    [SMALL_STATE(581)] = 37109,
-    [SMALL_STATE(582)] = 37143,
-    [SMALL_STATE(583)] = 37165,
-    [SMALL_STATE(584)] = 37185,
-    [SMALL_STATE(585)] = 37207,
-    [SMALL_STATE(586)] = 37241,
-    [SMALL_STATE(587)] = 37275,
-    [SMALL_STATE(588)] = 37305,
-    [SMALL_STATE(589)] = 37336,
-    [SMALL_STATE(590)] = 37357,
-    [SMALL_STATE(591)] = 37386,
-    [SMALL_STATE(592)] = 37405,
-    [SMALL_STATE(593)] = 37436,
-    [SMALL_STATE(594)] = 37467,
-    [SMALL_STATE(595)] = 37498,
-    [SMALL_STATE(596)] = 37529,
-    [SMALL_STATE(597)] = 37560,
-    [SMALL_STATE(598)] = 37588,
-    [SMALL_STATE(599)] = 37616,
-    [SMALL_STATE(600)] = 37640,
-    [SMALL_STATE(601)] = 37664,
-    [SMALL_STATE(602)] = 37692,
-    [SMALL_STATE(603)] = 37720,
-    [SMALL_STATE(604)] = 37748,
-    [SMALL_STATE(605)] = 37768,
-    [SMALL_STATE(606)] = 37796,
-    [SMALL_STATE(607)] = 37824,
-    [SMALL_STATE(608)] = 37848,
-    [SMALL_STATE(609)] = 37876,
-    [SMALL_STATE(610)] = 37904,
-    [SMALL_STATE(611)] = 37932,
-    [SMALL_STATE(612)] = 37956,
-    [SMALL_STATE(613)] = 37984,
-    [SMALL_STATE(614)] = 38012,
-    [SMALL_STATE(615)] = 38040,
-    [SMALL_STATE(616)] = 38064,
-    [SMALL_STATE(617)] = 38090,
-    [SMALL_STATE(618)] = 38118,
-    [SMALL_STATE(619)] = 38146,
-    [SMALL_STATE(620)] = 38174,
-    [SMALL_STATE(621)] = 38198,
-    [SMALL_STATE(622)] = 38226,
-    [SMALL_STATE(623)] = 38252,
-    [SMALL_STATE(624)] = 38274,
-    [SMALL_STATE(625)] = 38298,
-    [SMALL_STATE(626)] = 38319,
-    [SMALL_STATE(627)] = 38336,
-    [SMALL_STATE(628)] = 38361,
-    [SMALL_STATE(629)] = 38378,
-    [SMALL_STATE(630)] = 38397,
-    [SMALL_STATE(631)] = 38414,
-    [SMALL_STATE(632)] = 38433,
-    [SMALL_STATE(633)] = 38450,
-    [SMALL_STATE(634)] = 38475,
-    [SMALL_STATE(635)] = 38492,
-    [SMALL_STATE(636)] = 38509,
-    [SMALL_STATE(637)] = 38526,
-    [SMALL_STATE(638)] = 38547,
-    [SMALL_STATE(639)] = 38572,
-    [SMALL_STATE(640)] = 38589,
-    [SMALL_STATE(641)] = 38610,
-    [SMALL_STATE(642)] = 38627,
-    [SMALL_STATE(643)] = 38650,
-    [SMALL_STATE(644)] = 38675,
-    [SMALL_STATE(645)] = 38698,
-    [SMALL_STATE(646)] = 38717,
-    [SMALL_STATE(647)] = 38738,
-    [SMALL_STATE(648)] = 38759,
-    [SMALL_STATE(649)] = 38776,
-    [SMALL_STATE(650)] = 38797,
-    [SMALL_STATE(651)] = 38822,
-    [SMALL_STATE(652)] = 38845,
-    [SMALL_STATE(653)] = 38862,
-    [SMALL_STATE(654)] = 38887,
-    [SMALL_STATE(655)] = 38904,
-    [SMALL_STATE(656)] = 38927,
-    [SMALL_STATE(657)] = 38944,
-    [SMALL_STATE(658)] = 38969,
-    [SMALL_STATE(659)] = 38994,
-    [SMALL_STATE(660)] = 39011,
-    [SMALL_STATE(661)] = 39036,
-    [SMALL_STATE(662)] = 39053,
-    [SMALL_STATE(663)] = 39076,
-    [SMALL_STATE(664)] = 39099,
-    [SMALL_STATE(665)] = 39120,
-    [SMALL_STATE(666)] = 39143,
-    [SMALL_STATE(667)] = 39164,
-    [SMALL_STATE(668)] = 39184,
-    [SMALL_STATE(669)] = 39200,
-    [SMALL_STATE(670)] = 39220,
-    [SMALL_STATE(671)] = 39238,
-    [SMALL_STATE(672)] = 39256,
-    [SMALL_STATE(673)] = 39274,
-    [SMALL_STATE(674)] = 39292,
-    [SMALL_STATE(675)] = 39310,
-    [SMALL_STATE(676)] = 39332,
-    [SMALL_STATE(677)] = 39350,
-    [SMALL_STATE(678)] = 39368,
-    [SMALL_STATE(679)] = 39386,
-    [SMALL_STATE(680)] = 39404,
-    [SMALL_STATE(681)] = 39420,
-    [SMALL_STATE(682)] = 39438,
-    [SMALL_STATE(683)] = 39456,
-    [SMALL_STATE(684)] = 39478,
-    [SMALL_STATE(685)] = 39500,
-    [SMALL_STATE(686)] = 39520,
-    [SMALL_STATE(687)] = 39540,
-    [SMALL_STATE(688)] = 39558,
-    [SMALL_STATE(689)] = 39576,
-    [SMALL_STATE(690)] = 39594,
-    [SMALL_STATE(691)] = 39612,
-    [SMALL_STATE(692)] = 39628,
-    [SMALL_STATE(693)] = 39646,
-    [SMALL_STATE(694)] = 39664,
-    [SMALL_STATE(695)] = 39686,
-    [SMALL_STATE(696)] = 39704,
-    [SMALL_STATE(697)] = 39726,
-    [SMALL_STATE(698)] = 39742,
-    [SMALL_STATE(699)] = 39762,
-    [SMALL_STATE(700)] = 39784,
-    [SMALL_STATE(701)] = 39806,
-    [SMALL_STATE(702)] = 39826,
-    [SMALL_STATE(703)] = 39844,
-    [SMALL_STATE(704)] = 39866,
-    [SMALL_STATE(705)] = 39888,
-    [SMALL_STATE(706)] = 39910,
-    [SMALL_STATE(707)] = 39928,
-    [SMALL_STATE(708)] = 39950,
-    [SMALL_STATE(709)] = 39970,
-    [SMALL_STATE(710)] = 39988,
-    [SMALL_STATE(711)] = 40006,
-    [SMALL_STATE(712)] = 40024,
-    [SMALL_STATE(713)] = 40042,
-    [SMALL_STATE(714)] = 40060,
-    [SMALL_STATE(715)] = 40078,
-    [SMALL_STATE(716)] = 40096,
-    [SMALL_STATE(717)] = 40114,
-    [SMALL_STATE(718)] = 40132,
-    [SMALL_STATE(719)] = 40150,
-    [SMALL_STATE(720)] = 40168,
-    [SMALL_STATE(721)] = 40186,
-    [SMALL_STATE(722)] = 40204,
-    [SMALL_STATE(723)] = 40222,
-    [SMALL_STATE(724)] = 40244,
-    [SMALL_STATE(725)] = 40262,
-    [SMALL_STATE(726)] = 40280,
-    [SMALL_STATE(727)] = 40302,
-    [SMALL_STATE(728)] = 40324,
-    [SMALL_STATE(729)] = 40342,
-    [SMALL_STATE(730)] = 40362,
-    [SMALL_STATE(731)] = 40380,
-    [SMALL_STATE(732)] = 40400,
-    [SMALL_STATE(733)] = 40422,
-    [SMALL_STATE(734)] = 40444,
-    [SMALL_STATE(735)] = 40460,
-    [SMALL_STATE(736)] = 40480,
-    [SMALL_STATE(737)] = 40500,
-    [SMALL_STATE(738)] = 40520,
-    [SMALL_STATE(739)] = 40538,
-    [SMALL_STATE(740)] = 40558,
-    [SMALL_STATE(741)] = 40580,
-    [SMALL_STATE(742)] = 40596,
-    [SMALL_STATE(743)] = 40614,
-    [SMALL_STATE(744)] = 40632,
-    [SMALL_STATE(745)] = 40652,
-    [SMALL_STATE(746)] = 40674,
-    [SMALL_STATE(747)] = 40696,
-    [SMALL_STATE(748)] = 40718,
-    [SMALL_STATE(749)] = 40736,
-    [SMALL_STATE(750)] = 40756,
-    [SMALL_STATE(751)] = 40774,
-    [SMALL_STATE(752)] = 40792,
-    [SMALL_STATE(753)] = 40810,
-    [SMALL_STATE(754)] = 40828,
-    [SMALL_STATE(755)] = 40848,
-    [SMALL_STATE(756)] = 40870,
-    [SMALL_STATE(757)] = 40886,
-    [SMALL_STATE(758)] = 40902,
-    [SMALL_STATE(759)] = 40920,
-    [SMALL_STATE(760)] = 40936,
-    [SMALL_STATE(761)] = 40958,
-    [SMALL_STATE(762)] = 40978,
-    [SMALL_STATE(763)] = 40994,
-    [SMALL_STATE(764)] = 41014,
-    [SMALL_STATE(765)] = 41036,
-    [SMALL_STATE(766)] = 41058,
-    [SMALL_STATE(767)] = 41076,
-    [SMALL_STATE(768)] = 41098,
-    [SMALL_STATE(769)] = 41116,
-    [SMALL_STATE(770)] = 41138,
-    [SMALL_STATE(771)] = 41160,
-    [SMALL_STATE(772)] = 41182,
-    [SMALL_STATE(773)] = 41204,
-    [SMALL_STATE(774)] = 41222,
-    [SMALL_STATE(775)] = 41238,
-    [SMALL_STATE(776)] = 41254,
-    [SMALL_STATE(777)] = 41272,
-    [SMALL_STATE(778)] = 41288,
-    [SMALL_STATE(779)] = 41304,
-    [SMALL_STATE(780)] = 41320,
-    [SMALL_STATE(781)] = 41342,
-    [SMALL_STATE(782)] = 41358,
-    [SMALL_STATE(783)] = 41374,
-    [SMALL_STATE(784)] = 41391,
-    [SMALL_STATE(785)] = 41406,
-    [SMALL_STATE(786)] = 41423,
-    [SMALL_STATE(787)] = 41442,
-    [SMALL_STATE(788)] = 41461,
-    [SMALL_STATE(789)] = 41478,
-    [SMALL_STATE(790)] = 41493,
-    [SMALL_STATE(791)] = 41512,
-    [SMALL_STATE(792)] = 41529,
-    [SMALL_STATE(793)] = 41548,
-    [SMALL_STATE(794)] = 41567,
-    [SMALL_STATE(795)] = 41586,
-    [SMALL_STATE(796)] = 41605,
-    [SMALL_STATE(797)] = 41624,
-    [SMALL_STATE(798)] = 41639,
-    [SMALL_STATE(799)] = 41654,
-    [SMALL_STATE(800)] = 41673,
-    [SMALL_STATE(801)] = 41692,
-    [SMALL_STATE(802)] = 41711,
-    [SMALL_STATE(803)] = 41726,
-    [SMALL_STATE(804)] = 41741,
-    [SMALL_STATE(805)] = 41760,
-    [SMALL_STATE(806)] = 41777,
-    [SMALL_STATE(807)] = 41792,
-    [SMALL_STATE(808)] = 41811,
-    [SMALL_STATE(809)] = 41830,
-    [SMALL_STATE(810)] = 41849,
-    [SMALL_STATE(811)] = 41868,
-    [SMALL_STATE(812)] = 41887,
-    [SMALL_STATE(813)] = 41906,
-    [SMALL_STATE(814)] = 41925,
-    [SMALL_STATE(815)] = 41944,
-    [SMALL_STATE(816)] = 41963,
-    [SMALL_STATE(817)] = 41982,
-    [SMALL_STATE(818)] = 41997,
-    [SMALL_STATE(819)] = 42014,
-    [SMALL_STATE(820)] = 42033,
-    [SMALL_STATE(821)] = 42052,
-    [SMALL_STATE(822)] = 42071,
-    [SMALL_STATE(823)] = 42090,
-    [SMALL_STATE(824)] = 42109,
-    [SMALL_STATE(825)] = 42128,
-    [SMALL_STATE(826)] = 42145,
-    [SMALL_STATE(827)] = 42164,
-    [SMALL_STATE(828)] = 42183,
-    [SMALL_STATE(829)] = 42202,
-    [SMALL_STATE(830)] = 42221,
-    [SMALL_STATE(831)] = 42240,
-    [SMALL_STATE(832)] = 42257,
-    [SMALL_STATE(833)] = 42274,
-    [SMALL_STATE(834)] = 42293,
-    [SMALL_STATE(835)] = 42312,
-    [SMALL_STATE(836)] = 42331,
-    [SMALL_STATE(837)] = 42350,
-    [SMALL_STATE(838)] = 42369,
-    [SMALL_STATE(839)] = 42386,
-    [SMALL_STATE(840)] = 42401,
-    [SMALL_STATE(841)] = 42416,
-    [SMALL_STATE(842)] = 42433,
-    [SMALL_STATE(843)] = 42448,
-    [SMALL_STATE(844)] = 42465,
-    [SMALL_STATE(845)] = 42480,
-    [SMALL_STATE(846)] = 42499,
-    [SMALL_STATE(847)] = 42514,
-    [SMALL_STATE(848)] = 42529,
-    [SMALL_STATE(849)] = 42548,
-    [SMALL_STATE(850)] = 42563,
-    [SMALL_STATE(851)] = 42578,
-    [SMALL_STATE(852)] = 42593,
-    [SMALL_STATE(853)] = 42608,
-    [SMALL_STATE(854)] = 42627,
-    [SMALL_STATE(855)] = 42642,
-    [SMALL_STATE(856)] = 42661,
-    [SMALL_STATE(857)] = 42678,
-    [SMALL_STATE(858)] = 42697,
-    [SMALL_STATE(859)] = 42712,
-    [SMALL_STATE(860)] = 42731,
-    [SMALL_STATE(861)] = 42746,
-    [SMALL_STATE(862)] = 42765,
-    [SMALL_STATE(863)] = 42784,
-    [SMALL_STATE(864)] = 42799,
-    [SMALL_STATE(865)] = 42818,
-    [SMALL_STATE(866)] = 42833,
-    [SMALL_STATE(867)] = 42852,
-    [SMALL_STATE(868)] = 42871,
-    [SMALL_STATE(869)] = 42890,
-    [SMALL_STATE(870)] = 42907,
-    [SMALL_STATE(871)] = 42922,
-    [SMALL_STATE(872)] = 42939,
-    [SMALL_STATE(873)] = 42958,
-    [SMALL_STATE(874)] = 42973,
-    [SMALL_STATE(875)] = 42992,
-    [SMALL_STATE(876)] = 43007,
-    [SMALL_STATE(877)] = 43024,
-    [SMALL_STATE(878)] = 43041,
-    [SMALL_STATE(879)] = 43056,
-    [SMALL_STATE(880)] = 43075,
-    [SMALL_STATE(881)] = 43090,
-    [SMALL_STATE(882)] = 43105,
-    [SMALL_STATE(883)] = 43120,
-    [SMALL_STATE(884)] = 43139,
-    [SMALL_STATE(885)] = 43154,
-    [SMALL_STATE(886)] = 43173,
-    [SMALL_STATE(887)] = 43192,
-    [SMALL_STATE(888)] = 43207,
-    [SMALL_STATE(889)] = 43226,
-    [SMALL_STATE(890)] = 43245,
-    [SMALL_STATE(891)] = 43260,
-    [SMALL_STATE(892)] = 43275,
-    [SMALL_STATE(893)] = 43294,
-    [SMALL_STATE(894)] = 43313,
-    [SMALL_STATE(895)] = 43332,
-    [SMALL_STATE(896)] = 43351,
-    [SMALL_STATE(897)] = 43366,
-    [SMALL_STATE(898)] = 43381,
-    [SMALL_STATE(899)] = 43396,
-    [SMALL_STATE(900)] = 43411,
-    [SMALL_STATE(901)] = 43430,
-    [SMALL_STATE(902)] = 43445,
-    [SMALL_STATE(903)] = 43460,
-    [SMALL_STATE(904)] = 43477,
-    [SMALL_STATE(905)] = 43492,
-    [SMALL_STATE(906)] = 43507,
-    [SMALL_STATE(907)] = 43524,
-    [SMALL_STATE(908)] = 43543,
-    [SMALL_STATE(909)] = 43558,
-    [SMALL_STATE(910)] = 43573,
-    [SMALL_STATE(911)] = 43592,
-    [SMALL_STATE(912)] = 43611,
-    [SMALL_STATE(913)] = 43626,
-    [SMALL_STATE(914)] = 43643,
-    [SMALL_STATE(915)] = 43658,
-    [SMALL_STATE(916)] = 43677,
-    [SMALL_STATE(917)] = 43692,
-    [SMALL_STATE(918)] = 43711,
-    [SMALL_STATE(919)] = 43728,
-    [SMALL_STATE(920)] = 43747,
-    [SMALL_STATE(921)] = 43764,
-    [SMALL_STATE(922)] = 43783,
-    [SMALL_STATE(923)] = 43802,
-    [SMALL_STATE(924)] = 43819,
-    [SMALL_STATE(925)] = 43838,
-    [SMALL_STATE(926)] = 43857,
-    [SMALL_STATE(927)] = 43872,
-    [SMALL_STATE(928)] = 43887,
-    [SMALL_STATE(929)] = 43906,
-    [SMALL_STATE(930)] = 43923,
-    [SMALL_STATE(931)] = 43942,
-    [SMALL_STATE(932)] = 43961,
-    [SMALL_STATE(933)] = 43980,
-    [SMALL_STATE(934)] = 43995,
-    [SMALL_STATE(935)] = 44014,
-    [SMALL_STATE(936)] = 44033,
-    [SMALL_STATE(937)] = 44052,
-    [SMALL_STATE(938)] = 44067,
-    [SMALL_STATE(939)] = 44082,
-    [SMALL_STATE(940)] = 44099,
-    [SMALL_STATE(941)] = 44114,
-    [SMALL_STATE(942)] = 44133,
-    [SMALL_STATE(943)] = 44152,
-    [SMALL_STATE(944)] = 44167,
-    [SMALL_STATE(945)] = 44186,
-    [SMALL_STATE(946)] = 44205,
-    [SMALL_STATE(947)] = 44220,
-    [SMALL_STATE(948)] = 44239,
-    [SMALL_STATE(949)] = 44256,
-    [SMALL_STATE(950)] = 44275,
-    [SMALL_STATE(951)] = 44292,
-    [SMALL_STATE(952)] = 44311,
-    [SMALL_STATE(953)] = 44330,
-    [SMALL_STATE(954)] = 44347,
-    [SMALL_STATE(955)] = 44366,
-    [SMALL_STATE(956)] = 44381,
-    [SMALL_STATE(957)] = 44398,
-    [SMALL_STATE(958)] = 44415,
-    [SMALL_STATE(959)] = 44434,
-    [SMALL_STATE(960)] = 44449,
-    [SMALL_STATE(961)] = 44464,
-    [SMALL_STATE(962)] = 44483,
-    [SMALL_STATE(963)] = 44498,
-    [SMALL_STATE(964)] = 44513,
-    [SMALL_STATE(965)] = 44528,
-    [SMALL_STATE(966)] = 44543,
-    [SMALL_STATE(967)] = 44560,
-    [SMALL_STATE(968)] = 44579,
-    [SMALL_STATE(969)] = 44594,
-    [SMALL_STATE(970)] = 44611,
-    [SMALL_STATE(971)] = 44626,
-    [SMALL_STATE(972)] = 44643,
-    [SMALL_STATE(973)] = 44658,
-    [SMALL_STATE(974)] = 44673,
-    [SMALL_STATE(975)] = 44688,
-    [SMALL_STATE(976)] = 44705,
-    [SMALL_STATE(977)] = 44722,
-    [SMALL_STATE(978)] = 44741,
-    [SMALL_STATE(979)] = 44756,
-    [SMALL_STATE(980)] = 44775,
-    [SMALL_STATE(981)] = 44790,
-    [SMALL_STATE(982)] = 44809,
-    [SMALL_STATE(983)] = 44824,
-    [SMALL_STATE(984)] = 44843,
-    [SMALL_STATE(985)] = 44862,
-    [SMALL_STATE(986)] = 44877,
-    [SMALL_STATE(987)] = 44896,
-    [SMALL_STATE(988)] = 44915,
-    [SMALL_STATE(989)] = 44934,
-    [SMALL_STATE(990)] = 44949,
-    [SMALL_STATE(991)] = 44968,
-    [SMALL_STATE(992)] = 44983,
-    [SMALL_STATE(993)] = 44998,
-    [SMALL_STATE(994)] = 45017,
-    [SMALL_STATE(995)] = 45032,
-    [SMALL_STATE(996)] = 45047,
-    [SMALL_STATE(997)] = 45064,
-    [SMALL_STATE(998)] = 45079,
-    [SMALL_STATE(999)] = 45094,
-    [SMALL_STATE(1000)] = 45109,
-    [SMALL_STATE(1001)] = 45124,
-    [SMALL_STATE(1002)] = 45139,
-    [SMALL_STATE(1003)] = 45154,
-    [SMALL_STATE(1004)] = 45169,
-    [SMALL_STATE(1005)] = 45184,
-    [SMALL_STATE(1006)] = 45199,
-    [SMALL_STATE(1007)] = 45214,
-    [SMALL_STATE(1008)] = 45229,
-    [SMALL_STATE(1009)] = 45244,
-    [SMALL_STATE(1010)] = 45259,
-    [SMALL_STATE(1011)] = 45274,
-    [SMALL_STATE(1012)] = 45289,
-    [SMALL_STATE(1013)] = 45304,
-    [SMALL_STATE(1014)] = 45319,
-    [SMALL_STATE(1015)] = 45334,
-    [SMALL_STATE(1016)] = 45349,
-    [SMALL_STATE(1017)] = 45364,
-    [SMALL_STATE(1018)] = 45379,
-    [SMALL_STATE(1019)] = 45394,
-    [SMALL_STATE(1020)] = 45409,
-    [SMALL_STATE(1021)] = 45424,
-    [SMALL_STATE(1022)] = 45439,
-    [SMALL_STATE(1023)] = 45454,
-    [SMALL_STATE(1024)] = 45469,
-    [SMALL_STATE(1025)] = 45484,
-    [SMALL_STATE(1026)] = 45499,
-    [SMALL_STATE(1027)] = 45514,
-    [SMALL_STATE(1028)] = 45529,
-    [SMALL_STATE(1029)] = 45544,
-    [SMALL_STATE(1030)] = 45559,
-    [SMALL_STATE(1031)] = 45574,
-    [SMALL_STATE(1032)] = 45589,
-    [SMALL_STATE(1033)] = 45604,
-    [SMALL_STATE(1034)] = 45619,
-    [SMALL_STATE(1035)] = 45634,
-    [SMALL_STATE(1036)] = 45649,
-    [SMALL_STATE(1037)] = 45664,
-    [SMALL_STATE(1038)] = 45683,
-    [SMALL_STATE(1039)] = 45702,
-    [SMALL_STATE(1040)] = 45721,
-    [SMALL_STATE(1041)] = 45740,
-    [SMALL_STATE(1042)] = 45759,
-    [SMALL_STATE(1043)] = 45773,
-    [SMALL_STATE(1044)] = 45789,
-    [SMALL_STATE(1045)] = 45805,
-    [SMALL_STATE(1046)] = 45819,
-    [SMALL_STATE(1047)] = 45833,
-    [SMALL_STATE(1048)] = 45849,
-    [SMALL_STATE(1049)] = 45865,
-    [SMALL_STATE(1050)] = 45881,
-    [SMALL_STATE(1051)] = 45897,
-    [SMALL_STATE(1052)] = 45911,
-    [SMALL_STATE(1053)] = 45927,
-    [SMALL_STATE(1054)] = 45941,
-    [SMALL_STATE(1055)] = 45955,
-    [SMALL_STATE(1056)] = 45969,
-    [SMALL_STATE(1057)] = 45983,
-    [SMALL_STATE(1058)] = 45997,
-    [SMALL_STATE(1059)] = 46011,
-    [SMALL_STATE(1060)] = 46027,
-    [SMALL_STATE(1061)] = 46041,
-    [SMALL_STATE(1062)] = 46055,
-    [SMALL_STATE(1063)] = 46069,
-    [SMALL_STATE(1064)] = 46083,
-    [SMALL_STATE(1065)] = 46097,
-    [SMALL_STATE(1066)] = 46113,
-    [SMALL_STATE(1067)] = 46129,
-    [SMALL_STATE(1068)] = 46143,
-    [SMALL_STATE(1069)] = 46157,
-    [SMALL_STATE(1070)] = 46171,
-    [SMALL_STATE(1071)] = 46187,
-    [SMALL_STATE(1072)] = 46201,
-    [SMALL_STATE(1073)] = 46215,
-    [SMALL_STATE(1074)] = 46229,
-    [SMALL_STATE(1075)] = 46243,
-    [SMALL_STATE(1076)] = 46257,
-    [SMALL_STATE(1077)] = 46271,
-    [SMALL_STATE(1078)] = 46287,
-    [SMALL_STATE(1079)] = 46301,
-    [SMALL_STATE(1080)] = 46315,
-    [SMALL_STATE(1081)] = 46331,
-    [SMALL_STATE(1082)] = 46347,
-    [SMALL_STATE(1083)] = 46361,
-    [SMALL_STATE(1084)] = 46375,
-    [SMALL_STATE(1085)] = 46389,
-    [SMALL_STATE(1086)] = 46403,
-    [SMALL_STATE(1087)] = 46417,
-    [SMALL_STATE(1088)] = 46431,
-    [SMALL_STATE(1089)] = 46445,
-    [SMALL_STATE(1090)] = 46459,
-    [SMALL_STATE(1091)] = 46473,
-    [SMALL_STATE(1092)] = 46487,
-    [SMALL_STATE(1093)] = 46501,
-    [SMALL_STATE(1094)] = 46517,
-    [SMALL_STATE(1095)] = 46531,
-    [SMALL_STATE(1096)] = 46545,
-    [SMALL_STATE(1097)] = 46559,
-    [SMALL_STATE(1098)] = 46575,
-    [SMALL_STATE(1099)] = 46589,
-    [SMALL_STATE(1100)] = 46605,
-    [SMALL_STATE(1101)] = 46619,
-    [SMALL_STATE(1102)] = 46635,
-    [SMALL_STATE(1103)] = 46651,
-    [SMALL_STATE(1104)] = 46667,
-    [SMALL_STATE(1105)] = 46683,
-    [SMALL_STATE(1106)] = 46699,
-    [SMALL_STATE(1107)] = 46713,
-    [SMALL_STATE(1108)] = 46727,
-    [SMALL_STATE(1109)] = 46743,
-    [SMALL_STATE(1110)] = 46759,
-    [SMALL_STATE(1111)] = 46775,
-    [SMALL_STATE(1112)] = 46791,
-    [SMALL_STATE(1113)] = 46805,
-    [SMALL_STATE(1114)] = 46821,
-    [SMALL_STATE(1115)] = 46837,
-    [SMALL_STATE(1116)] = 46853,
-    [SMALL_STATE(1117)] = 46869,
-    [SMALL_STATE(1118)] = 46885,
-    [SMALL_STATE(1119)] = 46901,
-    [SMALL_STATE(1120)] = 46917,
-    [SMALL_STATE(1121)] = 46931,
-    [SMALL_STATE(1122)] = 46945,
-    [SMALL_STATE(1123)] = 46961,
-    [SMALL_STATE(1124)] = 46977,
-    [SMALL_STATE(1125)] = 46993,
-    [SMALL_STATE(1126)] = 47007,
-    [SMALL_STATE(1127)] = 47023,
-    [SMALL_STATE(1128)] = 47039,
-    [SMALL_STATE(1129)] = 47053,
-    [SMALL_STATE(1130)] = 47067,
-    [SMALL_STATE(1131)] = 47081,
-    [SMALL_STATE(1132)] = 47097,
-    [SMALL_STATE(1133)] = 47111,
-    [SMALL_STATE(1134)] = 47127,
-    [SMALL_STATE(1135)] = 47143,
-    [SMALL_STATE(1136)] = 47159,
-    [SMALL_STATE(1137)] = 47173,
-    [SMALL_STATE(1138)] = 47189,
-    [SMALL_STATE(1139)] = 47205,
-    [SMALL_STATE(1140)] = 47221,
-    [SMALL_STATE(1141)] = 47235,
-    [SMALL_STATE(1142)] = 47251,
-    [SMALL_STATE(1143)] = 47267,
-    [SMALL_STATE(1144)] = 47281,
-    [SMALL_STATE(1145)] = 47297,
-    [SMALL_STATE(1146)] = 47313,
-    [SMALL_STATE(1147)] = 47329,
-    [SMALL_STATE(1148)] = 47345,
-    [SMALL_STATE(1149)] = 47361,
-    [SMALL_STATE(1150)] = 47375,
-    [SMALL_STATE(1151)] = 47389,
-    [SMALL_STATE(1152)] = 47403,
-    [SMALL_STATE(1153)] = 47419,
-    [SMALL_STATE(1154)] = 47435,
-    [SMALL_STATE(1155)] = 47449,
-    [SMALL_STATE(1156)] = 47465,
-    [SMALL_STATE(1157)] = 47479,
-    [SMALL_STATE(1158)] = 47495,
-    [SMALL_STATE(1159)] = 47509,
-    [SMALL_STATE(1160)] = 47525,
-    [SMALL_STATE(1161)] = 47541,
-    [SMALL_STATE(1162)] = 47555,
-    [SMALL_STATE(1163)] = 47571,
-    [SMALL_STATE(1164)] = 47585,
-    [SMALL_STATE(1165)] = 47599,
-    [SMALL_STATE(1166)] = 47613,
-    [SMALL_STATE(1167)] = 47629,
-    [SMALL_STATE(1168)] = 47643,
-    [SMALL_STATE(1169)] = 47656,
-    [SMALL_STATE(1170)] = 47669,
-    [SMALL_STATE(1171)] = 47682,
-    [SMALL_STATE(1172)] = 47695,
-    [SMALL_STATE(1173)] = 47708,
-    [SMALL_STATE(1174)] = 47721,
-    [SMALL_STATE(1175)] = 47734,
-    [SMALL_STATE(1176)] = 47747,
-    [SMALL_STATE(1177)] = 47760,
-    [SMALL_STATE(1178)] = 47773,
-    [SMALL_STATE(1179)] = 47786,
-    [SMALL_STATE(1180)] = 47799,
-    [SMALL_STATE(1181)] = 47812,
-    [SMALL_STATE(1182)] = 47825,
-    [SMALL_STATE(1183)] = 47838,
-    [SMALL_STATE(1184)] = 47851,
-    [SMALL_STATE(1185)] = 47864,
-    [SMALL_STATE(1186)] = 47877,
-    [SMALL_STATE(1187)] = 47890,
-    [SMALL_STATE(1188)] = 47903,
-    [SMALL_STATE(1189)] = 47916,
-    [SMALL_STATE(1190)] = 47929,
-    [SMALL_STATE(1191)] = 47942,
-    [SMALL_STATE(1192)] = 47955,
-    [SMALL_STATE(1193)] = 47968,
-    [SMALL_STATE(1194)] = 47981,
-    [SMALL_STATE(1195)] = 47994,
-    [SMALL_STATE(1196)] = 48007,
-    [SMALL_STATE(1197)] = 48020,
-    [SMALL_STATE(1198)] = 48033,
-    [SMALL_STATE(1199)] = 48046,
-    [SMALL_STATE(1200)] = 48059,
-    [SMALL_STATE(1201)] = 48072,
-    [SMALL_STATE(1202)] = 48085,
-    [SMALL_STATE(1203)] = 48098,
-    [SMALL_STATE(1204)] = 48111,
-    [SMALL_STATE(1205)] = 48124,
-    [SMALL_STATE(1206)] = 48137,
-    [SMALL_STATE(1207)] = 48150,
-    [SMALL_STATE(1208)] = 48163,
-    [SMALL_STATE(1209)] = 48176,
-    [SMALL_STATE(1210)] = 48189,
-    [SMALL_STATE(1211)] = 48202,
-    [SMALL_STATE(1212)] = 48215,
-    [SMALL_STATE(1213)] = 48228,
-    [SMALL_STATE(1214)] = 48241,
-    [SMALL_STATE(1215)] = 48254,
-    [SMALL_STATE(1216)] = 48267,
-    [SMALL_STATE(1217)] = 48280,
-    [SMALL_STATE(1218)] = 48293,
-    [SMALL_STATE(1219)] = 48306,
-    [SMALL_STATE(1220)] = 48319,
-    [SMALL_STATE(1221)] = 48332,
-    [SMALL_STATE(1222)] = 48345,
-    [SMALL_STATE(1223)] = 48358,
-    [SMALL_STATE(1224)] = 48371,
-    [SMALL_STATE(1225)] = 48384,
-    [SMALL_STATE(1226)] = 48397,
-    [SMALL_STATE(1227)] = 48410,
-    [SMALL_STATE(1228)] = 48423,
-    [SMALL_STATE(1229)] = 48436,
-    [SMALL_STATE(1230)] = 48449,
-    [SMALL_STATE(1231)] = 48462,
-    [SMALL_STATE(1232)] = 48475,
-    [SMALL_STATE(1233)] = 48488,
-    [SMALL_STATE(1234)] = 48501,
-    [SMALL_STATE(1235)] = 48514,
-    [SMALL_STATE(1236)] = 48527,
-    [SMALL_STATE(1237)] = 48540,
-    [SMALL_STATE(1238)] = 48553,
-    [SMALL_STATE(1239)] = 48566,
-    [SMALL_STATE(1240)] = 48579,
-    [SMALL_STATE(1241)] = 48592,
-    [SMALL_STATE(1242)] = 48605,
-    [SMALL_STATE(1243)] = 48618,
-    [SMALL_STATE(1244)] = 48631,
-    [SMALL_STATE(1245)] = 48644,
-    [SMALL_STATE(1246)] = 48657,
-    [SMALL_STATE(1247)] = 48670,
-    [SMALL_STATE(1248)] = 48683,
-    [SMALL_STATE(1249)] = 48696,
-    [SMALL_STATE(1250)] = 48709,
-    [SMALL_STATE(1251)] = 48722,
-    [SMALL_STATE(1252)] = 48735,
-    [SMALL_STATE(1253)] = 48748,
-    [SMALL_STATE(1254)] = 48761,
-    [SMALL_STATE(1255)] = 48774,
-    [SMALL_STATE(1256)] = 48787,
-    [SMALL_STATE(1257)] = 48800,
-    [SMALL_STATE(1258)] = 48813,
-    [SMALL_STATE(1259)] = 48826,
-    [SMALL_STATE(1260)] = 48839,
-    [SMALL_STATE(1261)] = 48852,
-    [SMALL_STATE(1262)] = 48865,
-    [SMALL_STATE(1263)] = 48878,
-    [SMALL_STATE(1264)] = 48891,
-    [SMALL_STATE(1265)] = 48904,
-    [SMALL_STATE(1266)] = 48917,
-    [SMALL_STATE(1267)] = 48930,
-    [SMALL_STATE(1268)] = 48943,
-    [SMALL_STATE(1269)] = 48956,
-    [SMALL_STATE(1270)] = 48969,
-    [SMALL_STATE(1271)] = 48982,
-    [SMALL_STATE(1272)] = 48995,
-    [SMALL_STATE(1273)] = 49008,
-    [SMALL_STATE(1274)] = 49021,
-    [SMALL_STATE(1275)] = 49034,
-    [SMALL_STATE(1276)] = 49047,
-    [SMALL_STATE(1277)] = 49060,
-    [SMALL_STATE(1278)] = 49073,
-    [SMALL_STATE(1279)] = 49086,
-    [SMALL_STATE(1280)] = 49099,
-    [SMALL_STATE(1281)] = 49112,
-    [SMALL_STATE(1282)] = 49125,
-    [SMALL_STATE(1283)] = 49138,
-    [SMALL_STATE(1284)] = 49151,
-    [SMALL_STATE(1285)] = 49164,
-    [SMALL_STATE(1286)] = 49177,
-    [SMALL_STATE(1287)] = 49190,
-    [SMALL_STATE(1288)] = 49203,
-    [SMALL_STATE(1289)] = 49216,
-    [SMALL_STATE(1290)] = 49229,
-    [SMALL_STATE(1291)] = 49242,
-    [SMALL_STATE(1292)] = 49255,
-    [SMALL_STATE(1293)] = 49268,
-    [SMALL_STATE(1294)] = 49281,
-    [SMALL_STATE(1295)] = 49294,
-    [SMALL_STATE(1296)] = 49307,
-    [SMALL_STATE(1297)] = 49320,
-    [SMALL_STATE(1298)] = 49333,
-    [SMALL_STATE(1299)] = 49346,
-    [SMALL_STATE(1300)] = 49359,
-    [SMALL_STATE(1301)] = 49372,
-    [SMALL_STATE(1302)] = 49385,
-    [SMALL_STATE(1303)] = 49398,
-    [SMALL_STATE(1304)] = 49411,
-    [SMALL_STATE(1305)] = 49424,
-    [SMALL_STATE(1306)] = 49437,
-    [SMALL_STATE(1307)] = 49450,
-    [SMALL_STATE(1308)] = 49463,
-    [SMALL_STATE(1309)] = 49476,
-    [SMALL_STATE(1310)] = 49489,
-    [SMALL_STATE(1311)] = 49502,
-    [SMALL_STATE(1312)] = 49515,
-    [SMALL_STATE(1313)] = 49528,
-    [SMALL_STATE(1314)] = 49541,
-    [SMALL_STATE(1315)] = 49554,
-    [SMALL_STATE(1316)] = 49567,
-    [SMALL_STATE(1317)] = 49580,
-    [SMALL_STATE(1318)] = 49593,
-    [SMALL_STATE(1319)] = 49606,
-    [SMALL_STATE(1320)] = 49619,
-    [SMALL_STATE(1321)] = 49632,
-    [SMALL_STATE(1322)] = 49645,
-    [SMALL_STATE(1323)] = 49658,
-    [SMALL_STATE(1324)] = 49671,
-    [SMALL_STATE(1325)] = 49684,
-    [SMALL_STATE(1326)] = 49697,
-    [SMALL_STATE(1327)] = 49710,
-    [SMALL_STATE(1328)] = 49723,
-    [SMALL_STATE(1329)] = 49736,
-    [SMALL_STATE(1330)] = 49749,
-    [SMALL_STATE(1331)] = 49762,
-    [SMALL_STATE(1332)] = 49775,
-    [SMALL_STATE(1333)] = 49788,
-    [SMALL_STATE(1334)] = 49801,
-    [SMALL_STATE(1335)] = 49814,
-    [SMALL_STATE(1336)] = 49827,
-    [SMALL_STATE(1337)] = 49840,
-    [SMALL_STATE(1338)] = 49853,
-    [SMALL_STATE(1339)] = 49866,
-    [SMALL_STATE(1340)] = 49879,
-    [SMALL_STATE(1341)] = 49892,
-    [SMALL_STATE(1342)] = 49905,
-    [SMALL_STATE(1343)] = 49918,
-    [SMALL_STATE(1344)] = 49931,
-    [SMALL_STATE(1345)] = 49944,
-    [SMALL_STATE(1346)] = 49957,
-    [SMALL_STATE(1347)] = 49970,
-    [SMALL_STATE(1348)] = 49983,
-    [SMALL_STATE(1349)] = 49996,
-    [SMALL_STATE(1350)] = 50009,
-    [SMALL_STATE(1351)] = 50022,
-    [SMALL_STATE(1352)] = 50035,
-    [SMALL_STATE(1353)] = 50048,
-    [SMALL_STATE(1354)] = 50061,
-    [SMALL_STATE(1355)] = 50074,
-    [SMALL_STATE(1356)] = 50087,
-    [SMALL_STATE(1357)] = 50100,
-    [SMALL_STATE(1358)] = 50113,
-    [SMALL_STATE(1359)] = 50126,
-    [SMALL_STATE(1360)] = 50139,
-    [SMALL_STATE(1361)] = 50152,
-    [SMALL_STATE(1362)] = 50165,
-    [SMALL_STATE(1363)] = 50178,
-    [SMALL_STATE(1364)] = 50191,
-    [SMALL_STATE(1365)] = 50204,
-    [SMALL_STATE(1366)] = 50217,
-    [SMALL_STATE(1367)] = 50230,
-    [SMALL_STATE(1368)] = 50243,
-    [SMALL_STATE(1369)] = 50256,
-    [SMALL_STATE(1370)] = 50269,
-    [SMALL_STATE(1371)] = 50282,
-    [SMALL_STATE(1372)] = 50295,
-    [SMALL_STATE(1373)] = 50308,
-    [SMALL_STATE(1374)] = 50321,
-    [SMALL_STATE(1375)] = 50334,
-    [SMALL_STATE(1376)] = 50347,
-    [SMALL_STATE(1377)] = 50360,
-    [SMALL_STATE(1378)] = 50373,
-    [SMALL_STATE(1379)] = 50386,
-    [SMALL_STATE(1380)] = 50399,
-    [SMALL_STATE(1381)] = 50412,
-    [SMALL_STATE(1382)] = 50425,
-    [SMALL_STATE(1383)] = 50438,
-    [SMALL_STATE(1384)] = 50451,
-    [SMALL_STATE(1385)] = 50464,
-    [SMALL_STATE(1386)] = 50477,
-    [SMALL_STATE(1387)] = 50490,
-    [SMALL_STATE(1388)] = 50503,
-    [SMALL_STATE(1389)] = 50516,
-    [SMALL_STATE(1390)] = 50529,
-    [SMALL_STATE(1391)] = 50542,
-    [SMALL_STATE(1392)] = 50555,
-    [SMALL_STATE(1393)] = 50568,
-    [SMALL_STATE(1394)] = 50581,
-    [SMALL_STATE(1395)] = 50594,
-    [SMALL_STATE(1396)] = 50607,
-    [SMALL_STATE(1397)] = 50620,
-    [SMALL_STATE(1398)] = 50633,
-    [SMALL_STATE(1399)] = 50646,
-    [SMALL_STATE(1400)] = 50659,
-    [SMALL_STATE(1401)] = 50672,
-    [SMALL_STATE(1402)] = 50685,
-    [SMALL_STATE(1403)] = 50698,
-    [SMALL_STATE(1404)] = 50711,
-    [SMALL_STATE(1405)] = 50724,
-    [SMALL_STATE(1406)] = 50737,
-    [SMALL_STATE(1407)] = 50750,
-    [SMALL_STATE(1408)] = 50763,
-    [SMALL_STATE(1409)] = 50776,
-    [SMALL_STATE(1410)] = 50789,
-    [SMALL_STATE(1411)] = 50802,
-    [SMALL_STATE(1412)] = 50815,
-    [SMALL_STATE(1413)] = 50828,
-    [SMALL_STATE(1414)] = 50841,
-    [SMALL_STATE(1415)] = 50854,
-    [SMALL_STATE(1416)] = 50867,
-    [SMALL_STATE(1417)] = 50880,
-    [SMALL_STATE(1418)] = 50893,
-    [SMALL_STATE(1419)] = 50906,
-    [SMALL_STATE(1420)] = 50919,
-    [SMALL_STATE(1421)] = 50932,
-    [SMALL_STATE(1422)] = 50945,
-    [SMALL_STATE(1423)] = 50958,
-    [SMALL_STATE(1424)] = 50971,
-    [SMALL_STATE(1425)] = 50984,
-    [SMALL_STATE(1426)] = 50997,
-    [SMALL_STATE(1427)] = 51010,
-    [SMALL_STATE(1428)] = 51023,
-    [SMALL_STATE(1429)] = 51036,
-    [SMALL_STATE(1430)] = 51049,
-    [SMALL_STATE(1431)] = 51062,
-    [SMALL_STATE(1432)] = 51075,
-    [SMALL_STATE(1433)] = 51088,
-    [SMALL_STATE(1434)] = 51101,
-    [SMALL_STATE(1435)] = 51114,
-    [SMALL_STATE(1436)] = 51127,
-    [SMALL_STATE(1437)] = 51140,
-    [SMALL_STATE(1438)] = 51153,
-    [SMALL_STATE(1439)] = 51166,
-    [SMALL_STATE(1440)] = 51179,
-    [SMALL_STATE(1441)] = 51192,
-    [SMALL_STATE(1442)] = 51205,
-    [SMALL_STATE(1443)] = 51218,
-    [SMALL_STATE(1444)] = 51231,
-    [SMALL_STATE(1445)] = 51244,
-    [SMALL_STATE(1446)] = 51257,
-    [SMALL_STATE(1447)] = 51270,
-    [SMALL_STATE(1448)] = 51283,
-    [SMALL_STATE(1449)] = 51296,
-    [SMALL_STATE(1450)] = 51309,
-    [SMALL_STATE(1451)] = 51322,
-    [SMALL_STATE(1452)] = 51335,
-    [SMALL_STATE(1453)] = 51348,
-    [SMALL_STATE(1454)] = 51361,
-    [SMALL_STATE(1455)] = 51374,
-    [SMALL_STATE(1456)] = 51387,
-    [SMALL_STATE(1457)] = 51400,
-    [SMALL_STATE(1458)] = 51413,
-    [SMALL_STATE(1459)] = 51426,
-    [SMALL_STATE(1460)] = 51439,
-    [SMALL_STATE(1461)] = 51452,
-    [SMALL_STATE(1462)] = 51465,
-    [SMALL_STATE(1463)] = 51478,
-    [SMALL_STATE(1464)] = 51491,
-    [SMALL_STATE(1465)] = 51504,
-    [SMALL_STATE(1466)] = 51517,
-    [SMALL_STATE(1467)] = 51530,
-    [SMALL_STATE(1468)] = 51543,
-    [SMALL_STATE(1469)] = 51556,
-    [SMALL_STATE(1470)] = 51569,
-    [SMALL_STATE(1471)] = 51582,
-    [SMALL_STATE(1472)] = 51595,
-    [SMALL_STATE(1473)] = 51608,
-    [SMALL_STATE(1474)] = 51621,
-    [SMALL_STATE(1475)] = 51634,
-    [SMALL_STATE(1476)] = 51647,
-    [SMALL_STATE(1477)] = 51660,
-    [SMALL_STATE(1478)] = 51673,
-    [SMALL_STATE(1479)] = 51686,
-    [SMALL_STATE(1480)] = 51699,
-    [SMALL_STATE(1481)] = 51712,
-    [SMALL_STATE(1482)] = 51725,
-    [SMALL_STATE(1483)] = 51738,
-    [SMALL_STATE(1484)] = 51751,
-    [SMALL_STATE(1485)] = 51764,
-    [SMALL_STATE(1486)] = 51777,
-    [SMALL_STATE(1487)] = 51790,
-    [SMALL_STATE(1488)] = 51803,
-    [SMALL_STATE(1489)] = 51816,
-    [SMALL_STATE(1490)] = 51829,
-    [SMALL_STATE(1491)] = 51842,
-    [SMALL_STATE(1492)] = 51855,
-    [SMALL_STATE(1493)] = 51868,
-    [SMALL_STATE(1494)] = 51881,
-    [SMALL_STATE(1495)] = 51894,
-    [SMALL_STATE(1496)] = 51907,
-    [SMALL_STATE(1497)] = 51920,
-    [SMALL_STATE(1498)] = 51933,
-    [SMALL_STATE(1499)] = 51946,
-    [SMALL_STATE(1500)] = 51959,
-    [SMALL_STATE(1501)] = 51972,
-    [SMALL_STATE(1502)] = 51985,
-    [SMALL_STATE(1503)] = 51998,
-    [SMALL_STATE(1504)] = 52011,
-    [SMALL_STATE(1505)] = 52024,
-    [SMALL_STATE(1506)] = 52037,
-    [SMALL_STATE(1507)] = 52050,
-    [SMALL_STATE(1508)] = 52063,
-    [SMALL_STATE(1509)] = 52076,
-    [SMALL_STATE(1510)] = 52089,
-    [SMALL_STATE(1511)] = 52102,
-    [SMALL_STATE(1512)] = 52115,
-    [SMALL_STATE(1513)] = 52128,
-    [SMALL_STATE(1514)] = 52141,
-    [SMALL_STATE(1515)] = 52154,
-    [SMALL_STATE(1516)] = 52167,
-    [SMALL_STATE(1517)] = 52180,
-    [SMALL_STATE(1518)] = 52193,
-    [SMALL_STATE(1519)] = 52206,
-    [SMALL_STATE(1520)] = 52219,
-    [SMALL_STATE(1521)] = 52232,
-    [SMALL_STATE(1522)] = 52245,
-    [SMALL_STATE(1523)] = 52258,
-    [SMALL_STATE(1524)] = 52271,
-    [SMALL_STATE(1525)] = 52284,
-    [SMALL_STATE(1526)] = 52297,
-    [SMALL_STATE(1527)] = 52310,
-    [SMALL_STATE(1528)] = 52323,
-    [SMALL_STATE(1529)] = 52336,
-    [SMALL_STATE(1530)] = 52349,
-    [SMALL_STATE(1531)] = 52362,
-    [SMALL_STATE(1532)] = 52375,
-    [SMALL_STATE(1533)] = 52388,
-    [SMALL_STATE(1534)] = 52401,
-    [SMALL_STATE(1535)] = 52414,
-    [SMALL_STATE(1536)] = 52427,
-    [SMALL_STATE(1537)] = 52440,
-    [SMALL_STATE(1538)] = 52453,
-    [SMALL_STATE(1539)] = 52466,
-    [SMALL_STATE(1540)] = 52479,
-    [SMALL_STATE(1541)] = 52492,
-    [SMALL_STATE(1542)] = 52505,
-    [SMALL_STATE(1543)] = 52518,
-    [SMALL_STATE(1544)] = 52531,
-    [SMALL_STATE(1545)] = 52544,
-    [SMALL_STATE(1546)] = 52557,
-    [SMALL_STATE(1547)] = 52570,
-    [SMALL_STATE(1548)] = 52583,
-    [SMALL_STATE(1549)] = 52596,
-    [SMALL_STATE(1550)] = 52609,
-    [SMALL_STATE(1551)] = 52622,
-    [SMALL_STATE(1552)] = 52635,
-    [SMALL_STATE(1553)] = 52648,
-    [SMALL_STATE(1554)] = 52661,
-    [SMALL_STATE(1555)] = 52674,
-    [SMALL_STATE(1556)] = 52687,
-    [SMALL_STATE(1557)] = 52700,
-    [SMALL_STATE(1558)] = 52713,
-    [SMALL_STATE(1559)] = 52726,
-    [SMALL_STATE(1560)] = 52739,
-    [SMALL_STATE(1561)] = 52752,
-    [SMALL_STATE(1562)] = 52765,
-    [SMALL_STATE(1563)] = 52778,
-    [SMALL_STATE(1564)] = 52791,
-    [SMALL_STATE(1565)] = 52804,
-    [SMALL_STATE(1566)] = 52817,
-    [SMALL_STATE(1567)] = 52830,
-    [SMALL_STATE(1568)] = 52843,
-    [SMALL_STATE(1569)] = 52856,
-    [SMALL_STATE(1570)] = 52869,
-    [SMALL_STATE(1571)] = 52882,
-    [SMALL_STATE(1572)] = 52895,
-    [SMALL_STATE(1573)] = 52908,
-    [SMALL_STATE(1574)] = 52921,
-    [SMALL_STATE(1575)] = 52934,
-    [SMALL_STATE(1576)] = 52947,
-    [SMALL_STATE(1577)] = 52960,
-    [SMALL_STATE(1578)] = 52973,
-    [SMALL_STATE(1579)] = 52986,
-    [SMALL_STATE(1580)] = 52999,
-    [SMALL_STATE(1581)] = 53012,
-    [SMALL_STATE(1582)] = 53025,
-    [SMALL_STATE(1583)] = 53038,
-    [SMALL_STATE(1584)] = 53051,
-    [SMALL_STATE(1585)] = 53064,
-    [SMALL_STATE(1586)] = 53077,
-    [SMALL_STATE(1587)] = 53090,
-    [SMALL_STATE(1588)] = 53103,
-    [SMALL_STATE(1589)] = 53116,
-    [SMALL_STATE(1590)] = 53129,
-    [SMALL_STATE(1591)] = 53142,
-    [SMALL_STATE(1592)] = 53155,
-    [SMALL_STATE(1593)] = 53168,
-    [SMALL_STATE(1594)] = 53181,
-    [SMALL_STATE(1595)] = 53194,
-    [SMALL_STATE(1596)] = 53207,
-    [SMALL_STATE(1597)] = 53220,
-    [SMALL_STATE(1598)] = 53233,
-    [SMALL_STATE(1599)] = 53246,
-    [SMALL_STATE(1600)] = 53259,
-    [SMALL_STATE(1601)] = 53272,
-    [SMALL_STATE(1602)] = 53285,
-    [SMALL_STATE(1603)] = 53298,
-    [SMALL_STATE(1604)] = 53311,
-    [SMALL_STATE(1605)] = 53324,
-    [SMALL_STATE(1606)] = 53337,
-    [SMALL_STATE(1607)] = 53350,
-    [SMALL_STATE(1608)] = 53363,
-    [SMALL_STATE(1609)] = 53376,
-    [SMALL_STATE(1610)] = 53389,
-    [SMALL_STATE(1611)] = 53402,
-    [SMALL_STATE(1612)] = 53415,
-    [SMALL_STATE(1613)] = 53428,
-    [SMALL_STATE(1614)] = 53441,
-    [SMALL_STATE(1615)] = 53454,
-    [SMALL_STATE(1616)] = 53467,
-    [SMALL_STATE(1617)] = 53480,
-    [SMALL_STATE(1618)] = 53493,
-    [SMALL_STATE(1619)] = 53506,
-    [SMALL_STATE(1620)] = 53519,
-    [SMALL_STATE(1621)] = 53532,
-    [SMALL_STATE(1622)] = 53545,
-    [SMALL_STATE(1623)] = 53558,
-    [SMALL_STATE(1624)] = 53571,
-    [SMALL_STATE(1625)] = 53584,
-    [SMALL_STATE(1626)] = 53597,
-    [SMALL_STATE(1627)] = 53610,
-    [SMALL_STATE(1628)] = 53623,
-    [SMALL_STATE(1629)] = 53636,
-    [SMALL_STATE(1630)] = 53649,
-    [SMALL_STATE(1631)] = 53662,
-    [SMALL_STATE(1632)] = 53675,
-    [SMALL_STATE(1633)] = 53688,
-    [SMALL_STATE(1634)] = 53701,
-    [SMALL_STATE(1635)] = 53714,
-    [SMALL_STATE(1636)] = 53727,
-    [SMALL_STATE(1637)] = 53740,
-    [SMALL_STATE(1638)] = 53753,
-    [SMALL_STATE(1639)] = 53766,
-    [SMALL_STATE(1640)] = 53779,
-    [SMALL_STATE(1641)] = 53792,
-    [SMALL_STATE(1642)] = 53805,
-    [SMALL_STATE(1643)] = 53818,
-    [SMALL_STATE(1644)] = 53831,
-    [SMALL_STATE(1645)] = 53844,
-    [SMALL_STATE(1646)] = 53857,
-    [SMALL_STATE(1647)] = 53870,
-    [SMALL_STATE(1648)] = 53883,
-    [SMALL_STATE(1649)] = 53896,
-    [SMALL_STATE(1650)] = 53909,
-    [SMALL_STATE(1651)] = 53922,
-    [SMALL_STATE(1652)] = 53935,
-    [SMALL_STATE(1653)] = 53948,
-    [SMALL_STATE(1654)] = 53961,
-    [SMALL_STATE(1655)] = 53974,
-    [SMALL_STATE(1656)] = 53987,
-    [SMALL_STATE(1657)] = 54000,
-    [SMALL_STATE(1658)] = 54013,
-    [SMALL_STATE(1659)] = 54026,
-    [SMALL_STATE(1660)] = 54039,
-    [SMALL_STATE(1661)] = 54052,
-    [SMALL_STATE(1662)] = 54065,
-    [SMALL_STATE(1663)] = 54078,
-    [SMALL_STATE(1664)] = 54091,
-    [SMALL_STATE(1665)] = 54104,
-    [SMALL_STATE(1666)] = 54117,
-    [SMALL_STATE(1667)] = 54130,
-    [SMALL_STATE(1668)] = 54143,
-    [SMALL_STATE(1669)] = 54156,
-    [SMALL_STATE(1670)] = 54169,
-    [SMALL_STATE(1671)] = 54182,
-    [SMALL_STATE(1672)] = 54195,
-    [SMALL_STATE(1673)] = 54208,
-    [SMALL_STATE(1674)] = 54221,
-    [SMALL_STATE(1675)] = 54234,
-    [SMALL_STATE(1676)] = 54247,
-    [SMALL_STATE(1677)] = 54260,
-    [SMALL_STATE(1678)] = 54273,
-    [SMALL_STATE(1679)] = 54286,
-    [SMALL_STATE(1680)] = 54299,
-    [SMALL_STATE(1681)] = 54312,
-    [SMALL_STATE(1682)] = 54325,
-    [SMALL_STATE(1683)] = 54338,
-    [SMALL_STATE(1684)] = 54351,
-    [SMALL_STATE(1685)] = 54364,
-    [SMALL_STATE(1686)] = 54377,
-    [SMALL_STATE(1687)] = 54390,
-    [SMALL_STATE(1688)] = 54403,
-    [SMALL_STATE(1689)] = 54416,
-    [SMALL_STATE(1690)] = 54429,
-    [SMALL_STATE(1691)] = 54442,
-    [SMALL_STATE(1692)] = 54455,
-    [SMALL_STATE(1693)] = 54468,
-    [SMALL_STATE(1694)] = 54481,
-    [SMALL_STATE(1695)] = 54494,
-    [SMALL_STATE(1696)] = 54507,
-    [SMALL_STATE(1697)] = 54520,
-    [SMALL_STATE(1698)] = 54533,
-    [SMALL_STATE(1699)] = 54546,
-    [SMALL_STATE(1700)] = 54559,
-    [SMALL_STATE(1701)] = 54572,
-    [SMALL_STATE(1702)] = 54585,
-    [SMALL_STATE(1703)] = 54598,
-    [SMALL_STATE(1704)] = 54602,
+    [SMALL_STATE(448)] = 33309,
+    [SMALL_STATE(449)] = 33347,
+    [SMALL_STATE(450)] = 33383,
+    [SMALL_STATE(451)] = 33416,
+    [SMALL_STATE(452)] = 33449,
+    [SMALL_STATE(453)] = 33478,
+    [SMALL_STATE(454)] = 33511,
+    [SMALL_STATE(455)] = 33540,
+    [SMALL_STATE(456)] = 33573,
+    [SMALL_STATE(457)] = 33602,
+    [SMALL_STATE(458)] = 33632,
+    [SMALL_STATE(459)] = 33662,
+    [SMALL_STATE(460)] = 33692,
+    [SMALL_STATE(461)] = 33726,
+    [SMALL_STATE(462)] = 33756,
+    [SMALL_STATE(463)] = 33786,
+    [SMALL_STATE(464)] = 33816,
+    [SMALL_STATE(465)] = 33846,
+    [SMALL_STATE(466)] = 33876,
+    [SMALL_STATE(467)] = 33906,
+    [SMALL_STATE(468)] = 33936,
+    [SMALL_STATE(469)] = 33966,
+    [SMALL_STATE(470)] = 33996,
+    [SMALL_STATE(471)] = 34026,
+    [SMALL_STATE(472)] = 34056,
+    [SMALL_STATE(473)] = 34086,
+    [SMALL_STATE(474)] = 34116,
+    [SMALL_STATE(475)] = 34146,
+    [SMALL_STATE(476)] = 34176,
+    [SMALL_STATE(477)] = 34206,
+    [SMALL_STATE(478)] = 34240,
+    [SMALL_STATE(479)] = 34270,
+    [SMALL_STATE(480)] = 34300,
+    [SMALL_STATE(481)] = 34330,
+    [SMALL_STATE(482)] = 34360,
+    [SMALL_STATE(483)] = 34390,
+    [SMALL_STATE(484)] = 34420,
+    [SMALL_STATE(485)] = 34450,
+    [SMALL_STATE(486)] = 34480,
+    [SMALL_STATE(487)] = 34510,
+    [SMALL_STATE(488)] = 34540,
+    [SMALL_STATE(489)] = 34570,
+    [SMALL_STATE(490)] = 34600,
+    [SMALL_STATE(491)] = 34630,
+    [SMALL_STATE(492)] = 34660,
+    [SMALL_STATE(493)] = 34690,
+    [SMALL_STATE(494)] = 34720,
+    [SMALL_STATE(495)] = 34750,
+    [SMALL_STATE(496)] = 34780,
+    [SMALL_STATE(497)] = 34810,
+    [SMALL_STATE(498)] = 34837,
+    [SMALL_STATE(499)] = 34864,
+    [SMALL_STATE(500)] = 34891,
+    [SMALL_STATE(501)] = 34918,
+    [SMALL_STATE(502)] = 34945,
+    [SMALL_STATE(503)] = 34972,
+    [SMALL_STATE(504)] = 34999,
+    [SMALL_STATE(505)] = 35026,
+    [SMALL_STATE(506)] = 35053,
+    [SMALL_STATE(507)] = 35080,
+    [SMALL_STATE(508)] = 35107,
+    [SMALL_STATE(509)] = 35134,
+    [SMALL_STATE(510)] = 35161,
+    [SMALL_STATE(511)] = 35188,
+    [SMALL_STATE(512)] = 35215,
+    [SMALL_STATE(513)] = 35242,
+    [SMALL_STATE(514)] = 35269,
+    [SMALL_STATE(515)] = 35296,
+    [SMALL_STATE(516)] = 35323,
+    [SMALL_STATE(517)] = 35350,
+    [SMALL_STATE(518)] = 35377,
+    [SMALL_STATE(519)] = 35404,
+    [SMALL_STATE(520)] = 35431,
+    [SMALL_STATE(521)] = 35458,
+    [SMALL_STATE(522)] = 35485,
+    [SMALL_STATE(523)] = 35512,
+    [SMALL_STATE(524)] = 35539,
+    [SMALL_STATE(525)] = 35566,
+    [SMALL_STATE(526)] = 35593,
+    [SMALL_STATE(527)] = 35620,
+    [SMALL_STATE(528)] = 35647,
+    [SMALL_STATE(529)] = 35674,
+    [SMALL_STATE(530)] = 35701,
+    [SMALL_STATE(531)] = 35728,
+    [SMALL_STATE(532)] = 35755,
+    [SMALL_STATE(533)] = 35782,
+    [SMALL_STATE(534)] = 35809,
+    [SMALL_STATE(535)] = 35836,
+    [SMALL_STATE(536)] = 35863,
+    [SMALL_STATE(537)] = 35890,
+    [SMALL_STATE(538)] = 35917,
+    [SMALL_STATE(539)] = 35944,
+    [SMALL_STATE(540)] = 35971,
+    [SMALL_STATE(541)] = 35998,
+    [SMALL_STATE(542)] = 36025,
+    [SMALL_STATE(543)] = 36052,
+    [SMALL_STATE(544)] = 36079,
+    [SMALL_STATE(545)] = 36106,
+    [SMALL_STATE(546)] = 36133,
+    [SMALL_STATE(547)] = 36160,
+    [SMALL_STATE(548)] = 36187,
+    [SMALL_STATE(549)] = 36214,
+    [SMALL_STATE(550)] = 36241,
+    [SMALL_STATE(551)] = 36268,
+    [SMALL_STATE(552)] = 36295,
+    [SMALL_STATE(553)] = 36324,
+    [SMALL_STATE(554)] = 36353,
+    [SMALL_STATE(555)] = 36386,
+    [SMALL_STATE(556)] = 36415,
+    [SMALL_STATE(557)] = 36439,
+    [SMALL_STATE(558)] = 36477,
+    [SMALL_STATE(559)] = 36515,
+    [SMALL_STATE(560)] = 36553,
+    [SMALL_STATE(561)] = 36591,
+    [SMALL_STATE(562)] = 36629,
+    [SMALL_STATE(563)] = 36653,
+    [SMALL_STATE(564)] = 36680,
+    [SMALL_STATE(565)] = 36707,
+    [SMALL_STATE(566)] = 36741,
+    [SMALL_STATE(567)] = 36762,
+    [SMALL_STATE(568)] = 36783,
+    [SMALL_STATE(569)] = 36804,
+    [SMALL_STATE(570)] = 36841,
+    [SMALL_STATE(571)] = 36862,
+    [SMALL_STATE(572)] = 36883,
+    [SMALL_STATE(573)] = 36918,
+    [SMALL_STATE(574)] = 36939,
+    [SMALL_STATE(575)] = 36960,
+    [SMALL_STATE(576)] = 36983,
+    [SMALL_STATE(577)] = 37004,
+    [SMALL_STATE(578)] = 37025,
+    [SMALL_STATE(579)] = 37062,
+    [SMALL_STATE(580)] = 37085,
+    [SMALL_STATE(581)] = 37107,
+    [SMALL_STATE(582)] = 37141,
+    [SMALL_STATE(583)] = 37171,
+    [SMALL_STATE(584)] = 37193,
+    [SMALL_STATE(585)] = 37221,
+    [SMALL_STATE(586)] = 37255,
+    [SMALL_STATE(587)] = 37289,
+    [SMALL_STATE(588)] = 37309,
+    [SMALL_STATE(589)] = 37343,
+    [SMALL_STATE(590)] = 37377,
+    [SMALL_STATE(591)] = 37408,
+    [SMALL_STATE(592)] = 37439,
+    [SMALL_STATE(593)] = 37470,
+    [SMALL_STATE(594)] = 37489,
+    [SMALL_STATE(595)] = 37518,
+    [SMALL_STATE(596)] = 37539,
+    [SMALL_STATE(597)] = 37570,
+    [SMALL_STATE(598)] = 37601,
+    [SMALL_STATE(599)] = 37632,
+    [SMALL_STATE(600)] = 37658,
+    [SMALL_STATE(601)] = 37684,
+    [SMALL_STATE(602)] = 37704,
+    [SMALL_STATE(603)] = 37732,
+    [SMALL_STATE(604)] = 37756,
+    [SMALL_STATE(605)] = 37784,
+    [SMALL_STATE(606)] = 37812,
+    [SMALL_STATE(607)] = 37836,
+    [SMALL_STATE(608)] = 37864,
+    [SMALL_STATE(609)] = 37892,
+    [SMALL_STATE(610)] = 37920,
+    [SMALL_STATE(611)] = 37948,
+    [SMALL_STATE(612)] = 37976,
+    [SMALL_STATE(613)] = 38000,
+    [SMALL_STATE(614)] = 38024,
+    [SMALL_STATE(615)] = 38052,
+    [SMALL_STATE(616)] = 38080,
+    [SMALL_STATE(617)] = 38108,
+    [SMALL_STATE(618)] = 38132,
+    [SMALL_STATE(619)] = 38160,
+    [SMALL_STATE(620)] = 38184,
+    [SMALL_STATE(621)] = 38212,
+    [SMALL_STATE(622)] = 38240,
+    [SMALL_STATE(623)] = 38264,
+    [SMALL_STATE(624)] = 38292,
+    [SMALL_STATE(625)] = 38320,
+    [SMALL_STATE(626)] = 38342,
+    [SMALL_STATE(627)] = 38370,
+    [SMALL_STATE(628)] = 38389,
+    [SMALL_STATE(629)] = 38410,
+    [SMALL_STATE(630)] = 38427,
+    [SMALL_STATE(631)] = 38450,
+    [SMALL_STATE(632)] = 38473,
+    [SMALL_STATE(633)] = 38494,
+    [SMALL_STATE(634)] = 38511,
+    [SMALL_STATE(635)] = 38532,
+    [SMALL_STATE(636)] = 38549,
+    [SMALL_STATE(637)] = 38568,
+    [SMALL_STATE(638)] = 38589,
+    [SMALL_STATE(639)] = 38606,
+    [SMALL_STATE(640)] = 38631,
+    [SMALL_STATE(641)] = 38648,
+    [SMALL_STATE(642)] = 38665,
+    [SMALL_STATE(643)] = 38690,
+    [SMALL_STATE(644)] = 38709,
+    [SMALL_STATE(645)] = 38726,
+    [SMALL_STATE(646)] = 38743,
+    [SMALL_STATE(647)] = 38764,
+    [SMALL_STATE(648)] = 38787,
+    [SMALL_STATE(649)] = 38808,
+    [SMALL_STATE(650)] = 38825,
+    [SMALL_STATE(651)] = 38842,
+    [SMALL_STATE(652)] = 38867,
+    [SMALL_STATE(653)] = 38884,
+    [SMALL_STATE(654)] = 38905,
+    [SMALL_STATE(655)] = 38922,
+    [SMALL_STATE(656)] = 38939,
+    [SMALL_STATE(657)] = 38964,
+    [SMALL_STATE(658)] = 38989,
+    [SMALL_STATE(659)] = 39010,
+    [SMALL_STATE(660)] = 39035,
+    [SMALL_STATE(661)] = 39058,
+    [SMALL_STATE(662)] = 39083,
+    [SMALL_STATE(663)] = 39100,
+    [SMALL_STATE(664)] = 39125,
+    [SMALL_STATE(665)] = 39142,
+    [SMALL_STATE(666)] = 39165,
+    [SMALL_STATE(667)] = 39190,
+    [SMALL_STATE(668)] = 39213,
+    [SMALL_STATE(669)] = 39236,
+    [SMALL_STATE(670)] = 39256,
+    [SMALL_STATE(671)] = 39272,
+    [SMALL_STATE(672)] = 39292,
+    [SMALL_STATE(673)] = 39310,
+    [SMALL_STATE(674)] = 39328,
+    [SMALL_STATE(675)] = 39346,
+    [SMALL_STATE(676)] = 39364,
+    [SMALL_STATE(677)] = 39386,
+    [SMALL_STATE(678)] = 39404,
+    [SMALL_STATE(679)] = 39422,
+    [SMALL_STATE(680)] = 39440,
+    [SMALL_STATE(681)] = 39458,
+    [SMALL_STATE(682)] = 39476,
+    [SMALL_STATE(683)] = 39492,
+    [SMALL_STATE(684)] = 39510,
+    [SMALL_STATE(685)] = 39532,
+    [SMALL_STATE(686)] = 39554,
+    [SMALL_STATE(687)] = 39574,
+    [SMALL_STATE(688)] = 39594,
+    [SMALL_STATE(689)] = 39612,
+    [SMALL_STATE(690)] = 39630,
+    [SMALL_STATE(691)] = 39648,
+    [SMALL_STATE(692)] = 39666,
+    [SMALL_STATE(693)] = 39684,
+    [SMALL_STATE(694)] = 39700,
+    [SMALL_STATE(695)] = 39718,
+    [SMALL_STATE(696)] = 39736,
+    [SMALL_STATE(697)] = 39758,
+    [SMALL_STATE(698)] = 39776,
+    [SMALL_STATE(699)] = 39798,
+    [SMALL_STATE(700)] = 39814,
+    [SMALL_STATE(701)] = 39834,
+    [SMALL_STATE(702)] = 39856,
+    [SMALL_STATE(703)] = 39876,
+    [SMALL_STATE(704)] = 39894,
+    [SMALL_STATE(705)] = 39916,
+    [SMALL_STATE(706)] = 39938,
+    [SMALL_STATE(707)] = 39956,
+    [SMALL_STATE(708)] = 39978,
+    [SMALL_STATE(709)] = 40000,
+    [SMALL_STATE(710)] = 40022,
+    [SMALL_STATE(711)] = 40042,
+    [SMALL_STATE(712)] = 40060,
+    [SMALL_STATE(713)] = 40078,
+    [SMALL_STATE(714)] = 40096,
+    [SMALL_STATE(715)] = 40114,
+    [SMALL_STATE(716)] = 40132,
+    [SMALL_STATE(717)] = 40150,
+    [SMALL_STATE(718)] = 40168,
+    [SMALL_STATE(719)] = 40186,
+    [SMALL_STATE(720)] = 40204,
+    [SMALL_STATE(721)] = 40222,
+    [SMALL_STATE(722)] = 40240,
+    [SMALL_STATE(723)] = 40258,
+    [SMALL_STATE(724)] = 40280,
+    [SMALL_STATE(725)] = 40298,
+    [SMALL_STATE(726)] = 40316,
+    [SMALL_STATE(727)] = 40338,
+    [SMALL_STATE(728)] = 40360,
+    [SMALL_STATE(729)] = 40378,
+    [SMALL_STATE(730)] = 40396,
+    [SMALL_STATE(731)] = 40414,
+    [SMALL_STATE(732)] = 40432,
+    [SMALL_STATE(733)] = 40454,
+    [SMALL_STATE(734)] = 40474,
+    [SMALL_STATE(735)] = 40494,
+    [SMALL_STATE(736)] = 40516,
+    [SMALL_STATE(737)] = 40532,
+    [SMALL_STATE(738)] = 40552,
+    [SMALL_STATE(739)] = 40570,
+    [SMALL_STATE(740)] = 40590,
+    [SMALL_STATE(741)] = 40610,
+    [SMALL_STATE(742)] = 40626,
+    [SMALL_STATE(743)] = 40644,
+    [SMALL_STATE(744)] = 40662,
+    [SMALL_STATE(745)] = 40682,
+    [SMALL_STATE(746)] = 40704,
+    [SMALL_STATE(747)] = 40726,
+    [SMALL_STATE(748)] = 40746,
+    [SMALL_STATE(749)] = 40768,
+    [SMALL_STATE(750)] = 40790,
+    [SMALL_STATE(751)] = 40810,
+    [SMALL_STATE(752)] = 40828,
+    [SMALL_STATE(753)] = 40846,
+    [SMALL_STATE(754)] = 40864,
+    [SMALL_STATE(755)] = 40882,
+    [SMALL_STATE(756)] = 40900,
+    [SMALL_STATE(757)] = 40920,
+    [SMALL_STATE(758)] = 40942,
+    [SMALL_STATE(759)] = 40960,
+    [SMALL_STATE(760)] = 40976,
+    [SMALL_STATE(761)] = 40998,
+    [SMALL_STATE(762)] = 41018,
+    [SMALL_STATE(763)] = 41034,
+    [SMALL_STATE(764)] = 41054,
+    [SMALL_STATE(765)] = 41070,
+    [SMALL_STATE(766)] = 41086,
+    [SMALL_STATE(767)] = 41108,
+    [SMALL_STATE(768)] = 41126,
+    [SMALL_STATE(769)] = 41148,
+    [SMALL_STATE(770)] = 41170,
+    [SMALL_STATE(771)] = 41188,
+    [SMALL_STATE(772)] = 41210,
+    [SMALL_STATE(773)] = 41232,
+    [SMALL_STATE(774)] = 41250,
+    [SMALL_STATE(775)] = 41272,
+    [SMALL_STATE(776)] = 41288,
+    [SMALL_STATE(777)] = 41310,
+    [SMALL_STATE(778)] = 41326,
+    [SMALL_STATE(779)] = 41342,
+    [SMALL_STATE(780)] = 41358,
+    [SMALL_STATE(781)] = 41380,
+    [SMALL_STATE(782)] = 41396,
+    [SMALL_STATE(783)] = 41412,
+    [SMALL_STATE(784)] = 41428,
+    [SMALL_STATE(785)] = 41446,
+    [SMALL_STATE(786)] = 41463,
+    [SMALL_STATE(787)] = 41482,
+    [SMALL_STATE(788)] = 41501,
+    [SMALL_STATE(789)] = 41520,
+    [SMALL_STATE(790)] = 41537,
+    [SMALL_STATE(791)] = 41552,
+    [SMALL_STATE(792)] = 41569,
+    [SMALL_STATE(793)] = 41588,
+    [SMALL_STATE(794)] = 41605,
+    [SMALL_STATE(795)] = 41624,
+    [SMALL_STATE(796)] = 41643,
+    [SMALL_STATE(797)] = 41662,
+    [SMALL_STATE(798)] = 41681,
+    [SMALL_STATE(799)] = 41700,
+    [SMALL_STATE(800)] = 41719,
+    [SMALL_STATE(801)] = 41734,
+    [SMALL_STATE(802)] = 41753,
+    [SMALL_STATE(803)] = 41768,
+    [SMALL_STATE(804)] = 41787,
+    [SMALL_STATE(805)] = 41802,
+    [SMALL_STATE(806)] = 41819,
+    [SMALL_STATE(807)] = 41834,
+    [SMALL_STATE(808)] = 41853,
+    [SMALL_STATE(809)] = 41872,
+    [SMALL_STATE(810)] = 41891,
+    [SMALL_STATE(811)] = 41910,
+    [SMALL_STATE(812)] = 41929,
+    [SMALL_STATE(813)] = 41948,
+    [SMALL_STATE(814)] = 41967,
+    [SMALL_STATE(815)] = 41982,
+    [SMALL_STATE(816)] = 42001,
+    [SMALL_STATE(817)] = 42020,
+    [SMALL_STATE(818)] = 42039,
+    [SMALL_STATE(819)] = 42058,
+    [SMALL_STATE(820)] = 42077,
+    [SMALL_STATE(821)] = 42092,
+    [SMALL_STATE(822)] = 42111,
+    [SMALL_STATE(823)] = 42130,
+    [SMALL_STATE(824)] = 42149,
+    [SMALL_STATE(825)] = 42166,
+    [SMALL_STATE(826)] = 42185,
+    [SMALL_STATE(827)] = 42204,
+    [SMALL_STATE(828)] = 42223,
+    [SMALL_STATE(829)] = 42242,
+    [SMALL_STATE(830)] = 42261,
+    [SMALL_STATE(831)] = 42280,
+    [SMALL_STATE(832)] = 42297,
+    [SMALL_STATE(833)] = 42314,
+    [SMALL_STATE(834)] = 42333,
+    [SMALL_STATE(835)] = 42352,
+    [SMALL_STATE(836)] = 42371,
+    [SMALL_STATE(837)] = 42388,
+    [SMALL_STATE(838)] = 42407,
+    [SMALL_STATE(839)] = 42426,
+    [SMALL_STATE(840)] = 42445,
+    [SMALL_STATE(841)] = 42464,
+    [SMALL_STATE(842)] = 42481,
+    [SMALL_STATE(843)] = 42498,
+    [SMALL_STATE(844)] = 42515,
+    [SMALL_STATE(845)] = 42530,
+    [SMALL_STATE(846)] = 42549,
+    [SMALL_STATE(847)] = 42564,
+    [SMALL_STATE(848)] = 42579,
+    [SMALL_STATE(849)] = 42598,
+    [SMALL_STATE(850)] = 42613,
+    [SMALL_STATE(851)] = 42628,
+    [SMALL_STATE(852)] = 42643,
+    [SMALL_STATE(853)] = 42658,
+    [SMALL_STATE(854)] = 42677,
+    [SMALL_STATE(855)] = 42692,
+    [SMALL_STATE(856)] = 42707,
+    [SMALL_STATE(857)] = 42724,
+    [SMALL_STATE(858)] = 42739,
+    [SMALL_STATE(859)] = 42754,
+    [SMALL_STATE(860)] = 42773,
+    [SMALL_STATE(861)] = 42788,
+    [SMALL_STATE(862)] = 42807,
+    [SMALL_STATE(863)] = 42826,
+    [SMALL_STATE(864)] = 42841,
+    [SMALL_STATE(865)] = 42860,
+    [SMALL_STATE(866)] = 42875,
+    [SMALL_STATE(867)] = 42894,
+    [SMALL_STATE(868)] = 42913,
+    [SMALL_STATE(869)] = 42932,
+    [SMALL_STATE(870)] = 42951,
+    [SMALL_STATE(871)] = 42966,
+    [SMALL_STATE(872)] = 42983,
+    [SMALL_STATE(873)] = 43002,
+    [SMALL_STATE(874)] = 43017,
+    [SMALL_STATE(875)] = 43036,
+    [SMALL_STATE(876)] = 43053,
+    [SMALL_STATE(877)] = 43070,
+    [SMALL_STATE(878)] = 43085,
+    [SMALL_STATE(879)] = 43102,
+    [SMALL_STATE(880)] = 43121,
+    [SMALL_STATE(881)] = 43136,
+    [SMALL_STATE(882)] = 43155,
+    [SMALL_STATE(883)] = 43170,
+    [SMALL_STATE(884)] = 43189,
+    [SMALL_STATE(885)] = 43204,
+    [SMALL_STATE(886)] = 43223,
+    [SMALL_STATE(887)] = 43242,
+    [SMALL_STATE(888)] = 43257,
+    [SMALL_STATE(889)] = 43276,
+    [SMALL_STATE(890)] = 43295,
+    [SMALL_STATE(891)] = 43310,
+    [SMALL_STATE(892)] = 43325,
+    [SMALL_STATE(893)] = 43340,
+    [SMALL_STATE(894)] = 43359,
+    [SMALL_STATE(895)] = 43378,
+    [SMALL_STATE(896)] = 43397,
+    [SMALL_STATE(897)] = 43416,
+    [SMALL_STATE(898)] = 43431,
+    [SMALL_STATE(899)] = 43446,
+    [SMALL_STATE(900)] = 43465,
+    [SMALL_STATE(901)] = 43484,
+    [SMALL_STATE(902)] = 43499,
+    [SMALL_STATE(903)] = 43514,
+    [SMALL_STATE(904)] = 43531,
+    [SMALL_STATE(905)] = 43546,
+    [SMALL_STATE(906)] = 43561,
+    [SMALL_STATE(907)] = 43578,
+    [SMALL_STATE(908)] = 43593,
+    [SMALL_STATE(909)] = 43612,
+    [SMALL_STATE(910)] = 43627,
+    [SMALL_STATE(911)] = 43642,
+    [SMALL_STATE(912)] = 43661,
+    [SMALL_STATE(913)] = 43676,
+    [SMALL_STATE(914)] = 43693,
+    [SMALL_STATE(915)] = 43712,
+    [SMALL_STATE(916)] = 43731,
+    [SMALL_STATE(917)] = 43746,
+    [SMALL_STATE(918)] = 43765,
+    [SMALL_STATE(919)] = 43780,
+    [SMALL_STATE(920)] = 43799,
+    [SMALL_STATE(921)] = 43814,
+    [SMALL_STATE(922)] = 43833,
+    [SMALL_STATE(923)] = 43852,
+    [SMALL_STATE(924)] = 43867,
+    [SMALL_STATE(925)] = 43886,
+    [SMALL_STATE(926)] = 43905,
+    [SMALL_STATE(927)] = 43920,
+    [SMALL_STATE(928)] = 43939,
+    [SMALL_STATE(929)] = 43958,
+    [SMALL_STATE(930)] = 43975,
+    [SMALL_STATE(931)] = 43994,
+    [SMALL_STATE(932)] = 44011,
+    [SMALL_STATE(933)] = 44030,
+    [SMALL_STATE(934)] = 44047,
+    [SMALL_STATE(935)] = 44066,
+    [SMALL_STATE(936)] = 44083,
+    [SMALL_STATE(937)] = 44102,
+    [SMALL_STATE(938)] = 44117,
+    [SMALL_STATE(939)] = 44132,
+    [SMALL_STATE(940)] = 44149,
+    [SMALL_STATE(941)] = 44164,
+    [SMALL_STATE(942)] = 44183,
+    [SMALL_STATE(943)] = 44202,
+    [SMALL_STATE(944)] = 44221,
+    [SMALL_STATE(945)] = 44236,
+    [SMALL_STATE(946)] = 44255,
+    [SMALL_STATE(947)] = 44270,
+    [SMALL_STATE(948)] = 44285,
+    [SMALL_STATE(949)] = 44300,
+    [SMALL_STATE(950)] = 44319,
+    [SMALL_STATE(951)] = 44334,
+    [SMALL_STATE(952)] = 44353,
+    [SMALL_STATE(953)] = 44372,
+    [SMALL_STATE(954)] = 44389,
+    [SMALL_STATE(955)] = 44408,
+    [SMALL_STATE(956)] = 44423,
+    [SMALL_STATE(957)] = 44442,
+    [SMALL_STATE(958)] = 44459,
+    [SMALL_STATE(959)] = 44478,
+    [SMALL_STATE(960)] = 44493,
+    [SMALL_STATE(961)] = 44508,
+    [SMALL_STATE(962)] = 44525,
+    [SMALL_STATE(963)] = 44544,
+    [SMALL_STATE(964)] = 44559,
+    [SMALL_STATE(965)] = 44574,
+    [SMALL_STATE(966)] = 44589,
+    [SMALL_STATE(967)] = 44608,
+    [SMALL_STATE(968)] = 44623,
+    [SMALL_STATE(969)] = 44638,
+    [SMALL_STATE(970)] = 44655,
+    [SMALL_STATE(971)] = 44672,
+    [SMALL_STATE(972)] = 44689,
+    [SMALL_STATE(973)] = 44704,
+    [SMALL_STATE(974)] = 44721,
+    [SMALL_STATE(975)] = 44738,
+    [SMALL_STATE(976)] = 44757,
+    [SMALL_STATE(977)] = 44772,
+    [SMALL_STATE(978)] = 44789,
+    [SMALL_STATE(979)] = 44804,
+    [SMALL_STATE(980)] = 44821,
+    [SMALL_STATE(981)] = 44836,
+    [SMALL_STATE(982)] = 44851,
+    [SMALL_STATE(983)] = 44866,
+    [SMALL_STATE(984)] = 44885,
+    [SMALL_STATE(985)] = 44904,
+    [SMALL_STATE(986)] = 44919,
+    [SMALL_STATE(987)] = 44934,
+    [SMALL_STATE(988)] = 44953,
+    [SMALL_STATE(989)] = 44968,
+    [SMALL_STATE(990)] = 44983,
+    [SMALL_STATE(991)] = 45002,
+    [SMALL_STATE(992)] = 45017,
+    [SMALL_STATE(993)] = 45032,
+    [SMALL_STATE(994)] = 45051,
+    [SMALL_STATE(995)] = 45066,
+    [SMALL_STATE(996)] = 45081,
+    [SMALL_STATE(997)] = 45100,
+    [SMALL_STATE(998)] = 45115,
+    [SMALL_STATE(999)] = 45130,
+    [SMALL_STATE(1000)] = 45145,
+    [SMALL_STATE(1001)] = 45160,
+    [SMALL_STATE(1002)] = 45175,
+    [SMALL_STATE(1003)] = 45190,
+    [SMALL_STATE(1004)] = 45205,
+    [SMALL_STATE(1005)] = 45220,
+    [SMALL_STATE(1006)] = 45235,
+    [SMALL_STATE(1007)] = 45250,
+    [SMALL_STATE(1008)] = 45265,
+    [SMALL_STATE(1009)] = 45280,
+    [SMALL_STATE(1010)] = 45295,
+    [SMALL_STATE(1011)] = 45310,
+    [SMALL_STATE(1012)] = 45325,
+    [SMALL_STATE(1013)] = 45340,
+    [SMALL_STATE(1014)] = 45355,
+    [SMALL_STATE(1015)] = 45370,
+    [SMALL_STATE(1016)] = 45385,
+    [SMALL_STATE(1017)] = 45400,
+    [SMALL_STATE(1018)] = 45415,
+    [SMALL_STATE(1019)] = 45430,
+    [SMALL_STATE(1020)] = 45445,
+    [SMALL_STATE(1021)] = 45460,
+    [SMALL_STATE(1022)] = 45475,
+    [SMALL_STATE(1023)] = 45490,
+    [SMALL_STATE(1024)] = 45505,
+    [SMALL_STATE(1025)] = 45520,
+    [SMALL_STATE(1026)] = 45535,
+    [SMALL_STATE(1027)] = 45550,
+    [SMALL_STATE(1028)] = 45565,
+    [SMALL_STATE(1029)] = 45580,
+    [SMALL_STATE(1030)] = 45595,
+    [SMALL_STATE(1031)] = 45610,
+    [SMALL_STATE(1032)] = 45625,
+    [SMALL_STATE(1033)] = 45640,
+    [SMALL_STATE(1034)] = 45655,
+    [SMALL_STATE(1035)] = 45670,
+    [SMALL_STATE(1036)] = 45685,
+    [SMALL_STATE(1037)] = 45700,
+    [SMALL_STATE(1038)] = 45719,
+    [SMALL_STATE(1039)] = 45738,
+    [SMALL_STATE(1040)] = 45755,
+    [SMALL_STATE(1041)] = 45774,
+    [SMALL_STATE(1042)] = 45793,
+    [SMALL_STATE(1043)] = 45812,
+    [SMALL_STATE(1044)] = 45831,
+    [SMALL_STATE(1045)] = 45847,
+    [SMALL_STATE(1046)] = 45861,
+    [SMALL_STATE(1047)] = 45877,
+    [SMALL_STATE(1048)] = 45893,
+    [SMALL_STATE(1049)] = 45907,
+    [SMALL_STATE(1050)] = 45923,
+    [SMALL_STATE(1051)] = 45939,
+    [SMALL_STATE(1052)] = 45955,
+    [SMALL_STATE(1053)] = 45971,
+    [SMALL_STATE(1054)] = 45987,
+    [SMALL_STATE(1055)] = 46003,
+    [SMALL_STATE(1056)] = 46019,
+    [SMALL_STATE(1057)] = 46033,
+    [SMALL_STATE(1058)] = 46047,
+    [SMALL_STATE(1059)] = 46061,
+    [SMALL_STATE(1060)] = 46075,
+    [SMALL_STATE(1061)] = 46089,
+    [SMALL_STATE(1062)] = 46103,
+    [SMALL_STATE(1063)] = 46119,
+    [SMALL_STATE(1064)] = 46133,
+    [SMALL_STATE(1065)] = 46147,
+    [SMALL_STATE(1066)] = 46161,
+    [SMALL_STATE(1067)] = 46177,
+    [SMALL_STATE(1068)] = 46191,
+    [SMALL_STATE(1069)] = 46205,
+    [SMALL_STATE(1070)] = 46219,
+    [SMALL_STATE(1071)] = 46235,
+    [SMALL_STATE(1072)] = 46249,
+    [SMALL_STATE(1073)] = 46263,
+    [SMALL_STATE(1074)] = 46277,
+    [SMALL_STATE(1075)] = 46291,
+    [SMALL_STATE(1076)] = 46305,
+    [SMALL_STATE(1077)] = 46319,
+    [SMALL_STATE(1078)] = 46335,
+    [SMALL_STATE(1079)] = 46349,
+    [SMALL_STATE(1080)] = 46363,
+    [SMALL_STATE(1081)] = 46377,
+    [SMALL_STATE(1082)] = 46391,
+    [SMALL_STATE(1083)] = 46407,
+    [SMALL_STATE(1084)] = 46421,
+    [SMALL_STATE(1085)] = 46435,
+    [SMALL_STATE(1086)] = 46451,
+    [SMALL_STATE(1087)] = 46465,
+    [SMALL_STATE(1088)] = 46479,
+    [SMALL_STATE(1089)] = 46495,
+    [SMALL_STATE(1090)] = 46511,
+    [SMALL_STATE(1091)] = 46525,
+    [SMALL_STATE(1092)] = 46539,
+    [SMALL_STATE(1093)] = 46555,
+    [SMALL_STATE(1094)] = 46571,
+    [SMALL_STATE(1095)] = 46585,
+    [SMALL_STATE(1096)] = 46599,
+    [SMALL_STATE(1097)] = 46613,
+    [SMALL_STATE(1098)] = 46627,
+    [SMALL_STATE(1099)] = 46641,
+    [SMALL_STATE(1100)] = 46655,
+    [SMALL_STATE(1101)] = 46669,
+    [SMALL_STATE(1102)] = 46683,
+    [SMALL_STATE(1103)] = 46699,
+    [SMALL_STATE(1104)] = 46715,
+    [SMALL_STATE(1105)] = 46729,
+    [SMALL_STATE(1106)] = 46745,
+    [SMALL_STATE(1107)] = 46759,
+    [SMALL_STATE(1108)] = 46775,
+    [SMALL_STATE(1109)] = 46789,
+    [SMALL_STATE(1110)] = 46803,
+    [SMALL_STATE(1111)] = 46817,
+    [SMALL_STATE(1112)] = 46831,
+    [SMALL_STATE(1113)] = 46847,
+    [SMALL_STATE(1114)] = 46863,
+    [SMALL_STATE(1115)] = 46877,
+    [SMALL_STATE(1116)] = 46893,
+    [SMALL_STATE(1117)] = 46909,
+    [SMALL_STATE(1118)] = 46925,
+    [SMALL_STATE(1119)] = 46941,
+    [SMALL_STATE(1120)] = 46957,
+    [SMALL_STATE(1121)] = 46973,
+    [SMALL_STATE(1122)] = 46989,
+    [SMALL_STATE(1123)] = 47005,
+    [SMALL_STATE(1124)] = 47021,
+    [SMALL_STATE(1125)] = 47035,
+    [SMALL_STATE(1126)] = 47049,
+    [SMALL_STATE(1127)] = 47065,
+    [SMALL_STATE(1128)] = 47081,
+    [SMALL_STATE(1129)] = 47095,
+    [SMALL_STATE(1130)] = 47109,
+    [SMALL_STATE(1131)] = 47125,
+    [SMALL_STATE(1132)] = 47139,
+    [SMALL_STATE(1133)] = 47155,
+    [SMALL_STATE(1134)] = 47169,
+    [SMALL_STATE(1135)] = 47185,
+    [SMALL_STATE(1136)] = 47201,
+    [SMALL_STATE(1137)] = 47215,
+    [SMALL_STATE(1138)] = 47229,
+    [SMALL_STATE(1139)] = 47245,
+    [SMALL_STATE(1140)] = 47261,
+    [SMALL_STATE(1141)] = 47277,
+    [SMALL_STATE(1142)] = 47293,
+    [SMALL_STATE(1143)] = 47307,
+    [SMALL_STATE(1144)] = 47321,
+    [SMALL_STATE(1145)] = 47337,
+    [SMALL_STATE(1146)] = 47353,
+    [SMALL_STATE(1147)] = 47369,
+    [SMALL_STATE(1148)] = 47385,
+    [SMALL_STATE(1149)] = 47401,
+    [SMALL_STATE(1150)] = 47415,
+    [SMALL_STATE(1151)] = 47429,
+    [SMALL_STATE(1152)] = 47443,
+    [SMALL_STATE(1153)] = 47459,
+    [SMALL_STATE(1154)] = 47475,
+    [SMALL_STATE(1155)] = 47489,
+    [SMALL_STATE(1156)] = 47505,
+    [SMALL_STATE(1157)] = 47519,
+    [SMALL_STATE(1158)] = 47533,
+    [SMALL_STATE(1159)] = 47549,
+    [SMALL_STATE(1160)] = 47565,
+    [SMALL_STATE(1161)] = 47581,
+    [SMALL_STATE(1162)] = 47597,
+    [SMALL_STATE(1163)] = 47611,
+    [SMALL_STATE(1164)] = 47625,
+    [SMALL_STATE(1165)] = 47639,
+    [SMALL_STATE(1166)] = 47653,
+    [SMALL_STATE(1167)] = 47667,
+    [SMALL_STATE(1168)] = 47683,
+    [SMALL_STATE(1169)] = 47696,
+    [SMALL_STATE(1170)] = 47709,
+    [SMALL_STATE(1171)] = 47722,
+    [SMALL_STATE(1172)] = 47735,
+    [SMALL_STATE(1173)] = 47748,
+    [SMALL_STATE(1174)] = 47761,
+    [SMALL_STATE(1175)] = 47774,
+    [SMALL_STATE(1176)] = 47787,
+    [SMALL_STATE(1177)] = 47800,
+    [SMALL_STATE(1178)] = 47813,
+    [SMALL_STATE(1179)] = 47826,
+    [SMALL_STATE(1180)] = 47839,
+    [SMALL_STATE(1181)] = 47852,
+    [SMALL_STATE(1182)] = 47865,
+    [SMALL_STATE(1183)] = 47878,
+    [SMALL_STATE(1184)] = 47891,
+    [SMALL_STATE(1185)] = 47904,
+    [SMALL_STATE(1186)] = 47917,
+    [SMALL_STATE(1187)] = 47930,
+    [SMALL_STATE(1188)] = 47943,
+    [SMALL_STATE(1189)] = 47956,
+    [SMALL_STATE(1190)] = 47969,
+    [SMALL_STATE(1191)] = 47982,
+    [SMALL_STATE(1192)] = 47995,
+    [SMALL_STATE(1193)] = 48008,
+    [SMALL_STATE(1194)] = 48021,
+    [SMALL_STATE(1195)] = 48034,
+    [SMALL_STATE(1196)] = 48047,
+    [SMALL_STATE(1197)] = 48060,
+    [SMALL_STATE(1198)] = 48073,
+    [SMALL_STATE(1199)] = 48086,
+    [SMALL_STATE(1200)] = 48099,
+    [SMALL_STATE(1201)] = 48112,
+    [SMALL_STATE(1202)] = 48125,
+    [SMALL_STATE(1203)] = 48138,
+    [SMALL_STATE(1204)] = 48151,
+    [SMALL_STATE(1205)] = 48164,
+    [SMALL_STATE(1206)] = 48177,
+    [SMALL_STATE(1207)] = 48190,
+    [SMALL_STATE(1208)] = 48203,
+    [SMALL_STATE(1209)] = 48216,
+    [SMALL_STATE(1210)] = 48229,
+    [SMALL_STATE(1211)] = 48242,
+    [SMALL_STATE(1212)] = 48255,
+    [SMALL_STATE(1213)] = 48268,
+    [SMALL_STATE(1214)] = 48281,
+    [SMALL_STATE(1215)] = 48294,
+    [SMALL_STATE(1216)] = 48307,
+    [SMALL_STATE(1217)] = 48320,
+    [SMALL_STATE(1218)] = 48333,
+    [SMALL_STATE(1219)] = 48346,
+    [SMALL_STATE(1220)] = 48359,
+    [SMALL_STATE(1221)] = 48372,
+    [SMALL_STATE(1222)] = 48385,
+    [SMALL_STATE(1223)] = 48398,
+    [SMALL_STATE(1224)] = 48411,
+    [SMALL_STATE(1225)] = 48424,
+    [SMALL_STATE(1226)] = 48437,
+    [SMALL_STATE(1227)] = 48450,
+    [SMALL_STATE(1228)] = 48463,
+    [SMALL_STATE(1229)] = 48476,
+    [SMALL_STATE(1230)] = 48489,
+    [SMALL_STATE(1231)] = 48502,
+    [SMALL_STATE(1232)] = 48515,
+    [SMALL_STATE(1233)] = 48528,
+    [SMALL_STATE(1234)] = 48541,
+    [SMALL_STATE(1235)] = 48554,
+    [SMALL_STATE(1236)] = 48567,
+    [SMALL_STATE(1237)] = 48580,
+    [SMALL_STATE(1238)] = 48593,
+    [SMALL_STATE(1239)] = 48606,
+    [SMALL_STATE(1240)] = 48619,
+    [SMALL_STATE(1241)] = 48632,
+    [SMALL_STATE(1242)] = 48645,
+    [SMALL_STATE(1243)] = 48658,
+    [SMALL_STATE(1244)] = 48671,
+    [SMALL_STATE(1245)] = 48684,
+    [SMALL_STATE(1246)] = 48697,
+    [SMALL_STATE(1247)] = 48710,
+    [SMALL_STATE(1248)] = 48723,
+    [SMALL_STATE(1249)] = 48736,
+    [SMALL_STATE(1250)] = 48749,
+    [SMALL_STATE(1251)] = 48762,
+    [SMALL_STATE(1252)] = 48775,
+    [SMALL_STATE(1253)] = 48788,
+    [SMALL_STATE(1254)] = 48801,
+    [SMALL_STATE(1255)] = 48814,
+    [SMALL_STATE(1256)] = 48827,
+    [SMALL_STATE(1257)] = 48840,
+    [SMALL_STATE(1258)] = 48853,
+    [SMALL_STATE(1259)] = 48866,
+    [SMALL_STATE(1260)] = 48879,
+    [SMALL_STATE(1261)] = 48892,
+    [SMALL_STATE(1262)] = 48905,
+    [SMALL_STATE(1263)] = 48918,
+    [SMALL_STATE(1264)] = 48931,
+    [SMALL_STATE(1265)] = 48944,
+    [SMALL_STATE(1266)] = 48957,
+    [SMALL_STATE(1267)] = 48970,
+    [SMALL_STATE(1268)] = 48983,
+    [SMALL_STATE(1269)] = 48996,
+    [SMALL_STATE(1270)] = 49009,
+    [SMALL_STATE(1271)] = 49022,
+    [SMALL_STATE(1272)] = 49035,
+    [SMALL_STATE(1273)] = 49048,
+    [SMALL_STATE(1274)] = 49061,
+    [SMALL_STATE(1275)] = 49074,
+    [SMALL_STATE(1276)] = 49087,
+    [SMALL_STATE(1277)] = 49100,
+    [SMALL_STATE(1278)] = 49113,
+    [SMALL_STATE(1279)] = 49126,
+    [SMALL_STATE(1280)] = 49139,
+    [SMALL_STATE(1281)] = 49152,
+    [SMALL_STATE(1282)] = 49165,
+    [SMALL_STATE(1283)] = 49178,
+    [SMALL_STATE(1284)] = 49191,
+    [SMALL_STATE(1285)] = 49204,
+    [SMALL_STATE(1286)] = 49217,
+    [SMALL_STATE(1287)] = 49230,
+    [SMALL_STATE(1288)] = 49243,
+    [SMALL_STATE(1289)] = 49256,
+    [SMALL_STATE(1290)] = 49269,
+    [SMALL_STATE(1291)] = 49282,
+    [SMALL_STATE(1292)] = 49295,
+    [SMALL_STATE(1293)] = 49308,
+    [SMALL_STATE(1294)] = 49321,
+    [SMALL_STATE(1295)] = 49334,
+    [SMALL_STATE(1296)] = 49347,
+    [SMALL_STATE(1297)] = 49360,
+    [SMALL_STATE(1298)] = 49373,
+    [SMALL_STATE(1299)] = 49386,
+    [SMALL_STATE(1300)] = 49399,
+    [SMALL_STATE(1301)] = 49412,
+    [SMALL_STATE(1302)] = 49425,
+    [SMALL_STATE(1303)] = 49438,
+    [SMALL_STATE(1304)] = 49451,
+    [SMALL_STATE(1305)] = 49464,
+    [SMALL_STATE(1306)] = 49477,
+    [SMALL_STATE(1307)] = 49490,
+    [SMALL_STATE(1308)] = 49503,
+    [SMALL_STATE(1309)] = 49516,
+    [SMALL_STATE(1310)] = 49529,
+    [SMALL_STATE(1311)] = 49542,
+    [SMALL_STATE(1312)] = 49555,
+    [SMALL_STATE(1313)] = 49568,
+    [SMALL_STATE(1314)] = 49581,
+    [SMALL_STATE(1315)] = 49594,
+    [SMALL_STATE(1316)] = 49607,
+    [SMALL_STATE(1317)] = 49620,
+    [SMALL_STATE(1318)] = 49633,
+    [SMALL_STATE(1319)] = 49646,
+    [SMALL_STATE(1320)] = 49659,
+    [SMALL_STATE(1321)] = 49672,
+    [SMALL_STATE(1322)] = 49685,
+    [SMALL_STATE(1323)] = 49698,
+    [SMALL_STATE(1324)] = 49711,
+    [SMALL_STATE(1325)] = 49724,
+    [SMALL_STATE(1326)] = 49737,
+    [SMALL_STATE(1327)] = 49750,
+    [SMALL_STATE(1328)] = 49763,
+    [SMALL_STATE(1329)] = 49776,
+    [SMALL_STATE(1330)] = 49789,
+    [SMALL_STATE(1331)] = 49802,
+    [SMALL_STATE(1332)] = 49815,
+    [SMALL_STATE(1333)] = 49828,
+    [SMALL_STATE(1334)] = 49841,
+    [SMALL_STATE(1335)] = 49854,
+    [SMALL_STATE(1336)] = 49867,
+    [SMALL_STATE(1337)] = 49880,
+    [SMALL_STATE(1338)] = 49893,
+    [SMALL_STATE(1339)] = 49906,
+    [SMALL_STATE(1340)] = 49919,
+    [SMALL_STATE(1341)] = 49932,
+    [SMALL_STATE(1342)] = 49945,
+    [SMALL_STATE(1343)] = 49958,
+    [SMALL_STATE(1344)] = 49971,
+    [SMALL_STATE(1345)] = 49984,
+    [SMALL_STATE(1346)] = 49997,
+    [SMALL_STATE(1347)] = 50010,
+    [SMALL_STATE(1348)] = 50023,
+    [SMALL_STATE(1349)] = 50036,
+    [SMALL_STATE(1350)] = 50049,
+    [SMALL_STATE(1351)] = 50062,
+    [SMALL_STATE(1352)] = 50075,
+    [SMALL_STATE(1353)] = 50088,
+    [SMALL_STATE(1354)] = 50101,
+    [SMALL_STATE(1355)] = 50114,
+    [SMALL_STATE(1356)] = 50127,
+    [SMALL_STATE(1357)] = 50140,
+    [SMALL_STATE(1358)] = 50153,
+    [SMALL_STATE(1359)] = 50166,
+    [SMALL_STATE(1360)] = 50179,
+    [SMALL_STATE(1361)] = 50192,
+    [SMALL_STATE(1362)] = 50205,
+    [SMALL_STATE(1363)] = 50218,
+    [SMALL_STATE(1364)] = 50231,
+    [SMALL_STATE(1365)] = 50244,
+    [SMALL_STATE(1366)] = 50257,
+    [SMALL_STATE(1367)] = 50270,
+    [SMALL_STATE(1368)] = 50283,
+    [SMALL_STATE(1369)] = 50296,
+    [SMALL_STATE(1370)] = 50309,
+    [SMALL_STATE(1371)] = 50322,
+    [SMALL_STATE(1372)] = 50335,
+    [SMALL_STATE(1373)] = 50348,
+    [SMALL_STATE(1374)] = 50361,
+    [SMALL_STATE(1375)] = 50374,
+    [SMALL_STATE(1376)] = 50387,
+    [SMALL_STATE(1377)] = 50400,
+    [SMALL_STATE(1378)] = 50413,
+    [SMALL_STATE(1379)] = 50426,
+    [SMALL_STATE(1380)] = 50439,
+    [SMALL_STATE(1381)] = 50452,
+    [SMALL_STATE(1382)] = 50465,
+    [SMALL_STATE(1383)] = 50478,
+    [SMALL_STATE(1384)] = 50491,
+    [SMALL_STATE(1385)] = 50504,
+    [SMALL_STATE(1386)] = 50517,
+    [SMALL_STATE(1387)] = 50530,
+    [SMALL_STATE(1388)] = 50543,
+    [SMALL_STATE(1389)] = 50556,
+    [SMALL_STATE(1390)] = 50569,
+    [SMALL_STATE(1391)] = 50582,
+    [SMALL_STATE(1392)] = 50595,
+    [SMALL_STATE(1393)] = 50608,
+    [SMALL_STATE(1394)] = 50621,
+    [SMALL_STATE(1395)] = 50634,
+    [SMALL_STATE(1396)] = 50647,
+    [SMALL_STATE(1397)] = 50660,
+    [SMALL_STATE(1398)] = 50673,
+    [SMALL_STATE(1399)] = 50686,
+    [SMALL_STATE(1400)] = 50699,
+    [SMALL_STATE(1401)] = 50712,
+    [SMALL_STATE(1402)] = 50725,
+    [SMALL_STATE(1403)] = 50738,
+    [SMALL_STATE(1404)] = 50751,
+    [SMALL_STATE(1405)] = 50764,
+    [SMALL_STATE(1406)] = 50777,
+    [SMALL_STATE(1407)] = 50790,
+    [SMALL_STATE(1408)] = 50803,
+    [SMALL_STATE(1409)] = 50816,
+    [SMALL_STATE(1410)] = 50829,
+    [SMALL_STATE(1411)] = 50842,
+    [SMALL_STATE(1412)] = 50855,
+    [SMALL_STATE(1413)] = 50868,
+    [SMALL_STATE(1414)] = 50881,
+    [SMALL_STATE(1415)] = 50894,
+    [SMALL_STATE(1416)] = 50907,
+    [SMALL_STATE(1417)] = 50920,
+    [SMALL_STATE(1418)] = 50933,
+    [SMALL_STATE(1419)] = 50946,
+    [SMALL_STATE(1420)] = 50959,
+    [SMALL_STATE(1421)] = 50972,
+    [SMALL_STATE(1422)] = 50985,
+    [SMALL_STATE(1423)] = 50998,
+    [SMALL_STATE(1424)] = 51011,
+    [SMALL_STATE(1425)] = 51024,
+    [SMALL_STATE(1426)] = 51037,
+    [SMALL_STATE(1427)] = 51050,
+    [SMALL_STATE(1428)] = 51063,
+    [SMALL_STATE(1429)] = 51076,
+    [SMALL_STATE(1430)] = 51089,
+    [SMALL_STATE(1431)] = 51102,
+    [SMALL_STATE(1432)] = 51115,
+    [SMALL_STATE(1433)] = 51128,
+    [SMALL_STATE(1434)] = 51141,
+    [SMALL_STATE(1435)] = 51154,
+    [SMALL_STATE(1436)] = 51167,
+    [SMALL_STATE(1437)] = 51180,
+    [SMALL_STATE(1438)] = 51193,
+    [SMALL_STATE(1439)] = 51206,
+    [SMALL_STATE(1440)] = 51219,
+    [SMALL_STATE(1441)] = 51232,
+    [SMALL_STATE(1442)] = 51245,
+    [SMALL_STATE(1443)] = 51258,
+    [SMALL_STATE(1444)] = 51271,
+    [SMALL_STATE(1445)] = 51284,
+    [SMALL_STATE(1446)] = 51297,
+    [SMALL_STATE(1447)] = 51310,
+    [SMALL_STATE(1448)] = 51323,
+    [SMALL_STATE(1449)] = 51336,
+    [SMALL_STATE(1450)] = 51349,
+    [SMALL_STATE(1451)] = 51362,
+    [SMALL_STATE(1452)] = 51375,
+    [SMALL_STATE(1453)] = 51388,
+    [SMALL_STATE(1454)] = 51401,
+    [SMALL_STATE(1455)] = 51414,
+    [SMALL_STATE(1456)] = 51427,
+    [SMALL_STATE(1457)] = 51440,
+    [SMALL_STATE(1458)] = 51453,
+    [SMALL_STATE(1459)] = 51466,
+    [SMALL_STATE(1460)] = 51479,
+    [SMALL_STATE(1461)] = 51492,
+    [SMALL_STATE(1462)] = 51505,
+    [SMALL_STATE(1463)] = 51518,
+    [SMALL_STATE(1464)] = 51531,
+    [SMALL_STATE(1465)] = 51544,
+    [SMALL_STATE(1466)] = 51557,
+    [SMALL_STATE(1467)] = 51570,
+    [SMALL_STATE(1468)] = 51583,
+    [SMALL_STATE(1469)] = 51596,
+    [SMALL_STATE(1470)] = 51609,
+    [SMALL_STATE(1471)] = 51622,
+    [SMALL_STATE(1472)] = 51635,
+    [SMALL_STATE(1473)] = 51648,
+    [SMALL_STATE(1474)] = 51661,
+    [SMALL_STATE(1475)] = 51674,
+    [SMALL_STATE(1476)] = 51687,
+    [SMALL_STATE(1477)] = 51700,
+    [SMALL_STATE(1478)] = 51713,
+    [SMALL_STATE(1479)] = 51726,
+    [SMALL_STATE(1480)] = 51739,
+    [SMALL_STATE(1481)] = 51752,
+    [SMALL_STATE(1482)] = 51765,
+    [SMALL_STATE(1483)] = 51778,
+    [SMALL_STATE(1484)] = 51791,
+    [SMALL_STATE(1485)] = 51804,
+    [SMALL_STATE(1486)] = 51817,
+    [SMALL_STATE(1487)] = 51830,
+    [SMALL_STATE(1488)] = 51843,
+    [SMALL_STATE(1489)] = 51856,
+    [SMALL_STATE(1490)] = 51869,
+    [SMALL_STATE(1491)] = 51882,
+    [SMALL_STATE(1492)] = 51895,
+    [SMALL_STATE(1493)] = 51908,
+    [SMALL_STATE(1494)] = 51921,
+    [SMALL_STATE(1495)] = 51934,
+    [SMALL_STATE(1496)] = 51947,
+    [SMALL_STATE(1497)] = 51960,
+    [SMALL_STATE(1498)] = 51973,
+    [SMALL_STATE(1499)] = 51986,
+    [SMALL_STATE(1500)] = 51999,
+    [SMALL_STATE(1501)] = 52012,
+    [SMALL_STATE(1502)] = 52025,
+    [SMALL_STATE(1503)] = 52038,
+    [SMALL_STATE(1504)] = 52051,
+    [SMALL_STATE(1505)] = 52064,
+    [SMALL_STATE(1506)] = 52077,
+    [SMALL_STATE(1507)] = 52090,
+    [SMALL_STATE(1508)] = 52103,
+    [SMALL_STATE(1509)] = 52116,
+    [SMALL_STATE(1510)] = 52129,
+    [SMALL_STATE(1511)] = 52142,
+    [SMALL_STATE(1512)] = 52155,
+    [SMALL_STATE(1513)] = 52168,
+    [SMALL_STATE(1514)] = 52181,
+    [SMALL_STATE(1515)] = 52194,
+    [SMALL_STATE(1516)] = 52207,
+    [SMALL_STATE(1517)] = 52220,
+    [SMALL_STATE(1518)] = 52233,
+    [SMALL_STATE(1519)] = 52246,
+    [SMALL_STATE(1520)] = 52259,
+    [SMALL_STATE(1521)] = 52272,
+    [SMALL_STATE(1522)] = 52285,
+    [SMALL_STATE(1523)] = 52298,
+    [SMALL_STATE(1524)] = 52311,
+    [SMALL_STATE(1525)] = 52324,
+    [SMALL_STATE(1526)] = 52337,
+    [SMALL_STATE(1527)] = 52350,
+    [SMALL_STATE(1528)] = 52363,
+    [SMALL_STATE(1529)] = 52376,
+    [SMALL_STATE(1530)] = 52389,
+    [SMALL_STATE(1531)] = 52402,
+    [SMALL_STATE(1532)] = 52415,
+    [SMALL_STATE(1533)] = 52428,
+    [SMALL_STATE(1534)] = 52441,
+    [SMALL_STATE(1535)] = 52454,
+    [SMALL_STATE(1536)] = 52467,
+    [SMALL_STATE(1537)] = 52480,
+    [SMALL_STATE(1538)] = 52493,
+    [SMALL_STATE(1539)] = 52506,
+    [SMALL_STATE(1540)] = 52519,
+    [SMALL_STATE(1541)] = 52532,
+    [SMALL_STATE(1542)] = 52545,
+    [SMALL_STATE(1543)] = 52558,
+    [SMALL_STATE(1544)] = 52571,
+    [SMALL_STATE(1545)] = 52584,
+    [SMALL_STATE(1546)] = 52597,
+    [SMALL_STATE(1547)] = 52610,
+    [SMALL_STATE(1548)] = 52623,
+    [SMALL_STATE(1549)] = 52636,
+    [SMALL_STATE(1550)] = 52649,
+    [SMALL_STATE(1551)] = 52662,
+    [SMALL_STATE(1552)] = 52675,
+    [SMALL_STATE(1553)] = 52688,
+    [SMALL_STATE(1554)] = 52701,
+    [SMALL_STATE(1555)] = 52714,
+    [SMALL_STATE(1556)] = 52727,
+    [SMALL_STATE(1557)] = 52740,
+    [SMALL_STATE(1558)] = 52753,
+    [SMALL_STATE(1559)] = 52766,
+    [SMALL_STATE(1560)] = 52779,
+    [SMALL_STATE(1561)] = 52792,
+    [SMALL_STATE(1562)] = 52805,
+    [SMALL_STATE(1563)] = 52818,
+    [SMALL_STATE(1564)] = 52831,
+    [SMALL_STATE(1565)] = 52844,
+    [SMALL_STATE(1566)] = 52857,
+    [SMALL_STATE(1567)] = 52870,
+    [SMALL_STATE(1568)] = 52883,
+    [SMALL_STATE(1569)] = 52896,
+    [SMALL_STATE(1570)] = 52909,
+    [SMALL_STATE(1571)] = 52922,
+    [SMALL_STATE(1572)] = 52935,
+    [SMALL_STATE(1573)] = 52948,
+    [SMALL_STATE(1574)] = 52961,
+    [SMALL_STATE(1575)] = 52974,
+    [SMALL_STATE(1576)] = 52987,
+    [SMALL_STATE(1577)] = 53000,
+    [SMALL_STATE(1578)] = 53013,
+    [SMALL_STATE(1579)] = 53026,
+    [SMALL_STATE(1580)] = 53039,
+    [SMALL_STATE(1581)] = 53052,
+    [SMALL_STATE(1582)] = 53065,
+    [SMALL_STATE(1583)] = 53078,
+    [SMALL_STATE(1584)] = 53091,
+    [SMALL_STATE(1585)] = 53104,
+    [SMALL_STATE(1586)] = 53117,
+    [SMALL_STATE(1587)] = 53130,
+    [SMALL_STATE(1588)] = 53143,
+    [SMALL_STATE(1589)] = 53156,
+    [SMALL_STATE(1590)] = 53169,
+    [SMALL_STATE(1591)] = 53182,
+    [SMALL_STATE(1592)] = 53195,
+    [SMALL_STATE(1593)] = 53208,
+    [SMALL_STATE(1594)] = 53221,
+    [SMALL_STATE(1595)] = 53234,
+    [SMALL_STATE(1596)] = 53247,
+    [SMALL_STATE(1597)] = 53260,
+    [SMALL_STATE(1598)] = 53273,
+    [SMALL_STATE(1599)] = 53286,
+    [SMALL_STATE(1600)] = 53299,
+    [SMALL_STATE(1601)] = 53312,
+    [SMALL_STATE(1602)] = 53325,
+    [SMALL_STATE(1603)] = 53338,
+    [SMALL_STATE(1604)] = 53351,
+    [SMALL_STATE(1605)] = 53364,
+    [SMALL_STATE(1606)] = 53377,
+    [SMALL_STATE(1607)] = 53390,
+    [SMALL_STATE(1608)] = 53403,
+    [SMALL_STATE(1609)] = 53416,
+    [SMALL_STATE(1610)] = 53429,
+    [SMALL_STATE(1611)] = 53442,
+    [SMALL_STATE(1612)] = 53455,
+    [SMALL_STATE(1613)] = 53468,
+    [SMALL_STATE(1614)] = 53481,
+    [SMALL_STATE(1615)] = 53494,
+    [SMALL_STATE(1616)] = 53507,
+    [SMALL_STATE(1617)] = 53520,
+    [SMALL_STATE(1618)] = 53533,
+    [SMALL_STATE(1619)] = 53546,
+    [SMALL_STATE(1620)] = 53559,
+    [SMALL_STATE(1621)] = 53572,
+    [SMALL_STATE(1622)] = 53585,
+    [SMALL_STATE(1623)] = 53598,
+    [SMALL_STATE(1624)] = 53611,
+    [SMALL_STATE(1625)] = 53624,
+    [SMALL_STATE(1626)] = 53637,
+    [SMALL_STATE(1627)] = 53650,
+    [SMALL_STATE(1628)] = 53663,
+    [SMALL_STATE(1629)] = 53676,
+    [SMALL_STATE(1630)] = 53689,
+    [SMALL_STATE(1631)] = 53702,
+    [SMALL_STATE(1632)] = 53715,
+    [SMALL_STATE(1633)] = 53728,
+    [SMALL_STATE(1634)] = 53741,
+    [SMALL_STATE(1635)] = 53754,
+    [SMALL_STATE(1636)] = 53767,
+    [SMALL_STATE(1637)] = 53780,
+    [SMALL_STATE(1638)] = 53793,
+    [SMALL_STATE(1639)] = 53806,
+    [SMALL_STATE(1640)] = 53819,
+    [SMALL_STATE(1641)] = 53832,
+    [SMALL_STATE(1642)] = 53845,
+    [SMALL_STATE(1643)] = 53858,
+    [SMALL_STATE(1644)] = 53871,
+    [SMALL_STATE(1645)] = 53884,
+    [SMALL_STATE(1646)] = 53897,
+    [SMALL_STATE(1647)] = 53910,
+    [SMALL_STATE(1648)] = 53923,
+    [SMALL_STATE(1649)] = 53936,
+    [SMALL_STATE(1650)] = 53949,
+    [SMALL_STATE(1651)] = 53962,
+    [SMALL_STATE(1652)] = 53975,
+    [SMALL_STATE(1653)] = 53988,
+    [SMALL_STATE(1654)] = 54001,
+    [SMALL_STATE(1655)] = 54014,
+    [SMALL_STATE(1656)] = 54027,
+    [SMALL_STATE(1657)] = 54040,
+    [SMALL_STATE(1658)] = 54053,
+    [SMALL_STATE(1659)] = 54066,
+    [SMALL_STATE(1660)] = 54079,
+    [SMALL_STATE(1661)] = 54092,
+    [SMALL_STATE(1662)] = 54105,
+    [SMALL_STATE(1663)] = 54118,
+    [SMALL_STATE(1664)] = 54131,
+    [SMALL_STATE(1665)] = 54144,
+    [SMALL_STATE(1666)] = 54157,
+    [SMALL_STATE(1667)] = 54170,
+    [SMALL_STATE(1668)] = 54183,
+    [SMALL_STATE(1669)] = 54196,
+    [SMALL_STATE(1670)] = 54209,
+    [SMALL_STATE(1671)] = 54222,
+    [SMALL_STATE(1672)] = 54235,
+    [SMALL_STATE(1673)] = 54248,
+    [SMALL_STATE(1674)] = 54261,
+    [SMALL_STATE(1675)] = 54274,
+    [SMALL_STATE(1676)] = 54287,
+    [SMALL_STATE(1677)] = 54300,
+    [SMALL_STATE(1678)] = 54313,
+    [SMALL_STATE(1679)] = 54326,
+    [SMALL_STATE(1680)] = 54339,
+    [SMALL_STATE(1681)] = 54352,
+    [SMALL_STATE(1682)] = 54365,
+    [SMALL_STATE(1683)] = 54378,
+    [SMALL_STATE(1684)] = 54391,
+    [SMALL_STATE(1685)] = 54404,
+    [SMALL_STATE(1686)] = 54417,
+    [SMALL_STATE(1687)] = 54430,
+    [SMALL_STATE(1688)] = 54443,
+    [SMALL_STATE(1689)] = 54456,
+    [SMALL_STATE(1690)] = 54469,
+    [SMALL_STATE(1691)] = 54482,
+    [SMALL_STATE(1692)] = 54495,
+    [SMALL_STATE(1693)] = 54508,
+    [SMALL_STATE(1694)] = 54521,
+    [SMALL_STATE(1695)] = 54534,
+    [SMALL_STATE(1696)] = 54547,
+    [SMALL_STATE(1697)] = 54560,
+    [SMALL_STATE(1698)] = 54573,
+    [SMALL_STATE(1699)] = 54586,
+    [SMALL_STATE(1700)] = 54599,
+    [SMALL_STATE(1701)] = 54612,
+    [SMALL_STATE(1702)] = 54625,
+    [SMALL_STATE(1703)] = 54638,
+    [SMALL_STATE(1704)] = 54642,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -83061,15 +83108,15 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [9] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1615),
     [11] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1142),
+    SHIFT(1146),
     [13] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(665),
+    SHIFT(668),
     [15] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1612),
     [17] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1611),
     [19] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(824),
+    SHIFT(826),
     [21] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1608),
     [23] = { .entry = { .count = 1, .reusable = true } },
@@ -83077,13 +83124,13 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [25] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1606),
     [27] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(655),
+    SHIFT(665),
     [29] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(35),
+    SHIFT(34),
     [31] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(39),
+    SHIFT(41),
     [33] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(826),
+    SHIFT(828),
     [35] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1602),
     [37] = { .entry = { .count = 1, .reusable = true } },
@@ -83095,17 +83142,17 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [43] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1598),
     [45] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(175),
+    SHIFT(164),
     [47] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1133),
+    SHIFT(1134),
     [49] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(44),
     [51] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(836),
+    SHIFT(840),
     [53] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(944),
+    SHIFT(956),
     [55] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(603),
+    SHIFT(611),
     [57] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1593),
     [59] = { .entry = { .count = 1, .reusable = true } },
@@ -83115,43 +83162,43 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [63] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1590),
     [65] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1048),
+    SHIFT(1062),
     [67] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(630),
+    SHIFT(645),
     [69] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(648),
+    SHIFT(640),
     [71] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(652),
+    SHIFT(641),
     [73] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(652),
+    SHIFT(641),
     [75] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(628),
+    SHIFT(664),
     [77] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(775),
     [79] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1513),
     [81] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(626),
+    SHIFT(662),
     [83] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(654),
     [85] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(654),
     [87] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(639),
+    SHIFT(650),
     [89] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(635),
+    SHIFT(629),
     [91] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(635),
+    SHIFT(629),
     [93] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(762),
+    SHIFT(765),
     [95] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(762),
+    SHIFT(765),
     [97] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1328),
     [99] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(629),
+    SHIFT(643),
     [101] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(645),
+    SHIFT(627),
     [103] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(778),
     [105] = { .entry = { .count = 1, .reusable = false } },
@@ -83169,15 +83216,15 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [117] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1213),
     [119] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(86),
+    SHIFT(80),
     [121] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1607),
     [123] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1606),
     [125] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(37),
+    SHIFT(35),
     [127] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(42),
+    SHIFT(39),
     [129] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1602),
     [131] = { .entry = { .count = 1, .reusable = false } },
@@ -83187,191 +83234,191 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [135] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1598),
     [137] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(175),
+    SHIFT(164),
     [139] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1212),
     [141] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(84),
+    SHIFT(83),
     [143] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1179),
     [145] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(44),
     [147] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(836),
+    SHIFT(840),
     [149] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(603),
+    SHIFT(611),
     [151] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(782),
     [153] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1209),
     [155] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1048),
+    SHIFT(1062),
     [157] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(445),
-    [159] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1170),
-    [161] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1180),
-    [163] = { .entry = { .count = 2, .reusable = false } },
+    [159] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(630),
-    [166] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(645),
+    [162] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(648),
-    [169] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(640),
+    [165] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [172] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [168] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [175] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [171] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(628),
-    [178] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(664),
+    [174] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(775),
-    [181] = { .entry = { .count = 2, .reusable = false } },
+    [177] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1513),
-    [184] = { .entry = { .count = 2, .reusable = false } },
+    [180] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(626),
-    [187] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(662),
+    [183] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [190] = { .entry = { .count = 2, .reusable = false } },
+    [186] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [193] = { .entry = { .count = 2, .reusable = false } },
+    [189] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(639),
-    [196] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(650),
+    [192] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [199] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [195] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [202] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [198] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [205] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [201] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [208] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [204] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1328),
-    [211] = { .entry = { .count = 2, .reusable = false } },
+    [207] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(629),
-    [214] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(643),
+    [210] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(645),
-    [217] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(627),
+    [213] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(778),
-    [220] = { .entry = { .count = 2, .reusable = false } },
+    [216] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1520),
-    [223] = { .entry = { .count = 2, .reusable = false } },
+    [219] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1511),
-    [226] = { .entry = { .count = 2, .reusable = false } },
+    [222] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1612),
-    [229] = { .entry = { .count = 1, .reusable = true } },
+    [225] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    [231] = { .entry = { .count = 2, .reusable = false } },
+    [227] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1216),
-    [234] = { .entry = { .count = 2, .reusable = false } },
+    [230] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1215),
-    [237] = { .entry = { .count = 2, .reusable = false } },
+    [233] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1213),
-    [240] = { .entry = { .count = 2, .reusable = false } },
+    [236] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(86),
-    [243] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(80),
+    [239] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1607),
-    [246] = { .entry = { .count = 2, .reusable = false } },
+    [242] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1606),
-    [249] = { .entry = { .count = 2, .reusable = true } },
+    [245] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(37),
-    [252] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(35),
+    [248] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(42),
-    [255] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(39),
+    [251] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1602),
-    [258] = { .entry = { .count = 2, .reusable = false } },
+    [254] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1600),
-    [261] = { .entry = { .count = 2, .reusable = false } },
+    [257] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1599),
-    [264] = { .entry = { .count = 2, .reusable = false } },
+    [260] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1598),
-    [267] = { .entry = { .count = 2, .reusable = false } },
+    [263] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(175),
-    [270] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(164),
+    [266] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1212),
-    [273] = { .entry = { .count = 2, .reusable = false } },
+    [269] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(84),
-    [276] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(83),
+    [272] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1179),
-    [279] = { .entry = { .count = 2, .reusable = false } },
+    [275] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(44),
-    [282] = { .entry = { .count = 2, .reusable = false } },
+    [278] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(836),
-    [285] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(840),
+    [281] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(603),
-    [288] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(611),
+    [284] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(782),
-    [291] = { .entry = { .count = 2, .reusable = false } },
+    [287] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1209),
-    [294] = { .entry = { .count = 2, .reusable = false } },
+    [290] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1048),
-    [297] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(1062),
+    [293] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_value_def_repeat1, 2, 0, 0),
     SHIFT_REPEAT(445),
-    [300] = { .entry = { .count = 1, .reusable = true } },
+    [296] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1280),
+    [298] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1175),
-    [302] = { .entry = { .count = 1, .reusable = false } },
+    [300] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1174),
-    [304] = { .entry = { .count = 1, .reusable = false } },
+    [302] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1173),
+    [304] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1180),
     [306] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1280),
+    SHIFT(1170),
     [308] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(630),
+    SHIFT_REPEAT(645),
     [311] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(648),
+    SHIFT_REPEAT(640),
     [314] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
+    SHIFT_REPEAT(641),
     [317] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
+    SHIFT_REPEAT(641),
     [320] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(628),
+    SHIFT_REPEAT(664),
     [323] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(775),
@@ -83380,7 +83427,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1513),
     [329] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(626),
+    SHIFT_REPEAT(662),
     [332] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
@@ -83389,28 +83436,28 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(654),
     [338] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(639),
+    SHIFT_REPEAT(650),
     [341] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
+    SHIFT_REPEAT(629),
     [344] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
+    SHIFT_REPEAT(629),
     [347] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
+    SHIFT_REPEAT(765),
     [350] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
+    SHIFT_REPEAT(765),
     [353] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1328),
     [356] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(629),
+    SHIFT_REPEAT(643),
     [359] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(645),
+    SHIFT_REPEAT(627),
     [362] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(778),
@@ -83436,7 +83483,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1213),
     [385] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(86),
+    SHIFT_REPEAT(80),
     [388] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1607),
@@ -83445,10 +83492,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1606),
     [394] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(37),
+    SHIFT_REPEAT(35),
     [397] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(42),
+    SHIFT_REPEAT(39),
     [400] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1602),
@@ -83463,7 +83510,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1598),
     [412] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(175),
+    SHIFT_REPEAT(164),
     [415] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1212),
@@ -83475,10 +83522,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(44),
     [424] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(836),
+    SHIFT_REPEAT(840),
     [427] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(603),
+    SHIFT_REPEAT(611),
     [430] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(782),
@@ -83490,7 +83537,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1173),
     [439] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1048),
+    SHIFT_REPEAT(1062),
     [442] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_home_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(445),
@@ -83499,274 +83546,274 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [447] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1220),
     [449] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1375),
+    [451] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1597),
-    [451] = { .entry = { .count = 2, .reusable = false } },
+    [453] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(630),
-    [454] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(645),
+    [456] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(648),
-    [457] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(640),
+    [459] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [460] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [462] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [463] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [465] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(628),
-    [466] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(664),
+    [468] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(775),
-    [469] = { .entry = { .count = 2, .reusable = false } },
+    [471] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1513),
-    [472] = { .entry = { .count = 2, .reusable = false } },
+    [474] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(626),
-    [475] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(662),
+    [477] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [478] = { .entry = { .count = 2, .reusable = false } },
+    [480] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [481] = { .entry = { .count = 2, .reusable = false } },
+    [483] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(639),
-    [484] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(650),
+    [486] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [487] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [489] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [490] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [492] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [493] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [495] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [496] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [498] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1328),
-    [499] = { .entry = { .count = 2, .reusable = false } },
+    [501] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(629),
-    [502] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(643),
+    [504] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(645),
-    [505] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(627),
+    [507] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(778),
-    [508] = { .entry = { .count = 2, .reusable = false } },
+    [510] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1520),
-    [511] = { .entry = { .count = 2, .reusable = false } },
+    [513] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1511),
-    [514] = { .entry = { .count = 2, .reusable = false } },
+    [516] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1612),
-    [517] = { .entry = { .count = 1, .reusable = true } },
+    [519] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    [519] = { .entry = { .count = 2, .reusable = false } },
+    [521] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1216),
-    [522] = { .entry = { .count = 2, .reusable = false } },
+    [524] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1215),
-    [525] = { .entry = { .count = 2, .reusable = false } },
+    [527] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1213),
-    [528] = { .entry = { .count = 2, .reusable = false } },
+    [530] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(86),
-    [531] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(80),
+    [533] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1607),
-    [534] = { .entry = { .count = 2, .reusable = false } },
+    [536] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1606),
-    [537] = { .entry = { .count = 2, .reusable = true } },
+    [539] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(37),
-    [540] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(35),
+    [542] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(42),
-    [543] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(39),
+    [545] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1602),
-    [546] = { .entry = { .count = 2, .reusable = false } },
+    [548] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1600),
-    [549] = { .entry = { .count = 2, .reusable = false } },
+    [551] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1599),
-    [552] = { .entry = { .count = 2, .reusable = false } },
+    [554] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1598),
-    [555] = { .entry = { .count = 2, .reusable = false } },
+    [557] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(175),
-    [558] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(164),
+    [560] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1212),
-    [561] = { .entry = { .count = 2, .reusable = false } },
+    [563] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(44),
-    [564] = { .entry = { .count = 2, .reusable = false } },
+    [566] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(836),
-    [567] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(840),
+    [569] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(603),
-    [570] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(611),
+    [572] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(782),
-    [573] = { .entry = { .count = 2, .reusable = false } },
+    [575] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1209),
-    [576] = { .entry = { .count = 2, .reusable = false } },
+    [578] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1048),
-    [579] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(1062),
+    [581] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(445),
-    [582] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1503),
     [584] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1504),
-    [586] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1596),
+    [586] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1504),
     [588] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1380),
-    [590] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_interface_body, 1, 0, 0),
+    [590] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1380),
     [592] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1375),
+    SHIFT(1506),
     [594] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1378),
     [596] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(464),
+    SHIFT(466),
     [598] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(279),
     [600] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(461),
-    [602] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(467),
+    [602] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(459),
     [604] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(477),
+    SHIFT(462),
     [606] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(446),
     [608] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(446),
     [610] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(705),
+    SHIFT(708),
     [612] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1138),
     [614] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(825),
+    SHIFT(831),
     [616] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(458),
+    SHIFT(468),
     [618] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1521),
-    [620] = { .entry = { .count = 2, .reusable = false } },
+    [620] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1495),
+    [622] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(816),
+    [624] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1425),
+    [626] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1615),
-    [623] = { .entry = { .count = 2, .reusable = false } },
+    [629] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1142),
-    [626] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(1146),
+    [632] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(665),
-    [629] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(668),
+    [635] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1612),
-    [632] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    [634] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1611),
-    [637] = { .entry = { .count = 2, .reusable = true } },
+    [638] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(824),
     [640] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1608),
+    SHIFT_REPEAT(1611),
     [643] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1607),
+    SHIFT_REPEAT(826),
     [646] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1606),
+    SHIFT_REPEAT(1608),
     [649] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(655),
-    [652] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(1607),
+    [652] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(35),
+    SHIFT_REPEAT(1606),
     [655] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(39),
-    [658] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(665),
+    [658] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(826),
+    SHIFT_REPEAT(34),
     [661] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1602),
+    SHIFT_REPEAT(41),
     [664] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1601),
+    SHIFT_REPEAT(828),
     [667] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1600),
+    SHIFT_REPEAT(1602),
     [670] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1599),
+    SHIFT_REPEAT(1601),
     [673] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1598),
+    SHIFT_REPEAT(1600),
     [676] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(175),
+    SHIFT_REPEAT(1599),
     [679] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(816),
+    SHIFT_REPEAT(1598),
     [682] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1133),
+    SHIFT_REPEAT(164),
     [685] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(44),
+    SHIFT_REPEAT(816),
     [688] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(836),
+    SHIFT_REPEAT(1134),
     [691] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(944),
+    SHIFT_REPEAT(44),
     [694] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(603),
+    SHIFT_REPEAT(840),
     [697] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1593),
+    SHIFT_REPEAT(956),
     [700] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1592),
+    SHIFT_REPEAT(611),
     [703] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1591),
+    SHIFT_REPEAT(1593),
     [706] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1590),
+    SHIFT_REPEAT(1592),
     [709] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1048),
-    [712] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1425),
-    [714] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(816),
-    [716] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1495),
+    SHIFT_REPEAT(1591),
+    [712] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1590),
+    [715] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_template_module_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1062),
     [718] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
     [720] = { .entry = { .count = 2, .reusable = false } },
@@ -83774,10 +83821,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1615),
     [723] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1142),
+    SHIFT_REPEAT(1146),
     [726] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(665),
+    SHIFT_REPEAT(668),
     [729] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1612),
@@ -83786,7 +83833,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1611),
     [735] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(824),
+    SHIFT_REPEAT(826),
     [738] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1608),
@@ -83798,16 +83845,16 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1606),
     [747] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(655),
+    SHIFT_REPEAT(665),
     [750] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(35),
+    SHIFT_REPEAT(34),
     [753] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(39),
+    SHIFT_REPEAT(41),
     [756] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(826),
+    SHIFT_REPEAT(828),
     [759] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1602),
@@ -83825,22 +83872,22 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1598),
     [774] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(175),
+    SHIFT_REPEAT(164),
     [777] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1133),
+    SHIFT_REPEAT(1134),
     [780] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
     SHIFT_REPEAT(44),
     [783] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(836),
+    SHIFT_REPEAT(840),
     [786] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(944),
+    SHIFT_REPEAT(956),
     [789] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(603),
+    SHIFT_REPEAT(611),
     [792] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1593),
@@ -83855,506 +83902,506 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1590),
     [804] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1048),
+    SHIFT_REPEAT(1062),
     [807] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1510),
-    [809] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1496),
+    [809] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1510),
     [811] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1251),
-    [813] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_specification, 1, 0, 0),
+    [813] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1251),
     [815] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1273),
+    SHIFT(1473),
     [817] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1617),
+    SHIFT(1677),
     [819] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(728),
+    SHIFT(672),
     [821] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(725),
+    SHIFT(673),
     [823] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1618),
+    SHIFT(1678),
     [825] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1619),
+    SHIFT(1679),
     [827] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1620),
+    SHIFT(1680),
     [829] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(963),
+    SHIFT(804),
     [831] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(964),
+    SHIFT(806),
     [833] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(965),
+    SHIFT(814),
     [835] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(724),
+    SHIFT(674),
     [837] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(722),
+    SHIFT(675),
     [839] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(968),
+    SHIFT(820),
     [841] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1621),
+    SHIFT(1681),
     [843] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1701),
+    SHIFT(1487),
     [845] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1622),
+    SHIFT(1682),
     [847] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1623),
+    SHIFT(1683),
     [849] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1624),
+    SHIFT(1684),
     [851] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1625),
+    SHIFT(1685),
     [853] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(721),
+    SHIFT(677),
     [855] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(720),
+    SHIFT(678),
     [857] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1626),
+    SHIFT(1686),
     [859] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(719),
+    SHIFT(679),
     [861] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(717),
+    SHIFT(680),
     [863] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(716),
+    SHIFT(681),
     [865] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(714),
+    SHIFT(689),
     [867] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(713),
+    SHIFT(690),
     [869] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(712),
+    SHIFT(691),
     [871] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(711),
+    SHIFT(692),
     [873] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(978),
+    SHIFT(986),
     [875] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(710),
+    SHIFT(694),
     [877] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1627),
+    SHIFT(1687),
     [879] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(980),
+    SHIFT(988),
     [881] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(709),
+    SHIFT(695),
     [883] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(982),
+    SHIFT(844),
     [885] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1628),
+    SHIFT(1688),
     [887] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1629),
+    SHIFT(1689),
     [889] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(656),
+    SHIFT(635),
     [891] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1473),
+    SHIFT(1548),
     [893] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1677),
+    SHIFT(1547),
     [895] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(670),
+    SHIFT(469),
     [897] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(671),
+    SHIFT(470),
     [899] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1678),
+    SHIFT(1546),
     [901] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1679),
+    SHIFT(1545),
     [903] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1680),
+    SHIFT(1544),
     [905] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(802),
+    SHIFT(527),
     [907] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(803),
+    SHIFT(530),
     [909] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(806),
+    SHIFT(533),
     [911] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(672),
+    SHIFT(475),
     [913] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(673),
+    SHIFT(476),
     [915] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(817),
+    SHIFT(539),
     [917] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1681),
+    SHIFT(1542),
     [919] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1487),
+    SHIFT(1541),
     [921] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1682),
+    SHIFT(1540),
     [923] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1683),
+    SHIFT(1538),
     [925] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1684),
+    SHIFT(1537),
     [927] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1685),
+    SHIFT(1536),
     [929] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(674),
+    SHIFT(478),
     [931] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(676),
+    SHIFT(479),
     [933] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1686),
+    SHIFT(1535),
     [935] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(677),
+    SHIFT(480),
     [937] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(678),
+    SHIFT(481),
     [939] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(679),
+    SHIFT(457),
     [941] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(681),
+    SHIFT(483),
     [943] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(688),
+    SHIFT(484),
     [945] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(689),
+    SHIFT(485),
     [947] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(690),
+    SHIFT(486),
     [949] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(973),
+    SHIFT(515),
     [951] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(692),
+    SHIFT(496),
     [953] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1687),
+    SHIFT(1532),
     [955] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(974),
+    SHIFT(523),
     [957] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(693),
+    SHIFT(495),
     [959] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(839),
+    SHIFT(525),
     [961] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1688),
+    SHIFT(1531),
     [963] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1689),
+    SHIFT(1530),
     [965] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(634),
+    SHIFT(456),
     [967] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1548),
+    SHIFT(1426),
     [969] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1547),
+    SHIFT(1637),
     [971] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(457),
+    SHIFT(106),
     [973] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(460),
+    SHIFT(108),
     [975] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1546),
+    SHIFT(1638),
     [977] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1545),
+    SHIFT(1639),
     [979] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1544),
+    SHIFT(1640),
     [981] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(542),
+    SHIFT(158),
     [983] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(540),
+    SHIFT(125),
     [985] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(539),
+    SHIFT(177),
     [987] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(474),
+    SHIFT(105),
     [989] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(475),
+    SHIFT(101),
     [991] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(520),
+    SHIFT(175),
     [993] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1542),
+    SHIFT(1641),
     [995] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1541),
+    SHIFT(1702),
     [997] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1540),
+    SHIFT(1642),
     [999] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1538),
+    SHIFT(1643),
     [1001] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1537),
+    SHIFT(1644),
     [1003] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1536),
+    SHIFT(1645),
     [1005] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(455),
+    SHIFT(103),
     [1007] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(486),
+    SHIFT(102),
     [1009] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1535),
+    SHIFT(1646),
     [1011] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(488),
+    SHIFT(100),
     [1013] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(491),
+    SHIFT(114),
     [1015] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(493),
+    SHIFT(116),
     [1017] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(489),
+    SHIFT(104),
     [1019] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(492),
+    SHIFT(112),
     [1021] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(479),
+    SHIFT(111),
     [1023] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(478),
+    SHIFT(117),
     [1025] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(528),
+    SHIFT(131),
     [1027] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(476),
+    SHIFT(118),
     [1029] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1532),
+    SHIFT(1647),
     [1031] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(505),
+    SHIFT(183),
     [1033] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(462),
+    SHIFT(115),
     [1035] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(549),
+    SHIFT(122),
     [1037] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1531),
+    SHIFT(1648),
     [1039] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1530),
+    SHIFT(1649),
     [1041] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(448),
+    SHIFT(107),
     [1043] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1472),
+    SHIFT(1273),
     [1045] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1657),
+    SHIFT(1617),
     [1047] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(334),
+    SHIFT(731),
     [1049] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(336),
+    SHIFT(729),
     [1051] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1658),
+    SHIFT(1618),
     [1053] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1659),
+    SHIFT(1619),
     [1055] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1660),
+    SHIFT(1620),
     [1057] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(396),
+    SHIFT(963),
     [1059] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(395),
+    SHIFT(964),
     [1061] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(394),
+    SHIFT(965),
     [1063] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(337),
+    SHIFT(728),
     [1065] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(338),
+    SHIFT(725),
     [1067] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(391),
+    SHIFT(968),
     [1069] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1661),
+    SHIFT(1621),
     [1071] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1564),
+    SHIFT(1701),
     [1073] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1662),
+    SHIFT(1622),
     [1075] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1663),
+    SHIFT(1623),
     [1077] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1664),
+    SHIFT(1624),
     [1079] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1665),
+    SHIFT(1625),
     [1081] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(331),
+    SHIFT(724),
     [1083] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(341),
+    SHIFT(722),
     [1085] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1666),
+    SHIFT(1626),
     [1087] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(342),
+    SHIFT(721),
     [1089] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(357),
+    SHIFT(720),
     [1091] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(355),
+    SHIFT(719),
     [1093] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(354),
+    SHIFT(717),
     [1095] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(350),
+    SHIFT(716),
     [1097] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(349),
+    SHIFT(714),
     [1099] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(348),
+    SHIFT(713),
     [1101] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(367),
+    SHIFT(978),
     [1103] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(343),
+    SHIFT(712),
     [1105] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1667),
+    SHIFT(1627),
     [1107] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(366),
+    SHIFT(980),
     [1109] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(351),
+    SHIFT(711),
     [1111] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(373),
+    SHIFT(982),
     [1113] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1668),
+    SHIFT(1628),
     [1115] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1669),
+    SHIFT(1629),
     [1117] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(333),
+    SHIFT(644),
     [1119] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1426),
+    SHIFT(1472),
     [1121] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1637),
+    SHIFT(1657),
     [1123] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(113),
+    SHIFT(334),
     [1125] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(118),
+    SHIFT(336),
     [1127] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1638),
+    SHIFT(1658),
     [1129] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1639),
+    SHIFT(1659),
     [1131] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1640),
+    SHIFT(1660),
     [1133] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(143),
+    SHIFT(396),
     [1135] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(177),
+    SHIFT(395),
     [1137] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(179),
+    SHIFT(394),
     [1139] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(100),
+    SHIFT(337),
     [1141] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(116),
+    SHIFT(338),
     [1143] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(178),
+    SHIFT(391),
     [1145] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1641),
+    SHIFT(1661),
     [1147] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1702),
+    SHIFT(1564),
     [1149] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1642),
+    SHIFT(1662),
     [1151] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1643),
+    SHIFT(1663),
     [1153] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1644),
+    SHIFT(1664),
     [1155] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1645),
+    SHIFT(1665),
     [1157] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(102),
+    SHIFT(331),
     [1159] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(101),
+    SHIFT(341),
     [1161] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1646),
+    SHIFT(1666),
     [1163] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(115),
+    SHIFT(342),
     [1165] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(111),
+    SHIFT(357),
     [1167] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(109),
+    SHIFT(355),
     [1169] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(103),
+    SHIFT(354),
     [1171] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(105),
+    SHIFT(350),
     [1173] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(117),
+    SHIFT(349),
     [1175] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(114),
+    SHIFT(348),
     [1177] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(128),
+    SHIFT(384),
     [1179] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(112),
+    SHIFT(343),
     [1181] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1647),
+    SHIFT(1667),
     [1183] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(129),
+    SHIFT(374),
     [1185] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(110),
+    SHIFT(351),
     [1187] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(122),
+    SHIFT(373),
     [1189] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1648),
+    SHIFT(1668),
     [1191] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1649),
+    SHIFT(1669),
     [1193] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(104),
+    SHIFT(344),
     [1195] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1423),
     [1197] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(36),
+    SHIFT(42),
     [1199] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(32),
+    SHIFT(40),
     [1201] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(305),
     [1203] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1140),
+    SHIFT(1371),
     [1205] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1191),
+    SHIFT(1143),
     [1207] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1371),
-    [1209] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1064),
-    [1211] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1151),
-    [1213] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT(1191),
+    [1209] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(630),
-    [1216] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(645),
+    [1212] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(648),
-    [1219] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(640),
+    [1215] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [1222] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [1218] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [1225] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [1221] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(628),
-    [1228] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(664),
+    [1224] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(775),
-    [1231] = { .entry = { .count = 2, .reusable = false } },
+    [1227] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1513),
-    [1234] = { .entry = { .count = 2, .reusable = false } },
+    [1230] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(626),
-    [1237] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(662),
+    [1233] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [1240] = { .entry = { .count = 2, .reusable = false } },
+    [1236] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [1243] = { .entry = { .count = 2, .reusable = false } },
+    [1239] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(639),
-    [1246] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(650),
+    [1242] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [1249] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [1245] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [1252] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [1248] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [1255] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [1251] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [1258] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [1254] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1328),
-    [1261] = { .entry = { .count = 2, .reusable = false } },
+    [1257] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(629),
-    [1264] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(643),
+    [1260] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(645),
-    [1267] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(627),
+    [1263] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(778),
-    [1270] = { .entry = { .count = 2, .reusable = false } },
+    [1266] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1520),
-    [1273] = { .entry = { .count = 2, .reusable = false } },
+    [1269] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1511),
-    [1276] = { .entry = { .count = 1, .reusable = true } },
+    [1272] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    [1278] = { .entry = { .count = 2, .reusable = true } },
+    [1274] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(36),
-    [1281] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(42),
+    [1277] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(32),
-    [1284] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(40),
+    [1280] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(782),
-    [1287] = { .entry = { .count = 2, .reusable = false } },
+    [1283] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_except_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(445),
-    [1290] = { .entry = { .count = 1, .reusable = true } },
+    [1286] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1078),
+    [1288] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1065),
+    [1290] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1157),
     [1292] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_header, 2, 0, 0),
+    SHIFT(763),
     [1294] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(650),
+    SHIFT(428),
     [1296] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_forward_dcl, 2, 0, 0),
+    REDUCE(sym_value_header, 2, 0, 0),
     [1298] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(745),
+    SHIFT(651),
     [1300] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(667),
+    REDUCE(sym_value_forward_dcl, 2, 0, 0),
     [1302] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(428),
+    SHIFT(748),
     [1304] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(763),
+    SHIFT(669),
     [1306] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1523),
     [1308] = { .entry = { .count = 1, .reusable = false } },
@@ -84364,110 +84411,110 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [1312] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1431),
     [1314] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(99),
+    SHIFT(98),
     [1316] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1197),
-    [1318] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1595),
-    [1320] = { .entry = { .count = 2, .reusable = false } },
+    [1318] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(630),
-    [1323] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(645),
+    [1321] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(648),
-    [1326] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(640),
+    [1324] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [1329] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [1327] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(652),
-    [1332] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(641),
+    [1330] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(628),
-    [1335] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(664),
+    [1333] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1523),
-    [1338] = { .entry = { .count = 2, .reusable = false } },
+    [1336] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1522),
-    [1341] = { .entry = { .count = 2, .reusable = false } },
+    [1339] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(626),
-    [1344] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(662),
+    [1342] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [1347] = { .entry = { .count = 2, .reusable = false } },
+    [1345] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(654),
-    [1350] = { .entry = { .count = 2, .reusable = false } },
+    [1348] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(639),
-    [1353] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(650),
+    [1351] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [1356] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [1354] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(635),
-    [1359] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(629),
+    [1357] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [1362] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [1360] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(762),
-    [1365] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(765),
+    [1363] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1328),
-    [1368] = { .entry = { .count = 2, .reusable = false } },
+    [1366] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(629),
-    [1371] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(643),
+    [1369] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(645),
-    [1374] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(627),
+    [1372] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1196),
-    [1377] = { .entry = { .count = 2, .reusable = false } },
+    [1375] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1520),
-    [1380] = { .entry = { .count = 1, .reusable = true } },
+    [1378] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    [1382] = { .entry = { .count = 2, .reusable = false } },
+    [1380] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(99),
-    [1385] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(98),
+    [1383] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1598),
-    [1388] = { .entry = { .count = 2, .reusable = false } },
+    [1386] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(175),
-    [1391] = { .entry = { .count = 2, .reusable = false } },
+    SHIFT_REPEAT(164),
+    [1389] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(44),
-    [1394] = { .entry = { .count = 2, .reusable = false } },
+    [1392] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(445),
+    [1395] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1197),
     [1397] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1093),
-    [1399] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1248),
-    [1401] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(154),
-    [1403] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_init_dcl, 5, 0, 0),
-    [1405] = { .entry = { .count = 1, .reusable = true } },
+    [1399] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_init_dcl, 5, 0, 0),
-    [1407] = { .entry = { .count = 1, .reusable = false } },
+    [1401] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_export, 2, 0, 0),
-    [1409] = { .entry = { .count = 1, .reusable = true } },
+    [1403] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_export, 2, 0, 0),
-    [1411] = { .entry = { .count = 1, .reusable = false } },
+    [1405] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_init_dcl, 6, 0, 0),
-    [1413] = { .entry = { .count = 1, .reusable = true } },
+    [1407] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_init_dcl, 6, 0, 0),
-    [1415] = { .entry = { .count = 1, .reusable = false } },
+    [1409] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_init_dcl, 7, 0, 0),
-    [1417] = { .entry = { .count = 1, .reusable = true } },
+    [1411] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_init_dcl, 7, 0, 0),
+    [1413] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1093),
+    [1415] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1248),
+    [1417] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(138),
     [1419] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_state_member, 4, 0, 0),
     [1421] = { .entry = { .count = 1, .reusable = true } },
@@ -84492,14 +84539,14 @@ static const TSParseActionEntry ts_parse_actions[] = {
     REDUCE(aux_sym_home_body_repeat1, 1, 0, 0),
     [1441] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_home_body_repeat1, 1, 0, 0),
-    [1443] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(583),
-    [1445] = { .entry = { .count = 1, .reusable = true } },
+    [1443] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1225),
-    [1447] = { .entry = { .count = 1, .reusable = false } },
+    [1445] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1225),
-    [1449] = { .entry = { .count = 1, .reusable = false } },
+    [1447] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1226),
+    [1449] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(587),
     [1451] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(aux_sym_interface_body_repeat1, 1, 0, 0),
     [1453] = { .entry = { .count = 1, .reusable = true } },
@@ -84510,374 +84557,374 @@ static const TSParseActionEntry ts_parse_actions[] = {
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
     [1459] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(37),
+    SHIFT_REPEAT(35),
     [1462] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(42),
+    SHIFT_REPEAT(39),
     [1465] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_key, 1, 0, 2),
+    REDUCE(sym_annotation_appl_service, 1, 0, 2),
     [1467] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_key, 1, 0, 2),
+    REDUCE(sym_annotation_appl_service, 1, 0, 2),
     [1469] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(242),
+    SHIFT(758),
     [1471] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_nested, 1, 0, 2),
+    REDUCE(sym_annotation_appl_must_understand, 1, 0, 2),
     [1473] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_nested, 1, 0, 2),
+    REDUCE(sym_annotation_appl_must_understand, 1, 0, 2),
     [1475] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(250),
+    SHIFT(242),
     [1477] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_external, 1, 0, 2),
+    REDUCE(sym_annotation_appl_nested, 1, 0, 2),
     [1479] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_external, 1, 0, 2),
+    REDUCE(sym_annotation_appl_nested, 1, 0, 2),
     [1481] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(248),
+    SHIFT(250),
     [1483] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_hashid, 1, 0, 2),
+    REDUCE(sym_annotation_appl_external, 1, 0, 2),
     [1485] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_hashid, 1, 0, 2),
+    REDUCE(sym_annotation_appl_external, 1, 0, 2),
     [1487] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(265),
+    SHIFT(193),
     [1489] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_scoped_name, 1, 0, 0),
+    REDUCE(sym_annotation_appl_hashid, 1, 0, 2),
     [1491] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_scoped_name, 1, 0, 0),
-    [1493] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_default_nested, 1, 0, 2),
-    [1495] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_default_nested, 1, 0, 2),
+    REDUCE(sym_annotation_appl_hashid, 1, 0, 2),
+    [1493] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(263),
+    [1495] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_key, 1, 0, 2),
     [1497] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(269),
-    [1499] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_scoped_name, 2, 0, 0),
-    [1501] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_scoped_name, 2, 0, 0),
-    [1503] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_scoped_name, 3, 0, 0),
+    REDUCE(sym_annotation_appl_key, 1, 0, 2),
+    [1499] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(240),
+    [1501] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_autoid, 1, 0, 2),
+    [1503] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_autoid, 1, 0, 2),
     [1505] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_scoped_name, 3, 0, 0),
+    SHIFT(734),
     [1507] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_custom_body, 1, 0, 0),
+    REDUCE(sym_scoped_name, 1, 0, 0),
     [1509] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_custom_body, 1, 0, 0),
-    [1511] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(131),
-    [1513] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_ami, 1, 0, 2),
+    REDUCE(sym_scoped_name, 1, 0, 0),
+    [1511] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_optional, 1, 0, 2),
+    [1513] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_optional, 1, 0, 2),
     [1515] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_ami, 1, 0, 2),
-    [1517] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(264),
-    [1519] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_topic, 1, 0, 2),
-    [1521] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_topic, 1, 0, 2),
+    SHIFT(190),
+    [1517] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_scoped_name, 2, 0, 0),
+    [1519] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_scoped_name, 2, 0, 0),
+    [1521] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_scoped_name, 3, 0, 0),
     [1523] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(132),
+    REDUCE(sym_scoped_name, 3, 0, 0),
     [1525] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_oneway, 1, 0, 2),
+    REDUCE(sym_annotation_appl_ignore_literal_names, 1, 0, 2),
     [1527] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_oneway, 1, 0, 2),
+    REDUCE(sym_annotation_appl_ignore_literal_names, 1, 0, 2),
     [1529] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(257),
+    SHIFT(275),
     [1531] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_non_serialized, 1, 0, 2),
+    REDUCE(sym_annotation_appl_default_nested, 1, 0, 2),
     [1533] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_non_serialized, 1, 0, 2),
+    REDUCE(sym_annotation_appl_default_nested, 1, 0, 2),
     [1535] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(877),
+    SHIFT(268),
     [1537] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_autoid, 1, 0, 2),
+    REDUCE(sym_annotation_appl_custom_body, 1, 0, 0),
     [1539] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_autoid, 1, 0, 2),
+    REDUCE(sym_annotation_appl_custom_body, 1, 0, 0),
     [1541] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(731),
+    SHIFT(134),
     [1543] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_try_construct, 1, 0, 2),
+    REDUCE(sym_annotation_appl_oneway, 1, 0, 2),
     [1545] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_try_construct, 1, 0, 2),
+    REDUCE(sym_annotation_appl_oneway, 1, 0, 2),
     [1547] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(748),
+    SHIFT(255),
     [1549] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_service, 1, 0, 2),
+    REDUCE(sym_annotation_appl_topic, 1, 0, 2),
     [1551] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_service, 1, 0, 2),
+    REDUCE(sym_annotation_appl_topic, 1, 0, 2),
     [1553] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(758),
+    SHIFT(156),
     [1555] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_must_understand, 1, 0, 2),
+    REDUCE(sym_annotation_appl_ami, 1, 0, 2),
     [1557] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_must_understand, 1, 0, 2),
+    REDUCE(sym_annotation_appl_ami, 1, 0, 2),
     [1559] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(243),
+    SHIFT(262),
     [1561] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_ignore_literal_names, 1, 0, 2),
+    REDUCE(sym_annotation_appl_try_construct, 1, 0, 2),
     [1563] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_ignore_literal_names, 1, 0, 2),
+    REDUCE(sym_annotation_appl_try_construct, 1, 0, 2),
     [1565] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(276),
+    SHIFT(751),
     [1567] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_optional, 1, 0, 2),
+    REDUCE(sym_annotation_appl_non_serialized, 1, 0, 2),
     [1569] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_optional, 1, 0, 2),
+    REDUCE(sym_annotation_appl_non_serialized, 1, 0, 2),
     [1571] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(191),
+    SHIFT(878),
     [1573] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_hashid, 4, 0, 2),
+    REDUCE(sym_annotation_appl_default_nested, 4, 0, 2),
     [1575] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_hashid, 4, 0, 2),
-    [1577] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1240),
-    [1579] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1240),
-    [1581] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(994),
-    [1583] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(553),
+    REDUCE(sym_annotation_appl_default_nested, 4, 0, 2),
+    [1577] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_topic, 4, 0, 8),
+    [1579] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_topic, 4, 0, 8),
+    [1581] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_key, 4, 0, 2),
+    [1583] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_key, 4, 0, 2),
     [1585] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_annotation_appl_builtin_body, 1, 0, 0),
     [1587] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_annotation_appl_builtin_body, 1, 0, 0),
     [1589] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl, 2, 0, 0),
+    REDUCE(sym_annotation_appl_must_understand, 4, 0, 2),
     [1591] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl, 2, 0, 0),
+    REDUCE(sym_annotation_appl_must_understand, 4, 0, 2),
     [1593] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_extend_annotation_appl, 3, 0, 0),
+    REDUCE(sym_annotation_appl_default, 4, 0, 2),
     [1595] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_extend_annotation_appl, 3, 0, 0),
+    REDUCE(sym_annotation_appl_default, 4, 0, 2),
     [1597] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_optional, 3, 0, 2),
+    REDUCE(sym_annotation_appl_appendable, 1, 0, 2),
     [1599] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_optional, 3, 0, 2),
-    [1601] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_autoid, 3, 0, 2),
-    [1603] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_autoid, 3, 0, 2),
+    REDUCE(sym_annotation_appl_appendable, 1, 0, 2),
+    [1601] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(994),
+    [1603] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(555),
     [1605] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_custom_body, 3, 0, 0),
+    REDUCE(sym_annotation_appl_min, 4, 0, 5),
     [1607] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_custom_body, 3, 0, 0),
+    REDUCE(sym_annotation_appl_min, 4, 0, 5),
     [1609] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_try_construct_fail_action, 1, 0, 0),
+    REDUCE(sym_annotation_appl_max, 4, 0, 5),
     [1611] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_try_construct_fail_action, 1, 0, 0),
+    REDUCE(sym_annotation_appl_max, 4, 0, 5),
     [1613] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_data_representation_mask, 1, 0, 0),
+    REDUCE(sym_annotation_appl_unit, 4, 0, 2),
     [1615] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_data_representation_mask, 1, 0, 0),
+    REDUCE(sym_annotation_appl_unit, 4, 0, 2),
     [1617] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_extend_annotation_appl, 4, 0, 0),
+    REDUCE(sym_annotation_appl_bit_bound, 4, 0, 2),
     [1619] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_extend_annotation_appl, 4, 0, 0),
-    [1621] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(127),
-    [1623] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_id, 4, 0, 2),
-    [1625] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_id, 4, 0, 2),
-    [1627] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_autoid, 4, 0, 2),
-    [1629] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_autoid, 4, 0, 2),
-    [1631] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_optional, 4, 0, 2),
+    REDUCE(sym_annotation_appl_bit_bound, 4, 0, 2),
+    [1621] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_try_construct_fail_action, 1, 0, 0),
+    [1623] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_try_construct_fail_action, 1, 0, 0),
+    [1625] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_external, 4, 0, 2),
+    [1627] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_external, 4, 0, 2),
+    [1629] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_nested, 4, 0, 2),
+    [1631] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_nested, 4, 0, 2),
     [1633] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_optional, 4, 0, 2),
+    SHIFT(179),
     [1635] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_position, 4, 0, 2),
+    REDUCE(sym_annotation_appl_verbatim, 4, 0, 6),
     [1637] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_position, 4, 0, 2),
+    REDUCE(sym_annotation_appl_verbatim, 4, 0, 6),
     [1639] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_value, 4, 0, 2),
+    REDUCE(sym_annotation_appl_service, 4, 0, 2),
     [1641] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_value, 4, 0, 2),
+    REDUCE(sym_annotation_appl_service, 4, 0, 2),
     [1643] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_extensibility, 4, 0, 2),
+    REDUCE(sym_annotation_appl_oneway, 4, 0, 2),
     [1645] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_extensibility, 4, 0, 2),
+    REDUCE(sym_annotation_appl_oneway, 4, 0, 2),
     [1647] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_key, 4, 0, 2),
+    REDUCE(sym_annotation_appl_ami, 4, 0, 2),
     [1649] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_key, 4, 0, 2),
+    REDUCE(sym_annotation_appl_ami, 4, 0, 2),
     [1651] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_must_understand, 4, 0, 2),
+    REDUCE(sym_annotation_appl_hashid, 4, 0, 2),
     [1653] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_must_understand, 4, 0, 2),
-    [1655] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_default, 4, 0, 2),
-    [1657] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_default, 4, 0, 2),
+    REDUCE(sym_annotation_appl_hashid, 4, 0, 2),
+    [1655] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1240),
+    [1657] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1240),
     [1659] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_min, 4, 0, 5),
+    REDUCE(sym_annotation_appl_autoid, 4, 0, 2),
     [1661] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_min, 4, 0, 5),
+    REDUCE(sym_annotation_appl_autoid, 4, 0, 2),
     [1663] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_final, 1, 0, 2),
+    REDUCE(sym_annotation_appl_extensibility, 4, 0, 2),
     [1665] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_final, 1, 0, 2),
+    REDUCE(sym_annotation_appl_extensibility, 4, 0, 2),
     [1667] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_max, 4, 0, 5),
+    REDUCE(sym_annotation_appl_ignore_literal_names, 4, 0, 2),
     [1669] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_max, 4, 0, 5),
+    REDUCE(sym_annotation_appl_ignore_literal_names, 4, 0, 2),
     [1671] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_unit, 4, 0, 2),
+    REDUCE(sym_annotation_appl_try_construct, 4, 0, 2),
     [1673] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_unit, 4, 0, 2),
-    [1675] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_bit_bound, 4, 0, 2),
-    [1677] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_bit_bound, 4, 0, 2),
-    [1679] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_external, 4, 0, 2),
-    [1681] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_external, 4, 0, 2),
-    [1683] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_try_construct, 4, 0, 2),
+    [1675] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(397),
+    [1677] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_extend_annotation_appl, 3, 0, 0),
+    [1679] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_extend_annotation_appl, 3, 0, 0),
+    [1681] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_autoid, 3, 0, 2),
+    [1683] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_autoid, 3, 0, 2),
     [1685] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_nested, 4, 0, 2),
+    REDUCE(sym_annotation_appl_non_serialized, 4, 0, 2),
     [1687] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_nested, 4, 0, 2),
+    REDUCE(sym_annotation_appl_non_serialized, 4, 0, 2),
     [1689] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_verbatim, 4, 0, 6),
+    REDUCE(sym_annotation_appl_value, 4, 0, 2),
     [1691] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_verbatim, 4, 0, 6),
+    REDUCE(sym_annotation_appl_value, 4, 0, 2),
     [1693] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_service, 4, 0, 2),
+    REDUCE(sym_annotation_appl_data_representation, 4, 0, 2),
     [1695] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_service, 4, 0, 2),
+    REDUCE(sym_annotation_appl_data_representation, 4, 0, 2),
     [1697] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_oneway, 4, 0, 2),
+    REDUCE(sym_annotation_appl_optional, 3, 0, 2),
     [1699] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_oneway, 4, 0, 2),
+    REDUCE(sym_annotation_appl_optional, 3, 0, 2),
     [1701] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_ami, 4, 0, 2),
+    REDUCE(sym_annotation_appl_topic, 4, 0, 7),
     [1703] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_ami, 4, 0, 2),
+    REDUCE(sym_annotation_appl_topic, 4, 0, 7),
     [1705] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_default_nested, 4, 0, 2),
+    REDUCE(sym_annotation_appl, 2, 0, 0),
     [1707] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_default_nested, 4, 0, 2),
+    REDUCE(sym_annotation_appl, 2, 0, 0),
     [1709] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_verbatim, 8, 0, 16),
+    REDUCE(sym_annotation_appl_final, 1, 0, 2),
     [1711] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_verbatim, 8, 0, 16),
+    REDUCE(sym_annotation_appl_final, 1, 0, 2),
     [1713] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_ignore_literal_names, 4, 0, 2),
+    REDUCE(sym_annotation_appl_dds_request_topic, 4, 0, 2),
     [1715] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_ignore_literal_names, 4, 0, 2),
+    REDUCE(sym_annotation_appl_dds_request_topic, 4, 0, 2),
     [1717] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_try_construct, 4, 0, 2),
+    REDUCE(sym_annotation_appl_dds_reply_topic, 4, 0, 2),
     [1719] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_try_construct, 4, 0, 2),
+    REDUCE(sym_annotation_appl_dds_reply_topic, 4, 0, 2),
     [1721] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_non_serialized, 4, 0, 2),
+    REDUCE(sym_annotation_appl_custom_body, 4, 0, 0),
     [1723] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_non_serialized, 4, 0, 2),
+    REDUCE(sym_annotation_appl_custom_body, 4, 0, 0),
     [1725] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_data_representation, 4, 0, 2),
+    REDUCE(sym_annotation_appl_data_representation, 5, 0, 2),
     [1727] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_data_representation, 4, 0, 2),
+    REDUCE(sym_annotation_appl_data_representation, 5, 0, 2),
     [1729] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_topic, 4, 0, 7),
+    REDUCE(sym_annotation_appl_range, 6, 0, 12),
     [1731] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_topic, 4, 0, 7),
+    REDUCE(sym_annotation_appl_range, 6, 0, 12),
     [1733] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_topic, 4, 0, 8),
+    REDUCE(sym_annotation_appl_verbatim, 6, 0, 13),
     [1735] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_topic, 4, 0, 8),
+    REDUCE(sym_annotation_appl_verbatim, 6, 0, 13),
     [1737] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_dds_request_topic, 4, 0, 2),
+    REDUCE(sym_annotation_appl_verbatim, 6, 0, 14),
     [1739] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_dds_request_topic, 4, 0, 2),
+    REDUCE(sym_annotation_appl_verbatim, 6, 0, 14),
     [1741] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_dds_reply_topic, 4, 0, 2),
+    REDUCE(sym_annotation_appl_data_representation, 6, 0, 2),
     [1743] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_dds_reply_topic, 4, 0, 2),
+    REDUCE(sym_annotation_appl_data_representation, 6, 0, 2),
     [1745] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_custom_body, 4, 0, 0),
+    REDUCE(sym_annotation_appl_topic, 6, 0, 15),
     [1747] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_custom_body, 4, 0, 0),
+    REDUCE(sym_annotation_appl_topic, 6, 0, 15),
     [1749] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_data_representation, 5, 0, 2),
+    REDUCE(sym_annotation_appl_dds_request_topic, 6, 0, 2),
     [1751] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_data_representation, 5, 0, 2),
+    REDUCE(sym_annotation_appl_dds_request_topic, 6, 0, 2),
     [1753] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_range, 6, 0, 12),
+    REDUCE(sym_annotation_appl_dds_reply_topic, 6, 0, 2),
     [1755] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_range, 6, 0, 12),
+    REDUCE(sym_annotation_appl_dds_reply_topic, 6, 0, 2),
     [1757] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_verbatim, 6, 0, 13),
+    REDUCE(sym_annotation_appl_id, 4, 0, 2),
     [1759] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_verbatim, 6, 0, 13),
-    [1761] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_verbatim, 6, 0, 14),
-    [1763] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_verbatim, 6, 0, 14),
-    [1765] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_id, 4, 0, 2),
+    [1761] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(521),
+    [1763] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_annotation_appl_data_representation, 7, 0, 2),
-    [1767] = { .entry = { .count = 1, .reusable = true } },
+    [1765] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_annotation_appl_data_representation, 7, 0, 2),
+    [1767] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_appl_default_literal, 1, 0, 2),
     [1769] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(524),
+    REDUCE(sym_annotation_appl_default_literal, 1, 0, 2),
     [1771] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_data_representation, 6, 0, 2),
+    REDUCE(aux_sym_interface_dcl_repeat1, 1, 0, 0),
     [1773] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_data_representation, 6, 0, 2),
+    REDUCE(aux_sym_interface_dcl_repeat1, 1, 0, 0),
     [1775] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_appendable, 1, 0, 2),
+    REDUCE(sym_annotation_appl_mutable, 1, 0, 2),
     [1777] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_appendable, 1, 0, 2),
+    REDUCE(sym_annotation_appl_mutable, 1, 0, 2),
     [1779] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_default_literal, 1, 0, 2),
+    REDUCE(sym_annotation_appl_position, 4, 0, 2),
     [1781] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_default_literal, 1, 0, 2),
+    REDUCE(sym_annotation_appl_position, 4, 0, 2),
     [1783] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_mutable, 1, 0, 2),
+    REDUCE(sym_annotation_appl_custom_body, 3, 0, 0),
     [1785] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_mutable, 1, 0, 2),
+    REDUCE(sym_annotation_appl_custom_body, 3, 0, 0),
     [1787] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(847),
+    SHIFT(852),
     [1789] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(aux_sym_interface_dcl_repeat1, 1, 0, 0),
+    REDUCE(sym_annotation_appl, 1, 0, 0),
     [1791] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_interface_dcl_repeat1, 1, 0, 0),
+    REDUCE(sym_annotation_appl, 1, 0, 0),
     [1793] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_topic, 6, 0, 15),
+    REDUCE(sym_annotation_appl_optional, 4, 0, 2),
     [1795] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_topic, 6, 0, 15),
+    REDUCE(sym_annotation_appl_optional, 4, 0, 2),
     [1797] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl, 1, 0, 0),
+    REDUCE(sym_data_representation_mask, 1, 0, 0),
     [1799] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl, 1, 0, 0),
+    REDUCE(sym_data_representation_mask, 1, 0, 0),
     [1801] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_dds_request_topic, 6, 0, 2),
+    REDUCE(sym_annotation_appl_verbatim, 8, 0, 16),
     [1803] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_dds_request_topic, 6, 0, 2),
+    REDUCE(sym_annotation_appl_verbatim, 8, 0, 16),
     [1805] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_appl_dds_reply_topic, 6, 0, 2),
+    REDUCE(sym_extend_annotation_appl, 4, 0, 0),
     [1807] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_dds_reply_topic, 6, 0, 2),
+    REDUCE(sym_extend_annotation_appl, 4, 0, 0),
     [1809] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(846),
-    [1811] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(850),
+    [1811] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(524),
+    [1813] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(aux_sym_case_repeat1, 2, 0, 0),
-    [1813] = { .entry = { .count = 1, .reusable = true } },
+    [1815] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_case_repeat1, 2, 0, 0),
-    [1815] = { .entry = { .count = 2, .reusable = false } },
+    [1817] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_case_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1423),
-    [1818] = { .entry = { .count = 2, .reusable = false } },
+    [1820] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_case_repeat1, 2, 0, 0),
     SHIFT_REPEAT(305),
-    [1821] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(544),
     [1823] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(992),
-    [1825] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(392),
+    [1825] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(154),
     [1827] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(125),
+    SHIFT(992),
     [1829] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1655),
     [1831] = { .entry = { .count = 1, .reusable = false } },
@@ -84912,32 +84959,32 @@ static const TSParseActionEntry ts_parse_actions[] = {
     REDUCE(sym_case_label, 2, 0, 0),
     [1861] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(36),
+    SHIFT_REPEAT(42),
     [1864] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(32),
+    SHIFT_REPEAT(40),
     [1867] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_member, 3, 0, 9),
+    REDUCE(sym_member, 5, 0, 11),
     [1869] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_member, 3, 0, 9),
-    [1871] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_member, 5, 0, 11),
+    [1871] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_member, 4, 0, 9),
     [1873] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_member, 5, 0, 11),
-    [1875] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_member, 4, 0, 9),
+    [1875] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_member, 4, 0, 11),
     [1877] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_member, 4, 0, 9),
-    [1879] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_member, 4, 0, 11),
+    [1879] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_member, 3, 0, 9),
     [1881] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_member, 4, 0, 11),
+    REDUCE(sym_member, 3, 0, 9),
     [1883] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(223),
     [1885] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(737),
+    SHIFT(740),
     [1887] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(190),
+    SHIFT(189),
     [1889] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(233),
     [1891] = { .entry = { .count = 1, .reusable = true } },
@@ -84951,7 +84998,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [1899] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(718),
     [1901] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(975),
+    SHIFT(977),
     [1903] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_member, 5, 0, 9),
     [1905] = { .entry = { .count = 1, .reusable = true } },
@@ -84963,7 +85010,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [1911] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(306),
     [1913] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(120),
+    SHIFT(141),
     [1915] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_member, 6, 0, 11),
     [1917] = { .entry = { .count = 1, .reusable = true } },
@@ -84973,121 +85020,121 @@ static const TSParseActionEntry ts_parse_actions[] = {
     [1921] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(304),
     [1923] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(148),
+    SHIFT(147),
     [1925] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(303),
     [1927] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_member, 5, 0, 0),
+    REDUCE(sym_annotation_member, 3, 0, 0),
     [1929] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_member, 5, 0, 0),
+    REDUCE(sym_annotation_member, 3, 0, 0),
     [1931] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_body, 2, 0, 0),
+    REDUCE(sym_annotation_member, 4, 0, 0),
     [1933] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_body, 2, 0, 0),
+    REDUCE(sym_annotation_member, 4, 0, 0),
     [1935] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_member, 6, 0, 0),
+    REDUCE(sym_annotation_body, 1, 0, 0),
     [1937] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_member, 6, 0, 0),
+    REDUCE(sym_annotation_body, 1, 0, 0),
     [1939] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_member, 4, 0, 0),
+    REDUCE(sym_annotation_member, 5, 0, 0),
     [1941] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_member, 4, 0, 0),
+    REDUCE(sym_annotation_member, 5, 0, 0),
     [1943] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_body, 1, 0, 0),
+    REDUCE(aux_sym_annotation_dcl_repeat1, 1, 0, 0),
     [1945] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_body, 1, 0, 0),
-    [1947] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(aux_sym_annotation_dcl_repeat1, 1, 0, 0),
+    [1947] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_annotation_body, 2, 0, 0),
     [1949] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_annotation_dcl_repeat1, 1, 0, 0),
+    REDUCE(sym_annotation_body, 2, 0, 0),
     [1951] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_annotation_member, 3, 0, 0),
+    REDUCE(sym_annotation_member, 6, 0, 0),
     [1953] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_member, 3, 0, 0),
+    REDUCE(sym_annotation_member, 6, 0, 0),
     [1955] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(35),
-    [1957] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1491),
+    REDUCE(sym_preproc_include, 3, 0, 4),
+    [1957] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_preproc_include, 3, 0, 4),
     [1959] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_definition, 1, 0, 0),
     [1961] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_definition, 1, 0, 0),
     [1963] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_preproc_include, 3, 0, 4),
+    REDUCE(sym_definition, 2, 0, 0),
     [1965] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_preproc_include, 3, 0, 4),
+    REDUCE(sym_definition, 2, 0, 0),
     [1967] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_preproc_call, 2, 0, 1),
-    [1969] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_preproc_call, 2, 0, 1),
+    SHIFT(34),
+    [1969] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1491),
     [1971] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_preproc_define, 2, 0, 0),
     [1973] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_preproc_define, 2, 0, 0),
     [1975] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_preproc_call, 3, 0, 3),
+    REDUCE(sym_preproc_call, 2, 0, 1),
     [1977] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_preproc_call, 3, 0, 3),
+    REDUCE(sym_preproc_call, 2, 0, 1),
     [1979] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_definition, 2, 0, 0),
+    REDUCE(sym_preproc_call, 3, 0, 3),
     [1981] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_definition, 2, 0, 0),
+    REDUCE(sym_preproc_call, 3, 0, 3),
     [1983] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1500),
+    [1985] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_tpl_definition, 1, 0, 0),
-    [1985] = { .entry = { .count = 1, .reusable = true } },
+    [1987] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_tpl_definition, 1, 0, 0),
-    [1987] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(aux_sym_template_module_dcl_repeat1, 1, 0, 0),
-    [1989] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_template_module_dcl_repeat1, 1, 0, 0),
-    [1991] = { .entry = { .count = 1, .reusable = false } },
+    [1989] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_param_attribute, 1, 0, 0),
-    [1993] = { .entry = { .count = 1, .reusable = true } },
+    [1991] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_param_attribute, 1, 0, 0),
+    [1993] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_tpl_definition, 2, 0, 0),
     [1995] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_specification_repeat1, 1, 0, 0),
-    [1997] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_tpl_definition, 2, 0, 0),
+    [1997] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_specification_repeat1, 1, 0, 0),
     [1999] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1500),
+    REDUCE(aux_sym_specification_repeat1, 1, 0, 0),
     [2001] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_tpl_definition, 2, 0, 0),
+    REDUCE(aux_sym_template_module_dcl_repeat1, 1, 0, 0),
     [2003] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_tpl_definition, 2, 0, 0),
+    REDUCE(aux_sym_template_module_dcl_repeat1, 1, 0, 0),
     [2005] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(604),
+    SHIFT(601),
     [2007] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1178),
     [2009] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1213),
     [2011] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(86),
+    SHIFT(80),
     [2013] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(633),
+    SHIFT(666),
     [2015] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(621),
+    SHIFT(608),
     [2017] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(794),
+    SHIFT(796),
     [2019] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(917),
     [2021] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(790),
+    SHIFT(792),
     [2023] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(793),
+    SHIFT(795),
     [2025] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_component_body, 1, 0, 0),
     [2027] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(630),
+    SHIFT(645),
     [2029] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(648),
+    SHIFT(640),
     [2031] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(628),
+    SHIFT(664),
     [2033] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1466),
     [2035] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(626),
+    SHIFT(662),
     [2037] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(639),
+    SHIFT(650),
     [2039] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
     [2041] = { .entry = { .count = 2, .reusable = true } },
@@ -85095,31 +85142,31 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1213),
     [2044] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(86),
+    SHIFT_REPEAT(80),
     [2047] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(35),
+    SHIFT_REPEAT(34),
     [2050] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(39),
+    SHIFT_REPEAT(41),
     [2053] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(633),
+    SHIFT_REPEAT(666),
     [2056] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(621),
+    SHIFT_REPEAT(608),
     [2059] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(794),
+    SHIFT_REPEAT(796),
     [2062] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(917),
     [2065] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(790),
+    SHIFT_REPEAT(792),
     [2068] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_component_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(793),
+    SHIFT_REPEAT(795),
     [2071] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_port_body, 2, 0, 0),
     [2073] = { .entry = { .count = 1, .reusable = true } },
@@ -85129,2241 +85176,2245 @@ static const TSParseActionEntry ts_parse_actions[] = {
     SHIFT_REPEAT(1213),
     [2078] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(86),
+    SHIFT_REPEAT(80),
     [2081] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(35),
+    SHIFT_REPEAT(34),
     [2084] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(39),
+    SHIFT_REPEAT(41),
     [2087] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(633),
+    SHIFT_REPEAT(666),
     [2090] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(621),
+    SHIFT_REPEAT(608),
     [2093] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(793),
+    SHIFT_REPEAT(795),
     [2096] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_port_body, 1, 0, 0),
-    [2098] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1336),
-    [2100] = { .entry = { .count = 1, .reusable = true } },
+    [2098] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    [2102] = { .entry = { .count = 2, .reusable = true } },
+    [2100] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1213),
-    [2105] = { .entry = { .count = 2, .reusable = true } },
+    [2103] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(86),
-    [2108] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(80),
+    [2106] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(35),
-    [2111] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(34),
+    [2109] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(39),
-    [2114] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(41),
+    [2112] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(633),
-    [2117] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(666),
+    [2115] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(621),
-    [2120] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(608),
+    [2118] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_port_body_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(793),
+    SHIFT_REPEAT(795),
+    [2121] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_port_body, 1, 0, 0),
     [2123] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_dec_number, 1, 0, 0),
     [2125] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_dec_number, 1, 0, 0),
-    [2127] = { .entry = { .count = 2, .reusable = true } },
+    [2127] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_floating_pt_literal, 4, 0, 0),
+    [2129] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_floating_pt_literal, 4, 0, 0),
+    [2131] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(493),
+    [2133] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(491),
+    [2135] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(35),
-    [2130] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(34),
+    [2138] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(39),
-    [2133] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_integer_literal, 2, 0, 0),
-    [2135] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_integer_literal, 2, 0, 0),
-    [2137] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(950),
-    [2139] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1430),
-    [2141] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(174),
+    SHIFT_REPEAT(41),
+    [2141] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_floating_pt_literal, 3, 0, 0),
     [2143] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1382),
-    [2145] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_primary_expr, 1, 0, 0),
+    REDUCE(sym_floating_pt_literal, 3, 0, 0),
+    [2145] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(473),
     [2147] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(474),
+    [2149] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1382),
+    [2151] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_primary_expr, 1, 0, 0),
-    [2149] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_integer_literal, 1, 0, 0),
-    [2151] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_integer_literal, 1, 0, 0),
     [2153] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(856),
+    REDUCE(sym_primary_expr, 1, 0, 0),
     [2155] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(217),
-    [2157] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_wide_string_literal, 3, 0, 0),
-    [2159] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_wide_string_literal, 3, 0, 0),
+    SHIFT(1430),
+    [2157] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(173),
+    [2159] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_integer_literal, 2, 0, 0),
     [2161] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(754),
-    [2163] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_boolean_literal, 1, 0, 0),
-    [2165] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_boolean_literal, 1, 0, 0),
-    [2167] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_unary_expr, 2, 0, 0),
+    REDUCE(sym_integer_literal, 2, 0, 0),
+    [2163] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(961),
+    [2165] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_integer_literal, 1, 0, 0),
+    [2167] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_integer_literal, 1, 0, 0),
     [2169] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_unary_expr, 2, 0, 0),
+    SHIFT(856),
     [2171] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(188),
-    [2173] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_unary_operator, 1, 0, 0),
-    [2175] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_unary_operator, 1, 0, 0),
-    [2177] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(156),
-    [2179] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(314),
+    [2173] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_string_literal, 3, 0, 0),
+    [2175] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_string_literal, 3, 0, 0),
+    [2177] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_add_expr, 3, 0, 0),
-    [2181] = { .entry = { .count = 1, .reusable = true } },
+    [2179] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_add_expr, 3, 0, 0),
-    [2183] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(361),
+    [2181] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(383),
+    [2183] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(383),
     [2185] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(361),
-    [2187] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_floating_pt_literal, 5, 0, 0),
-    [2189] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_floating_pt_literal, 5, 0, 0),
-    [2191] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_char_literal, 3, 0, 0),
-    [2193] = { .entry = { .count = 1, .reusable = true } },
+    [2187] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_char_literal, 3, 0, 0),
-    [2195] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_fixed_pt_literal, 5, 0, 0),
-    [2197] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_fixed_pt_literal, 5, 0, 0),
-    [2199] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_wide_string_literal, 4, 0, 0),
-    [2201] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_wide_string_literal, 4, 0, 0),
-    [2203] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_wide_character_literal, 4, 0, 0),
+    [2189] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_oct_number, 1, 0, 0),
+    [2191] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_oct_number, 1, 0, 0),
+    [2193] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_wide_string_literal, 3, 0, 0),
+    [2195] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_wide_string_literal, 3, 0, 0),
+    [2197] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_primary_expr, 3, 0, 0),
+    [2199] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_primary_expr, 3, 0, 0),
+    [2201] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_mult_expr, 3, 0, 0),
+    [2203] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_mult_expr, 3, 0, 0),
     [2205] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_wide_character_literal, 4, 0, 0),
+    REDUCE(sym_unary_operator, 1, 0, 0),
     [2207] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_floating_pt_literal, 4, 0, 0),
-    [2209] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_floating_pt_literal, 4, 0, 0),
-    [2211] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_fixed_pt_literal, 4, 0, 0),
+    REDUCE(sym_unary_operator, 1, 0, 0),
+    [2209] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_boolean_literal, 1, 0, 0),
+    [2211] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_boolean_literal, 1, 0, 0),
     [2213] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_fixed_pt_literal, 4, 0, 0),
+    SHIFT(756),
     [2215] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(210),
-    [2217] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(211),
+    SHIFT(187),
+    [2217] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_wide_string_literal, 4, 0, 0),
     [2219] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(876),
+    REDUCE(sym_wide_string_literal, 4, 0, 0),
     [2221] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_oct_number, 1, 0, 0),
+    REDUCE(sym_wide_character_literal, 4, 0, 0),
     [2223] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_oct_number, 1, 0, 0),
-    [2225] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(750),
+    REDUCE(sym_wide_character_literal, 4, 0, 0),
+    [2225] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_fixed_pt_literal, 4, 0, 0),
     [2227] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(301),
-    [2229] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_literal, 1, 0, 0),
+    REDUCE(sym_fixed_pt_literal, 4, 0, 0),
+    [2229] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(210),
     [2231] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_literal, 1, 0, 0),
+    SHIFT(211),
     [2233] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_unary_expr, 1, 0, 0),
+    REDUCE(sym_add_expr, 1, 0, 0),
     [2235] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_unary_expr, 1, 0, 0),
-    [2237] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_mult_expr, 1, 0, 0),
-    [2239] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_mult_expr, 1, 0, 0),
-    [2241] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_add_expr, 1, 0, 0),
+    [2237] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(217),
+    [2239] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(218),
+    [2241] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(753),
     [2243] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_add_expr, 1, 0, 0),
+    SHIFT(316),
     [2245] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_primary_expr, 3, 0, 0),
+    REDUCE(sym_mult_expr, 1, 0, 0),
     [2247] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_primary_expr, 3, 0, 0),
+    REDUCE(sym_mult_expr, 1, 0, 0),
     [2249] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(218),
-    [2251] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_string_literal, 3, 0, 0),
+    SHIFT(309),
+    [2251] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(308),
     [2253] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_string_literal, 3, 0, 0),
+    SHIFT(300),
     [2255] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(751),
-    [2257] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(309),
-    [2259] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(752),
+    [2257] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_string_literal, 2, 0, 0),
-    [2261] = { .entry = { .count = 1, .reusable = true } },
+    [2259] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_string_literal, 2, 0, 0),
+    [2261] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_unary_expr, 2, 0, 0),
     [2263] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(320),
-    [2265] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(308),
+    REDUCE(sym_unary_expr, 2, 0, 0),
+    [2265] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_fixed_pt_literal, 5, 0, 0),
     [2267] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(316),
+    REDUCE(sym_fixed_pt_literal, 5, 0, 0),
     [2269] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_mult_expr, 3, 0, 0),
+    REDUCE(sym_literal, 1, 0, 0),
     [2271] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_mult_expr, 3, 0, 0),
+    REDUCE(sym_literal, 1, 0, 0),
     [2273] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_shift_expr, 3, 0, 0),
+    REDUCE(sym_floating_pt_literal, 5, 0, 0),
     [2275] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_shift_expr, 3, 0, 0),
-    [2277] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(344),
-    [2279] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_simple_type_spec, 1, 0, 0),
+    REDUCE(sym_floating_pt_literal, 5, 0, 0),
+    [2277] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_unary_expr, 1, 0, 0),
+    [2279] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_unary_expr, 1, 0, 0),
     [2281] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_simple_type_spec, 1, 0, 0),
-    [2283] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_shift_expr, 1, 0, 0),
-    [2285] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(143),
+    [2283] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(876),
+    [2285] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_shift_expr, 1, 0, 0),
     [2287] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(277),
+    REDUCE(sym_shift_expr, 1, 0, 0),
     [2289] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_component_body_repeat1, 1, 0, 0),
-    [2291] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_export, 2, 0, 0),
-    [2293] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_and_expr, 3, 0, 0),
-    [2295] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_and_expr, 3, 0, 0),
+    SHIFT(352),
+    [2291] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_shift_expr, 3, 0, 0),
+    [2293] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_shift_expr, 3, 0, 0),
+    [2295] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_simple_type_spec, 1, 0, 0),
     [2297] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(330),
-    [2299] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_and_expr, 1, 0, 0),
+    REDUCE(sym_simple_type_spec, 1, 0, 0),
+    [2299] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(277),
     [2301] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_and_expr, 1, 0, 0),
+    REDUCE(aux_sym_component_body_repeat1, 1, 0, 0),
     [2303] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1189),
-    [2305] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_port_export, 2, 0, 0),
+    REDUCE(sym_component_export, 2, 0, 0),
+    [2305] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_and_expr, 1, 0, 0),
     [2307] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_connector_export, 2, 0, 0),
+    REDUCE(sym_and_expr, 1, 0, 0),
     [2309] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_xor_expr, 3, 0, 0),
-    [2311] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(325),
+    SHIFT(330),
+    [2311] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_and_expr, 3, 0, 0),
     [2313] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_xor_expr, 1, 0, 0),
+    REDUCE(sym_and_expr, 3, 0, 0),
     [2315] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_port_body_repeat1, 1, 0, 0),
+    SHIFT(1264),
     [2317] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_port_export, 1, 0, 0),
-    [2319] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_connector_dcl_repeat1, 1, 0, 0),
-    [2321] = { .entry = { .count = 1, .reusable = true } },
+    [2319] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_connector_export, 1, 0, 0),
+    [2321] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_port_body_repeat1, 1, 0, 0),
     [2323] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1195),
+    SHIFT(1255),
     [2325] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1150),
+    SHIFT(1075),
     [2327] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(33),
+    SHIFT(32),
     [2329] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(40),
+    SHIFT(37),
     [2331] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1149),
+    SHIFT(1074),
     [2333] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1255),
+    REDUCE(sym_connector_export, 2, 0, 0),
     [2335] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1075),
+    REDUCE(sym_port_ref, 2, 0, 0),
     [2337] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1074),
+    REDUCE(sym_xor_expr, 3, 0, 0),
     [2339] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_port_ref, 2, 0, 0),
+    SHIFT(325),
     [2341] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1136),
+    REDUCE(sym_port_export, 1, 0, 0),
     [2343] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(465),
+    REDUCE(sym_port_export, 2, 0, 0),
     [2345] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1163),
+    SHIFT(1195),
     [2347] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1084),
+    SHIFT(1150),
     [2349] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_or_expr, 3, 0, 0),
+    SHIFT(1149),
     [2351] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(323),
+    REDUCE(sym_xor_expr, 1, 0, 0),
     [2353] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_or_expr, 1, 0, 0),
     [2355] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1124),
+    SHIFT(323),
     [2357] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_declarator, 1, 0, 0),
+    SHIFT(1164),
     [2359] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1126),
+    SHIFT(487),
     [2361] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1127),
+    REDUCE(sym_or_expr, 3, 0, 0),
     [2363] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1073),
+    SHIFT(1120),
     [2365] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1096),
+    REDUCE(sym_attr_declarator, 1, 0, 0),
     [2367] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1423),
+    SHIFT(1121),
     [2369] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(305),
+    SHIFT(1130),
     [2371] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_const_expr, 1, 0, 0),
+    SHIFT(1142),
     [2373] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(322),
+    SHIFT(1072),
     [2375] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_union_def_repeat1, 2, 0, 0),
-    [2377] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_union_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1423),
-    [2380] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_union_def_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(305),
+    SHIFT(1128),
+    [2377] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(19),
+    [2379] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(651),
+    [2381] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_event_forward_dcl, 3, 0, 0),
     [2383] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_simple_declarator, 1, 0, 0),
+    SHIFT(748),
     [2385] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_event_header, 2, 0, 0),
     [2387] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(650),
-    [2389] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_event_forward_dcl, 2, 0, 0),
+    [2389] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_simple_declarator, 1, 0, 0),
     [2391] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(745),
-    [2393] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1079),
-    [2395] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(18),
-    [2397] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_forward_dcl, 3, 0, 0),
-    [2399] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(34),
-    [2401] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(41),
-    [2403] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(507),
-    [2405] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1616),
+    REDUCE(aux_sym_union_def_repeat1, 2, 0, 0),
+    [2393] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_union_def_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1423),
+    [2396] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_union_def_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(305),
+    [2399] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_const_expr, 1, 0, 0),
+    [2401] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(322),
+    [2403] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1110),
+    [2405] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1423),
     [2407] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1161),
+    SHIFT(305),
     [2409] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1633),
-    [2411] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1058),
-    [2413] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1058),
-    [2415] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1693),
-    [2417] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_header, 2, 0, 0),
-    [2419] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(945),
-    [2421] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_forward_dcl, 2, 0, 0),
-    [2423] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1040),
+    SHIFT(1086),
+    [2411] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(32),
+    [2414] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(37),
+    [2417] = { .entry = { .count = 2, .reusable = false } },
+    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(38),
+    [2420] = { .entry = { .count = 2, .reusable = false } },
+    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(36),
+    [2423] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1616),
     [2425] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(20),
-    [2427] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(445),
-    [2429] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_integer_sign, 1, 0, 0),
-    [2431] = { .entry = { .count = 1, .reusable = false } },
+    [2427] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(sym_integer_sign, 1, 0, 0),
+    [2429] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(38),
+    [2431] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(36),
     [2433] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(995),
-    [2435] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(849),
-    [2437] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1316),
-    [2439] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(498),
+    SHIFT(847),
+    [2435] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1693),
+    [2437] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1058),
+    [2439] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1058),
     [2441] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(124),
+    SHIFT(335),
     [2443] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(842),
+    SHIFT(332),
     [2445] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1653),
-    [2447] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(335),
+    [2447] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1163),
     [2449] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(332),
-    [2451] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_header, 3, 0, 0),
-    [2453] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(251),
-    [2455] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(33),
-    [2458] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(40),
+    SHIFT(1281),
+    [2451] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(656),
+    [2453] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(543),
+    [2455] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(11),
+    [2457] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(445),
+    [2459] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_array_declarator, 2, 0, 0),
     [2461] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1107),
-    [2463] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(989),
-    [2465] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(130),
+    SHIFT(249),
+    [2463] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1316),
+    [2465] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1111),
     [2467] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1673),
-    [2469] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1281),
-    [2471] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(658),
-    [2473] = { .entry = { .count = 2, .reusable = false } },
-    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(34),
-    [2476] = { .entry = { .count = 2, .reusable = false } },
-    REDUCE(aux_sym_interface_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(41),
+    REDUCE(sym_event_header, 3, 0, 0),
+    [2469] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_component_header, 2, 0, 0),
+    [2471] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(945),
+    [2473] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_component_forward_dcl, 2, 0, 0),
+    [2475] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1040),
+    [2477] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(185),
     [2479] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1633),
+    [2481] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(148),
+    [2483] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(995),
+    [2485] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1673),
+    [2487] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(514),
+    [2489] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(854),
+    [2491] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_array_declarator_repeat1, 2, 0, 0),
-    [2481] = { .entry = { .count = 2, .reusable = true } },
+    [2493] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_array_declarator_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(251),
-    [2484] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_array_declarator, 2, 0, 0),
-    [2486] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_signed_int, 1, 0, 0),
-    [2488] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1042),
-    [2490] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1194),
-    [2492] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_unsigned_int, 1, 0, 0),
-    [2494] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(236),
-    [2496] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_string_type, 1, 0, 0),
+    SHIFT_REPEAT(249),
+    [2496] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(989),
     [2498] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_signed_short_int, 1, 0, 0),
+    SHIFT(237),
     [2500] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1332),
+    REDUCE(sym_wide_string_type, 1, 0, 0),
     [2502] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_integer_type, 1, 0, 0),
+    SHIFT(1474),
     [2504] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(180),
+    [2506] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_unsigned_longlong_int, 1, 0, 0),
-    [2506] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1278),
-    [2508] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(121),
+    [2508] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(617),
     [2510] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_readonly_attr_declarator, 1, 0, 0),
+    SHIFT(1332),
     [2512] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1485),
+    REDUCE(sym_integer_type, 1, 0, 0),
     [2514] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_unsigned_long_int, 1, 0, 0),
+    REDUCE(sym_readonly_attr_declarator, 1, 0, 0),
     [2516] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1485),
+    [2518] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_signed_long_int, 1, 0, 0),
+    [2520] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_signed_longlong_int, 1, 0, 0),
+    [2522] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1042),
+    [2524] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1038),
+    [2526] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1043),
+    [2528] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(236),
+    [2530] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_string_type, 1, 0, 0),
+    [2532] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_signed_short_int, 1, 0, 0),
+    [2534] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1278),
+    [2536] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(126),
+    [2538] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_unsigned_long_int, 1, 0, 0),
+    [2540] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(696),
+    [2542] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_unsigned_short_int, 1, 0, 0),
+    [2544] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1108),
+    [2546] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1194),
+    [2548] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1165),
+    [2550] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_bitset_dcl_repeat1, 2, 0, 0),
-    [2518] = { .entry = { .count = 2, .reusable = true } },
+    [2552] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_bitset_dcl_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1194),
-    [2521] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1128),
-    [2523] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(615),
-    [2525] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(237),
-    [2527] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_wide_string_type, 1, 0, 0),
-    [2529] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1474),
-    [2531] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(180),
-    [2533] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_signed_long_int, 1, 0, 0),
-    [2535] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(694),
-    [2537] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_signed_longlong_int, 1, 0, 0),
-    [2539] = { .entry = { .count = 1, .reusable = true } },
+    [2555] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1129),
+    [2557] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_signed_int, 1, 0, 0),
+    [2559] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1156),
-    [2541] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_unsigned_short_int, 1, 0, 0),
-    [2543] = { .entry = { .count = 1, .reusable = false } },
+    [2561] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_unsigned_int, 1, 0, 0),
+    [2563] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1611),
-    [2545] = { .entry = { .count = 1, .reusable = false } },
+    [2565] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1608),
-    [2547] = { .entry = { .count = 1, .reusable = false } },
+    [2567] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1550),
-    [2549] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(993),
-    [2551] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1038),
-    [2553] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(990),
-    [2555] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1164),
-    [2557] = { .entry = { .count = 1, .reusable = true } },
+    [2569] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1560),
-    [2559] = { .entry = { .count = 1, .reusable = true } },
+    [2571] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(723),
-    [2561] = { .entry = { .count = 1, .reusable = true } },
+    [2573] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1558),
-    [2563] = { .entry = { .count = 1, .reusable = true } },
+    [2575] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_op_dcl, 5, 0, 0),
-    [2565] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_wide_string_type, 4, 0, 0),
-    [2567] = { .entry = { .count = 2, .reusable = false } },
+    [2577] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_string_type, 4, 0, 0),
+    [2579] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_string_literal_repeat1, 2, 0, 0),
     SHIFT_REPEAT(832),
-    [2570] = { .entry = { .count = 1, .reusable = false } },
+    [2582] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(aux_sym_string_literal_repeat1, 2, 0, 0),
-    [2572] = { .entry = { .count = 2, .reusable = true } },
+    [2584] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_string_literal_repeat1, 2, 0, 0),
     SHIFT_REPEAT(832),
-    [2575] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(744),
-    [2577] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(186),
-    [2579] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(215),
-    [2581] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(212),
-    [2583] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(200),
-    [2585] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(809),
     [2587] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(79),
+    SHIFT(747),
     [2589] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(198),
+    SHIFT(186),
     [2591] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(687),
+    SHIFT(215),
     [2593] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(267),
+    SHIFT(212),
     [2595] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(266),
+    SHIFT(813),
     [2597] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_positive_int_const, 1, 0, 0),
+    SHIFT(81),
     [2599] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(263),
+    SHIFT(200),
     [2601] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1262),
+    SHIFT(196),
     [2603] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(935),
+    SHIFT(688),
     [2605] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(85),
+    SHIFT(284),
     [2607] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(787),
+    SHIFT(269),
     [2609] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(685),
+    REDUCE(sym_positive_int_const, 1, 0, 0),
     [2611] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_declarators, 2, 0, 0),
+    SHIFT(1262),
     [2613] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1230),
+    SHIFT(808),
     [2615] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(262),
+    SHIFT(76),
     [2617] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(261),
+    SHIFT(788),
     [2619] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(682),
+    SHIFT(686),
     [2621] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_type_spec, 1, 0, 0),
+    REDUCE(sym_declarators, 2, 0, 0),
     [2623] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(831),
+    SHIFT(1230),
     [2625] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(159),
+    SHIFT(267),
     [2627] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(583),
+    SHIFT(266),
     [2629] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_name, 1, 0, 0),
+    SHIFT(265),
     [2631] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(770),
+    SHIFT(683),
     [2633] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_inheritance_spec, 2, 0, 0),
+    REDUCE(sym_type_spec, 1, 0, 0),
     [2635] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(771),
+    SHIFT(836),
     [2637] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_array_declarator_repeat1, 1, 0, 0),
+    SHIFT(170),
     [2639] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(808),
+    SHIFT(587),
     [2641] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_supported_interface_spec, 2, 0, 0),
-    [2643] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(832),
-    [2645] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(470),
+    REDUCE(sym_value_name, 1, 0, 0),
+    [2643] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(772),
+    [2645] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_value_inheritance_spec, 2, 0, 0),
     [2647] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(832),
-    [2649] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(870),
+    SHIFT(774),
+    [2649] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_array_declarator_repeat1, 1, 0, 0),
     [2651] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(832),
+    [2653] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(471),
-    [2653] = { .entry = { .count = 2, .reusable = false } },
+    [2655] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(832),
+    [2657] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(870),
+    [2659] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(472),
+    [2661] = { .entry = { .count = 2, .reusable = false } },
     REDUCE(aux_sym_char_literal_repeat1, 2, 0, 0),
     SHIFT_REPEAT(870),
-    [2656] = { .entry = { .count = 1, .reusable = false } },
+    [2664] = { .entry = { .count = 1, .reusable = false } },
     REDUCE(aux_sym_char_literal_repeat1, 2, 0, 0),
-    [2658] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_header, 4, 0, 0),
-    [2660] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(813),
-    [2662] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(490),
-    [2664] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1206),
-    [2666] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(487),
+    [2666] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(881),
     [2668] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(991),
+    REDUCE(sym_supported_interface_spec, 2, 0, 0),
     [2670] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1201),
-    [2672] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(152),
-    [2674] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(805),
+    REDUCE(sym_home_header, 4, 0, 0),
+    [2672] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(818),
+    [2674] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1206),
     [2676] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(768),
+    SHIFT(488),
     [2678] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(299),
-    [2680] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(300),
-    [2682] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(275),
+    SHIFT(458),
+    [2680] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(991),
+    [2682] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1201),
     [2684] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(270),
+    SHIFT(152),
     [2686] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(259),
+    SHIFT(805),
     [2688] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(766),
+    SHIFT(770),
     [2690] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(196),
+    SHIFT(298),
     [2692] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(197),
+    SHIFT(299),
     [2694] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(204),
+    SHIFT(292),
     [2696] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1484),
+    SHIFT(264),
     [2698] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(205),
+    SHIFT(260),
     [2700] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(189),
-    [2702] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_inheritance_spec, 4, 0, 0),
-    [2704] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(765),
+    SHIFT(767),
+    [2702] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(197),
+    [2704] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1484),
     [2706] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(708),
-    [2708] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT(198),
+    [2708] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(204),
+    [2710] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_value_inheritance_spec, 4, 0, 0),
+    [2712] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(766),
+    [2714] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(205),
+    [2716] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(191),
+    [2718] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_value_inheritance_spec_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(770),
-    [2711] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT_REPEAT(772),
+    [2721] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_value_inheritance_spec_repeat1, 2, 0, 0),
-    [2713] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(126),
-    [2715] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1063),
-    [2717] = { .entry = { .count = 1, .reusable = true } },
+    [2723] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(710),
+    [2725] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(149),
+    [2727] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1071),
+    [2729] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_map_type, 8, 0, 0),
-    [2719] = { .entry = { .count = 1, .reusable = true } },
+    [2731] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_declarators, 1, 0, 0),
-    [2721] = { .entry = { .count = 1, .reusable = true } },
+    [2733] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(360),
-    [2723] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_dcl, 6, 0, 0),
-    [2725] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1072),
-    [2727] = { .entry = { .count = 1, .reusable = true } },
+    [2735] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_fixed_array_size, 3, 0, 0),
-    [2729] = { .entry = { .count = 1, .reusable = true } },
+    [2737] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_raises_expr_repeat1, 2, 0, 0),
-    [2731] = { .entry = { .count = 2, .reusable = true } },
+    [2739] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_raises_expr_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(808),
-    [2734] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(844),
-    [2736] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_header, 6, 0, 0),
-    [2738] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(456),
-    [2740] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(468),
+    SHIFT_REPEAT(881),
     [2742] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(547),
-    [2744] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1190),
+    REDUCE(sym_op_dcl, 6, 0, 0),
+    [2744] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1083),
     [2746] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_map_type, 6, 0, 0),
+    REDUCE(sym_home_header, 6, 0, 0),
     [2748] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_fixed_pt_type, 6, 0, 0),
-    [2750] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_sequence_type, 6, 0, 0),
-    [2752] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1125),
+    SHIFT(849),
+    [2750] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(463),
+    [2752] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(461),
     [2754] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(80),
-    [2756] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(51),
+    SHIFT(512),
+    [2756] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1190),
     [2758] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(915),
+    REDUCE(sym_map_type, 6, 0, 0),
     [2760] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_struct_forward_dcl, 2, 0, 0),
+    SHIFT(1133),
     [2762] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_floating_pt_type, 1, 0, 0),
+    SHIFT(84),
     [2764] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_dcl, 4, 0, 0),
+    SHIFT(49),
     [2766] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_header, 5, 0, 0),
+    SHIFT(915),
     [2768] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_header, 2, 0, 0),
+    REDUCE(sym_struct_forward_dcl, 2, 0, 0),
     [2770] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(704),
+    REDUCE(sym_fixed_pt_type, 6, 0, 0),
     [2772] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_forward_dcl, 2, 0, 0),
+    REDUCE(sym_op_dcl, 4, 0, 0),
     [2774] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_inheritance_spec, 3, 0, 0),
+    REDUCE(sym_sequence_type, 6, 0, 0),
     [2776] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(726),
+    REDUCE(sym_floating_pt_type, 1, 0, 0),
     [2778] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_string_type, 4, 0, 0),
+    REDUCE(sym_home_header, 5, 0, 0),
     [2780] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_interface_header, 2, 0, 0),
+    [2782] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(707),
+    [2784] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_interface_forward_dcl, 2, 0, 0),
+    [2786] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_value_inheritance_spec, 3, 0, 0),
+    [2788] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(726),
+    [2790] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_base_type_spec, 1, 0, 0),
-    [2782] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_declarators_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(685),
-    [2785] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_declarators_repeat1, 2, 0, 0),
-    [2787] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_sequence_type, 4, 0, 0),
-    [2789] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_any_type, 1, 0, 0),
-    [2791] = { .entry = { .count = 1, .reusable = true } },
+    [2792] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_template_type_spec, 1, 0, 0),
-    [2793] = { .entry = { .count = 1, .reusable = true } },
+    [2794] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_any_type, 1, 0, 0),
+    [2796] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_sequence_type, 4, 0, 0),
+    [2798] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(983),
-    [2795] = { .entry = { .count = 1, .reusable = true } },
+    [2800] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_object_type, 1, 0, 0),
-    [2797] = { .entry = { .count = 2, .reusable = true } },
+    [2802] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_wide_string_type, 4, 0, 0),
+    [2804] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_declarators_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(686),
+    [2807] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_declarators_repeat1, 2, 0, 0),
+    [2809] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_factory_param_dcls_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1114),
-    [2800] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT_REPEAT(1116),
+    [2812] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_factory_param_dcls_repeat1, 2, 0, 0),
-    [2802] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_any_declarators_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(698),
-    [2805] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_any_declarators_repeat1, 2, 0, 0),
-    [2807] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1114),
-    [2809] = { .entry = { .count = 1, .reusable = true } },
+    [2814] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1139),
+    [2816] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_annotation_appl_params, 1, 0, 0),
+    [2818] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1116),
+    [2820] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_factory_param_dcls, 1, 0, 0),
-    [2811] = { .entry = { .count = 1, .reusable = true } },
+    [2822] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_finder_dcl, 4, 0, 0),
-    [2813] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(91),
-    [2815] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1271),
-    [2817] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(732),
-    [2819] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_inheritance_spec, 3, 0, 0),
-    [2821] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(578),
-    [2823] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1527),
-    [2825] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1085),
+    [2824] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_any_declarators_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(700),
     [2827] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1091),
+    REDUCE(aux_sym_any_declarators_repeat1, 2, 0, 0),
     [2829] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(458),
+    SHIFT(92),
     [2831] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1116),
+    SHIFT(1271),
     [2833] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_init_param_dcls, 1, 0, 0),
+    SHIFT(593),
     [2835] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(64),
+    SHIFT(586),
     [2837] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_supported_interface_spec, 3, 0, 0),
+    SHIFT(1527),
     [2839] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(640),
+    SHIFT(468),
     [2841] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(537),
+    SHIFT(1091),
     [2843] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_actual_parameters, 2, 0, 0),
+    SHIFT(1098),
     [2845] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(22),
+    REDUCE(sym_factory_dcl, 4, 0, 0),
     [2847] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(581),
+    SHIFT(1118),
     [2849] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1046),
+    REDUCE(sym_init_param_dcls, 1, 0, 0),
     [2851] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_connector_header, 2, 0, 0),
+    REDUCE(sym_supported_interface_spec, 3, 0, 0),
     [2853] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(986),
+    SHIFT(653),
     [2855] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_formal_parameters, 2, 0, 0),
+    SHIFT(546),
     [2857] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(73),
+    REDUCE(sym_actual_parameters, 2, 0, 0),
     [2859] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(57),
+    SHIFT(25),
     [2861] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_parameter_dcls, 1, 0, 0),
+    SHIFT(63),
     [2863] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_inheritance_spec, 5, 0, 0),
+    REDUCE(sym_connector_header, 2, 0, 0),
     [2865] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_union_forward_dcl, 2, 0, 0),
-    [2867] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1381),
-    [2869] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(sym_union_forward_dcl, 2, 0, 0),
+    SHIFT(996),
+    [2867] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(589),
+    [2869] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1109),
     [2871] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1556),
+    REDUCE(sym_formal_parameters, 2, 0, 0),
     [2873] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1555),
+    SHIFT(72),
     [2875] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1554),
+    SHIFT(732),
     [2877] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(857),
+    REDUCE(sym_value_inheritance_spec, 5, 0, 0),
     [2879] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1135),
+    SHIFT(55),
     [2881] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_params, 2, 0, 0),
+    REDUCE(sym_parameter_dcls, 1, 0, 0),
     [2883] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1123),
-    [2885] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1478),
-    [2887] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_declarator, 2, 0, 0),
+    REDUCE(sym_union_forward_dcl, 2, 0, 0),
+    [2885] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1381),
+    [2887] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(sym_union_forward_dcl, 2, 0, 0),
     [2889] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_raises_expr, 1, 0, 0),
-    [2891] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(aux_sym_string_literal_repeat1, 1, 0, 0),
+    SHIFT(1556),
+    [2891] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1555),
     [2893] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_string_literal_repeat1, 1, 0, 0),
+    SHIFT(1554),
     [2895] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(329),
+    REDUCE(sym_annotation_appl_params, 2, 0, 0),
     [2897] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(315),
+    SHIFT(869),
     [2899] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_readonly_attr_declarator, 2, 0, 0),
+    SHIFT(1127),
     [2901] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_bitfield_repeat1, 2, 0, 0),
-    [2903] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_bitfield_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1091),
-    [2906] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_readonly_attr_declarator_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1124),
+    SHIFT(1478),
+    [2903] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(aux_sym_string_literal_repeat1, 1, 0, 0),
+    [2905] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_string_literal_repeat1, 1, 0, 0),
+    [2907] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_attr_declarator, 2, 0, 0),
     [2909] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_readonly_attr_declarator_repeat1, 2, 0, 0),
+    REDUCE(sym_readonly_attr_declarator, 2, 0, 0),
     [2911] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1099),
+    SHIFT(328),
     [2913] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_in_parameter_dcls, 1, 0, 0),
+    SHIFT(259),
     [2915] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1415),
-    [2917] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_declarator, 1, 0, 0),
-    [2919] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_parameter_dcls, 2, 0, 0),
-    [2921] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(63),
-    [2923] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(29),
-    [2925] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(66),
+    REDUCE(sym_attr_raises_expr, 1, 0, 0),
+    [2917] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_readonly_attr_declarator_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1120),
+    [2920] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_readonly_attr_declarator_repeat1, 2, 0, 0),
+    [2922] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_bitfield_repeat1, 2, 0, 0),
+    [2924] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_bitfield_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1098),
     [2927] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_init_param_dcls, 2, 0, 0),
+    SHIFT(1105),
     [2929] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(970),
+    REDUCE(sym_in_parameter_dcls, 1, 0, 0),
     [2931] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_factory_dcl, 5, 0, 0),
+    SHIFT(1415),
     [2933] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_factory_param_dcls, 2, 0, 0),
+    REDUCE(sym_declarator, 1, 0, 0),
     [2935] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(938),
+    REDUCE(sym_parameter_dcls, 2, 0, 0),
     [2937] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(65),
+    [2939] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_init_param_dcls, 2, 0, 0),
+    [2941] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(976),
+    [2943] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_factory_dcl, 5, 0, 0),
+    [2945] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_factory_param_dcls, 2, 0, 0),
+    [2947] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(948),
+    [2949] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_finder_dcl, 5, 0, 0),
-    [2939] = { .entry = { .count = 2, .reusable = true } },
+    [2951] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(67),
+    [2953] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(30),
+    [2955] = { .entry = { .count = 1, .reusable = false } },
+    REDUCE(aux_sym_char_literal_repeat1, 1, 0, 0),
+    [2957] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(938),
+    [2959] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(916),
+    [2961] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_interface_inheritance_spec_repeat1, 2, 0, 0),
     SHIFT_REPEAT(732),
-    [2942] = { .entry = { .count = 1, .reusable = true } },
+    [2964] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_interface_inheritance_spec_repeat1, 2, 0, 0),
-    [2944] = { .entry = { .count = 1, .reusable = false } },
-    REDUCE(aux_sym_char_literal_repeat1, 1, 0, 0),
-    [2946] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(927),
-    [2948] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(908),
-    [2950] = { .entry = { .count = 1, .reusable = true } },
+    [2966] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_value_inheritance_spec, 1, 0, 0),
-    [2952] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(370),
-    [2954] = { .entry = { .count = 1, .reusable = true } },
+    [2968] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(361),
+    [2970] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_value_inheritance_spec, 6, 0, 0),
-    [2956] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(374),
-    [2958] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(580),
-    [2960] = { .entry = { .count = 1, .reusable = true } },
+    [2972] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(366),
+    [2974] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(581),
+    [2976] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_union_def_repeat1, 1, 0, 0),
-    [2962] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(503),
-    [2964] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1130),
-    [2966] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(378),
-    [2968] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_in_parameter_dcls, 2, 0, 0),
-    [2970] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_context_expr_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1123),
-    [2973] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_context_expr_repeat1, 2, 0, 0),
-    [2975] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_parameter_dcls_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(57),
     [2978] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_parameter_dcls_repeat1, 2, 0, 0),
+    SHIFT(1131),
     [2980] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_params, 1, 0, 0),
+    SHIFT(371),
     [2982] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_formal_parameters, 1, 0, 0),
+    SHIFT(503),
     [2984] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(384),
-    [2986] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_init_param_dcls_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1116),
-    [2989] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_init_param_dcls_repeat1, 2, 0, 0),
+    SHIFT(536),
+    [2986] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_in_parameter_dcls, 2, 0, 0),
+    [2988] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_context_expr_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1127),
     [2991] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_actual_parameters, 1, 0, 0),
+    REDUCE(aux_sym_context_expr_repeat1, 2, 0, 0),
     [2993] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_bitmask_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(594),
+    REDUCE(aux_sym_parameter_dcls_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(55),
     [2996] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_bitmask_dcl_repeat1, 2, 0, 0),
+    REDUCE(aux_sym_parameter_dcls_repeat1, 2, 0, 0),
     [2998] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(173),
+    SHIFT(538),
     [3000] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(176),
-    [3002] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_name, 1, 0, 0),
-    [3004] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_inheritance_spec, 7, 0, 0),
-    [3006] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(169),
-    [3008] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(326),
-    [3010] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_enum_dcl_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(596),
+    SHIFT(380),
+    [3002] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_init_param_dcls_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(1118),
+    [3005] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_init_param_dcls_repeat1, 2, 0, 0),
+    [3007] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(975),
+    [3009] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_formal_parameters, 1, 0, 0),
+    [3011] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(174),
     [3013] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_enum_dcl_repeat1, 2, 0, 0),
+    SHIFT(167),
     [3015] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(163),
+    REDUCE(sym_value_inheritance_spec, 7, 0, 0),
     [3017] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(506),
+    SHIFT(162),
     [3019] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(72),
+    REDUCE(sym_actual_parameters, 1, 0, 0),
     [3021] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(586),
-    [3023] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1158),
-    [3025] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_factory_dcl, 4, 0, 0),
-    [3027] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1062),
-    [3029] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT(329),
+    [3023] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_bitmask_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(596),
+    [3026] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_bitmask_dcl_repeat1, 2, 0, 0),
+    [3028] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(153),
+    [3030] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(71),
+    [3032] = { .entry = { .count = 2, .reusable = true } },
+    REDUCE(aux_sym_enum_dcl_repeat1, 2, 0, 0),
+    SHIFT_REPEAT(590),
+    [3035] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(aux_sym_enum_dcl_repeat1, 2, 0, 0),
+    [3037] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_interface_inheritance_spec, 3, 0, 0),
+    [3039] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_interface_name, 1, 0, 0),
+    [3041] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1069),
+    [3043] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_in_parameter_dcls_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1099),
-    [3032] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT_REPEAT(1105),
+    [3046] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_in_parameter_dcls_repeat1, 2, 0, 0),
-    [3034] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(698),
-    [3036] = { .entry = { .count = 1, .reusable = true } },
+    [3048] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(700),
+    [3050] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_any_declarators, 1, 0, 0),
-    [3038] = { .entry = { .count = 1, .reusable = true } },
+    [3052] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_formal_parameter_names, 1, 0, 0),
-    [3040] = { .entry = { .count = 1, .reusable = true } },
+    [3054] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1327),
-    [3042] = { .entry = { .count = 1, .reusable = true } },
+    [3056] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(588),
+    [3058] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1162),
+    [3060] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_case, 3, 0, 0),
-    [3044] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_any_declarators, 2, 0, 0),
-    [3046] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_inheritance_spec, 2, 0, 0),
-    [3048] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1061),
-    [3050] = { .entry = { .count = 1, .reusable = true } },
+    [3062] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1068),
+    [3064] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1035),
-    [3052] = { .entry = { .count = 1, .reusable = true } },
+    [3066] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_formal_parameter_names, 2, 0, 0),
-    [3054] = { .entry = { .count = 2, .reusable = true } },
+    [3068] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_raises_expr_repeat1, 2, 0, 0),
     SHIFT_REPEAT(983),
-    [3057] = { .entry = { .count = 1, .reusable = true } },
+    [3071] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1031),
-    [3059] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_inheritance_spec, 2, 0, 0),
-    [3061] = { .entry = { .count = 1, .reusable = true } },
+    [3073] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_formal_parameter_names_repeat1, 2, 0, 0),
-    [3063] = { .entry = { .count = 2, .reusable = true } },
+    [3075] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_formal_parameter_names_repeat1, 2, 0, 0),
     SHIFT_REPEAT(1327),
-    [3066] = { .entry = { .count = 1, .reusable = true } },
+    [3078] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_any_declarators, 2, 0, 0),
+    [3080] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_actual_parameters_repeat1, 2, 0, 0),
-    [3068] = { .entry = { .count = 2, .reusable = true } },
+    [3082] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_actual_parameters_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(22),
-    [3071] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT_REPEAT(25),
+    [3085] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_component_inheritance_spec, 2, 0, 0),
+    [3087] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_formal_parameters_repeat1, 2, 0, 0),
-    [3073] = { .entry = { .count = 2, .reusable = true } },
+    [3089] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_formal_parameters_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(73),
-    [3076] = { .entry = { .count = 2, .reusable = true } },
+    SHIFT_REPEAT(72),
+    [3092] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_appl_params_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(1135),
-    [3079] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT_REPEAT(1139),
+    [3095] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(aux_sym_annotation_appl_params_repeat1, 2, 0, 0),
-    [3081] = { .entry = { .count = 2, .reusable = true } },
-    REDUCE(aux_sym_annotation_appl_data_representation_repeat1, 2, 0, 0),
-    SHIFT_REPEAT(640),
-    [3084] = { .entry = { .count = 1, .reusable = true } },
+    [3097] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_home_inheritance_spec, 2, 0, 0),
+    [3099] = { .entry = { .count = 2, .reusable = true } },
     REDUCE(aux_sym_annotation_appl_data_representation_repeat1, 2, 0, 0),
-    [3086] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_inheritance_spec, 2, 0, 0),
-    [3088] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(518),
-    [3090] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(591),
-    [3092] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1027),
-    [3094] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1021),
-    [3096] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(967),
-    [3098] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(65),
-    [3100] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_header, 3, 0, 0),
+    SHIFT_REPEAT(653),
     [3102] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitset_dcl, 5, 0, 0),
+    REDUCE(aux_sym_annotation_appl_data_representation_repeat1, 2, 0, 0),
     [3104] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1605),
+    SHIFT(1027),
     [3106] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1609),
+    SHIFT(1021),
     [3108] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_constr_type_dcl, 1, 0, 0),
+    REDUCE(sym_interface_inheritance_spec, 2, 0, 0),
     [3110] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitmask_dcl, 5, 0, 0),
+    SHIFT(64),
     [3112] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1604),
+    REDUCE(sym_component_header, 3, 0, 0),
     [3114] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(791),
+    SHIFT(1089),
     [3116] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1022),
+    REDUCE(sym_union_dcl, 1, 0, 0),
     [3118] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1589),
     [3120] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_connector_inherit_spec, 2, 0, 0),
+    SHIFT(1214),
     [3122] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_struct_dcl, 1, 0, 0),
+    REDUCE(sym_bitfield_spec, 6, 0, 0),
     [3124] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_appl_param, 3, 0, 0),
+    REDUCE(sym_interface_type, 1, 0, 0),
     [3126] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(472),
+    SHIFT(1610),
     [3128] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(473),
+    SHIFT(1609),
     [3130] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_raises_expr, 5, 0, 0),
+    REDUCE(sym_connector_inherit_spec, 2, 0, 0),
     [3132] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_exception_list, 4, 0, 0),
+    SHIFT(1605),
     [3134] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_raises_expr, 4, 0, 0),
+    SHIFT(1604),
     [3136] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_struct_def, 6, 0, 10),
+    SHIFT(793),
     [3138] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(653),
+    SHIFT(1022),
     [3140] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(834),
+    REDUCE(sym_struct_dcl, 1, 0, 0),
     [3142] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(365),
+    REDUCE(sym_constr_type_dcl, 1, 0, 0),
     [3144] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(283),
+    REDUCE(sym_annotation_appl_param, 3, 0, 0),
     [3146] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_any_declarator, 1, 0, 0),
+    REDUCE(sym_struct_def, 6, 0, 10),
     [3148] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_dcl, 7, 0, 0),
+    SHIFT(663),
     [3150] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(777),
+    SHIFT(834),
     [3152] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(238),
+    REDUCE(sym_raises_expr, 5, 0, 0),
     [3154] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_in_param_dcl, 3, 0, 0),
+    REDUCE(sym_exception_list, 4, 0, 0),
     [3156] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_exception_list, 3, 0, 0),
+    SHIFT(779),
     [3158] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_enum_dcl, 6, 0, 0),
+    SHIFT(239),
     [3160] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_enumerator, 1, 0, 0),
+    REDUCE(sym_raises_expr, 4, 0, 0),
     [3162] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_enum_dcl, 4, 0, 0),
+    REDUCE(sym_enum_dcl, 6, 0, 0),
     [3164] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(48),
+    REDUCE(sym_enumerator, 1, 0, 0),
     [3166] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_struct_def, 4, 0, 0),
+    REDUCE(sym_enum_dcl, 4, 0, 0),
     [3168] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_union_def, 9, 0, 0),
+    REDUCE(sym_any_declarator, 1, 0, 0),
     [3170] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(918),
+    SHIFT(50),
     [3172] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(164),
+    REDUCE(sym_struct_def, 4, 0, 0),
     [3174] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(942),
+    REDUCE(sym_op_dcl, 7, 0, 0),
     [3176] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitfield_spec, 6, 0, 0),
+    REDUCE(sym_in_param_dcl, 3, 0, 0),
     [3178] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitmask_dcl, 6, 0, 0),
+    SHIFT(377),
     [3180] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitfield, 2, 0, 0),
+    SHIFT(283),
     [3182] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_actual_parameter, 1, 0, 0),
+    REDUCE(sym_exception_list, 3, 0, 0),
     [3184] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_factory_param_dcl, 3, 0, 0),
+    SHIFT(759),
     [3186] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_init_param_dcl, 3, 0, 0),
+    SHIFT(246),
     [3188] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_bitfield_repeat1, 1, 0, 0),
+    REDUCE(sym_union_def, 9, 0, 0),
     [3190] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_union_dcl, 1, 0, 0),
+    REDUCE(sym_actual_parameter, 1, 0, 0),
     [3192] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(76),
+    SHIFT(931),
     [3194] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_formal_parameter_type, 1, 0, 0),
+    SHIFT(155),
     [3196] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_param_dcl, 3, 0, 0),
+    SHIFT(942),
     [3198] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_union_def, 8, 0, 0),
+    REDUCE(sym_bitfield, 2, 0, 0),
     [3200] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(996),
+    REDUCE(sym_primary_key_spec, 2, 0, 0),
     [3202] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(383),
+    SHIFT(79),
     [3204] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_oneway_dcl, 6, 0, 0),
+    REDUCE(sym_formal_parameter_type, 1, 0, 0),
     [3206] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(843),
+    REDUCE(sym_factory_param_dcl, 3, 0, 0),
     [3208] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(502),
+    REDUCE(sym_init_param_dcl, 3, 0, 0),
     [3210] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_primary_key_spec, 2, 0, 0),
+    REDUCE(aux_sym_bitfield_repeat1, 1, 0, 0),
     [3212] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_type, 1, 0, 0),
+    REDUCE(sym_param_dcl, 3, 0, 0),
     [3214] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1610),
+    SHIFT(843),
     [3216] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bit_value, 2, 0, 0),
+    SHIFT(549),
     [3218] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1081),
+    SHIFT(1039),
     [3220] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(403),
+    SHIFT(379),
     [3222] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(318),
+    REDUCE(sym_op_oneway_dcl, 6, 0, 0),
     [3224] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(818),
+    REDUCE(sym_bitset_dcl, 5, 0, 0),
     [3226] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(909),
+    REDUCE(sym_bitmask_dcl, 5, 0, 0),
     [3228] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_param_dcl, 2, 0, 0),
+    REDUCE(sym_union_def, 8, 0, 0),
     [3230] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1214),
+    REDUCE(sym_bit_value, 2, 0, 0),
     [3232] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_oneway_dcl, 5, 0, 0),
+    SHIFT(362),
     [3234] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(837),
+    SHIFT(257),
     [3236] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitset_dcl, 6, 0, 0),
+    SHIFT(824),
     [3238] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_get_excep_expr, 2, 0, 0),
+    SHIFT(918),
     [3240] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitfield, 3, 0, 0),
+    SHIFT(837),
     [3242] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1165),
+    REDUCE(sym_param_dcl, 2, 0, 0),
     [3244] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(435),
+    REDUCE(sym_bitmask_dcl, 6, 0, 0),
     [3246] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1517),
+    REDUCE(sym_bitset_dcl, 6, 0, 0),
     [3248] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1515),
+    REDUCE(sym_bitfield, 3, 0, 0),
     [3250] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(21),
+    SHIFT(1166),
     [3252] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1565),
+    SHIFT(435),
     [3254] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_enum_dcl, 7, 0, 0),
+    REDUCE(sym_op_oneway_dcl, 5, 0, 0),
     [3256] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(747),
+    SHIFT(1517),
     [3258] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(871),
+    SHIFT(1515),
     [3260] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_struct_def, 7, 0, 10),
+    SHIFT(21),
     [3262] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_const_type, 1, 0, 0),
+    REDUCE(sym_get_excep_expr, 2, 0, 0),
     [3264] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(422),
-    [3266] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1561),
+    SHIFT(749),
+    [3266] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(871),
     [3268] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_formal_parameter, 2, 0, 0),
+    SHIFT(1565),
     [3270] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_member_type, 1, 0, 0),
+    REDUCE(sym_enum_dcl, 7, 0, 0),
     [3272] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(563),
+    REDUCE(sym_struct_def, 7, 0, 10),
     [3274] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_porttype_forward_dcl, 2, 0, 0),
+    REDUCE(sym_annotation_member_type, 1, 0, 0),
     [3276] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bit_value, 1, 0, 0),
-    [3278] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitmask_dcl, 4, 0, 0),
+    SHIFT(424),
+    [3278] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1561),
     [3280] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_struct_def, 5, 0, 0),
+    REDUCE(sym_const_type, 1, 0, 0),
     [3282] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(643),
+    REDUCE(sym_bit_value, 1, 0, 0),
     [3284] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_switch_type_spec, 1, 0, 0),
+    REDUCE(sym_bitmask_dcl, 4, 0, 0),
     [3286] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(aux_sym_bitset_dcl_repeat1, 1, 0, 0),
+    REDUCE(sym_formal_parameter, 2, 0, 0),
     [3288] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_imported_scope, 1, 0, 0),
+    SHIFT(661),
     [3290] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitset_dcl, 4, 0, 0),
+    SHIFT(565),
     [3292] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(466),
+    REDUCE(sym_porttype_forward_dcl, 2, 0, 0),
     [3294] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(469),
+    REDUCE(aux_sym_bitset_dcl_repeat1, 1, 0, 0),
     [3296] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_enum_dcl, 5, 0, 0),
+    REDUCE(sym_bitset_dcl, 4, 0, 0),
     [3298] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_enumerator, 2, 0, 0),
+    REDUCE(sym_struct_def, 5, 0, 0),
     [3300] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(756),
+    REDUCE(sym_switch_type_spec, 1, 0, 0),
     [3302] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(246),
+    REDUCE(sym_imported_scope, 1, 0, 0),
     [3304] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitmask_dcl, 7, 0, 0),
+    REDUCE(sym_enum_dcl, 5, 0, 0),
     [3306] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitset_dcl, 7, 0, 0),
+    REDUCE(sym_enumerator, 2, 0, 0),
     [3308] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_bitfield_spec, 4, 0, 0),
+    REDUCE(sym_bitmask_dcl, 7, 0, 0),
     [3310] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1270),
+    REDUCE(sym_bitset_dcl, 7, 0, 0),
     [3312] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(863),
+    REDUCE(sym_bitfield_spec, 4, 0, 0),
     [3314] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_def, 3, 0, 0),
+    SHIFT(1270),
     [3316] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(74),
+    SHIFT(865),
     [3318] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1361),
+    REDUCE(sym_event_def, 3, 0, 0),
     [3320] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1315),
+    SHIFT(74),
     [3322] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1314),
+    SHIFT(1361),
     [3324] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_dcl, 3, 0, 0),
+    SHIFT(1315),
     [3326] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1309),
+    SHIFT(1314),
     [3328] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(560),
+    REDUCE(sym_home_dcl, 3, 0, 0),
     [3330] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_def, 3, 0, 0),
+    SHIFT(1309),
     [3332] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1279),
+    SHIFT(562),
     [3334] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_def, 3, 0, 0),
+    REDUCE(sym_component_def, 3, 0, 0),
     [3336] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_header, 3, 0, 0),
+    SHIFT(1279),
     [3338] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_box_def, 3, 0, 0),
+    REDUCE(sym_value_def, 3, 0, 0),
     [3340] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_dcl, 1, 0, 0),
+    REDUCE(sym_value_header, 3, 0, 0),
     [3342] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1274),
+    REDUCE(sym_value_box_def, 3, 0, 0),
     [3344] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_system_lib_string, 3, 0, 0),
+    REDUCE(sym_attr_dcl, 1, 0, 0),
     [3346] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(577),
+    SHIFT(1274),
     [3348] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(31),
+    REDUCE(sym_system_lib_string, 3, 0, 0),
     [3350] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_porttype_def, 4, 0, 0),
+    SHIFT(571),
     [3352] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_except_dcl, 4, 0, 0),
+    SHIFT(31),
     [3354] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(15),
+    SHIFT(829),
     [3356] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(17),
+    REDUCE(sym_except_dcl, 4, 0, 0),
     [3358] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(245),
+    SHIFT(14),
     [3360] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_any_const_type, 1, 0, 0),
+    SHIFT(15),
     [3362] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_dcl, 4, 0, 0),
+    SHIFT(226),
     [3364] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(363),
+    REDUCE(sym_any_const_type, 1, 0, 0),
     [3366] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(541),
+    REDUCE(sym_annotation_dcl, 4, 0, 0),
     [3368] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_autoid_kind, 1, 0, 0),
+    SHIFT(398),
     [3370] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(543),
+    SHIFT(550),
     [3372] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(545),
+    REDUCE(sym_autoid_kind, 1, 0, 0),
     [3374] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(535),
+    SHIFT(551),
     [3376] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(534),
+    SHIFT(529),
     [3378] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_extensibility_kind, 1, 0, 0),
+    SHIFT(522),
     [3380] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(533),
+    SHIFT(520),
     [3382] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(532),
+    REDUCE(sym_extensibility_kind, 1, 0, 0),
     [3384] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1266),
+    SHIFT(519),
     [3386] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(531),
+    SHIFT(518),
     [3388] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_header, 3, 0, 0),
+    SHIFT(1266),
     [3390] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(89),
+    SHIFT(517),
     [3392] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(247),
+    REDUCE(sym_interface_header, 3, 0, 0),
     [3394] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_type_spec, 1, 0, 0),
+    SHIFT(85),
     [3396] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1119),
+    SHIFT(247),
     [3398] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(527),
+    REDUCE(sym_op_type_spec, 1, 0, 0),
     [3400] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(526),
+    SHIFT(1123),
     [3402] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_def, 3, 0, 0),
+    SHIFT(511),
     [3404] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(525),
+    SHIFT(509),
     [3406] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(496),
+    REDUCE(sym_interface_def, 3, 0, 0),
     [3408] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(523),
+    SHIFT(507),
     [3410] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(522),
+    SHIFT(506),
     [3412] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_verbatim_language, 1, 0, 0),
+    SHIFT(505),
     [3414] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_placement_kind, 1, 0, 0),
+    SHIFT(504),
     [3416] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(521),
+    REDUCE(sym_verbatim_language, 1, 0, 0),
     [3418] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(93),
+    REDUCE(sym_placement_kind, 1, 0, 0),
     [3420] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(272),
+    SHIFT(502),
     [3422] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_service_platform, 1, 0, 0),
+    SHIFT(93),
     [3424] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(516),
+    SHIFT(272),
     [3426] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(515),
+    REDUCE(sym_service_platform, 1, 0, 0),
     [3428] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(514),
+    SHIFT(500),
     [3430] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(513),
+    SHIFT(499),
     [3432] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(510),
+    SHIFT(528),
     [3434] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(509),
+    SHIFT(501),
     [3436] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(495),
+    SHIFT(513),
     [3438] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(504),
+    SHIFT(498),
     [3440] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(530),
+    SHIFT(532),
     [3442] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_topic_platform, 1, 0, 0),
+    SHIFT(534),
     [3444] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(501),
+    SHIFT(516),
     [3446] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(274),
+    REDUCE(sym_topic_platform, 1, 0, 0),
     [3448] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(500),
+    SHIFT(548),
     [3450] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(252),
+    SHIFT(274),
     [3452] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(499),
+    SHIFT(547),
     [3454] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(497),
+    SHIFT(276),
     [3456] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1492),
+    SHIFT(545),
     [3458] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1143),
+    SHIFT(544),
     [3460] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_module_dcl, 4, 0, 0),
+    SHIFT(1492),
     [3462] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1497),
+    SHIFT(1151),
     [3464] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_supports, 2, 0, 0),
+    REDUCE(sym_module_dcl, 4, 0, 0),
     [3466] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(774),
+    SHIFT(1497),
     [3468] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(668),
+    REDUCE(sym_value_supports, 2, 0, 0),
     [3470] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_header, 4, 0, 0),
+    SHIFT(670),
     [3472] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(235),
+    SHIFT(783),
     [3474] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(83),
+    REDUCE(sym_event_header, 4, 0, 0),
     [3476] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_header, 4, 0, 0),
+    SHIFT(235),
     [3478] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(855),
+    SHIFT(82),
     [3480] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_template_module_ref, 6, 0, 0),
+    REDUCE(sym_component_header, 4, 0, 0),
     [3482] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1534),
+    REDUCE(sym_template_module_ref, 6, 0, 0),
     [3484] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1700),
+    REDUCE(sym_porttype_def, 4, 0, 0),
     [3486] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_connector_header, 3, 0, 0),
+    SHIFT(1533),
     [3488] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_type_declarator, 2, 0, 0),
+    SHIFT(1700),
     [3490] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_def, 4, 0, 0),
+    REDUCE(sym_connector_header, 3, 0, 0),
     [3492] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(801),
+    REDUCE(sym_type_declarator, 2, 0, 0),
     [3494] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_op_with_context, 2, 0, 0),
+    REDUCE(sym_interface_def, 4, 0, 0),
     [3496] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(661),
+    SHIFT(803),
     [3498] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(54),
+    REDUCE(sym_op_with_context, 2, 0, 0),
     [3500] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1699),
+    SHIFT(652),
     [3502] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_dcl, 2, 0, 0),
+    SHIFT(52),
     [3504] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(659),
+    SHIFT(1699),
     [3506] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(675),
+    REDUCE(sym_attr_dcl, 2, 0, 0),
     [3508] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_def, 4, 0, 0),
+    SHIFT(655),
     [3510] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1697),
+    SHIFT(676),
     [3512] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(997),
+    REDUCE(sym_value_def, 4, 0, 0),
     [3514] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(998),
+    SHIFT(1697),
     [3516] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(999),
+    SHIFT(997),
     [3518] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1000),
+    SHIFT(998),
     [3520] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1001),
+    SHIFT(999),
     [3522] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1002),
+    SHIFT(1000),
     [3524] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1003),
+    SHIFT(1001),
     [3526] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1004),
+    SHIFT(1002),
     [3528] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1005),
+    SHIFT(1003),
     [3530] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1006),
+    SHIFT(1004),
     [3532] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1007),
+    SHIFT(1005),
     [3534] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1008),
+    SHIFT(1006),
     [3536] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1009),
+    SHIFT(1007),
     [3538] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1010),
+    SHIFT(1008),
     [3540] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1011),
+    SHIFT(1009),
     [3542] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1012),
+    SHIFT(1010),
     [3544] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1013),
+    SHIFT(1011),
     [3546] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1014),
+    SHIFT(1012),
     [3548] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1015),
+    SHIFT(1013),
     [3550] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1016),
+    SHIFT(1014),
     [3552] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1017),
+    SHIFT(1015),
     [3554] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1018),
+    SHIFT(1016),
     [3556] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1019),
+    SHIFT(1017),
     [3558] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1020),
+    SHIFT(1018),
     [3560] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1613),
+    SHIFT(1019),
     [3562] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_def, 4, 0, 0),
+    SHIFT(1020),
     [3564] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1023),
+    SHIFT(1613),
     [3566] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1024),
+    REDUCE(sym_component_def, 4, 0, 0),
     [3568] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1025),
+    SHIFT(1023),
     [3570] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1026),
+    SHIFT(1024),
     [3572] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(683),
+    SHIFT(1025),
     [3574] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(684),
+    SHIFT(1026),
     [3576] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(649),
+    SHIFT(684),
     [3578] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1028),
+    SHIFT(685),
     [3580] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1029),
+    SHIFT(658),
     [3582] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1030),
+    SHIFT(1028),
     [3584] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(260),
+    SHIFT(1029),
     [3586] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1032),
+    SHIFT(1030),
     [3588] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1033),
+    SHIFT(946),
     [3590] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1034),
+    SHIFT(1032),
     [3592] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_element_spec, 3, 0, 0),
+    SHIFT(1033),
     [3594] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1264),
+    SHIFT(1034),
     [3596] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1036),
+    REDUCE(sym_element_spec, 3, 0, 0),
     [3598] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1060),
+    SHIFT(1263),
     [3600] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(574),
+    SHIFT(1036),
     [3602] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_type_prefix_dcl, 3, 0, 0),
+    SHIFT(1067),
     [3604] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_element_spec, 2, 0, 0),
+    SHIFT(573),
     [3606] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_type_id_dcl, 3, 0, 0),
+    REDUCE(sym_type_prefix_dcl, 3, 0, 0),
     [3608] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(573),
+    REDUCE(sym_element_spec, 2, 0, 0),
     [3610] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_def, 4, 0, 0),
+    REDUCE(sym_type_id_dcl, 3, 0, 0),
     [3612] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1325),
+    SHIFT(574),
     [3614] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_connector_dcl, 4, 0, 0),
+    REDUCE(sym_event_def, 4, 0, 0),
     [3616] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(133),
+    SHIFT(1325),
     [3618] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(134),
+    REDUCE(sym_connector_dcl, 4, 0, 0),
     [3620] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(135),
+    SHIFT(172),
     [3622] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(136),
+    SHIFT(142),
     [3624] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(137),
+    SHIFT(182),
     [3626] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(138),
+    SHIFT(178),
     [3628] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(139),
+    SHIFT(151),
     [3630] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(140),
+    SHIFT(144),
     [3632] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(141),
+    SHIFT(121),
     [3634] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(142),
+    SHIFT(123),
     [3636] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(144),
+    SHIFT(124),
     [3638] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(145),
+    SHIFT(127),
     [3640] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(146),
+    SHIFT(128),
     [3642] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(147),
+    SHIFT(129),
     [3644] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(149),
+    SHIFT(130),
     [3646] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(150),
+    SHIFT(132),
     [3648] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(151),
+    SHIFT(133),
     [3650] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(153),
+    SHIFT(135),
     [3652] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(155),
+    SHIFT(136),
     [3654] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(119),
+    SHIFT(137),
     [3656] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(157),
+    SHIFT(139),
     [3658] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(160),
+    SHIFT(140),
     [3660] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(161),
+    SHIFT(119),
     [3662] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(162),
+    SHIFT(145),
     [3664] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_dcl, 4, 0, 0),
+    SHIFT(146),
     [3666] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(946),
+    SHIFT(150),
     [3668] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(165),
+    REDUCE(sym_home_dcl, 4, 0, 0),
     [3670] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(166),
+    SHIFT(464),
     [3672] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(167),
+    SHIFT(120),
     [3674] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(168),
+    SHIFT(159),
     [3676] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(485),
+    SHIFT(160),
     [3678] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(170),
+    SHIFT(161),
     [3680] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(171),
+    SHIFT(261),
     [3682] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(172),
+    SHIFT(163),
     [3684] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_except_dcl, 5, 0, 0),
+    SHIFT(165),
     [3686] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(182),
+    SHIFT(166),
     [3688] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(184),
+    REDUCE(sym_except_dcl, 5, 0, 0),
     [3690] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(185),
+    SHIFT(168),
     [3692] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_abs_def, 5, 0, 0),
+    SHIFT(169),
     [3694] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(158),
+    SHIFT(171),
     [3696] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_dcl, 2, 0, 0),
+    REDUCE(sym_value_abs_def, 5, 0, 0),
     [3698] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(441),
+    SHIFT(184),
     [3700] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(271),
+    REDUCE(sym_interface_dcl, 2, 0, 0),
     [3702] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_abs_def, 5, 0, 0),
+    SHIFT(443),
     [3704] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(430),
+    SHIFT(270),
     [3706] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(442),
+    REDUCE(sym_event_abs_def, 5, 0, 0),
     [3708] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_finder_dcl, 6, 0, 0),
+    SHIFT(426),
     [3710] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(401),
+    SHIFT(440),
     [3712] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(402),
+    REDUCE(sym_finder_dcl, 6, 0, 0),
     [3714] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(358),
+    SHIFT(401),
     [3716] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(404),
+    SHIFT(358),
     [3718] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(406),
+    SHIFT(402),
     [3720] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(407),
+    SHIFT(403),
     [3722] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(408),
+    SHIFT(405),
     [3724] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(409),
+    SHIFT(406),
     [3726] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(389),
+    SHIFT(407),
     [3728] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(411),
+    SHIFT(408),
     [3730] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(413),
+    SHIFT(409),
     [3732] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(414),
+    SHIFT(410),
     [3734] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(415),
+    SHIFT(412),
     [3736] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(416),
+    SHIFT(389),
     [3738] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(417),
+    SHIFT(414),
     [3740] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(418),
+    SHIFT(415),
     [3742] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(412),
+    SHIFT(416),
     [3744] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(410),
+    SHIFT(418),
     [3746] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(405),
+    SHIFT(417),
     [3748] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(398),
+    SHIFT(413),
     [3750] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(393),
+    SHIFT(404),
     [3752] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(388),
+    SHIFT(393),
     [3754] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(387),
+    SHIFT(388),
     [3756] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(385),
+    SHIFT(386),
     [3758] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_factory_dcl, 6, 0, 0),
+    SHIFT(359),
     [3760] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(67),
-    [3762] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(382),
+    [3762] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_factory_dcl, 6, 0, 0),
     [3764] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(381),
+    SHIFT(66),
     [3766] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(380),
+    SHIFT(378),
     [3768] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(379),
+    SHIFT(376),
     [3770] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_context_expr, 5, 0, 0),
+    SHIFT(375),
     [3772] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(377),
+    SHIFT(372),
     [3774] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(376),
+    REDUCE(sym_context_expr, 5, 0, 0),
     [3776] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(375),
+    SHIFT(370),
     [3778] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(734),
+    SHIFT(369),
     [3780] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(372),
+    SHIFT(367),
     [3782] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(371),
+    SHIFT(736),
     [3784] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(359),
+    SHIFT(365),
     [3786] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(297),
+    SHIFT(364),
     [3788] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(369),
+    SHIFT(363),
     [3790] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_template_module_dcl, 8, 0, 0),
+    SHIFT(295),
     [3792] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(106),
+    SHIFT(385),
     [3794] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(517),
+    REDUCE(sym_template_module_dcl, 8, 0, 0),
     [3796] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_max_expr, 3, 0, 0),
+    SHIFT(109),
     [3798] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(450),
+    SHIFT(526),
     [3800] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_dcl, 5, 0, 0),
+    REDUCE(sym_max_expr, 3, 0, 0),
     [3802] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(850),
+    SHIFT(454),
     [3804] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(852),
+    REDUCE(sym_annotation_dcl, 5, 0, 0),
     [3806] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(854),
+    SHIFT(855),
     [3808] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(858),
+    SHIFT(857),
     [3810] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(860),
+    SHIFT(858),
     [3812] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(565),
+    SHIFT(860),
     [3814] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(865),
+    SHIFT(863),
     [3816] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(873),
+    SHIFT(570),
     [3818] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(875),
+    SHIFT(873),
     [3820] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(878),
+    SHIFT(877),
     [3822] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(880),
     [3824] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(881),
-    [3826] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(882),
-    [3828] = { .entry = { .count = 1, .reusable = true } },
+    [3826] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(884),
-    [3830] = { .entry = { .count = 1, .reusable = true } },
+    [3828] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(887),
-    [3832] = { .entry = { .count = 1, .reusable = true } },
+    [3830] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(891),
+    [3832] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(892),
     [3834] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(896),
-    [3836] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(897),
-    [3838] = { .entry = { .count = 1, .reusable = true } },
+    [3836] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(898),
+    [3838] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(901),
     [3840] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(899),
+    SHIFT(902),
     [3842] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(901),
+    SHIFT(904),
     [3844] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(902),
+    SHIFT(905),
     [3846] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(904),
+    SHIFT(907),
     [3848] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(905),
+    SHIFT(909),
     [3850] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(362),
+    SHIFT(910),
     [3852] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(364),
-    [3854] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(912),
+    [3854] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(387),
     [3856] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(914),
+    SHIFT(411),
     [3858] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(916),
+    SHIFT(920),
     [3860] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(926),
+    SHIFT(923),
     [3862] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1082),
+    SHIFT(926),
     [3864] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(933),
+    SHIFT(937),
     [3866] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(784),
+    SHIFT(1048),
     [3868] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(937),
+    SHIFT(940),
     [3870] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_destination_type, 1, 0, 0),
+    SHIFT(944),
     [3872] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(940),
+    SHIFT(947),
     [3874] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(943),
+    REDUCE(sym_destination_type, 1, 0, 0),
     [3876] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(955),
+    SHIFT(950),
     [3878] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(972),
+    SHIFT(955),
     [3880] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(339),
+    SHIFT(972),
     [3882] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(636),
+    SHIFT(981),
     [3884] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(641),
+    SHIFT(333),
     [3886] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(739),
+    SHIFT(633),
     [3888] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_context_expr, 4, 0, 0),
+    SHIFT(649),
     [3890] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1100),
+    SHIFT(744),
     [3892] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_raises_expr, 2, 0, 0),
+    REDUCE(sym_context_expr, 4, 0, 0),
     [3894] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(59),
+    SHIFT(1106),
     [3896] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_set_excep_expr, 2, 0, 0),
+    REDUCE(sym_attr_raises_expr, 2, 0, 0),
     [3898] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(895),
+    SHIFT(58),
     [3900] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1185),
+    REDUCE(sym_set_excep_expr, 2, 0, 0),
     [3902] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1160),
+    SHIFT(895),
     [3904] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_type_dcl, 2, 0, 0),
+    SHIFT(1185),
     [3906] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_home_header, 7, 0, 0),
+    SHIFT(1047),
     [3908] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_formal_parameter_type, 2, 0, 0),
+    REDUCE(sym_type_dcl, 2, 0, 0),
     [3910] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1188),
+    REDUCE(sym_home_header, 7, 0, 0),
     [3912] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(25),
+    REDUCE(sym_formal_parameter_type, 2, 0, 0),
     [3914] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_native_dcl, 2, 0, 0),
+    SHIFT(1188),
     [3916] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(431),
+    SHIFT(22),
     [3918] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_template_module_dcl, 7, 0, 0),
+    REDUCE(sym_native_dcl, 2, 0, 0),
     [3920] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_module_dcl, 5, 0, 0),
+    SHIFT(429),
     [3922] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1562),
+    REDUCE(sym_template_module_dcl, 7, 0, 0),
     [3924] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_import_dcl, 2, 0, 0),
+    REDUCE(sym_module_dcl, 5, 0, 0),
     [3926] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1559),
+    SHIFT(1562),
     [3928] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(512),
+    REDUCE(sym_import_dcl, 2, 0, 0),
     [3930] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_abs_def, 7, 0, 0),
+    SHIFT(1559),
     [3932] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_abs_def, 7, 0, 0),
+    SHIFT(540),
     [3934] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_typedef_dcl, 2, 0, 0),
+    REDUCE(sym_const_dcl, 5, 0, 0),
     [3936] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(327),
+    REDUCE(sym_event_abs_def, 7, 0, 0),
     [3938] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_const_dcl, 5, 0, 0),
+    REDUCE(sym_typedef_dcl, 2, 0, 0),
     [3940] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(741),
+    REDUCE(sym_value_abs_def, 7, 0, 0),
     [3942] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_default, 2, 0, 0),
+    SHIFT(326),
     [3944] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_module_dcl, 6, 0, 0),
+    SHIFT(741),
     [3946] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(78),
+    REDUCE(sym_default, 2, 0, 0),
     [3948] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(868),
+    REDUCE(sym_module_dcl, 6, 0, 0),
     [3950] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(241),
+    SHIFT(87),
     [3952] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(864),
+    SHIFT(868),
     [3954] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(614),
+    SHIFT(241),
     [3956] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_uses_dcl, 4, 0, 0),
+    SHIFT(864),
     [3958] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_kind, 2, 0, 0),
+    SHIFT(615),
     [3960] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1379),
+    REDUCE(sym_uses_dcl, 4, 0, 0),
     [3962] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_value_kind, 2, 0, 0),
+    [3964] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1379),
+    [3966] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(859),
-    [3964] = { .entry = { .count = 1, .reusable = false } },
+    [3968] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1703),
-    [3966] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_fixed_pt_const_type, 1, 0, 0),
-    [3968] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(576),
     [3970] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_context_expr, 3, 0, 0),
+    REDUCE(sym_fixed_pt_const_type, 1, 0, 0),
     [3972] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(225),
+    SHIFT(569),
     [3974] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(224),
+    REDUCE(sym_context_expr, 3, 0, 0),
     [3976] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(607),
+    SHIFT(225),
     [3978] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_readonly_attr_spec, 4, 0, 0),
+    SHIFT(224),
     [3980] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_porttype_def, 5, 0, 0),
+    SHIFT(613),
     [3982] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(90),
+    REDUCE(sym_porttype_def, 5, 0, 0),
     [3984] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(216),
+    REDUCE(sym_readonly_attr_spec, 4, 0, 0),
     [3986] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(321),
+    SHIFT(90),
     [3988] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(214),
+    SHIFT(216),
     [3990] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(564),
+    SHIFT(317),
     [3992] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(213),
+    SHIFT(214),
     [3994] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1122),
+    SHIFT(577),
     [3996] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(313),
+    SHIFT(213),
     [3998] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(752),
+    SHIFT(1126),
     [4000] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(302),
+    SHIFT(320),
     [4002] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(207),
+    SHIFT(754),
     [4004] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(559),
+    SHIFT(321),
     [4006] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(451),
+    SHIFT(207),
     [4008] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1481),
+    SHIFT(558),
     [4010] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(60),
+    SHIFT(452),
     [4012] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(757),
+    SHIFT(1481),
     [4014] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(575),
+    SHIFT(62),
     [4016] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(759),
+    SHIFT(762),
     [4018] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(595),
+    SHIFT(578),
     [4020] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(602),
+    SHIFT(764),
     [4022] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_kind, 2, 0, 0),
+    SHIFT(591),
     [4024] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(46),
+    SHIFT(610),
     [4026] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(421),
+    REDUCE(sym_interface_kind, 2, 0, 0),
     [4028] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(588),
-    [4030] = { .entry = { .count = 1, .reusable = false } },
-    SHIFT(1486),
+    SHIFT(47),
+    [4030] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(419),
     [4032] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(424),
-    [4034] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(597),
+    [4034] = { .entry = { .count = 1, .reusable = false } },
+    SHIFT(1486),
+    [4036] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(425),
+    [4038] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_template_module_inst, 6, 0, 0),
-    [4036] = { .entry = { .count = 1, .reusable = false } },
+    [4040] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1704),
-    [4038] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1159),
-    [4040] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(444),
     [4042] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_porttype_dcl, 1, 0, 0),
+    SHIFT(1160),
     [4044] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(508),
+    SHIFT(444),
     [4046] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(511),
+    REDUCE(sym_porttype_dcl, 1, 0, 0),
     [4048] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(3),
+    SHIFT(542),
     [4050] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_dcl, 1, 0, 0),
+    SHIFT(541),
     [4052] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(6),
+    SHIFT(7),
     [4054] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(433),
+    REDUCE(sym_event_dcl, 1, 0, 0),
     [4056] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_attr_spec, 3, 0, 0),
+    SHIFT(5),
     [4058] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_component_dcl, 1, 0, 0),
+    SHIFT(433),
     [4060] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(519),
+    REDUCE(sym_attr_spec, 3, 0, 0),
     [4062] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_type_dcl, 1, 0, 0),
+    REDUCE(sym_component_dcl, 1, 0, 0),
     [4064] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(281),
+    SHIFT(537),
     [4066] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(4),
+    REDUCE(sym_type_dcl, 1, 0, 0),
     [4068] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(52),
+    SHIFT(281),
     [4070] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_dcl, 1, 0, 0),
+    SHIFT(6),
     [4072] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(529),
+    SHIFT(53),
     [4074] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(10),
+    REDUCE(sym_value_dcl, 1, 0, 0),
     [4076] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_dcl, 1, 0, 0),
+    SHIFT(535),
     [4078] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(767),
+    SHIFT(10),
     [4080] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(538),
+    REDUCE(sym_interface_dcl, 1, 0, 0),
     [4082] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(425),
+    SHIFT(769),
     [4084] = { .entry = { .count = 1, .reusable = true } },
-    ACCEPT_INPUT(),
+    SHIFT(497),
     [4086] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(240),
+    SHIFT(421),
     [4088] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(815),
+    ACCEPT_INPUT(),
     [4090] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1148),
+    SHIFT(243),
     [4092] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(657),
+    SHIFT(815),
     [4094] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(601),
+    SHIFT(1153),
     [4096] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_min_expr, 3, 0, 0),
+    SHIFT(642),
     [4098] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_annotation_dcl, 6, 0, 0),
+    SHIFT(616),
     [4100] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_event_abs_def, 6, 0, 0),
+    REDUCE(sym_min_expr, 3, 0, 0),
     [4102] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_abs_def, 6, 0, 0),
+    REDUCE(sym_annotation_dcl, 6, 0, 0),
     [4104] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1524),
+    REDUCE(sym_event_abs_def, 6, 0, 0),
     [4106] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(822),
+    REDUCE(sym_value_abs_def, 6, 0, 0),
     [4108] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(761),
+    SHIFT(1524),
     [4110] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(592),
+    SHIFT(825),
     [4112] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_value_kind, 1, 0, 0),
+    SHIFT(761),
     [4114] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(328),
+    SHIFT(592),
     [4116] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_port_dcl, 3, 0, 0),
+    REDUCE(sym_value_kind, 1, 0, 0),
     [4118] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_consumes_dcl, 3, 0, 0),
+    SHIFT(327),
     [4120] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1552),
+    REDUCE(sym_port_dcl, 3, 0, 0),
     [4122] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1065),
+    REDUCE(sym_consumes_dcl, 3, 0, 0),
     [4124] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_interface_kind, 1, 0, 0),
+    SHIFT(1552),
     [4126] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_publishes_dcl, 3, 0, 0),
+    SHIFT(1066),
     [4128] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_emits_dcl, 3, 0, 0),
+    REDUCE(sym_interface_kind, 1, 0, 0),
     [4130] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1557),
+    REDUCE(sym_publishes_dcl, 3, 0, 0),
     [4132] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_uses_dcl, 3, 0, 0),
+    REDUCE(sym_emits_dcl, 3, 0, 0),
     [4134] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1557),
+    [4136] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_uses_dcl, 3, 0, 0),
+    [4138] = { .entry = { .count = 1, .reusable = true } },
     SHIFT(1516),
-    [4136] = { .entry = { .count = 1, .reusable = false } },
+    [4140] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(423),
-    [4138] = { .entry = { .count = 1, .reusable = false } },
+    [4142] = { .entry = { .count = 1, .reusable = false } },
     SHIFT(1563),
-    [4140] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(555),
-    [4142] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(209),
     [4144] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(288),
+    SHIFT(560),
     [4146] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(753),
+    SHIFT(209),
     [4148] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(284),
+    SHIFT(302),
     [4150] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(202),
+    SHIFT(755),
     [4152] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(201),
+    SHIFT(301),
     [4154] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(268),
+    SHIFT(202),
     [4156] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(199),
+    SHIFT(201),
     [4158] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(77),
+    SHIFT(287),
     [4160] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(599),
+    SHIFT(199),
     [4162] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(230),
+    SHIFT(77),
     [4164] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(231),
+    SHIFT(619),
     [4166] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1166),
+    SHIFT(229),
     [4168] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(96),
+    SHIFT(230),
     [4170] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(296),
+    SHIFT(1167),
     [4172] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(666),
+    SHIFT(97),
     [4174] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(294),
+    SHIFT(296),
     [4176] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(293),
+    SHIFT(634),
     [4178] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(291),
+    SHIFT(293),
     [4180] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(558),
+    SHIFT(252),
     [4182] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(239),
+    SHIFT(290),
     [4184] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(285),
+    SHIFT(557),
     [4186] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(773),
+    SHIFT(238),
     [4188] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(282),
+    SHIFT(288),
     [4190] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(226),
+    SHIFT(773),
     [4192] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(249),
+    SHIFT(282),
     [4194] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(254),
+    SHIFT(245),
     [4196] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(193),
+    SHIFT(248),
     [4198] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(82),
+    SHIFT(271),
     [4200] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(611),
+    SHIFT(251),
     [4202] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(244),
+    SHIFT(86),
     [4204] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(192),
+    SHIFT(606),
     [4206] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1111),
+    SHIFT(244),
     [4208] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(94),
+    SHIFT(192),
     [4210] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(280),
+    SHIFT(1155),
     [4212] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(647),
+    SHIFT(94),
     [4214] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(286),
+    SHIFT(280),
     [4216] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(287),
+    SHIFT(648),
     [4218] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(290),
+    SHIFT(285),
     [4220] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(557),
+    SHIFT(286),
     [4222] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(234),
+    SHIFT(289),
     [4224] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(292),
+    SHIFT(559),
     [4226] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(738),
+    SHIFT(234),
     [4228] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(295),
+    SHIFT(291),
     [4230] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(229),
+    SHIFT(738),
     [4232] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(228),
+    SHIFT(294),
     [4234] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(298),
+    SHIFT(231),
     [4236] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(227),
+    SHIFT(228),
     [4238] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(88),
+    SHIFT(297),
     [4240] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(620),
+    SHIFT(227),
     [4242] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(221),
+    SHIFT(89),
     [4244] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(220),
+    SHIFT(622),
     [4246] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1050),
+    SHIFT(221),
     [4248] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(95),
+    SHIFT(220),
     [4250] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(310),
+    SHIFT(1046),
     [4252] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(625),
+    SHIFT(95),
     [4254] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(311),
+    SHIFT(310),
     [4256] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(312),
+    SHIFT(637),
     [4258] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(314),
+    SHIFT(311),
     [4260] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(556),
+    SHIFT(312),
     [4262] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(219),
+    SHIFT(313),
     [4264] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(317),
+    SHIFT(561),
     [4266] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(706),
+    SHIFT(219),
     [4268] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(319),
+    SHIFT(315),
     [4270] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(208),
+    SHIFT(706),
     [4272] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(206),
+    SHIFT(318),
     [4274] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(289),
+    SHIFT(208),
     [4276] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(203),
+    SHIFT(206),
     [4278] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(87),
+    SHIFT(319),
     [4280] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(600),
+    SHIFT(203),
     [4282] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(195),
+    SHIFT(78),
     [4284] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(194),
+    SHIFT(603),
     [4286] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1139),
+    SHIFT(195),
     [4288] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(97),
+    SHIFT(194),
     [4290] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(258),
+    SHIFT(1140),
     [4292] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(664),
+    SHIFT(96),
     [4294] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(256),
+    SHIFT(258),
     [4296] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(255),
+    SHIFT(632),
     [4298] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(278),
+    SHIFT(256),
     [4300] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_provides_dcl, 3, 0, 0),
+    SHIFT(254),
     [4302] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(68),
+    SHIFT(278),
     [4304] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(53),
+    REDUCE(sym_provides_dcl, 3, 0, 0),
     [4306] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(760),
+    SHIFT(68),
     [4308] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1146),
+    SHIFT(54),
     [4310] = { .entry = { .count = 1, .reusable = true } },
-    SHIFT(1147),
+    SHIFT(760),
     [4312] = { .entry = { .count = 1, .reusable = true } },
-    REDUCE(sym_comment, 2, 0, 0),
+    SHIFT(1147),
     [4314] = { .entry = { .count = 1, .reusable = true } },
+    SHIFT(1158),
+    [4316] = { .entry = { .count = 1, .reusable = true } },
+    REDUCE(sym_comment, 2, 0, 0),
+    [4318] = { .entry = { .count = 1, .reusable = true } },
     REDUCE(sym_comment, 3, 0, 0),
 };
 
diff --git a/test/corpus/const_dcl.txt b/test/corpus/const_dcl.txt
index 2033984..00699a5 100644
--- a/test/corpus/const_dcl.txt
+++ b/test/corpus/const_dcl.txt
@@ -26,6 +26,11 @@ const A::B::C::D::E::F a = 0;
 
 const M::Size MYSIZE = M::medium;
 
+const float const_float = 13.1;
+const double const_double = 84.1e;
+const long double const_longdouble = 46.1;
+
+
 ---
 
 (specification
@@ -377,4 +382,58 @@ const M::Size MYSIZE = M::medium;
                         (scoped_name
                           (scoped_name
                             (identifier))
-                          (identifier))))))))))))))
+                          (identifier)))))))))))))
+  (definition
+    (const_dcl
+      (const_type
+        (floating_pt_type))
+      (identifier)
+      (const_expr
+        (or_expr
+          (xor_expr
+            (and_expr
+              (shift_expr
+                (add_expr
+                  (mult_expr
+                    (unary_expr
+                      (primary_expr
+                        (literal
+                          (floating_pt_literal
+                            (dec_number)
+                            (dec_number))))))))))))))
+  (definition
+    (const_dcl
+      (const_type
+        (floating_pt_type))
+      (identifier)
+      (const_expr
+        (or_expr
+          (xor_expr
+            (and_expr
+              (shift_expr
+                (add_expr
+                  (mult_expr
+                    (unary_expr
+                      (primary_expr
+                        (literal
+                          (floating_pt_literal
+                            (dec_number)
+                            (dec_number))))))))))))))
+  (definition
+    (const_dcl
+      (const_type
+        (floating_pt_type))
+      (identifier)
+      (const_expr
+        (or_expr
+          (xor_expr
+            (and_expr
+              (shift_expr
+                (add_expr
+                  (mult_expr
+                    (unary_expr
+                      (primary_expr
+                        (literal
+                          (floating_pt_literal
+                            (dec_number)
+                            (dec_number)))))))))))))))