RubyGems - gherkin - Versions diffs - 2.11.5 → 2.11.6 - Mend

gherkin 2.11.5 → 2.11.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

data/.travis.yml +1 -1
data/History.md +13 -0
data/README.md +20 -19
data/cucumber.yml +1 -0
data/ext/gherkin_lexer_hi/extconf.rb +6 -0
data/ext/gherkin_lexer_hi/gherkin_lexer_hi.c +1749 -0
data/ext/gherkin_lexer_sk/gherkin_lexer_sk.c +825 -384
data/ext/gherkin_lexer_tl/extconf.rb +6 -0
data/ext/gherkin_lexer_tl/gherkin_lexer_tl.c +2021 -0
data/ext/gherkin_lexer_tt/extconf.rb +6 -0
data/ext/gherkin_lexer_tt/gherkin_lexer_tt.c +1936 -0
data/features/parser_with_native_lexer.feature +1 -1
data/features/pretty_formatter.feature +1 -0
data/gherkin.gemspec +9 -9
data/lib/gherkin/README.md +3 -3
data/lib/gherkin/formatter/hashable.rb +7 -1
data/lib/gherkin/formatter/json_formatter.rb +11 -0
data/lib/gherkin/i18n.json +63 -21
data/lib/gherkin/lexer/i18n_lexer.rb +4 -3
data/lib/gherkin/lexer/tl.rb +1723 -0
data/lib/gherkin/lexer/tt.rb +1640 -0
data/lib/gherkin/rubify.rb +15 -8
data/ragel/lexer.js.rl.erb +2 -2
data/spec/gherkin/fixtures/with_bom_and_language_spec.feature +4 -0
data/spec/gherkin/i18n_spec.rb +5 -2
data/spec/gherkin/rubify_spec.rb +23 -0
data/spec/gherkin/shared/encoding_group.rb +14 -0
data/tasks/cucumber.rake +1 -0
data/tasks/gems.rake +2 -2
metadata +34 -19

data/ext/gherkin_lexer_sk/gherkin_lexer_sk.c CHANGED

@@ -110,57 +110,91 @@ static const char _lexer_actions[] = {
 };
 static const short _lexer_key_offsets[] = {
-	0, 0, 17, 18, 19, 35, 36, 37,
-	39, 41, 46, 51, 56, 61, 65, 69,
-	71, 72, 73, 74, 75, 76, 77, 78,
+	0, 0, 21, 22, 23, 43, 44, 45,
+	47, 49, 54, 59, 64, 69, 73, 77,
 	79, 80, 81, 82, 83, 84, 85, 86,
-	87, 89, 91, 96, 103, 108, 110, 111,
-	112, 113, 114, 115, 116, 117, 118, 119,
-	120, 121, 122, 123, 124, 125, 126, 127,
-	128, 129, 130, 131, 132, 145, 147, 149,
-	151, 153, 155, 157, 159, 161, 163, 165,
-	167, 169, 171, 173, 175, 191, 193, 196,
-	197, 198, 199, 200, 201, 202, 203, 204,
-	205, 206, 207, 217, 219, 221, 223, 225,
-	227, 229, 231, 233, 235, 237, 239, 241,
-	243, 245, 247, 249, 251, 253, 255, 257,
-	259, 261, 263, 265, 267, 269, 271, 273,
-	275, 277, 280, 283, 285, 287, 289, 291,
-	293, 295, 297, 299, 301, 303, 305, 307,
-	309, 311, 313, 315, 317, 319, 321, 323,
-	325, 327, 329, 331, 333, 334, 335, 336,
-	337, 338, 339, 340, 341, 342, 343, 344,
-	358, 360, 362, 364, 366, 368, 370, 372,
-	374, 376, 378, 380, 382, 384, 386, 388,
-	391, 393, 395, 397, 399, 401, 403, 405,
-	407, 409, 411, 413, 415, 417, 419, 421,
-	423, 425, 427, 429, 431, 433, 436, 438,
-	440, 442, 444, 446, 448, 450, 452, 454,
-	456, 458, 460, 462, 464, 466, 468, 470,
-	472, 474, 476, 477, 478, 479, 480, 481,
-	482, 483, 484, 485, 486, 493, 495, 497,
-	499, 501, 503, 505, 507, 509, 511, 513,
-	515, 516, 517, 518, 519, 520, 521, 522,
-	523, 524, 538, 540, 542, 544, 546, 548,
-	550, 552, 554, 556, 558, 560, 562, 564,
-	566, 568, 571, 573, 575, 577, 579, 581,
-	583, 585, 587, 589, 591, 593, 595, 597,
-	599, 601, 603, 605, 607, 609, 611, 613,
-	617, 619, 621, 623, 625, 627, 629, 631,
-	633, 635, 637, 639, 641, 643, 645, 647,
-	649, 651, 653, 655, 657, 659, 661, 663,
-	665, 666, 667, 671, 677, 680, 682, 688,
-	704, 707, 709, 711, 713, 715, 717, 720,
-	722, 724, 726, 728, 730, 732, 734, 736,
-	738, 740, 742, 744, 746, 748, 750, 752,
-	754, 756, 758, 760, 762
+	87, 88, 89, 90, 91, 92, 93, 94,
+	95, 97, 99, 104, 111, 116, 119, 123,
+	127, 130, 133, 136, 139, 142, 145, 148,
+	151, 154, 157, 160, 163, 166, 169, 172,
+	173, 174, 175, 176, 177, 178, 179, 180,
+	181, 182, 195, 197, 199, 201, 203, 205,
+	207, 209, 211, 213, 215, 217, 219, 221,
+	223, 225, 227, 229, 231, 233, 235, 237,
+	257, 258, 259, 260, 261, 262, 263, 264,
+	265, 266, 267, 268, 269, 270, 271, 272,
+	273, 274, 276, 277, 278, 279, 295, 297,
+	299, 301, 303, 305, 307, 309, 311, 313,
+	315, 317, 319, 321, 323, 325, 329, 351,
+	352, 353, 354, 355, 356, 357, 358, 359,
+	360, 361, 362, 363, 364, 365, 367, 371,
+	372, 373, 374, 375, 376, 377, 378, 379,
+	380, 381, 382, 383, 384, 385, 386, 387,
+	388, 389, 390, 391, 409, 411, 413, 415,
+	417, 419, 421, 423, 425, 427, 429, 431,
+	433, 435, 437, 439, 443, 465, 466, 467,
+	468, 469, 470, 471, 472, 473, 474, 492,
+	494, 496, 498, 500, 502, 504, 506, 508,
+	510, 512, 514, 516, 518, 520, 522, 526,
+	548, 549, 550, 551, 552, 553, 554, 555,
+	556, 557, 558, 559, 560, 561, 562, 563,
+	564, 565, 566, 567, 568, 569, 570, 571,
+	572, 574, 575, 576, 577, 578, 579, 580,
+	581, 582, 583, 584, 585, 586, 587, 588,
+	589, 593, 599, 602, 604, 610, 630, 632,
+	634, 636, 638, 640, 642, 644, 646, 648,
+	650, 652, 654, 656, 658, 660, 662, 664,
+	666, 668, 670, 672, 674, 676, 678, 680,
+	683, 685, 687, 689, 691, 693, 695, 697,
+	699, 701, 703, 705, 707, 709, 711, 716,
+	718, 720, 722, 724, 726, 728, 730, 732,
+	734, 736, 738, 740, 742, 744, 746, 748,
+	750, 752, 754, 756, 758, 760, 762, 764,
+	766, 768, 770, 772, 774, 776, 778, 780,
+	782, 784, 786, 788, 790, 792, 794, 796,
+	798, 800, 802, 804, 806, 808, 810, 812,
+	813, 814, 815, 816, 817, 818, 819, 820,
+	821, 822, 823, 824, 825, 826, 827, 829,
+	831, 833, 835, 837, 839, 841, 843, 845,
+	847, 849, 851, 853, 855, 857, 859, 861,
+	863, 865, 867, 869, 871, 873, 875, 877,
+	880, 882, 884, 886, 888, 890, 892, 894,
+	896, 898, 900, 902, 904, 906, 908, 912,
+	914, 916, 918, 920, 922, 924, 926, 928,
+	930, 932, 934, 936, 938, 940, 942, 944,
+	946, 948, 950, 952, 954, 956, 958, 960,
+	962, 964, 966, 968, 970, 972, 974, 976,
+	978, 980, 982, 984, 986, 988, 990, 992,
+	994, 996, 998, 999, 1000, 1001, 1002, 1003,
+	1004, 1005, 1006, 1007, 1008, 1017, 1019, 1021,
+	1023, 1025, 1027, 1029, 1031, 1033, 1035, 1037,
+	1039, 1041, 1043, 1045, 1047, 1049, 1051, 1053,
+	1055, 1057, 1059, 1061, 1063, 1065, 1067, 1069,
+	1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077,
+	1078, 1079, 1080, 1081, 1082, 1083, 1084, 1086,
+	1088, 1090, 1092, 1094, 1096, 1098, 1100, 1102,
+	1104, 1106, 1108, 1112, 1114, 1116, 1118, 1120,
+	1122, 1124, 1126, 1128, 1130, 1132, 1134, 1136,
+	1138, 1140, 1142, 1144, 1146, 1148, 1150, 1152,
+	1154, 1156, 1158, 1160, 1162, 1164, 1166, 1168,
+	1170, 1172, 1174, 1176, 1178, 1180, 1182, 1184,
+	1186, 1188, 1190, 1192, 1194, 1196, 1198, 1200,
+	1202, 1204, 1206, 1208, 1210, 1212, 1214, 1216,
+	1218, 1220, 1222, 1224, 1226, 1229, 1231, 1233,
+	1235, 1237, 1239, 1241, 1243, 1245, 1247, 1249,
+	1251, 1253, 1255, 1258, 1261, 1263, 1265, 1267,
+	1269, 1271, 1273, 1275, 1277, 1279, 1281, 1283,
+	1285, 1287, 1289, 1291, 1293, 1295, 1297, 1299,
+	1301, 1303, 1305, 1307, 1309, 1311, 1313, 1315,
+	1317, 1319, 1321, 1323, 1325, 1327
 };
 static const char _lexer_trans_keys[] = {
 	-17, 10, 32, 34, 35, 37, 42, 64,
-	65, 75, 78, 80, 83, 84, 124, 9,
-	13, -69, -65, 10, 32, 34, 35, 37,
-	42, 64, 65, 75, 78, 80, 83, 84,
+	65, 70, 75, 78, 79, 80, 83, 84,
+	86, 90, 124, 9, 13, -69, -65, 10,
+	32, 34, 35, 37, 42, 64, 65, 70,
+	75, 78, 79, 80, 83, 84, 86, 90,
 	124, 9, 13, 34, 34, 10, 13, 10,
 	13, 10, 32, 34, 9, 13, 10, 32,
 	34, 9, 13, 10, 32, 34, 9, 13,
@@ -170,136 +204,238 @@ static const char _lexer_trans_keys[] = {
 	95, 69, 78, 68, 95, 37, 32, 10,
 	13, 10, 13, 13, 32, 64, 9, 10,
 	9, 10, 13, 32, 64, 11, 12, 10,
-	32, 64, 9, 13, 32, 108, 101, 101,
-	-60, -113, -61, -95, -60, -115, 114, 116,
-	32, 83, 99, 101, 110, -61, -95, 114,
-	117, 58, 10, 10, 10, 32, 35, 37,
-	42, 64, 65, 75, 80, 83, 84, 9,
+	32, 64, 9, 13, 32, 107, 108, 10,
+	13, 116, 122, 10, 13, 97, 105, 10,
+	13, 107, 10, 13, 116, 10, 13, 105,
+	10, 13, 101, -59, 10, 13, -66, 10,
+	13, 10, 13, 32, -61, 10, 13, -95,
+	10, 13, 10, 13, 114, 10, 13, 111,
+	10, 13, 118, 10, 13, 101, -59, 10,
+	13, -120, 10, 13, 101, 117, 110, 107,
+	99, 105, 97, 58, 10, 10, 10, 32,
+	35, 37, 64, 70, 78, 79, 80, 83,
+	86, 9, 13, 10, 95, 10, 70, 10,
+	69, 10, 65, 10, 84, 10, 85, 10,
+	82, 10, 69, 10, 95, 10, 69, 10,
+	78, 10, 68, 10, 95, 10, 37, 10,
+	117, 10, 110, 10, 107, 10, 99, 10,
+	105, 10, 97, 10, 58, 10, 32, 34,
+	35, 37, 42, 64, 65, 70, 75, 78,
+	79, 80, 83, 84, 86, 90, 124, 9,
+	13, 101, -60, -113, -61, -95, -60, -115,
+	114, 116, 32, 83, 99, 101, 110, -61,
+	-95, 114, 97, 117, 58, 10, 10, 10,
+	32, 35, 37, 42, 64, 65, 70, 75,
+	80, 83, 84, 86, 90, 9, 13, 10,
+	95, 10, 70, 10, 69, 10, 65, 10,
+	84, 10, 85, 10, 82, 10, 69, 10,
+	95, 10, 69, 10, 78, 10, 68, 10,
+	95, 10, 37, 10, 32, 10, 32, 107,
+	108, 10, 32, 34, 35, 37, 42, 64,
+	65, 70, 75, 78, 79, 80, 83, 84,
+	86, 90, 116, 122, 124, 9, 13, 115,
+	110, 111, 118, 97, 32, 83, 99, 101,
+	110, -61, -95, 114, 97, 111, 114, -59,
+	107, 116, 122, -66, 105, 97, 100, 97,
+	118, 107, 105, 97, -60, -66, 111, 109,
+	97, 100, 105, 101, 58, 10, 10, 10,
+	32, 35, 37, 42, 64, 65, 70, 75,
+	78, 79, 80, 83, 84, 86, 90, 9,
 	13, 10, 95, 10, 70, 10, 69, 10,
 	65, 10, 84, 10, 85, 10, 82, 10,
 	69, 10, 95, 10, 69, 10, 78, 10,
 	68, 10, 95, 10, 37, 10, 32, 10,
-	32, 34, 35, 37, 42, 64, 65, 75,
-	78, 80, 83, 84, 124, 9, 13, 111,
-	114, -59, 107, 122, -66, 105, 97, 100,
-	97, 118, 107, 97, 58, 10, 10, 10,
-	32, 35, 37, 64, 78, 80, 83, 9,
-	13, 10, 95, 10, 70, 10, 69, 10,
-	65, 10, 84, 10, 85, 10, 82, 10,
-	69, 10, 95, 10, 69, 10, 78, 10,
-	68, 10, 95, 10, 37, -61, 10, -95,
-	10, -60, 10, -115, 10, 10, 114, 10,
-	116, 10, 32, 10, 83, 10, 99, 10,
-	101, 10, 110, -61, 10, -95, 10, 10,
-	114, 10, 117, 10, 58, 10, 111, 114,
-	-59, 10, 122, -66, 10, 10, 105, 10,
+	32, 107, 108, 10, 32, 34, 35, 37,
+	42, 64, 65, 70, 75, 78, 79, 80,
+	83, 84, 86, 90, 116, 122, 124, 9,
+	13, 99, 101, 110, -61, -95, 114, 58,
+	10, 10, 10, 32, 35, 37, 42, 64,
+	65, 70, 75, 78, 79, 80, 83, 84,
+	86, 90, 9, 13, 10, 95, 10, 70,
+	10, 69, 10, 65, 10, 84, 10, 85,
+	10, 82, 10, 69, 10, 95, 10, 69,
+	10, 78, 10, 68, 10, 95, 10, 37,
+	10, 32, 10, 32, 107, 108, 10, 32,
+	34, 35, 37, 42, 64, 65, 70, 75,
+	78, 79, 80, 83, 84, 86, 90, 116,
+	122, 124, 9, 13, 97, 107, 108, 97,
+	115, 116, 110, 111, 115, -59, -91, 97,
+	32, 112, 114, 101, 100, 112, 111, 107,
+	108, 97, 100, 117, 97, 105, 107, 116,
+	105, 101, -59, -66, 32, -61, -95, 114,
+	111, 118, 101, -59, -120, 32, 124, 9,
+	13, 10, 32, 92, 124, 9, 13, 10,
+	92, 124, 10, 92, 10, 32, 92, 124,
+	9, 13, 10, 32, 34, 35, 37, 42,
+	64, 65, 70, 75, 78, 79, 80, 83,
+	84, 86, 90, 124, 9, 13, 10, 101,
+	10, 117, 10, 110, 10, 107, 10, 99,
+	10, 105, 10, 97, 10, 58, 10, 101,
+	-60, 10, -113, 10, -61, 10, -95, 10,
+	-60, 10, -115, 10, 10, 114, 10, 116,
+	10, 32, 10, 83, 10, 99, 10, 101,
+	10, 110, -61, 10, -95, 10, 10, 114,
+	10, 97, 117, 10, 115, 10, 110, 10,
+	111, 10, 118, 10, 97, 10, 32, 10,
+	83, 10, 99, 10, 101, 10, 110, -61,
+	10, -95, 10, 10, 114, 10, 111, -59,
+	10, 107, 116, 122, -66, 10, 10, 105,
+	10, 97, 10, 100, 10, 97, 10, 118,
+	10, 107, 10, 105, 10, 97, -60, 10,
+	-66, 10, 10, 111, 10, 109, 10, 97,
+	10, 100, 10, 105, 10, 101, 10, 99,
+	10, 101, 10, 110, -61, 10, -95, 10,
+	10, 114, 10, 97, 10, 107, 10, 108,
+	10, 97, 10, 115, 10, 116, 10, 110,
+	10, 111, 10, 115, -59, 10, -91, 10,
+	10, 97, 10, 32, 10, 112, 10, 114,
+	10, 101, 10, 100, 10, 112, 10, 111,
+	10, 107, 10, 108, 10, 97, 10, 100,
+	10, 117, 97, 105, 107, 116, 105, 101,
+	-59, -66, 32, -61, -95, 114, 111, 118,
+	101, -59, -120, 10, 101, 10, 117, 10,
+	110, 10, 107, 10, 99, 10, 105, 10,
+	97, 10, 58, 10, 101, -60, 10, -113,
+	10, -61, 10, -95, 10, -60, 10, -115,
+	10, 10, 114, 10, 116, 10, 32, 10,
+	83, 10, 99, 10, 101, 10, 110, -61,
+	10, -95, 10, 10, 114, 10, 97, 117,
+	10, 115, 10, 110, 10, 111, 10, 118,
+	10, 97, 10, 32, 10, 83, 10, 99,
+	10, 101, 10, 110, -61, 10, -95, 10,
+	10, 114, 10, 111, -59, 10, 107, 116,
+	-66, 10, 10, 105, 10, 97, 10, 100,
+	10, 97, 10, 118, 10, 107, 10, 105,
+	10, 97, -60, 10, -66, 10, 10, 111,
+	10, 109, 10, 99, 10, 101, 10, 110,
+	-61, 10, -95, 10, 10, 114, 10, 97,
+	10, 107, 10, 108, 10, 97, 10, 115,
+	10, 116, 10, 110, 10, 111, 10, 115,
+	-59, 10, -91, 10, 10, 97, 10, 32,
+	10, 112, 10, 114, 10, 101, 10, 100,
+	10, 112, 10, 111, 10, 107, 10, 108,
+	10, 97, 10, 100, 10, 117, -61, -83,
+	107, 108, 97, 100, 121, 58, 10, 10,
+	10, 32, 35, 70, 80, 86, 124, 9,
+	13, 10, 117, 10, 110, 10, 107, 10,
+	99, 10, 105, 10, 97, 10, 58, 10,
+	111, -59, 10, -66, 10, 10, 105, 10,
 	97, 10, 100, 10, 97, 10, 118, 10,
-	107, 10, 97, 10, 97, 10, 100, 10,
+	107, 10, 108, 10, 97, 10, 115, 10,
+	116, 10, 110, 10, 111, 10, 115, -59,
+	10, -91, 10, 97, 105, 107, 116, 105,
+	101, -59, -66, 32, -61, -95, 114, 111,
+	118, 101, -59, -120, 10, 101, 10, 117,
+	10, 110, 10, 107, 10, 99, 10, 105,
+	10, 97, 10, 58, 10, 101, -60, 10,
+	-113, 10, 10, 111, -59, 10, 107, 116,
+	-66, 10, 10, 105, 10, 97, 10, 100,
+	10, 97, 10, 118, 10, 107, 10, 105,
+	10, 97, -60, 10, -66, 10, 10, 111,
+	10, 109, 10, 99, 10, 101, 10, 110,
+	-61, 10, -95, 10, 10, 114, 10, 97,
+	10, 107, 10, 108, 10, 97, 10, 115,
+	10, 116, 10, 110, 10, 111, 10, 115,
+	-59, 10, -91, 10, 10, 97, 10, 32,
+	10, 112, 10, 114, 10, 101, 10, 100,
+	10, 112, 10, 111, 10, 107, 10, 108,
+	10, 97, 10, 100, 10, 117, -61, 10,
+	-95, 10, -60, 10, -115, 10, 10, 114,
+	10, 116, 10, 32, 10, 83, 10, 99,
+	10, 101, 10, 110, -61, 10, -95, 10,
+	10, 114, 10, 97, 117, 10, 115, 10,
+	110, 10, 111, 10, 118, 10, 97, 10,
+	32, 10, 83, 10, 99, 10, 101, 10,
+	110, -61, 10, -95, 10, 10, 114, 10,
+	111, 114, -59, 10, 122, -66, 10, 10,
+	105, 10, 97, 10, 100, 10, 97, 10,
+	118, 10, 107, 10, 97, 10, 100, 10,
 	105, 10, 101, -61, 10, -83, 10, 10,
 	107, 10, 108, 10, 97, 10, 100, 10,
 	121, 10, 99, 10, 101, 10, 110, -61,
-	10, -95, 10, 10, 114, 105, 97, -60,
-	-66, 97, 100, 105, 101, 58, 10, 10,
-	10, 32, 35, 37, 42, 64, 65, 75,
-	78, 80, 83, 84, 9, 13, 10, 95,
-	10, 70, 10, 69, 10, 65, 10, 84,
-	10, 85, 10, 82, 10, 69, 10, 95,
-	10, 69, 10, 78, 10, 68, 10, 95,
-	10, 37, 10, 32, 10, 32, 108, 10,
-	101, 10, 101, -60, 10, -113, 10, -61,
-	10, -95, 10, -60, 10, -115, 10, 10,
-	114, 10, 116, 10, 32, 10, 83, 10,
-	99, 10, 101, 10, 110, -61, 10, -95,
-	10, 10, 114, 10, 117, 10, 58, 10,
-	111, -59, 10, 107, -66, 10, 10, 105,
-	10, 97, 10, 100, 10, 97, 10, 118,
-	10, 107, 10, 97, 10, 105, 10, 97,
-	-60, 10, -66, 10, 10, 99, 10, 101,
-	10, 110, -61, 10, -95, 10, 10, 114,
-	10, 97, 10, 107, -61, -83, 107, 108,
-	97, 100, 121, 58, 10, 10, 10, 32,
-	35, 80, 124, 9, 13, 10, 111, -59,
-	10, -66, 10, 10, 105, 10, 97, 10,
-	100, 10, 97, 10, 118, 10, 107, 10,
-	97, 10, 58, 99, 101, 110, -61, -95,
-	114, 58, 10, 10, 10, 32, 35, 37,
-	42, 64, 65, 75, 78, 80, 83, 84,
-	9, 13, 10, 95, 10, 70, 10, 69,
-	10, 65, 10, 84, 10, 85, 10, 82,
-	10, 69, 10, 95, 10, 69, 10, 78,
-	10, 68, 10, 95, 10, 37, 10, 32,
-	10, 32, 108, 10, 101, 10, 101, -60,
-	10, -113, 10, -61, 10, -95, 10, -60,
-	10, -115, 10, 10, 114, 10, 116, 10,
-	32, 10, 83, 10, 99, 10, 101, 10,
-	110, -61, 10, -95, 10, 10, 114, 10,
-	117, 10, 58, 10, 111, -59, 10, 107,
-	122, -66, 10, 10, 105, 10, 97, 10,
-	100, 10, 97, 10, 118, 10, 107, 10,
-	97, 10, 105, 10, 97, -60, 10, -66,
-	10, 10, 97, 10, 100, 10, 105, 10,
-	101, 10, 99, 10, 101, 10, 110, -61,
-	10, -95, 10, 10, 114, 10, 97, 10,
-	107, 97, 107, 32, 124, 9, 13, 10,
-	32, 92, 124, 9, 13, 10, 92, 124,
-	10, 92, 10, 32, 92, 124, 9, 13,
-	10, 32, 34, 35, 37, 42, 64, 65,
-	75, 78, 80, 83, 84, 124, 9, 13,
-	10, 32, 108, 10, 101, 10, 101, -60,
-	10, -113, 10, 10, 111, -59, 10, 107,
-	-66, 10, 10, 105, 10, 97, 10, 100,
-	10, 97, 10, 118, 10, 107, 10, 97,
-	10, 58, 10, 105, 10, 97, -60, 10,
-	-66, 10, 10, 99, 10, 101, 10, 110,
-	-61, 10, -95, 10, 10, 114, 10, 97,
-	10, 107, 0
+	10, -95, 10, 10, 114, 10, 108, 10,
+	97, 10, 115, 10, 116, 10, 110, 10,
+	111, 10, 115, -59, 10, -91, 10, 0
 };
 static const char _lexer_single_lengths[] = {
-	0, 15, 1, 1, 14, 1, 1, 2,
+	0, 19, 1, 1, 18, 1, 1, 2,
 	2, 3, 3, 3, 3, 2, 2, 2,
 	1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1,
-	2, 2, 3, 5, 3, 2, 1, 1,
+	2, 2, 3, 5, 3, 3, 4, 4,
+	3, 3, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 11, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 18,
 	1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 11, 2, 2, 2,
+	1, 2, 1, 1, 1, 14, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 2, 2, 2, 14, 2, 3, 1,
+	2, 2, 2, 2, 2, 4, 20, 1,
 	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 8, 2, 2, 2, 2, 2,
+	1, 1, 1, 1, 1, 2, 4, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 16, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 4, 20, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 16, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 4, 20,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	2, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	2, 4, 3, 2, 4, 18, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 3,
 	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 5, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 3, 3, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 2, 2, 2, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 12,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 1,
+	1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 3,
 	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 4, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 2, 2, 2, 2, 3, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 5, 2, 2, 2,
+	1, 1, 1, 1, 7, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 1,
 	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 12, 2, 2, 2, 2, 2, 2,
+	1, 1, 1, 1, 1, 1, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 4, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 3, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 2, 2, 2, 2, 2, 2, 4,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	1, 1, 2, 4, 3, 2, 4, 14,
-	3, 2, 2, 2, 2, 2, 3, 2,
+	2, 2, 2, 2, 3, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 3, 3, 2, 2, 2, 2,
 	2, 2, 2, 2, 2, 2, 2, 2,
-	2, 2, 2, 2, 0
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 0
 };
 static const char _lexer_range_lengths[] = {
@@ -310,17 +446,23 @@ static const char _lexer_range_lengths[] = {
 	0, 0, 1, 1, 1, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1, 0, 0, 0,
+	0, 1, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 1,
 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 1, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 1, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 1, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 1, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 1,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -328,13 +470,34 @@ static const char _lexer_range_lengths[] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
+	1, 1, 0, 0, 1, 1, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 1, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 1, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
@@ -342,66 +505,106 @@ static const char _lexer_range_lengths[] = {
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 1, 1, 0, 0, 1, 1,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0
 };
 static const short _lexer_index_offsets[] = {
-	0, 0, 17, 19, 21, 37, 39, 41,
-	44, 47, 52, 57, 62, 67, 71, 75,
-	78, 80, 82, 84, 86, 88, 90, 92,
-	94, 96, 98, 100, 102, 104, 106, 108,
-	110, 113, 116, 121, 128, 133, 136, 138,
-	140, 142, 144, 146, 148, 150, 152, 154,
-	156, 158, 160, 162, 164, 166, 168, 170,
-	172, 174, 176, 178, 180, 193, 196, 199,
-	202, 205, 208, 211, 214, 217, 220, 223,
-	226, 229, 232, 235, 238, 254, 257, 261,
-	263, 265, 267, 269, 271, 273, 275, 277,
-	279, 281, 283, 293, 296, 299, 302, 305,
-	308, 311, 314, 317, 320, 323, 326, 329,
-	332, 335, 338, 341, 344, 347, 350, 353,
-	356, 359, 362, 365, 368, 371, 374, 377,
-	380, 383, 387, 391, 394, 397, 400, 403,
-	406, 409, 412, 415, 418, 421, 424, 427,
-	430, 433, 436, 439, 442, 445, 448, 451,
-	454, 457, 460, 463, 466, 468, 470, 472,
-	474, 476, 478, 480, 482, 484, 486, 488,
-	502, 505, 508, 511, 514, 517, 520, 523,
-	526, 529, 532, 535, 538, 541, 544, 547,
-	551, 554, 557, 560, 563, 566, 569, 572,
-	575, 578, 581, 584, 587, 590, 593, 596,
-	599, 602, 605, 608, 611, 614, 618, 621,
-	624, 627, 630, 633, 636, 639, 642, 645,
-	648, 651, 654, 657, 660, 663, 666, 669,
-	672, 675, 678, 680, 682, 684, 686, 688,
-	690, 692, 694, 696, 698, 705, 708, 711,
-	714, 717, 720, 723, 726, 729, 732, 735,
-	738, 740, 742, 744, 746, 748, 750, 752,
-	754, 756, 770, 773, 776, 779, 782, 785,
-	788, 791, 794, 797, 800, 803, 806, 809,
-	812, 815, 819, 822, 825, 828, 831, 834,
-	837, 840, 843, 846, 849, 852, 855, 858,
-	861, 864, 867, 870, 873, 876, 879, 882,
-	887, 890, 893, 896, 899, 902, 905, 908,
-	911, 914, 917, 920, 923, 926, 929, 932,
-	935, 938, 941, 944, 947, 950, 953, 956,
-	959, 961, 963, 967, 973, 977, 980, 986,
-	1002, 1006, 1009, 1012, 1015, 1018, 1021, 1025,
-	1028, 1031, 1034, 1037, 1040, 1043, 1046, 1049,
-	1052, 1055, 1058, 1061, 1064, 1067, 1070, 1073,
-	1076, 1079, 1082, 1085, 1088
+	0, 0, 21, 23, 25, 45, 47, 49,
+	52, 55, 60, 65, 70, 75, 79, 83,
+	86, 88, 90, 92, 94, 96, 98, 100,
+	102, 104, 106, 108, 110, 112, 114, 116,
+	118, 121, 124, 129, 136, 141, 145, 150,
+	155, 159, 163, 167, 171, 175, 179, 183,
+	187, 191, 195, 199, 203, 207, 211, 215,
+	217, 219, 221, 223, 225, 227, 229, 231,
+	233, 235, 248, 251, 254, 257, 260, 263,
+	266, 269, 272, 275, 278, 281, 284, 287,
+	290, 293, 296, 299, 302, 305, 308, 311,
+	331, 333, 335, 337, 339, 341, 343, 345,
+	347, 349, 351, 353, 355, 357, 359, 361,
+	363, 365, 368, 370, 372, 374, 390, 393,
+	396, 399, 402, 405, 408, 411, 414, 417,
+	420, 423, 426, 429, 432, 435, 440, 462,
+	464, 466, 468, 470, 472, 474, 476, 478,
+	480, 482, 484, 486, 488, 490, 493, 498,
+	500, 502, 504, 506, 508, 510, 512, 514,
+	516, 518, 520, 522, 524, 526, 528, 530,
+	532, 534, 536, 538, 556, 559, 562, 565,
+	568, 571, 574, 577, 580, 583, 586, 589,
+	592, 595, 598, 601, 606, 628, 630, 632,
+	634, 636, 638, 640, 642, 644, 646, 664,
+	667, 670, 673, 676, 679, 682, 685, 688,
+	691, 694, 697, 700, 703, 706, 709, 714,
+	736, 738, 740, 742, 744, 746, 748, 750,
+	752, 754, 756, 758, 760, 762, 764, 766,
+	768, 770, 772, 774, 776, 778, 780, 782,
+	784, 787, 789, 791, 793, 795, 797, 799,
+	801, 803, 805, 807, 809, 811, 813, 815,
+	817, 821, 827, 831, 834, 840, 860, 863,
+	866, 869, 872, 875, 878, 881, 884, 887,
+	890, 893, 896, 899, 902, 905, 908, 911,
+	914, 917, 920, 923, 926, 929, 932, 935,
+	939, 942, 945, 948, 951, 954, 957, 960,
+	963, 966, 969, 972, 975, 978, 981, 987,
+	990, 993, 996, 999, 1002, 1005, 1008, 1011,
+	1014, 1017, 1020, 1023, 1026, 1029, 1032, 1035,
+	1038, 1041, 1044, 1047, 1050, 1053, 1056, 1059,
+	1062, 1065, 1068, 1071, 1074, 1077, 1080, 1083,
+	1086, 1089, 1092, 1095, 1098, 1101, 1104, 1107,
+	1110, 1113, 1116, 1119, 1122, 1125, 1128, 1131,
+	1133, 1135, 1137, 1139, 1141, 1143, 1145, 1147,
+	1149, 1151, 1153, 1155, 1157, 1159, 1161, 1164,
+	1167, 1170, 1173, 1176, 1179, 1182, 1185, 1188,
+	1191, 1194, 1197, 1200, 1203, 1206, 1209, 1212,
+	1215, 1218, 1221, 1224, 1227, 1230, 1233, 1236,
+	1240, 1243, 1246, 1249, 1252, 1255, 1258, 1261,
+	1264, 1267, 1270, 1273, 1276, 1279, 1282, 1287,
+	1290, 1293, 1296, 1299, 1302, 1305, 1308, 1311,
+	1314, 1317, 1320, 1323, 1326, 1329, 1332, 1335,
+	1338, 1341, 1344, 1347, 1350, 1353, 1356, 1359,
+	1362, 1365, 1368, 1371, 1374, 1377, 1380, 1383,
+	1386, 1389, 1392, 1395, 1398, 1401, 1404, 1407,
+	1410, 1413, 1416, 1418, 1420, 1422, 1424, 1426,
+	1428, 1430, 1432, 1434, 1436, 1445, 1448, 1451,
+	1454, 1457, 1460, 1463, 1466, 1469, 1472, 1475,
+	1478, 1481, 1484, 1487, 1490, 1493, 1496, 1499,
+	1502, 1505, 1508, 1511, 1514, 1517, 1520, 1523,
+	1525, 1527, 1529, 1531, 1533, 1535, 1537, 1539,
+	1541, 1543, 1545, 1547, 1549, 1551, 1553, 1556,
+	1559, 1562, 1565, 1568, 1571, 1574, 1577, 1580,
+	1583, 1586, 1589, 1594, 1597, 1600, 1603, 1606,
+	1609, 1612, 1615, 1618, 1621, 1624, 1627, 1630,
+	1633, 1636, 1639, 1642, 1645, 1648, 1651, 1654,
+	1657, 1660, 1663, 1666, 1669, 1672, 1675, 1678,
+	1681, 1684, 1687, 1690, 1693, 1696, 1699, 1702,
+	1705, 1708, 1711, 1714, 1717, 1720, 1723, 1726,
+	1729, 1732, 1735, 1738, 1741, 1744, 1747, 1750,
+	1753, 1756, 1759, 1762, 1765, 1769, 1772, 1775,
+	1778, 1781, 1784, 1787, 1790, 1793, 1796, 1799,
+	1802, 1805, 1808, 1812, 1816, 1819, 1822, 1825,
+	1828, 1831, 1834, 1837, 1840, 1843, 1846, 1849,
+	1852, 1855, 1858, 1861, 1864, 1867, 1870, 1873,
+	1876, 1879, 1882, 1885, 1888, 1891, 1894, 1897,
+	1900, 1903, 1906, 1909, 1912, 1915
 };
 static const short _lexer_trans_targs[] = {
 	2, 4, 4, 5, 15, 17, 31, 34,
-	37, 39, 42, 77, 240, 312, 314, 4,
-	0, 3, 0, 4, 0, 4, 4, 5,
-	15, 17, 31, 34, 37, 39, 42, 77,
-	240, 312, 314, 4, 0, 6, 0, 7,
+	37, 56, 88, 91, 127, 141, 181, 208,
+	210, 219, 248, 4, 0, 3, 0, 4,
+	0, 4, 4, 5, 15, 17, 31, 34,
+	37, 56, 88, 91, 127, 141, 181, 208,
+	210, 219, 248, 4, 0, 6, 0, 7,
 	0, 9, 8, 8, 9, 8, 8, 10,
 	10, 11, 10, 10, 10, 10, 11, 10,
 	10, 10, 10, 12, 10, 10, 10, 10,
@@ -410,137 +613,240 @@ static const short _lexer_trans_targs[] = {
 	18, 0, 19, 0, 20, 0, 21, 0,
 	22, 0, 23, 0, 24, 0, 25, 0,
 	26, 0, 27, 0, 28, 0, 29, 0,
-	30, 0, 348, 0, 32, 0, 4, 16,
+	30, 0, 613, 0, 32, 0, 4, 16,
 	33, 4, 16, 33, 0, 0, 0, 0,
 	35, 36, 4, 36, 36, 34, 35, 35,
-	4, 36, 34, 36, 0, 32, 38, 0,
-	31, 0, 40, 0, 41, 0, 31, 0,
-	43, 0, 44, 0, 45, 0, 46, 0,
-	47, 0, 48, 0, 49, 0, 50, 0,
-	51, 0, 52, 0, 53, 0, 54, 0,
-	55, 0, 56, 0, 57, 0, 58, 0,
-	60, 59, 60, 59, 60, 60, 4, 61,
-	75, 4, 320, 322, 325, 340, 346, 60,
-	59, 60, 62, 59, 60, 63, 59, 60,
-	64, 59, 60, 65, 59, 60, 66, 59,
-	60, 67, 59, 60, 68, 59, 60, 69,
-	59, 60, 70, 59, 60, 71, 59, 60,
-	72, 59, 60, 73, 59, 60, 74, 59,
-	60, 4, 59, 60, 76, 59, 4, 4,
-	5, 15, 17, 31, 34, 37, 39, 42,
-	77, 240, 312, 314, 4, 0, 78, 218,
-	0, 79, 148, 152, 0, 80, 0, 81,
-	0, 82, 0, 83, 0, 84, 0, 85,
-	0, 86, 0, 87, 0, 88, 0, 90,
-	89, 90, 89, 90, 90, 4, 91, 4,
-	105, 121, 142, 90, 89, 90, 92, 89,
-	90, 93, 89, 90, 94, 89, 90, 95,
-	89, 90, 96, 89, 90, 97, 89, 90,
-	98, 89, 90, 99, 89, 90, 100, 89,
-	90, 101, 89, 90, 102, 89, 90, 103,
-	89, 90, 104, 89, 90, 4, 89, 106,
-	90, 89, 107, 90, 89, 108, 90, 89,
-	109, 90, 89, 90, 110, 89, 90, 111,
-	89, 90, 112, 89, 90, 113, 89, 90,
-	114, 89, 90, 115, 89, 90, 116, 89,
-	117, 90, 89, 118, 90, 89, 90, 119,
-	89, 90, 120, 89, 90, 76, 89, 90,
-	122, 135, 89, 123, 90, 131, 89, 124,
-	90, 89, 90, 125, 89, 90, 126, 89,
-	90, 127, 89, 90, 128, 89, 90, 129,
-	89, 90, 130, 89, 90, 120, 89, 90,
-	132, 89, 90, 133, 89, 90, 134, 89,
-	90, 120, 89, 136, 90, 89, 137, 90,
-	89, 90, 138, 89, 90, 139, 89, 90,
-	140, 89, 90, 141, 89, 90, 120, 89,
-	90, 143, 89, 90, 144, 89, 90, 145,
-	89, 146, 90, 89, 147, 90, 89, 90,
-	120, 89, 149, 0, 150, 0, 151, 0,
-	31, 0, 153, 0, 154, 0, 155, 0,
-	156, 0, 157, 0, 159, 158, 159, 158,
-	159, 159, 4, 160, 174, 4, 175, 177,
-	180, 196, 210, 216, 159, 158, 159, 161,
-	158, 159, 162, 158, 159, 163, 158, 159,
-	164, 158, 159, 165, 158, 159, 166, 158,
-	159, 167, 158, 159, 168, 158, 159, 169,
-	158, 159, 170, 158, 159, 171, 158, 159,
-	172, 158, 159, 173, 158, 159, 4, 158,
-	159, 76, 158, 159, 76, 176, 158, 159,
-	174, 158, 159, 178, 158, 179, 159, 158,
-	174, 159, 158, 181, 159, 158, 182, 159,
-	158, 183, 159, 158, 184, 159, 158, 159,
-	185, 158, 159, 186, 158, 159, 187, 158,
-	159, 188, 158, 159, 189, 158, 159, 190,
-	158, 159, 191, 158, 192, 159, 158, 193,
-	159, 158, 159, 194, 158, 159, 195, 158,
-	159, 76, 158, 159, 197, 158, 198, 159,
-	206, 158, 199, 159, 158, 159, 200, 158,
-	159, 201, 158, 159, 202, 158, 159, 203,
-	158, 159, 204, 158, 159, 205, 158, 159,
-	195, 158, 159, 207, 158, 159, 208, 158,
-	209, 159, 158, 174, 159, 158, 159, 211,
-	158, 159, 212, 158, 159, 213, 158, 214,
-	159, 158, 215, 159, 158, 159, 195, 158,
-	159, 217, 158, 159, 174, 158, 219, 0,
-	220, 0, 221, 0, 222, 0, 223, 0,
-	224, 0, 225, 0, 226, 0, 228, 227,
-	228, 227, 228, 228, 4, 229, 4, 228,
-	227, 228, 230, 227, 231, 228, 227, 232,
-	228, 227, 228, 233, 227, 228, 234, 227,
-	228, 235, 227, 228, 236, 227, 228, 237,
-	227, 228, 238, 227, 228, 239, 227, 228,
-	76, 227, 241, 0, 242, 0, 243, 0,
-	244, 0, 245, 0, 246, 0, 247, 0,
-	249, 248, 249, 248, 249, 249, 4, 250,
-	264, 4, 265, 267, 270, 286, 304, 310,
-	249, 248, 249, 251, 248, 249, 252, 248,
-	249, 253, 248, 249, 254, 248, 249, 255,
-	248, 249, 256, 248, 249, 257, 248, 249,
-	258, 248, 249, 259, 248, 249, 260, 248,
-	249, 261, 248, 249, 262, 248, 249, 263,
-	248, 249, 4, 248, 249, 76, 248, 249,
-	76, 266, 248, 249, 264, 248, 249, 268,
-	248, 269, 249, 248, 264, 249, 248, 271,
-	249, 248, 272, 249, 248, 273, 249, 248,
-	274, 249, 248, 249, 275, 248, 249, 276,
-	248, 249, 277, 248, 249, 278, 248, 249,
-	279, 248, 249, 280, 248, 249, 281, 248,
-	282, 249, 248, 283, 249, 248, 249, 284,
-	248, 249, 285, 248, 249, 76, 248, 249,
-	287, 248, 288, 249, 296, 300, 248, 289,
-	249, 248, 249, 290, 248, 249, 291, 248,
-	249, 292, 248, 249, 293, 248, 249, 294,
-	248, 249, 295, 248, 249, 285, 248, 249,
-	297, 248, 249, 298, 248, 299, 249, 248,
-	264, 249, 248, 249, 301, 248, 249, 302,
-	248, 249, 303, 248, 249, 285, 248, 249,
-	305, 248, 249, 306, 248, 249, 307, 248,
-	308, 249, 248, 309, 249, 248, 249, 285,
-	248, 249, 311, 248, 249, 264, 248, 313,
-	0, 31, 0, 314, 315, 314, 0, 319,
-	318, 317, 315, 318, 316, 0, 317, 315,
-	316, 0, 317, 316, 319, 318, 317, 315,
-	318, 316, 319, 319, 5, 15, 17, 31,
-	34, 37, 39, 42, 77, 240, 312, 314,
-	319, 0, 60, 76, 321, 59, 60, 75,
-	59, 60, 323, 59, 324, 60, 59, 75,
-	60, 59, 60, 326, 59, 327, 60, 336,
-	59, 328, 60, 59, 60, 329, 59, 60,
-	330, 59, 60, 331, 59, 60, 332, 59,
-	60, 333, 59, 60, 334, 59, 60, 335,
-	59, 60, 76, 59, 60, 337, 59, 60,
-	338, 59, 339, 60, 59, 75, 60, 59,
-	60, 341, 59, 60, 342, 59, 60, 343,
-	59, 344, 60, 59, 345, 60, 59, 60,
-	335, 59, 60, 347, 59, 60, 75, 59,
-	0, 0
+	4, 36, 34, 36, 0, 38, 31, 55,
+	0, 4, 16, 39, 47, 33, 4, 16,
+	40, 43, 33, 4, 16, 41, 33, 4,
+	16, 42, 33, 4, 16, 43, 33, 4,
+	16, 44, 33, 45, 4, 16, 33, 46,
+	4, 16, 33, 4, 16, 32, 33, 48,
+	4, 16, 33, 49, 4, 16, 33, 4,
+	16, 50, 33, 4, 16, 51, 33, 4,
+	16, 52, 33, 4, 16, 53, 33, 54,
+	4, 16, 33, 46, 4, 16, 33, 31,
+	0, 57, 0, 58, 0, 59, 0, 60,
+	0, 61, 0, 62, 0, 63, 0, 65,
+	64, 65, 64, 65, 65, 4, 66, 4,
+	80, 550, 565, 578, 598, 604, 65, 64,
+	65, 67, 64, 65, 68, 64, 65, 69,
+	64, 65, 70, 64, 65, 71, 64, 65,
+	72, 64, 65, 73, 64, 65, 74, 64,
+	65, 75, 64, 65, 76, 64, 65, 77,
+	64, 65, 78, 64, 65, 79, 64, 65,
+	4, 64, 65, 81, 64, 65, 82, 64,
+	65, 83, 64, 65, 84, 64, 65, 85,
+	64, 65, 86, 64, 65, 87, 64, 4,
+	4, 5, 15, 17, 31, 34, 37, 56,
+	88, 91, 127, 141, 181, 208, 210, 219,
+	248, 4, 0, 89, 0, 90, 0, 31,
+	0, 92, 0, 93, 0, 94, 0, 95,
+	0, 96, 0, 97, 0, 98, 0, 99,
+	0, 100, 0, 101, 0, 102, 0, 103,
+	0, 104, 0, 105, 0, 106, 106, 0,
+	107, 0, 109, 108, 109, 108, 109, 109,
+	4, 110, 124, 4, 125, 495, 502, 505,
+	520, 526, 528, 537, 109, 108, 109, 111,
+	108, 109, 112, 108, 109, 113, 108, 109,
+	114, 108, 109, 115, 108, 109, 116, 108,
+	109, 117, 108, 109, 118, 108, 109, 119,
+	108, 109, 120, 108, 109, 121, 108, 109,
+	122, 108, 109, 123, 108, 109, 4, 108,
+	109, 87, 108, 109, 126, 124, 494, 108,
+	4, 4, 5, 15, 17, 31, 34, 37,
+	56, 88, 91, 127, 141, 181, 208, 210,
+	219, 478, 486, 248, 4, 0, 128, 0,
+	129, 0, 130, 0, 131, 0, 132, 0,
+	133, 0, 134, 0, 135, 0, 136, 0,
+	137, 0, 138, 0, 139, 0, 140, 0,
+	106, 0, 142, 442, 0, 143, 150, 154,
+	156, 0, 144, 0, 145, 0, 146, 0,
+	147, 0, 148, 0, 149, 0, 61, 0,
+	151, 0, 152, 0, 153, 0, 31, 0,
+	155, 0, 31, 0, 157, 0, 158, 0,
+	159, 0, 160, 0, 161, 0, 163, 162,
+	163, 162, 163, 163, 4, 164, 178, 4,
+	179, 359, 366, 369, 384, 397, 412, 418,
+	420, 429, 163, 162, 163, 165, 162, 163,
+	166, 162, 163, 167, 162, 163, 168, 162,
+	163, 169, 162, 163, 170, 162, 163, 171,
+	162, 163, 172, 162, 163, 173, 162, 163,
+	174, 162, 163, 175, 162, 163, 176, 162,
+	163, 177, 162, 163, 4, 162, 163, 87,
+	162, 163, 180, 178, 358, 162, 4, 4,
+	5, 15, 17, 31, 34, 37, 56, 88,
+	91, 127, 141, 181, 208, 210, 219, 342,
+	350, 248, 4, 0, 182, 0, 183, 0,
+	184, 0, 185, 0, 186, 0, 187, 0,
+	188, 0, 190, 189, 190, 189, 190, 190,
+	4, 191, 205, 4, 206, 255, 262, 265,
+	280, 293, 312, 318, 320, 329, 190, 189,
+	190, 192, 189, 190, 193, 189, 190, 194,
+	189, 190, 195, 189, 190, 196, 189, 190,
+	197, 189, 190, 198, 189, 190, 199, 189,
+	190, 200, 189, 190, 201, 189, 190, 202,
+	189, 190, 203, 189, 190, 204, 189, 190,
+	4, 189, 190, 87, 189, 190, 207, 205,
+	254, 189, 4, 4, 5, 15, 17, 31,
+	34, 37, 56, 88, 91, 127, 141, 181,
+	208, 210, 219, 232, 240, 248, 4, 0,
+	209, 0, 31, 0, 211, 0, 212, 0,
+	213, 0, 214, 0, 215, 0, 216, 0,
+	217, 0, 218, 0, 62, 0, 220, 0,
+	221, 0, 222, 0, 223, 0, 224, 0,
+	225, 0, 226, 0, 227, 0, 228, 0,
+	229, 0, 230, 0, 231, 0, 31, 0,
+	233, 236, 0, 234, 0, 235, 0, 236,
+	0, 237, 0, 238, 0, 239, 0, 87,
+	0, 241, 0, 242, 0, 243, 0, 244,
+	0, 245, 0, 246, 0, 247, 0, 239,
+	0, 248, 249, 248, 0, 253, 252, 251,
+	249, 252, 250, 0, 251, 249, 250, 0,
+	251, 250, 253, 252, 251, 249, 252, 250,
+	253, 253, 5, 15, 17, 31, 34, 37,
+	56, 88, 91, 127, 141, 181, 208, 210,
+	219, 248, 253, 0, 190, 205, 189, 190,
+	256, 189, 190, 257, 189, 190, 258, 189,
+	190, 259, 189, 190, 260, 189, 190, 261,
+	189, 190, 87, 189, 190, 263, 189, 264,
+	190, 189, 205, 190, 189, 266, 190, 189,
+	267, 190, 189, 268, 190, 189, 269, 190,
+	189, 190, 270, 189, 190, 271, 189, 190,
+	272, 189, 190, 273, 189, 190, 274, 189,
+	190, 275, 189, 190, 276, 189, 277, 190,
+	189, 278, 190, 189, 190, 279, 189, 190,
+	261, 261, 189, 190, 281, 189, 190, 282,
+	189, 190, 283, 189, 190, 284, 189, 190,
+	285, 189, 190, 286, 189, 190, 287, 189,
+	190, 288, 189, 190, 289, 189, 190, 290,
+	189, 291, 190, 189, 292, 190, 189, 190,
+	260, 189, 190, 294, 189, 295, 190, 302,
+	306, 308, 189, 296, 190, 189, 190, 297,
+	189, 190, 298, 189, 190, 299, 189, 190,
+	300, 189, 190, 301, 189, 190, 260, 189,
+	190, 303, 189, 190, 304, 189, 305, 190,
+	189, 205, 190, 189, 190, 307, 189, 190,
+	205, 189, 190, 309, 189, 190, 310, 189,
+	190, 311, 189, 190, 261, 189, 190, 313,
+	189, 190, 314, 189, 190, 315, 189, 316,
+	190, 189, 317, 190, 189, 190, 261, 189,
+	190, 319, 189, 190, 205, 189, 190, 321,
+	189, 190, 322, 189, 190, 323, 189, 190,
+	324, 189, 190, 325, 189, 190, 326, 189,
+	190, 327, 189, 328, 190, 189, 261, 190,
+	189, 190, 330, 189, 190, 331, 189, 190,
+	332, 189, 190, 333, 189, 190, 334, 189,
+	190, 335, 189, 190, 336, 189, 190, 337,
+	189, 190, 338, 189, 190, 339, 189, 190,
+	340, 189, 190, 341, 189, 190, 205, 189,
+	343, 346, 0, 344, 0, 345, 0, 346,
+	0, 347, 0, 348, 0, 349, 0, 87,
+	0, 351, 0, 352, 0, 353, 0, 354,
+	0, 355, 0, 356, 0, 357, 0, 349,
+	0, 163, 178, 162, 163, 360, 162, 163,
+	361, 162, 163, 362, 162, 163, 363, 162,
+	163, 364, 162, 163, 365, 162, 163, 87,
+	162, 163, 367, 162, 368, 163, 162, 178,
+	163, 162, 370, 163, 162, 371, 163, 162,
+	372, 163, 162, 373, 163, 162, 163, 374,
+	162, 163, 375, 162, 163, 376, 162, 163,
+	377, 162, 163, 378, 162, 163, 379, 162,
+	163, 380, 162, 381, 163, 162, 382, 163,
+	162, 163, 383, 162, 163, 365, 365, 162,
+	163, 385, 162, 163, 386, 162, 163, 387,
+	162, 163, 388, 162, 163, 389, 162, 163,
+	390, 162, 163, 391, 162, 163, 392, 162,
+	163, 393, 162, 163, 394, 162, 395, 163,
+	162, 396, 163, 162, 163, 364, 162, 163,
+	398, 162, 399, 163, 406, 410, 162, 400,
+	163, 162, 163, 401, 162, 163, 402, 162,
+	163, 403, 162, 163, 404, 162, 163, 405,
+	162, 163, 364, 162, 163, 407, 162, 163,
+	408, 162, 409, 163, 162, 178, 163, 162,
+	163, 411, 162, 163, 178, 162, 163, 413,
+	162, 163, 414, 162, 163, 415, 162, 416,
+	163, 162, 417, 163, 162, 163, 365, 162,
+	163, 419, 162, 163, 178, 162, 163, 421,
+	162, 163, 422, 162, 163, 423, 162, 163,
+	424, 162, 163, 425, 162, 163, 426, 162,
+	163, 427, 162, 428, 163, 162, 365, 163,
+	162, 163, 430, 162, 163, 431, 162, 163,
+	432, 162, 163, 433, 162, 163, 434, 162,
+	163, 435, 162, 163, 436, 162, 163, 437,
+	162, 163, 438, 162, 163, 439, 162, 163,
+	440, 162, 163, 441, 162, 163, 178, 162,
+	443, 0, 444, 0, 445, 0, 446, 0,
+	447, 0, 448, 0, 449, 0, 450, 0,
+	452, 451, 452, 451, 452, 452, 4, 453,
+	460, 469, 4, 452, 451, 452, 454, 451,
+	452, 455, 451, 452, 456, 451, 452, 457,
+	451, 452, 458, 451, 452, 459, 451, 452,
+	87, 451, 452, 461, 451, 462, 452, 451,
+	463, 452, 451, 452, 464, 451, 452, 465,
+	451, 452, 466, 451, 452, 467, 451, 452,
+	468, 451, 452, 458, 451, 452, 470, 451,
+	452, 471, 451, 452, 472, 451, 452, 473,
+	451, 452, 474, 451, 452, 475, 451, 452,
+	476, 451, 477, 452, 451, 459, 452, 451,
+	479, 482, 0, 480, 0, 481, 0, 482,
+	0, 483, 0, 484, 0, 485, 0, 87,
+	0, 487, 0, 488, 0, 489, 0, 490,
+	0, 491, 0, 492, 0, 493, 0, 485,
+	0, 109, 124, 108, 109, 496, 108, 109,
+	497, 108, 109, 498, 108, 109, 499, 108,
+	109, 500, 108, 109, 501, 108, 109, 87,
+	108, 109, 503, 108, 504, 109, 108, 124,
+	109, 108, 109, 506, 108, 507, 109, 514,
+	518, 108, 508, 109, 108, 109, 509, 108,
+	109, 510, 108, 109, 511, 108, 109, 512,
+	108, 109, 513, 108, 109, 500, 108, 109,
+	515, 108, 109, 516, 108, 517, 109, 108,
+	124, 109, 108, 109, 519, 108, 109, 124,
+	108, 109, 521, 108, 109, 522, 108, 109,
+	523, 108, 524, 109, 108, 525, 109, 108,
+	109, 501, 108, 109, 527, 108, 109, 124,
+	108, 109, 529, 108, 109, 530, 108, 109,
+	531, 108, 109, 532, 108, 109, 533, 108,
+	109, 534, 108, 109, 535, 108, 536, 109,
+	108, 501, 109, 108, 109, 538, 108, 109,
+	539, 108, 109, 540, 108, 109, 541, 108,
+	109, 542, 108, 109, 543, 108, 109, 544,
+	108, 109, 545, 108, 109, 546, 108, 109,
+	547, 108, 109, 548, 108, 109, 549, 108,
+	109, 124, 108, 551, 65, 64, 552, 65,
+	64, 553, 65, 64, 554, 65, 64, 65,
+	555, 64, 65, 556, 64, 65, 557, 64,
+	65, 558, 64, 65, 559, 64, 65, 560,
+	64, 65, 561, 64, 562, 65, 64, 563,
+	65, 64, 65, 564, 64, 65, 86, 86,
+	64, 65, 566, 64, 65, 567, 64, 65,
+	568, 64, 65, 569, 64, 65, 570, 64,
+	65, 571, 64, 65, 572, 64, 65, 573,
+	64, 65, 574, 64, 65, 575, 64, 576,
+	65, 64, 577, 65, 64, 65, 85, 64,
+	65, 579, 591, 64, 580, 65, 587, 64,
+	581, 65, 64, 65, 582, 64, 65, 583,
+	64, 65, 584, 64, 65, 585, 64, 65,
+	586, 64, 65, 85, 64, 65, 588, 64,
+	65, 589, 64, 65, 590, 64, 65, 86,
+	64, 592, 65, 64, 593, 65, 64, 65,
+	594, 64, 65, 595, 64, 65, 596, 64,
+	65, 597, 64, 65, 86, 64, 65, 599,
+	64, 65, 600, 64, 65, 601, 64, 602,
+	65, 64, 603, 65, 64, 65, 86, 64,
+	65, 605, 64, 65, 606, 64, 65, 607,
+	64, 65, 608, 64, 65, 609, 64, 65,
+	610, 64, 65, 611, 64, 612, 65, 64,
+	86, 65, 64, 0, 0
 };
 static const unsigned char _lexer_trans_actions[] = {
 	0, 54, 0, 5, 1, 0, 29, 1,
-	29, 29, 29, 29, 29, 29, 35, 0,
-	43, 0, 43, 0, 43, 54, 0, 5,
-	1, 0, 29, 1, 29, 29, 29, 29,
+	29, 29, 29, 29, 29, 29, 29, 29,
+	29, 29, 35, 0, 43, 0, 43, 0,
+	43, 54, 0, 5, 1, 0, 29, 1,
+	29, 29, 29, 29, 29, 29, 29, 29,
 	29, 29, 35, 0, 43, 0, 43, 0,
 	43, 139, 48, 9, 106, 11, 0, 134,
 	45, 45, 45, 3, 122, 33, 33, 33,
@@ -553,127 +859,229 @@ static const unsigned char _lexer_trans_actions[] = {
 	0, 43, 0, 43, 0, 43, 149, 126,
 	57, 110, 23, 0, 43, 43, 43, 43,
 	0, 27, 118, 27, 27, 51, 27, 0,
-	54, 0, 1, 0, 43, 0, 0, 43,
+	54, 0, 1, 0, 43, 0, 0, 0,
+	43, 149, 126, 57, 57, 57, 110, 23,
+	0, 0, 0, 110, 23, 0, 0, 110,
+	23, 0, 0, 110, 23, 0, 0, 110,
+	23, 0, 0, 0, 110, 23, 0, 0,
+	110, 23, 0, 110, 23, 0, 0, 0,
+	110, 23, 0, 0, 110, 23, 0, 110,
+	23, 0, 0, 110, 23, 0, 0, 110,
+	23, 0, 0, 110, 23, 0, 0, 0,
+	110, 23, 0, 0, 110, 23, 0, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 144,
+	57, 54, 0, 54, 0, 69, 33, 69,
+	84, 84, 84, 84, 84, 84, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	13, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 13, 0, 130,
+	31, 60, 57, 31, 63, 57, 63, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	66, 31, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 0, 43,
+	0, 43, 144, 57, 54, 0, 54, 0,
+	78, 33, 84, 78, 84, 84, 84, 84,
+	84, 84, 84, 84, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 19, 0,
+	54, 19, 0, 54, 19, 0, 0, 0,
+	130, 31, 60, 57, 31, 63, 57, 63,
+	63, 63, 63, 63, 63, 63, 63, 63,
+	63, 0, 0, 66, 31, 43, 0, 43,
 	0, 43, 0, 43, 0, 43, 0, 43,
 	0, 43, 0, 43, 0, 43, 0, 43,
 	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 0, 43, 0, 0, 0,
 	0, 43, 0, 43, 0, 43, 0, 43,
 	0, 43, 0, 43, 0, 43, 0, 43,
-	144, 57, 54, 0, 54, 0, 78, 33,
-	84, 78, 84, 84, 84, 84, 84, 0,
-	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 144, 57,
+	54, 0, 54, 0, 72, 33, 84, 72,
+	84, 84, 84, 84, 84, 84, 84, 84,
+	84, 84, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	54, 19, 0, 54, 19, 0, 130, 31,
+	54, 0, 0, 54, 15, 0, 54, 15,
+	0, 54, 15, 0, 0, 0, 130, 31,
 	60, 57, 31, 63, 57, 63, 63, 63,
-	63, 63, 63, 66, 31, 43, 0, 0,
-	43, 0, 0, 0, 43, 0, 43, 0,
-	43, 0, 43, 0, 43, 0, 43, 0,
-	43, 0, 43, 0, 43, 0, 43, 144,
-	57, 54, 0, 54, 0, 69, 33, 69,
-	84, 84, 84, 0, 0, 54, 0, 0,
+	63, 63, 63, 63, 63, 63, 63, 0,
+	0, 66, 31, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 144, 57, 54, 0, 54, 0,
+	75, 33, 84, 75, 84, 84, 84, 84,
+	84, 84, 84, 84, 84, 84, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
-	0, 54, 0, 0, 54, 13, 0, 0,
-	54, 0, 0, 54, 0, 0, 54, 0,
-	0, 54, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
+	17, 0, 54, 17, 0, 54, 17, 0,
+	0, 0, 130, 31, 60, 57, 31, 63,
+	57, 63, 63, 63, 63, 63, 63, 63,
+	63, 63, 63, 0, 0, 66, 31, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 17,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 0, 0, 43, 54, 37, 37,
+	87, 37, 37, 43, 0, 39, 0, 43,
+	0, 0, 54, 0, 0, 39, 0, 0,
+	54, 0, 93, 90, 41, 96, 90, 96,
+	96, 96, 96, 96, 96, 96, 96, 96,
+	96, 99, 0, 43, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	0, 54, 0, 0, 54, 0, 54, 0,
-	0, 54, 0, 0, 54, 13, 0, 54,
-	0, 0, 0, 0, 54, 0, 0, 0,
-	54, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 17, 0, 54, 0, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	54, 0, 0, 0, 54, 0, 0, 54,
+	54, 0, 0, 54, 0, 0, 0, 54,
+	0, 0, 54, 0, 54, 0, 0, 54,
+	0, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 0, 54, 0, 0, 54, 0, 54,
-	0, 0, 0, 43, 0, 43, 0, 43,
-	0, 43, 0, 43, 0, 43, 0, 43,
-	0, 43, 0, 43, 144, 57, 54, 0,
-	54, 0, 72, 33, 84, 72, 84, 84,
-	84, 84, 84, 84, 0, 0, 54, 0,
+	0, 0, 54, 0, 0, 0, 54, 0,
+	0, 0, 0, 0, 54, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 0, 54,
+	0, 0, 54, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 0,
+	54, 0, 0, 54, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
-	0, 0, 54, 0, 0, 54, 15, 0,
-	54, 15, 0, 54, 15, 0, 0, 54,
-	0, 0, 54, 0, 0, 0, 54, 0,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 0, 54, 0, 0, 54,
 	0, 54, 0, 0, 54, 0, 0, 54,
-	0, 0, 54, 0, 0, 54, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	0, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 15,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 15,
 	0, 54, 0, 0, 0, 54, 0, 0,
-	54, 0, 54, 0, 0, 54, 0, 0,
-	54, 15, 0, 54, 0, 0, 0, 54,
-	0, 0, 0, 54, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	0, 54, 0, 0, 54, 0, 54, 0,
+	54, 0, 0, 0, 54, 0, 0, 54,
 	0, 54, 0, 0, 54, 0, 0, 0,
-	54, 0, 0, 54, 0, 54, 0, 0,
-	54, 0, 0, 54, 0, 0, 0, 43,
-	0, 43, 0, 43, 0, 43, 0, 43,
-	0, 43, 0, 43, 0, 43, 144, 57,
-	54, 0, 54, 0, 81, 84, 81, 0,
-	0, 54, 0, 0, 0, 54, 0, 0,
-	54, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
-	21, 0, 0, 43, 0, 43, 0, 43,
-	0, 43, 0, 43, 0, 43, 0, 43,
-	144, 57, 54, 0, 54, 0, 75, 33,
-	84, 75, 84, 84, 84, 84, 84, 84,
 	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 0, 54,
+	0, 0, 54, 0, 54, 0, 0, 54,
+	0, 0, 0, 54, 0, 0, 0, 0,
+	54, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 0, 54, 0, 0, 54, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 0,
+	54, 0, 0, 54, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 0, 54, 0, 0, 54,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
-	0, 54, 17, 0, 54, 17, 0, 54,
-	17, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	0, 43, 0, 43, 0, 43, 0, 43,
+	144, 57, 54, 0, 54, 0, 81, 84,
+	84, 84, 81, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	21, 0, 54, 0, 0, 0, 54, 0,
 	0, 54, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	0, 54, 0, 0, 54, 0, 54, 0,
-	0, 54, 0, 0, 54, 17, 0, 54,
-	0, 0, 0, 54, 0, 0, 0, 0,
-	54, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 0, 54, 0, 0, 54, 0,
+	0, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 19,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 0, 43, 0, 43, 0, 43, 0,
+	43, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 19,
+	0, 54, 0, 0, 0, 54, 0, 0,
+	54, 0, 54, 0, 0, 0, 54, 0,
+	0, 0, 0, 54, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 0, 54, 0,
 	0, 54, 0, 54, 0, 0, 54, 0,
 	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 0, 54, 0, 0, 54, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	0, 54, 0, 0, 54, 0, 54, 0,
-	0, 54, 0, 0, 54, 0, 0, 0,
-	43, 0, 43, 0, 0, 0, 43, 54,
-	37, 37, 87, 37, 37, 43, 0, 39,
-	0, 43, 0, 0, 54, 0, 0, 39,
-	0, 0, 54, 0, 93, 90, 41, 96,
-	90, 96, 96, 96, 96, 96, 96, 99,
-	0, 43, 54, 19, 0, 0, 54, 0,
-	0, 54, 0, 0, 0, 54, 0, 0,
-	54, 0, 54, 0, 0, 0, 54, 0,
+	54, 0, 0, 54, 0, 0, 0, 54,
 	0, 0, 54, 0, 54, 0, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
-	0, 54, 19, 0, 54, 0, 0, 54,
-	0, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 0, 54, 0, 0,
+	54, 0, 54, 0, 0, 54, 0, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 0,
+	54, 0, 0, 54, 0, 54, 0, 0,
+	54, 0, 0, 0, 0, 54, 0, 0,
+	0, 54, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 54, 0, 0,
 	54, 0, 0, 54, 0, 0, 54, 0,
 	0, 0, 54, 0, 0, 54, 0, 54,
 	0, 0, 54, 0, 0, 54, 0, 0,
-	0, 0
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 0,
+	54, 0, 0, 54, 0, 54, 0, 0,
+	54, 0, 0, 54, 0, 0, 54, 0,
+	0, 54, 0, 0, 54, 0, 0, 54,
+	0, 0, 54, 0, 0, 0, 54, 0,
+	0, 54, 0, 0, 0
 };
 static const unsigned char _lexer_eof_actions[] = {
@@ -720,11 +1128,44 @@ static const unsigned char _lexer_eof_actions[] = {
 	43, 43, 43, 43, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 43, 43, 43,
-	43, 43, 43, 43, 43
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43, 43, 43,
+	43, 43, 43, 43, 43, 43
 };
 static const int lexer_start = 1;
-static const int lexer_first_final = 348;
+static const int lexer_first_final = 613;
 static const int lexer_error = 0;
 static const int lexer_en_main = 1;
@@ -898,14 +1339,14 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
     assert(*pe == '\0' && "pointer does not end on NULL");
-#line 902 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
+#line 1343 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
 	{
 	cs = lexer_start;
 	}
 #line 425 "/Users/ahellesoy/github/gherkin/tasks/../ragel/i18n/sk.c.rl"
-#line 909 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
+#line 1350 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1195,7 +1636,7 @@ _match:
     }
   }
 	break;
-#line 1199 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
+#line 1640 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
 		}
 	}
@@ -1258,7 +1699,7 @@ _again:
     }
   }
 	break;
-#line 1262 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
+#line 1703 "ext/gherkin_lexer_sk/gherkin_lexer_sk.c"
 		}
 	}
 	}