gherkin 2.11.1 → 2.11.2

data/History.md

@@ -1,3 +1,10 @@
+## [2.11.2](https://github.com/cucumber/gherkin/compare/v2.11.1...v2.11.2)
+
+* [Java] Depend on an external gherkin-jvm-deps jar with repackaged dependencies (Aslak Hellesøy, Rex Hoffman)
+* [Core] Renamed i18n.yml to i18n.json, which simplifies the build system for Java. (Aslak Hellesøy)
+* [Java Reporter should take embeddings as `byte[]` and not `InputStream` ([#184](https://github.com/cucumber/gherkin/issues/184) Aslak Hellesøy)
+* [Core] A little addition to russian translation ([#183](https://github.com/cucumber/gherkin/pull/183) Sergey Sytsevich)
+
 ## [2.11.1](https://github.com/cucumber/gherkin/compare/v2.11.0...v2.11.1)
 
 * [JavaScript] Native implementation of JSONFormatter (Aslak Hellesøy)

data/README.md

@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.11.1</version>
+        <version>2.11.2</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)

data/ext/gherkin_lexer_bm/gherkin_lexer_bm.c

@@ -116,47 +116,50 @@ static const short _lexer_key_offsets[] = {
 	87, 88, 89, 90, 91, 92, 93, 94, 
 	95, 97, 99, 104, 111, 116, 117, 118, 
 	119, 120, 121, 122, 123, 124, 125, 126, 
-	127, 128, 129, 130, 131, 132, 133, 140, 
-	142, 144, 146, 148, 150, 152, 172, 173, 
+	127, 128, 129, 130, 131, 132, 133, 134, 
+	141, 143, 145, 147, 149, 151, 153, 173, 
 	174, 175, 176, 177, 178, 179, 180, 181, 
-	182, 194, 196, 198, 200, 202, 204, 206, 
-	208, 210, 212, 214, 216, 218, 220, 222, 
-	224, 226, 228, 230, 232, 234, 236, 238, 
-	240, 242, 244, 246, 248, 250, 252, 254, 
-	256, 258, 260, 262, 264, 266, 268, 270, 
-	272, 274, 276, 278, 280, 282, 284, 286, 
-	288, 290, 292, 294, 296, 298, 300, 302, 
-	304, 306, 308, 309, 310, 311, 312, 313, 
-	314, 315, 316, 317, 318, 319, 320, 321, 
-	322, 323, 324, 325, 326, 327, 328, 329, 
-	345, 347, 349, 351, 353, 355, 357, 359, 
-	361, 363, 365, 367, 369, 371, 373, 375, 
-	377, 379, 381, 383, 385, 387, 389, 391, 
-	393, 395, 397, 399, 401, 403, 405, 407, 
-	409, 411, 413, 415, 417, 419, 421, 423, 
-	425, 427, 429, 431, 433, 435, 437, 439, 
-	441, 443, 445, 447, 449, 451, 453, 455, 
-	457, 459, 461, 463, 465, 466, 467, 468, 
-	469, 470, 471, 472, 473, 474, 475, 476, 
-	477, 478, 479, 480, 481, 482, 483, 484, 
-	485, 486, 487, 502, 504, 506, 508, 510, 
-	512, 514, 516, 518, 520, 522, 524, 526, 
-	528, 530, 532, 534, 536, 538, 540, 542, 
-	544, 546, 548, 550, 552, 554, 556, 558, 
-	560, 562, 564, 566, 568, 570, 572, 574, 
-	576, 578, 580, 582, 584, 586, 588, 590, 
-	592, 594, 596, 597, 598, 599, 600, 601, 
-	602, 603, 604, 605, 622, 624, 626, 628, 
-	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, 682, 684, 686, 688, 690, 692, 
-	694, 696, 698, 700, 702, 704, 706, 708, 
-	710, 712, 714, 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, 769, 770, 
-	771, 772, 776, 782, 785, 787, 793, 813
+	182, 183, 195, 197, 199, 201, 203, 205, 
+	207, 209, 211, 213, 215, 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, 279, 281, 283, 285, 
+	287, 289, 291, 293, 295, 297, 299, 301, 
+	303, 305, 307, 309, 311, 313, 315, 317, 
+	319, 321, 323, 324, 325, 326, 327, 328, 
+	329, 330, 331, 332, 333, 334, 335, 336, 
+	337, 338, 339, 340, 341, 342, 343, 344, 
+	360, 362, 364, 366, 368, 370, 372, 374, 
+	376, 378, 380, 382, 384, 386, 388, 390, 
+	392, 394, 396, 398, 400, 402, 404, 406, 
+	408, 410, 412, 414, 416, 418, 420, 422, 
+	424, 426, 428, 430, 432, 434, 436, 438, 
+	440, 442, 444, 446, 448, 450, 452, 454, 
+	456, 458, 460, 462, 464, 466, 468, 470, 
+	472, 474, 476, 478, 480, 482, 484, 486, 
+	488, 490, 492, 494, 495, 496, 497, 498, 
+	499, 500, 501, 502, 503, 504, 505, 506, 
+	507, 508, 509, 510, 511, 512, 513, 514, 
+	515, 516, 517, 532, 534, 536, 538, 540, 
+	542, 544, 546, 548, 550, 552, 554, 556, 
+	558, 560, 562, 564, 566, 568, 570, 572, 
+	574, 576, 578, 580, 582, 584, 586, 588, 
+	590, 592, 594, 596, 598, 600, 602, 604, 
+	606, 608, 610, 612, 614, 616, 618, 620, 
+	622, 624, 626, 627, 628, 629, 630, 631, 
+	632, 633, 634, 635, 652, 654, 656, 658, 
+	660, 662, 664, 666, 668, 670, 672, 674, 
+	676, 678, 680, 682, 684, 686, 688, 690, 
+	692, 694, 696, 698, 700, 702, 704, 706, 
+	708, 710, 712, 714, 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, 820, 826, 829, 831, 837, 857
 };
 
 static const char _lexer_trans_keys[] = {
@@ -176,92 +179,98 @@ static const char _lexer_trans_keys[] = {
 	9, 10, 13, 32, 64, 11, 12, 10, 
 	32, 64, 9, 13, 112, 97, 98, 105, 
 	108, 97, 97, 103, 105, 111, 110, 116, 
-	111, 104, 58, 10, 10, 10, 32, 35, 
-	70, 124, 9, 13, 10, 117, 10, 110, 
-	10, 103, 10, 115, 10, 105, 10, 58, 
-	10, 32, 34, 35, 37, 42, 64, 65, 
-	66, 67, 68, 70, 75, 76, 77, 83, 
-	84, 124, 9, 13, 97, 110, 117, 110, 
-	103, 115, 105, 58, 10, 10, 10, 32, 
-	35, 37, 64, 67, 70, 76, 77, 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, 10, 111, 
-	10, 110, 10, 116, 10, 111, 10, 104, 
-	10, 58, 10, 117, 10, 110, 10, 103, 
-	10, 115, 10, 105, 10, 97, 10, 116, 
-	10, 97, 10, 114, 10, 32, 10, 66, 
-	10, 101, 10, 108, 10, 97, 10, 107, 
-	10, 97, 10, 110, 10, 103, 10, 101, 
-	10, 110, 10, 103, 10, 103, 10, 97, 
-	10, 114, 10, 105, 10, 115, 10, 107, 
-	10, 97, 10, 110, 10, 32, 10, 83, 
-	10, 101, 10, 110, 10, 97, 10, 114, 
-	10, 105, 10, 111, 101, 109, 117, 100, 
-	105, 97, 116, 97, 114, 32, 66, 101, 
-	108, 97, 107, 97, 110, 103, 58, 10, 
-	10, 10, 32, 35, 37, 42, 64, 65, 
-	66, 68, 70, 75, 77, 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, 
-	112, 10, 97, 10, 98, 10, 105, 10, 
-	108, 10, 97, 10, 97, 10, 103, 10, 
-	105, 10, 97, 10, 110, 10, 117, 10, 
+	111, 104, 32, 58, 10, 10, 10, 32, 
+	35, 70, 124, 9, 13, 10, 117, 10, 
 	110, 10, 103, 10, 115, 10, 105, 10, 
-	58, 10, 101, 10, 109, 10, 117, 10, 
-	100, 10, 105, 10, 101, 10, 110, 10, 
-	103, 10, 103, 10, 97, 10, 114, 10, 
-	105, 10, 115, 10, 107, 10, 97, 10, 
-	110, 10, 32, 10, 83, 10, 101, 10, 
-	110, 10, 97, 10, 114, 10, 105, 10, 
-	111, 10, 101, 10, 116, 10, 97, 10, 
-	112, 101, 110, 103, 103, 97, 114, 105, 
-	115, 107, 97, 110, 32, 83, 101, 110, 
-	97, 114, 105, 111, 58, 10, 10, 10, 
-	32, 35, 37, 42, 64, 65, 66, 68, 
-	70, 75, 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, 112, 10, 97, 
-	10, 98, 10, 105, 10, 108, 10, 97, 
-	10, 97, 10, 103, 10, 105, 10, 97, 
-	10, 110, 10, 117, 10, 110, 10, 103, 
-	10, 115, 10, 105, 10, 58, 10, 101, 
-	10, 109, 10, 117, 10, 100, 10, 105, 
-	10, 101, 10, 110, 10, 97, 10, 114, 
-	10, 105, 10, 111, 10, 101, 10, 116, 
-	10, 97, 10, 112, 101, 110, 97, 114, 
-	105, 111, 58, 10, 10, 10, 32, 35, 
-	37, 42, 64, 65, 66, 68, 70, 75, 
-	76, 77, 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, 112, 10, 97, 
-	10, 98, 10, 105, 10, 108, 10, 97, 
-	10, 97, 10, 103, 10, 105, 10, 97, 
-	10, 110, 10, 117, 10, 110, 10, 103, 
-	10, 115, 10, 105, 10, 58, 10, 101, 
-	10, 109, 10, 117, 10, 100, 10, 105, 
-	10, 97, 10, 116, 10, 97, 10, 114, 
-	10, 32, 10, 66, 10, 101, 10, 108, 
-	10, 97, 10, 107, 10, 97, 10, 110, 
-	10, 103, 10, 101, 10, 110, 10, 103, 
+	58, 10, 32, 34, 35, 37, 42, 64, 
+	65, 66, 67, 68, 70, 75, 76, 77, 
+	83, 84, 124, 9, 13, 97, 110, 117, 
+	110, 103, 115, 105, 58, 10, 10, 10, 
+	32, 35, 37, 64, 67, 70, 76, 77, 
+	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, 10, 
+	111, 10, 110, 10, 116, 10, 111, 10, 
+	104, 10, 32, 10, 58, 10, 117, 10, 
+	110, 10, 103, 10, 115, 10, 105, 10, 
+	97, 10, 116, 10, 97, 10, 114, 10, 
+	32, 10, 66, 10, 101, 10, 108, 10, 
+	97, 10, 107, 10, 97, 10, 110, 10, 
+	103, 10, 101, 10, 110, 10, 103, 10, 
+	103, 10, 97, 10, 114, 10, 105, 10, 
+	115, 10, 107, 10, 97, 10, 110, 10, 
+	32, 10, 83, 10, 101, 10, 110, 10, 
+	97, 10, 114, 10, 105, 10, 111, 10, 
+	101, 10, 110, 10, 97, 10, 114, 10, 
+	105, 10, 111, 101, 109, 117, 100, 105, 
+	97, 116, 97, 114, 32, 66, 101, 108, 
+	97, 107, 97, 110, 103, 58, 10, 10, 
+	10, 32, 35, 37, 42, 64, 65, 66, 
+	68, 70, 75, 77, 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, 112, 
+	10, 97, 10, 98, 10, 105, 10, 108, 
+	10, 97, 10, 97, 10, 103, 10, 105, 
+	10, 97, 10, 110, 10, 117, 10, 110, 
+	10, 103, 10, 115, 10, 105, 10, 58, 
+	10, 101, 10, 109, 10, 117, 10, 100, 
+	10, 105, 10, 101, 10, 110, 10, 103, 
 	10, 103, 10, 97, 10, 114, 10, 105, 
 	10, 115, 10, 107, 10, 97, 10, 110, 
 	10, 32, 10, 83, 10, 101, 10, 110, 
 	10, 97, 10, 114, 10, 105, 10, 111, 
-	10, 101, 10, 116, 10, 97, 10, 112, 
-	101, 116, 97, 112, 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, 66, 67, 68, 70, 75, 76, 77, 
-	83, 84, 124, 9, 13, 0
+	10, 32, 10, 101, 10, 110, 10, 97, 
+	10, 114, 10, 105, 10, 111, 10, 101, 
+	10, 116, 10, 97, 10, 112, 101, 110, 
+	103, 103, 97, 114, 105, 115, 107, 97, 
+	110, 32, 83, 101, 110, 97, 114, 105, 
+	111, 32, 58, 10, 10, 10, 32, 35, 
+	37, 42, 64, 65, 66, 68, 70, 75, 
+	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, 112, 10, 97, 10, 98, 
+	10, 105, 10, 108, 10, 97, 10, 97, 
+	10, 103, 10, 105, 10, 97, 10, 110, 
+	10, 117, 10, 110, 10, 103, 10, 115, 
+	10, 105, 10, 58, 10, 101, 10, 109, 
+	10, 117, 10, 100, 10, 105, 10, 101, 
+	10, 110, 10, 97, 10, 114, 10, 105, 
+	10, 111, 10, 101, 10, 116, 10, 97, 
+	10, 112, 101, 110, 97, 114, 105, 111, 
+	58, 10, 10, 10, 32, 35, 37, 42, 
+	64, 65, 66, 68, 70, 75, 76, 77, 
+	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, 112, 10, 97, 10, 98, 
+	10, 105, 10, 108, 10, 97, 10, 97, 
+	10, 103, 10, 105, 10, 97, 10, 110, 
+	10, 117, 10, 110, 10, 103, 10, 115, 
+	10, 105, 10, 58, 10, 101, 10, 109, 
+	10, 117, 10, 100, 10, 105, 10, 97, 
+	10, 116, 10, 97, 10, 114, 10, 32, 
+	10, 66, 10, 101, 10, 108, 10, 97, 
+	10, 107, 10, 97, 10, 110, 10, 103, 
+	10, 101, 10, 110, 10, 103, 10, 103, 
+	10, 97, 10, 114, 10, 105, 10, 115, 
+	10, 107, 10, 97, 10, 110, 10, 32, 
+	10, 83, 10, 101, 10, 110, 10, 97, 
+	10, 114, 10, 105, 10, 111, 10, 32, 
+	10, 101, 10, 110, 10, 97, 10, 114, 
+	10, 105, 10, 111, 10, 101, 10, 116, 
+	10, 97, 10, 112, 101, 116, 97, 112, 
+	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, 66, 67, 68, 
+	70, 75, 76, 77, 83, 84, 124, 9, 
+	13, 0
 };
 
 static const char _lexer_single_lengths[] = {
@@ -271,10 +280,11 @@ static const char _lexer_single_lengths[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	2, 2, 3, 5, 3, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 5, 2, 
-	2, 2, 2, 2, 2, 18, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 5, 
+	2, 2, 2, 2, 2, 2, 18, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	10, 2, 2, 2, 2, 2, 2, 2, 
+	1, 10, 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, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
@@ -291,7 +301,8 @@ static const char _lexer_single_lengths[] = {
 	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, 1, 1, 1, 1, 
+	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, 1, 1, 1, 1, 1, 1, 
 	1, 1, 13, 2, 2, 2, 2, 2, 
@@ -310,8 +321,9 @@ static const char _lexer_single_lengths[] = {
 	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, 1, 1, 1, 
-	1, 2, 4, 3, 2, 4, 18, 0
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 1, 1, 1, 1, 
+	2, 4, 3, 2, 4, 18, 0
 };
 
 static const char _lexer_range_lengths[] = {
@@ -321,10 +333,11 @@ static const char _lexer_range_lengths[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 1, 1, 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, 1, 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, 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, 
@@ -344,6 +357,7 @@ 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, 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, 
@@ -361,7 +375,8 @@ 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, 1, 1, 0, 0, 1, 1, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	1, 1, 0, 0, 1, 1, 0
 };
 
 static const short _lexer_index_offsets[] = {
@@ -371,56 +386,59 @@ static const short _lexer_index_offsets[] = {
 	102, 104, 106, 108, 110, 112, 114, 116, 
 	118, 121, 124, 129, 136, 141, 143, 145, 
 	147, 149, 151, 153, 155, 157, 159, 161, 
-	163, 165, 167, 169, 171, 173, 175, 182, 
-	185, 188, 191, 194, 197, 200, 220, 222, 
+	163, 165, 167, 169, 171, 173, 175, 177, 
+	184, 187, 190, 193, 196, 199, 202, 222, 
 	224, 226, 228, 230, 232, 234, 236, 238, 
-	240, 252, 255, 258, 261, 264, 267, 270, 
-	273, 276, 279, 282, 285, 288, 291, 294, 
-	297, 300, 303, 306, 309, 312, 315, 318, 
-	321, 324, 327, 330, 333, 336, 339, 342, 
-	345, 348, 351, 354, 357, 360, 363, 366, 
-	369, 372, 375, 378, 381, 384, 387, 390, 
-	393, 396, 399, 402, 405, 408, 411, 414, 
-	417, 420, 423, 425, 427, 429, 431, 433, 
-	435, 437, 439, 441, 443, 445, 447, 449, 
-	451, 453, 455, 457, 459, 461, 463, 465, 
-	481, 484, 487, 490, 493, 496, 499, 502, 
-	505, 508, 511, 514, 517, 520, 523, 526, 
-	529, 532, 535, 538, 541, 544, 547, 550, 
-	553, 556, 559, 562, 565, 568, 571, 574, 
-	577, 580, 583, 586, 589, 592, 595, 598, 
-	601, 604, 607, 610, 613, 616, 619, 622, 
-	625, 628, 631, 634, 637, 640, 643, 646, 
-	649, 652, 655, 658, 661, 663, 665, 667, 
-	669, 671, 673, 675, 677, 679, 681, 683, 
-	685, 687, 689, 691, 693, 695, 697, 699, 
-	701, 703, 705, 720, 723, 726, 729, 732, 
-	735, 738, 741, 744, 747, 750, 753, 756, 
-	759, 762, 765, 768, 771, 774, 777, 780, 
-	783, 786, 789, 792, 795, 798, 801, 804, 
-	807, 810, 813, 816, 819, 822, 825, 828, 
-	831, 834, 837, 840, 843, 846, 849, 852, 
-	855, 858, 861, 863, 865, 867, 869, 871, 
-	873, 875, 877, 879, 896, 899, 902, 905, 
-	908, 911, 914, 917, 920, 923, 926, 929, 
-	932, 935, 938, 941, 944, 947, 950, 953, 
-	956, 959, 962, 965, 968, 971, 974, 977, 
-	980, 983, 986, 989, 992, 995, 998, 1001, 
-	1004, 1007, 1010, 1013, 1016, 1019, 1022, 1025, 
-	1028, 1031, 1034, 1037, 1040, 1043, 1046, 1049, 
-	1052, 1055, 1058, 1061, 1064, 1067, 1070, 1073, 
-	1076, 1079, 1082, 1085, 1088, 1091, 1094, 1097, 
-	1100, 1103, 1106, 1109, 1112, 1115, 1117, 1119, 
-	1121, 1123, 1127, 1133, 1137, 1140, 1146, 1166
+	240, 242, 254, 257, 260, 263, 266, 269, 
+	272, 275, 278, 281, 284, 287, 290, 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, 386, 389, 
+	392, 395, 398, 401, 404, 407, 410, 413, 
+	416, 419, 422, 425, 428, 431, 434, 437, 
+	440, 443, 446, 448, 450, 452, 454, 456, 
+	458, 460, 462, 464, 466, 468, 470, 472, 
+	474, 476, 478, 480, 482, 484, 486, 488, 
+	504, 507, 510, 513, 516, 519, 522, 525, 
+	528, 531, 534, 537, 540, 543, 546, 549, 
+	552, 555, 558, 561, 564, 567, 570, 573, 
+	576, 579, 582, 585, 588, 591, 594, 597, 
+	600, 603, 606, 609, 612, 615, 618, 621, 
+	624, 627, 630, 633, 636, 639, 642, 645, 
+	648, 651, 654, 657, 660, 663, 666, 669, 
+	672, 675, 678, 681, 684, 687, 690, 693, 
+	696, 699, 702, 705, 707, 709, 711, 713, 
+	715, 717, 719, 721, 723, 725, 727, 729, 
+	731, 733, 735, 737, 739, 741, 743, 745, 
+	747, 749, 751, 766, 769, 772, 775, 778, 
+	781, 784, 787, 790, 793, 796, 799, 802, 
+	805, 808, 811, 814, 817, 820, 823, 826, 
+	829, 832, 835, 838, 841, 844, 847, 850, 
+	853, 856, 859, 862, 865, 868, 871, 874, 
+	877, 880, 883, 886, 889, 892, 895, 898, 
+	901, 904, 907, 909, 911, 913, 915, 917, 
+	919, 921, 923, 925, 942, 945, 948, 951, 
+	954, 957, 960, 963, 966, 969, 972, 975, 
+	978, 981, 984, 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, 1134, 1137, 1140, 1143, 
+	1146, 1149, 1152, 1155, 1158, 1161, 1164, 1167, 
+	1170, 1173, 1176, 1179, 1182, 1184, 1186, 1188, 
+	1190, 1194, 1200, 1204, 1207, 1213, 1233
 };
 
 static const short _lexer_trans_targs[] = {
 	2, 4, 4, 5, 15, 17, 31, 34, 
-	37, 43, 46, 62, 64, 130, 135, 212, 
-	282, 365, 369, 4, 0, 3, 0, 4, 
+	37, 43, 46, 63, 65, 138, 143, 227, 
+	298, 388, 392, 4, 0, 3, 0, 4, 
 	0, 4, 4, 5, 15, 17, 31, 34, 
-	37, 43, 46, 62, 64, 130, 135, 212, 
-	282, 365, 369, 4, 0, 6, 0, 7, 
+	37, 43, 46, 63, 65, 138, 143, 227, 
+	298, 388, 392, 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, 
@@ -429,138 +447,147 @@ 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, 375, 0, 32, 0, 4, 16, 
+	30, 0, 398, 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, 38, 0, 39, 
 	0, 40, 0, 41, 0, 42, 0, 31, 
 	0, 44, 0, 45, 0, 31, 0, 47, 
 	0, 48, 0, 49, 0, 50, 0, 51, 
-	0, 52, 0, 54, 53, 54, 53, 54, 
-	54, 4, 55, 4, 54, 53, 54, 56, 
-	53, 54, 57, 53, 54, 58, 53, 54, 
-	59, 53, 54, 60, 53, 54, 61, 53, 
-	4, 4, 5, 15, 17, 31, 34, 37, 
-	43, 46, 62, 64, 130, 135, 212, 282, 
-	365, 369, 4, 0, 63, 0, 31, 0, 
-	65, 0, 66, 0, 67, 0, 68, 0, 
-	69, 0, 70, 0, 72, 71, 72, 71, 
-	72, 72, 4, 73, 4, 87, 93, 98, 
-	111, 124, 72, 71, 72, 74, 71, 72, 
-	75, 71, 72, 76, 71, 72, 77, 71, 
-	72, 78, 71, 72, 79, 71, 72, 80, 
-	71, 72, 81, 71, 72, 82, 71, 72, 
-	83, 71, 72, 84, 71, 72, 85, 71, 
-	72, 86, 71, 72, 4, 71, 72, 88, 
-	71, 72, 89, 71, 72, 90, 71, 72, 
-	91, 71, 72, 92, 71, 72, 61, 71, 
-	72, 94, 71, 72, 95, 71, 72, 96, 
-	71, 72, 97, 71, 72, 92, 71, 72, 
-	99, 71, 72, 100, 71, 72, 101, 71, 
-	72, 102, 71, 72, 103, 71, 72, 104, 
-	71, 72, 105, 71, 72, 106, 71, 72, 
-	107, 71, 72, 108, 71, 72, 109, 71, 
-	72, 110, 71, 72, 92, 71, 72, 112, 
-	71, 72, 113, 71, 72, 114, 71, 72, 
-	115, 71, 72, 116, 71, 72, 117, 71, 
-	72, 118, 71, 72, 119, 71, 72, 120, 
-	71, 72, 121, 71, 72, 122, 71, 72, 
-	123, 71, 72, 124, 71, 72, 125, 71, 
-	72, 126, 71, 72, 127, 71, 72, 128, 
-	71, 72, 129, 71, 72, 92, 71, 131, 
-	0, 132, 0, 133, 0, 134, 0, 62, 
-	0, 136, 0, 137, 0, 138, 0, 139, 
-	0, 140, 0, 141, 0, 142, 0, 143, 
-	0, 144, 0, 145, 0, 146, 0, 147, 
-	0, 148, 0, 149, 0, 151, 150, 151, 
-	150, 151, 151, 4, 152, 166, 4, 167, 
-	173, 176, 178, 184, 189, 202, 208, 151, 
-	150, 151, 153, 150, 151, 154, 150, 151, 
-	155, 150, 151, 156, 150, 151, 157, 150, 
-	151, 158, 150, 151, 159, 150, 151, 160, 
-	150, 151, 161, 150, 151, 162, 150, 151, 
-	163, 150, 151, 164, 150, 151, 165, 150, 
-	151, 4, 150, 151, 61, 150, 151, 168, 
-	150, 151, 169, 150, 151, 170, 150, 151, 
-	171, 150, 151, 172, 150, 151, 166, 150, 
-	151, 174, 150, 151, 175, 150, 151, 166, 
-	150, 151, 177, 150, 151, 166, 150, 151, 
-	179, 150, 151, 180, 150, 151, 181, 150, 
-	151, 182, 150, 151, 183, 150, 151, 61, 
-	150, 151, 185, 150, 151, 186, 150, 151, 
-	187, 150, 151, 188, 150, 151, 176, 150, 
-	151, 190, 150, 151, 191, 150, 151, 192, 
-	150, 151, 193, 150, 151, 194, 150, 151, 
-	195, 150, 151, 196, 150, 151, 197, 150, 
-	151, 198, 150, 151, 199, 150, 151, 200, 
-	150, 151, 201, 150, 151, 202, 150, 151, 
-	203, 150, 151, 204, 150, 151, 205, 150, 
-	151, 206, 150, 151, 207, 150, 151, 183, 
-	150, 151, 209, 150, 151, 210, 150, 151, 
-	211, 150, 151, 175, 150, 213, 0, 214, 
-	0, 215, 0, 216, 0, 217, 0, 218, 
-	0, 219, 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, 232, 0, 234, 233, 234, 
-	233, 234, 234, 4, 235, 249, 4, 250, 
-	256, 259, 261, 267, 272, 278, 234, 233, 
-	234, 236, 233, 234, 237, 233, 234, 238, 
-	233, 234, 239, 233, 234, 240, 233, 234, 
-	241, 233, 234, 242, 233, 234, 243, 233, 
-	234, 244, 233, 234, 245, 233, 234, 246, 
-	233, 234, 247, 233, 234, 248, 233, 234, 
-	4, 233, 234, 61, 233, 234, 251, 233, 
-	234, 252, 233, 234, 253, 233, 234, 254, 
-	233, 234, 255, 233, 234, 249, 233, 234, 
-	257, 233, 234, 258, 233, 234, 249, 233, 
-	234, 260, 233, 234, 249, 233, 234, 262, 
-	233, 234, 263, 233, 234, 264, 233, 234, 
-	265, 233, 234, 266, 233, 234, 61, 233, 
-	234, 268, 233, 234, 269, 233, 234, 270, 
-	233, 234, 271, 233, 234, 259, 233, 234, 
-	273, 233, 234, 274, 233, 234, 275, 233, 
-	234, 276, 233, 234, 277, 233, 234, 266, 
-	233, 234, 279, 233, 234, 280, 233, 234, 
-	281, 233, 234, 258, 233, 283, 0, 284, 
-	0, 285, 0, 286, 0, 287, 0, 288, 
-	0, 289, 0, 291, 290, 291, 290, 291, 
-	291, 4, 292, 306, 4, 307, 313, 316, 
-	318, 324, 329, 342, 355, 361, 291, 290, 
-	291, 293, 290, 291, 294, 290, 291, 295, 
-	290, 291, 296, 290, 291, 297, 290, 291, 
-	298, 290, 291, 299, 290, 291, 300, 290, 
-	291, 301, 290, 291, 302, 290, 291, 303, 
-	290, 291, 304, 290, 291, 305, 290, 291, 
-	4, 290, 291, 61, 290, 291, 308, 290, 
-	291, 309, 290, 291, 310, 290, 291, 311, 
-	290, 291, 312, 290, 291, 306, 290, 291, 
-	314, 290, 291, 315, 290, 291, 306, 290, 
-	291, 317, 290, 291, 306, 290, 291, 319, 
-	290, 291, 320, 290, 291, 321, 290, 291, 
-	322, 290, 291, 323, 290, 291, 61, 290, 
-	291, 325, 290, 291, 326, 290, 291, 327, 
-	290, 291, 328, 290, 291, 316, 290, 291, 
-	330, 290, 291, 331, 290, 291, 332, 290, 
-	291, 333, 290, 291, 334, 290, 291, 335, 
-	290, 291, 336, 290, 291, 337, 290, 291, 
-	338, 290, 291, 339, 290, 291, 340, 290, 
-	291, 341, 290, 291, 323, 290, 291, 343, 
-	290, 291, 344, 290, 291, 345, 290, 291, 
-	346, 290, 291, 347, 290, 291, 348, 290, 
-	291, 349, 290, 291, 350, 290, 291, 351, 
-	290, 291, 352, 290, 291, 353, 290, 291, 
-	354, 290, 291, 355, 290, 291, 356, 290, 
-	291, 357, 290, 291, 358, 290, 291, 359, 
-	290, 291, 360, 290, 291, 323, 290, 291, 
-	362, 290, 291, 363, 290, 291, 364, 290, 
-	291, 315, 290, 366, 0, 367, 0, 368, 
-	0, 45, 0, 369, 370, 369, 0, 374, 
-	373, 372, 370, 373, 371, 0, 372, 370, 
-	371, 0, 372, 371, 374, 373, 372, 370, 
-	373, 371, 374, 374, 5, 15, 17, 31, 
-	34, 37, 43, 46, 62, 64, 130, 135, 
-	212, 282, 365, 369, 374, 0, 0, 0
+	0, 52, 0, 53, 0, 55, 54, 55, 
+	54, 55, 55, 4, 56, 4, 55, 54, 
+	55, 57, 54, 55, 58, 54, 55, 59, 
+	54, 55, 60, 54, 55, 61, 54, 55, 
+	62, 54, 4, 4, 5, 15, 17, 31, 
+	34, 37, 43, 46, 63, 65, 138, 143, 
+	227, 298, 388, 392, 4, 0, 64, 0, 
+	31, 0, 66, 0, 67, 0, 68, 0, 
+	69, 0, 70, 0, 71, 0, 73, 72, 
+	73, 72, 73, 73, 4, 74, 4, 88, 
+	95, 100, 113, 132, 73, 72, 73, 75, 
+	72, 73, 76, 72, 73, 77, 72, 73, 
+	78, 72, 73, 79, 72, 73, 80, 72, 
+	73, 81, 72, 73, 82, 72, 73, 83, 
+	72, 73, 84, 72, 73, 85, 72, 73, 
+	86, 72, 73, 87, 72, 73, 4, 72, 
+	73, 89, 72, 73, 90, 72, 73, 91, 
+	72, 73, 92, 72, 73, 93, 72, 73, 
+	94, 72, 73, 62, 72, 73, 96, 72, 
+	73, 97, 72, 73, 98, 72, 73, 99, 
+	72, 73, 94, 72, 73, 101, 72, 73, 
+	102, 72, 73, 103, 72, 73, 104, 72, 
+	73, 105, 72, 73, 106, 72, 73, 107, 
+	72, 73, 108, 72, 73, 109, 72, 73, 
+	110, 72, 73, 111, 72, 73, 112, 72, 
+	73, 94, 72, 73, 114, 72, 73, 115, 
+	72, 73, 116, 72, 73, 117, 72, 73, 
+	118, 72, 73, 119, 72, 73, 120, 72, 
+	73, 121, 72, 73, 122, 72, 73, 123, 
+	72, 73, 124, 72, 73, 125, 72, 73, 
+	126, 72, 73, 127, 72, 73, 128, 72, 
+	73, 129, 72, 73, 130, 72, 73, 131, 
+	72, 73, 93, 72, 73, 133, 72, 73, 
+	134, 72, 73, 135, 72, 73, 136, 72, 
+	73, 137, 72, 73, 94, 72, 139, 0, 
+	140, 0, 141, 0, 142, 0, 63, 0, 
+	144, 0, 145, 0, 146, 0, 147, 0, 
+	148, 0, 149, 0, 150, 0, 151, 0, 
+	152, 0, 153, 0, 154, 0, 155, 0, 
+	156, 0, 157, 0, 159, 158, 159, 158, 
+	159, 159, 4, 160, 174, 4, 175, 181, 
+	184, 186, 192, 197, 217, 223, 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, 62, 158, 159, 176, 158, 
+	159, 177, 158, 159, 178, 158, 159, 179, 
+	158, 159, 180, 158, 159, 174, 158, 159, 
+	182, 158, 159, 183, 158, 159, 174, 158, 
+	159, 185, 158, 159, 174, 158, 159, 187, 
+	158, 159, 188, 158, 159, 189, 158, 159, 
+	190, 158, 159, 191, 158, 159, 62, 158, 
+	159, 193, 158, 159, 194, 158, 159, 195, 
+	158, 159, 196, 158, 159, 184, 158, 159, 
+	198, 158, 159, 199, 158, 159, 200, 158, 
+	159, 201, 158, 159, 202, 158, 159, 203, 
+	158, 159, 204, 158, 159, 205, 158, 159, 
+	206, 158, 159, 207, 158, 159, 208, 158, 
+	159, 209, 158, 159, 210, 158, 159, 211, 
+	158, 159, 212, 158, 159, 213, 158, 159, 
+	214, 158, 159, 215, 158, 159, 216, 158, 
+	159, 191, 158, 159, 218, 158, 159, 219, 
+	158, 159, 220, 158, 159, 221, 158, 159, 
+	222, 158, 159, 191, 158, 159, 224, 158, 
+	159, 225, 158, 159, 226, 158, 159, 183, 
+	158, 228, 0, 229, 0, 230, 0, 231, 
+	0, 232, 0, 233, 0, 234, 0, 235, 
+	0, 236, 0, 237, 0, 238, 0, 239, 
+	0, 240, 0, 241, 0, 242, 0, 243, 
+	0, 244, 0, 245, 0, 246, 0, 247, 
+	0, 248, 0, 250, 249, 250, 249, 250, 
+	250, 4, 251, 265, 4, 266, 272, 275, 
+	277, 283, 288, 294, 250, 249, 250, 252, 
+	249, 250, 253, 249, 250, 254, 249, 250, 
+	255, 249, 250, 256, 249, 250, 257, 249, 
+	250, 258, 249, 250, 259, 249, 250, 260, 
+	249, 250, 261, 249, 250, 262, 249, 250, 
+	263, 249, 250, 264, 249, 250, 4, 249, 
+	250, 62, 249, 250, 267, 249, 250, 268, 
+	249, 250, 269, 249, 250, 270, 249, 250, 
+	271, 249, 250, 265, 249, 250, 273, 249, 
+	250, 274, 249, 250, 265, 249, 250, 276, 
+	249, 250, 265, 249, 250, 278, 249, 250, 
+	279, 249, 250, 280, 249, 250, 281, 249, 
+	250, 282, 249, 250, 62, 249, 250, 284, 
+	249, 250, 285, 249, 250, 286, 249, 250, 
+	287, 249, 250, 275, 249, 250, 289, 249, 
+	250, 290, 249, 250, 291, 249, 250, 292, 
+	249, 250, 293, 249, 250, 282, 249, 250, 
+	295, 249, 250, 296, 249, 250, 297, 249, 
+	250, 274, 249, 299, 0, 300, 0, 301, 
+	0, 302, 0, 303, 0, 304, 0, 305, 
+	0, 307, 306, 307, 306, 307, 307, 4, 
+	308, 322, 4, 323, 329, 332, 334, 340, 
+	345, 358, 378, 384, 307, 306, 307, 309, 
+	306, 307, 310, 306, 307, 311, 306, 307, 
+	312, 306, 307, 313, 306, 307, 314, 306, 
+	307, 315, 306, 307, 316, 306, 307, 317, 
+	306, 307, 318, 306, 307, 319, 306, 307, 
+	320, 306, 307, 321, 306, 307, 4, 306, 
+	307, 62, 306, 307, 324, 306, 307, 325, 
+	306, 307, 326, 306, 307, 327, 306, 307, 
+	328, 306, 307, 322, 306, 307, 330, 306, 
+	307, 331, 306, 307, 322, 306, 307, 333, 
+	306, 307, 322, 306, 307, 335, 306, 307, 
+	336, 306, 307, 337, 306, 307, 338, 306, 
+	307, 339, 306, 307, 62, 306, 307, 341, 
+	306, 307, 342, 306, 307, 343, 306, 307, 
+	344, 306, 307, 332, 306, 307, 346, 306, 
+	307, 347, 306, 307, 348, 306, 307, 349, 
+	306, 307, 350, 306, 307, 351, 306, 307, 
+	352, 306, 307, 353, 306, 307, 354, 306, 
+	307, 355, 306, 307, 356, 306, 307, 357, 
+	306, 307, 339, 306, 307, 359, 306, 307, 
+	360, 306, 307, 361, 306, 307, 362, 306, 
+	307, 363, 306, 307, 364, 306, 307, 365, 
+	306, 307, 366, 306, 307, 367, 306, 307, 
+	368, 306, 307, 369, 306, 307, 370, 306, 
+	307, 371, 306, 307, 372, 306, 307, 373, 
+	306, 307, 374, 306, 307, 375, 306, 307, 
+	376, 306, 307, 377, 306, 307, 339, 306, 
+	307, 379, 306, 307, 380, 306, 307, 381, 
+	306, 307, 382, 306, 307, 383, 306, 307, 
+	339, 306, 307, 385, 306, 307, 386, 306, 
+	307, 387, 306, 307, 331, 306, 389, 0, 
+	390, 0, 391, 0, 45, 0, 392, 393, 
+	392, 0, 397, 396, 395, 393, 396, 394, 
+	0, 395, 393, 394, 0, 395, 394, 397, 
+	396, 395, 393, 396, 394, 397, 397, 5, 
+	15, 17, 31, 34, 37, 43, 46, 63, 
+	65, 138, 143, 227, 298, 388, 392, 397, 
+	0, 0, 0
 };
 
 static const unsigned char _lexer_trans_actions[] = {
@@ -585,27 +612,25 @@ static const unsigned char _lexer_trans_actions[] = {
 	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, 144, 57, 54, 0, 54, 
-	0, 81, 84, 81, 0, 0, 54, 0, 
+	43, 0, 43, 0, 43, 144, 57, 54, 
+	0, 54, 0, 81, 84, 81, 0, 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, 
-	130, 31, 60, 57, 31, 63, 57, 63, 
-	63, 63, 63, 63, 63, 63, 63, 63, 
-	63, 66, 31, 43, 0, 43, 0, 43, 
+	21, 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, 144, 57, 54, 0, 
-	54, 0, 69, 33, 69, 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, 43, 0, 43, 0, 43, 144, 57, 
+	54, 0, 54, 0, 69, 33, 69, 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, 13, 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, 13, 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, 54, 13, 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, 
@@ -616,26 +641,32 @@ static const unsigned char _lexer_trans_actions[] = {
 	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, 
-	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, 144, 57, 54, 
-	0, 54, 0, 72, 33, 84, 72, 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, 15, 0, 54, 15, 0, 54, 0, 
+	54, 0, 0, 54, 0, 0, 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, 144, 57, 54, 0, 
+	54, 0, 72, 33, 84, 72, 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, 
+	15, 0, 54, 15, 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, 15, 
+	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, 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, 
@@ -646,48 +677,52 @@ static const unsigned char _lexer_trans_actions[] = {
 	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, 43, 0, 
+	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, 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, 144, 57, 54, 
-	0, 54, 0, 78, 33, 84, 78, 84, 
-	84, 84, 84, 84, 84, 84, 0, 0, 
-	54, 0, 0, 54, 0, 0, 54, 0, 
+	43, 0, 43, 144, 57, 54, 0, 54, 
+	0, 78, 33, 84, 78, 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, 
-	19, 0, 54, 19, 0, 54, 0, 0, 
-	54, 0, 0, 54, 0, 0, 54, 0, 
+	0, 0, 54, 0, 0, 54, 19, 0, 
+	54, 19, 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, 0, 0, 54, 19, 0, 
-	54, 0, 0, 54, 0, 0, 54, 0, 
+	0, 0, 54, 0, 0, 54, 0, 0, 
+	54, 0, 0, 54, 19, 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, 0, 43, 0, 
+	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, 75, 33, 84, 75, 84, 84, 84, 
-	84, 84, 84, 84, 84, 84, 0, 0, 
-	54, 0, 0, 54, 0, 0, 54, 0, 
+	43, 144, 57, 54, 0, 54, 0, 75, 
+	33, 84, 75, 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, 
-	17, 0, 54, 17, 0, 54, 0, 0, 
-	54, 0, 0, 54, 0, 0, 54, 0, 
+	0, 0, 54, 0, 0, 54, 17, 0, 
+	54, 17, 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, 0, 0, 54, 17, 0, 
+	0, 0, 54, 0, 0, 54, 0, 0, 
+	54, 0, 0, 54, 17, 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, 0, 0, 
@@ -703,13 +738,14 @@ static const unsigned char _lexer_trans_actions[] = {
 	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, 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, 0, 0
+	54, 0, 0, 54, 0, 0, 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, 0, 0
 };
 
 static const unsigned char _lexer_eof_actions[] = {
@@ -759,11 +795,14 @@ 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
 };
 
 static const int lexer_start = 1;
-static const int lexer_first_final = 375;
+static const int lexer_first_final = 398;
 static const int lexer_error = 0;
 
 static const int lexer_en_main = 1;
@@ -937,14 +976,14 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
     assert(*pe == '\0' && "pointer does not end on NULL");
     
     
-#line 941 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
+#line 980 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
 	{
 	cs = lexer_start;
 	}
 
 #line 425 "/Users/ahellesoy/github/gherkin/tasks/../ragel/i18n/bm.c.rl"
     
-#line 948 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
+#line 987 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1234,7 +1273,7 @@ _match:
     }
   }
 	break;
-#line 1238 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
+#line 1277 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
 		}
 	}
 
@@ -1297,7 +1336,7 @@ _again:
     }
   }
 	break;
-#line 1301 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
+#line 1340 "ext/gherkin_lexer_bm/gherkin_lexer_bm.c"
 		}
 	}
 	}