gherkin 2.10.0 → 2.11.0

data/History.md

@@ -1,3 +1,10 @@
+## [2.11.0](https://github.com/cucumber/gherkin/compare/v2.10.0...v2.11.0)
+
+* [Core] Alias Feature with Business Need and Ability. ([#167](https://github.com/cucumber/gherkin/issues/167) Aslak Hellesøy)
+* [Java] Better exception on bad filter mix. ([#179](https://github.com/cucumber/gherkin/issues/179) Aslak Hellesøy)
+* [Java, Ruby] Formatters don't deal well with things not associated with a step ([#172](https://github.com/cucumber/gherkin/issues/172) David Kowis, Aslak Hellesøy)
+* [Java] Make model classes implement `java.io.Serializable` ([#180](https://github.com/cucumber/gherkin/issues/180) Aslak Hellesøy)
+
 ## [2.10.0](https://github.com/cucumber/gherkin/compare/v2.9.3...v2.10.0)
 
 * [Core] Added Malay language support. ([#176](https://github.com/cucumber/gherkin/pull/176) Choon Siong)

data/README.md

@@ -1,5 +1,4 @@
 [![Build Status](https://secure.travis-ci.org/cucumber/gherkin.png)](http://travis-ci.org/cucumber/gherkin)
-[![Dependency Status](https://gemnasium.com/cucumber/gherkin.png)](https://gemnasium.com/cucumber/gherkin)
 
 A fast lexer and parser for the Gherkin language based on Ragel. Gherkin is two things:
 
@@ -55,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.10.0</version>
+        <version>2.11.0</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -203,7 +202,7 @@ Now we're ready to install the Windows rubies:
     rvm gemset use cucumber
     gem install bundler
     bundle install
-	PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p194
+    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p194
 
     # 1.8.7
     CC=gcc-4.2 rvm install 1.8.7-p352
@@ -217,7 +216,7 @@ Now we're ready to install the Windows rubies:
 Now you can build Windows gems:
 
     rake compile
-	mkdir release
+    mkdir release
     rake gems:win
 
 ## Release process

data/ext/gherkin_lexer_en/gherkin_lexer_en.c

@@ -114,43 +114,55 @@ static const short _lexer_key_offsets[] = {
 	43, 45, 50, 55, 60, 65, 69, 73, 
 	75, 76, 77, 78, 79, 80, 81, 82, 
 	83, 84, 85, 86, 87, 88, 89, 90, 
-	91, 93, 95, 100, 107, 112, 113, 114, 
-	116, 117, 118, 119, 120, 121, 122, 123, 
-	124, 125, 126, 127, 142, 144, 146, 148, 
-	150, 152, 154, 156, 158, 160, 162, 164, 
-	166, 168, 170, 172, 190, 191, 192, 193, 
-	194, 195, 196, 197, 198, 199, 200, 207, 
-	209, 211, 213, 215, 217, 219, 221, 222, 
-	223, 224, 225, 226, 227, 228, 229, 230, 
-	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, 325, 327, 329, 333, 336, 338, 
-	340, 342, 344, 346, 348, 350, 352, 354, 
-	356, 358, 359, 360, 361, 362, 363, 364, 
-	365, 366, 367, 368, 369, 372, 374, 375, 
-	376, 377, 378, 379, 380, 381, 382, 383, 
-	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, 475, 
-	476, 477, 478, 479, 480, 481, 482, 497, 
-	499, 501, 503, 505, 507, 509, 511, 513, 
-	515, 517, 519, 521, 523, 525, 527, 529, 
-	531, 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, 591, 594, 596, 
-	598, 600, 602, 604, 606, 608, 610, 612, 
-	614, 616, 618, 619, 623, 629, 632, 634, 
-	640, 658, 660, 662, 664, 666, 668, 670, 
-	672, 674, 676, 678, 680, 682, 684, 686, 
-	688, 690, 692, 694, 696, 698, 700, 702, 
-	705, 708, 710, 712, 714, 716, 718, 720, 
-	722, 724, 726, 728, 730, 732, 733
+	91, 93, 95, 100, 107, 112, 114, 115, 
+	116, 117, 118, 119, 120, 121, 122, 134, 
+	136, 138, 140, 142, 144, 146, 148, 150, 
+	152, 154, 156, 158, 160, 162, 164, 166, 
+	168, 170, 172, 174, 176, 194, 196, 197, 
+	198, 199, 200, 201, 202, 203, 204, 205, 
+	206, 207, 222, 224, 226, 228, 230, 232, 
+	234, 236, 238, 240, 242, 244, 246, 248, 
+	250, 252, 255, 257, 259, 261, 263, 265, 
+	267, 269, 271, 274, 276, 278, 280, 282, 
+	284, 286, 288, 290, 292, 294, 296, 298, 
+	300, 302, 304, 306, 308, 310, 312, 314, 
+	316, 318, 320, 322, 324, 326, 328, 331, 
+	334, 336, 338, 340, 342, 344, 346, 348, 
+	350, 352, 354, 356, 358, 360, 361, 362, 
+	363, 364, 365, 366, 367, 368, 369, 370, 
+	371, 372, 373, 374, 375, 376, 377, 378, 
+	379, 380, 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, 440, 441, 442, 443, 
+	444, 445, 446, 447, 448, 449, 450, 451, 
+	452, 453, 454, 455, 456, 459, 461, 462, 
+	463, 464, 465, 466, 467, 468, 469, 470, 
+	485, 487, 489, 491, 493, 495, 497, 499, 
+	501, 503, 505, 507, 509, 511, 513, 515, 
+	518, 520, 522, 524, 526, 528, 530, 532, 
+	534, 537, 539, 541, 543, 545, 547, 549, 
+	551, 553, 555, 557, 559, 561, 563, 565, 
+	567, 569, 571, 573, 575, 577, 579, 581, 
+	583, 585, 587, 589, 591, 593, 594, 595, 
+	596, 597, 598, 599, 600, 601, 616, 618, 
+	620, 622, 624, 626, 628, 630, 632, 634, 
+	636, 638, 640, 642, 644, 646, 649, 651, 
+	653, 655, 657, 659, 661, 663, 666, 668, 
+	670, 672, 674, 676, 678, 680, 682, 685, 
+	687, 689, 691, 693, 695, 697, 699, 701, 
+	703, 705, 707, 709, 711, 713, 715, 717, 
+	719, 721, 723, 725, 727, 729, 731, 733, 
+	735, 737, 740, 743, 745, 747, 749, 751, 
+	753, 755, 757, 759, 761, 763, 765, 767, 
+	768, 772, 778, 781, 783, 789, 807, 810, 
+	812, 814, 816, 818, 820, 822, 824, 826, 
+	828, 830, 832, 834, 836, 838, 840, 842, 
+	844, 846, 848, 850, 852, 854, 856, 858, 
+	860, 862, 864, 866, 868, 870, 872, 874, 
+	876, 878, 880, 882, 884, 886, 890, 893, 
+	895, 897, 899, 901, 903, 905, 907, 909, 
+	911, 913, 915, 916
 };
 
 static const char _lexer_trans_keys[] = {
@@ -168,84 +180,107 @@ static const char _lexer_trans_keys[] = {
 	95, 37, 32, 10, 13, 10, 13, 13, 
 	32, 64, 9, 10, 9, 10, 13, 32, 
 	64, 11, 12, 10, 32, 64, 9, 13, 
-	110, 100, 97, 117, 99, 107, 103, 114, 
-	111, 117, 110, 100, 58, 10, 10, 10, 
-	32, 35, 37, 42, 64, 65, 66, 70, 
-	71, 83, 84, 87, 9, 13, 10, 95, 
+	98, 110, 105, 108, 105, 116, 121, 58, 
+	10, 10, 10, 32, 35, 37, 64, 65, 
+	66, 69, 70, 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, 32, 10, 32, 34, 35, 
-	37, 42, 64, 65, 66, 69, 70, 71, 
-	83, 84, 87, 124, 9, 13, 120, 97, 
-	109, 112, 108, 101, 115, 58, 10, 10, 
-	10, 32, 35, 70, 124, 9, 13, 10, 
-	101, 10, 97, 10, 116, 10, 117, 10, 
-	114, 10, 101, 10, 58, 101, 97, 116, 
-	117, 114, 101, 58, 10, 10, 10, 32, 
-	35, 37, 64, 66, 69, 70, 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, 97, 10, 
-	99, 10, 107, 10, 103, 10, 114, 10, 
-	111, 10, 117, 10, 110, 10, 100, 10, 
-	58, 10, 120, 10, 97, 10, 109, 10, 
-	112, 10, 108, 10, 101, 10, 115, 10, 
-	101, 10, 97, 10, 116, 10, 117, 10, 
-	114, 10, 101, 10, 99, 10, 101, 10, 
-	110, 10, 97, 10, 114, 10, 105, 10, 
-	111, 10, 32, 58, 115, 10, 79, 84, 
-	10, 117, 10, 116, 10, 108, 10, 105, 
-	10, 110, 10, 101, 10, 109, 10, 112, 
-	10, 108, 10, 97, 10, 116, 105, 118, 
-	101, 110, 99, 101, 110, 97, 114, 105, 
-	111, 32, 58, 115, 79, 84, 117, 116, 
-	108, 105, 110, 101, 58, 10, 10, 10, 
+	10, 37, 10, 98, 10, 105, 10, 108, 
+	10, 105, 10, 116, 10, 121, 10, 58, 
+	10, 32, 34, 35, 37, 42, 64, 65, 
+	66, 69, 70, 71, 83, 84, 87, 124, 
+	9, 13, 97, 117, 99, 107, 103, 114, 
+	111, 117, 110, 100, 58, 10, 10, 10, 
 	32, 35, 37, 42, 64, 65, 66, 70, 
 	71, 83, 84, 87, 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, 110, 10, 100, 
-	10, 117, 10, 116, 10, 101, 10, 97, 
-	10, 116, 10, 117, 10, 114, 10, 101, 
-	10, 58, 10, 105, 10, 118, 10, 101, 
+	10, 37, 10, 32, 10, 98, 110, 10, 
+	105, 10, 108, 10, 105, 10, 116, 10, 
+	121, 10, 58, 10, 100, 10, 117, 10, 
+	115, 116, 10, 105, 10, 110, 10, 101, 
+	10, 115, 10, 115, 10, 32, 10, 78, 
+	10, 101, 10, 101, 10, 100, 10, 101, 
+	10, 97, 10, 116, 10, 117, 10, 114, 
+	10, 101, 10, 105, 10, 118, 10, 101, 
 	10, 110, 10, 99, 10, 101, 10, 110, 
 	10, 97, 10, 114, 10, 105, 10, 111, 
-	10, 104, 101, 109, 112, 108, 97, 116, 
-	10, 10, 10, 32, 35, 37, 42, 64, 
-	65, 66, 70, 71, 83, 84, 87, 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, 
-	110, 10, 100, 10, 97, 117, 10, 99, 
-	10, 107, 10, 103, 10, 114, 10, 111, 
-	10, 117, 10, 110, 10, 100, 10, 58, 
-	10, 116, 10, 101, 10, 97, 10, 116, 
-	10, 117, 10, 114, 10, 101, 10, 105, 
-	10, 118, 10, 101, 10, 110, 10, 99, 
-	10, 101, 10, 110, 10, 97, 10, 114, 
-	10, 105, 10, 111, 10, 32, 58, 10, 
-	79, 84, 10, 117, 10, 116, 10, 108, 
-	10, 105, 10, 110, 10, 101, 10, 109, 
-	10, 112, 10, 108, 10, 97, 10, 116, 
-	10, 104, 104, 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, 69, 70, 71, 83, 84, 87, 124, 
-	9, 13, 10, 110, 10, 100, 10, 117, 
-	10, 116, 10, 101, 10, 97, 10, 116, 
-	10, 117, 10, 114, 10, 101, 10, 58, 
-	10, 105, 10, 118, 10, 101, 10, 110, 
+	10, 32, 58, 10, 79, 84, 10, 117, 
+	10, 116, 10, 108, 10, 105, 10, 110, 
+	10, 101, 10, 109, 10, 112, 10, 108, 
+	10, 97, 10, 116, 10, 104, 115, 116, 
+	105, 110, 101, 115, 115, 32, 78, 101, 
+	101, 100, 120, 97, 109, 112, 108, 101, 
+	115, 58, 10, 10, 10, 32, 35, 65, 
+	66, 70, 124, 9, 13, 10, 98, 10, 
+	105, 10, 108, 10, 105, 10, 116, 10, 
+	121, 10, 58, 10, 117, 10, 115, 10, 
+	105, 10, 110, 10, 101, 10, 115, 10, 
+	115, 10, 32, 10, 78, 10, 101, 10, 
+	101, 10, 100, 10, 101, 10, 97, 10, 
+	116, 10, 117, 10, 114, 10, 101, 101, 
+	97, 116, 117, 114, 101, 105, 118, 101, 
+	110, 99, 101, 110, 97, 114, 105, 111, 
+	32, 58, 115, 79, 84, 117, 116, 108, 
+	105, 110, 101, 58, 10, 10, 10, 32, 
+	35, 37, 42, 64, 65, 66, 70, 71, 
+	83, 84, 87, 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, 98, 110, 10, 105, 
+	10, 108, 10, 105, 10, 116, 10, 121, 
+	10, 58, 10, 100, 10, 117, 10, 115, 
+	116, 10, 105, 10, 110, 10, 101, 10, 
+	115, 10, 115, 10, 32, 10, 78, 10, 
+	101, 10, 101, 10, 100, 10, 101, 10, 
+	97, 10, 116, 10, 117, 10, 114, 10, 
+	101, 10, 105, 10, 118, 10, 101, 10, 
+	110, 10, 99, 10, 101, 10, 110, 10, 
+	97, 10, 114, 10, 105, 10, 111, 10, 
+	104, 101, 109, 112, 108, 97, 116, 10, 
+	10, 10, 32, 35, 37, 42, 64, 65, 
+	66, 70, 71, 83, 84, 87, 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, 98, 
+	110, 10, 105, 10, 108, 10, 105, 10, 
+	116, 10, 121, 10, 58, 10, 100, 10, 
+	97, 117, 10, 99, 10, 107, 10, 103, 
+	10, 114, 10, 111, 10, 117, 10, 110, 
+	10, 100, 10, 115, 116, 10, 105, 10, 
+	110, 10, 101, 10, 115, 10, 115, 10, 
+	32, 10, 78, 10, 101, 10, 101, 10, 
+	101, 10, 97, 10, 116, 10, 117, 10, 
+	114, 10, 101, 10, 105, 10, 118, 10, 
+	101, 10, 110, 10, 99, 10, 101, 10, 
+	110, 10, 97, 10, 114, 10, 105, 10, 
+	111, 10, 32, 58, 10, 79, 84, 10, 
+	117, 10, 116, 10, 108, 10, 105, 10, 
+	110, 10, 101, 10, 109, 10, 112, 10, 
+	108, 10, 97, 10, 116, 10, 104, 104, 
+	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, 69, 70, 
+	71, 83, 84, 87, 124, 9, 13, 10, 
+	97, 117, 10, 99, 10, 107, 10, 103, 
+	10, 114, 10, 111, 10, 117, 10, 110, 
+	10, 100, 10, 115, 10, 105, 10, 110, 
+	10, 101, 10, 115, 10, 115, 10, 32, 
+	10, 78, 10, 101, 10, 101, 10, 120, 
+	10, 97, 10, 109, 10, 112, 10, 108, 
+	10, 101, 10, 115, 10, 101, 10, 97, 
+	10, 116, 10, 117, 10, 114, 10, 101, 
 	10, 99, 10, 101, 10, 110, 10, 97, 
 	10, 114, 10, 105, 10, 111, 10, 32, 
-	58, 10, 79, 84, 10, 117, 10, 116, 
-	10, 108, 10, 105, 10, 110, 10, 101, 
-	10, 109, 10, 112, 10, 108, 10, 97, 
-	10, 116, 10, 104, 116, 0
+	58, 115, 10, 79, 84, 10, 117, 10, 
+	116, 10, 108, 10, 105, 10, 110, 10, 
+	101, 10, 109, 10, 112, 10, 108, 10, 
+	97, 10, 116, 100, 0
 };
 
 static const char _lexer_single_lengths[] = {
@@ -253,43 +288,55 @@ static const char _lexer_single_lengths[] = {
 	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, 1, 1, 2, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 13, 2, 2, 2, 2, 
+	2, 2, 3, 5, 3, 2, 1, 1, 
+	1, 1, 1, 1, 1, 1, 10, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 16, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 5, 2, 
-	2, 2, 2, 2, 2, 2, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 9, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 16, 2, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 13, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 3, 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, 
+	2, 2, 2, 2, 2, 2, 3, 3, 
 	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, 1, 1, 1, 1, 
+	1, 7, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 4, 3, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 1, 1, 1, 1, 1, 1, 1, 
+	2, 2, 2, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 3, 2, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 13, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 3, 
 	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, 2, 2, 
-	2, 2, 2, 2, 2, 2, 1, 1, 
-	1, 1, 1, 1, 1, 1, 13, 2, 
+	2, 2, 2, 2, 2, 1, 1, 1, 
+	1, 1, 1, 1, 1, 13, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 3, 2, 2, 
+	2, 2, 2, 2, 2, 3, 2, 2, 
+	2, 2, 2, 2, 2, 2, 3, 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, 2, 2, 
-	2, 2, 2, 2, 3, 3, 2, 2, 
+	2, 3, 3, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 1, 
+	2, 4, 3, 2, 4, 16, 3, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 1, 2, 4, 3, 2, 4, 
-	16, 2, 2, 2, 2, 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, 1, 0
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 4, 3, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 1, 0
 };
 
 static const char _lexer_range_lengths[] = {
@@ -298,18 +345,24 @@ static const char _lexer_range_lengths[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 1, 1, 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, 0, 
+	0, 0, 0, 0, 1, 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, 1, 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, 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, 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, 
@@ -320,20 +373,26 @@ 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, 1, 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, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	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, 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
 };
 
 static const short _lexer_index_offsets[] = {
@@ -341,51 +400,63 @@ static const short _lexer_index_offsets[] = {
 	48, 51, 56, 61, 66, 71, 75, 79, 
 	82, 84, 86, 88, 90, 92, 94, 96, 
 	98, 100, 102, 104, 106, 108, 110, 112, 
-	114, 117, 120, 125, 132, 137, 139, 141, 
-	144, 146, 148, 150, 152, 154, 156, 158, 
-	160, 162, 164, 166, 181, 184, 187, 190, 
-	193, 196, 199, 202, 205, 208, 211, 214, 
-	217, 220, 223, 226, 244, 246, 248, 250, 
-	252, 254, 256, 258, 260, 262, 264, 271, 
-	274, 277, 280, 283, 286, 289, 292, 294, 
-	296, 298, 300, 302, 304, 306, 308, 310, 
-	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, 426, 429, 432, 435, 438, 
-	441, 444, 447, 450, 453, 458, 462, 465, 
-	468, 471, 474, 477, 480, 483, 486, 489, 
-	492, 495, 497, 499, 501, 503, 505, 507, 
-	509, 511, 513, 515, 517, 521, 524, 526, 
-	528, 530, 532, 534, 536, 538, 540, 542, 
-	557, 560, 563, 566, 569, 572, 575, 578, 
-	581, 584, 587, 590, 593, 596, 599, 602, 
-	605, 608, 611, 614, 617, 620, 623, 626, 
-	629, 632, 635, 638, 641, 644, 647, 650, 
-	653, 656, 659, 662, 665, 668, 671, 673, 
-	675, 677, 679, 681, 683, 685, 687, 702, 
-	705, 708, 711, 714, 717, 720, 723, 726, 
-	729, 732, 735, 738, 741, 744, 747, 750, 
-	753, 757, 760, 763, 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, 842, 846, 849, 
-	852, 855, 858, 861, 864, 867, 870, 873, 
-	876, 879, 882, 884, 888, 894, 898, 901, 
-	907, 925, 928, 931, 934, 937, 940, 943, 
-	946, 949, 952, 955, 958, 961, 964, 967, 
-	970, 973, 976, 979, 982, 985, 988, 991, 
-	995, 999, 1002, 1005, 1008, 1011, 1014, 1017, 
-	1020, 1023, 1026, 1029, 1032, 1035, 1037
+	114, 117, 120, 125, 132, 137, 140, 142, 
+	144, 146, 148, 150, 152, 154, 156, 168, 
+	171, 174, 177, 180, 183, 186, 189, 192, 
+	195, 198, 201, 204, 207, 210, 213, 216, 
+	219, 222, 225, 228, 231, 249, 252, 254, 
+	256, 258, 260, 262, 264, 266, 268, 270, 
+	272, 274, 289, 292, 295, 298, 301, 304, 
+	307, 310, 313, 316, 319, 322, 325, 328, 
+	331, 334, 338, 341, 344, 347, 350, 353, 
+	356, 359, 362, 366, 369, 372, 375, 378, 
+	381, 384, 387, 390, 393, 396, 399, 402, 
+	405, 408, 411, 414, 417, 420, 423, 426, 
+	429, 432, 435, 438, 441, 444, 447, 451, 
+	455, 458, 461, 464, 467, 470, 473, 476, 
+	479, 482, 485, 488, 491, 494, 496, 498, 
+	500, 502, 504, 506, 508, 510, 512, 514, 
+	516, 518, 520, 522, 524, 526, 528, 530, 
+	532, 534, 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, 620, 622, 624, 626, 
+	628, 630, 632, 634, 636, 638, 640, 642, 
+	644, 646, 648, 650, 652, 656, 659, 661, 
+	663, 665, 667, 669, 671, 673, 675, 677, 
+	692, 695, 698, 701, 704, 707, 710, 713, 
+	716, 719, 722, 725, 728, 731, 734, 737, 
+	741, 744, 747, 750, 753, 756, 759, 762, 
+	765, 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, 855, 857, 
+	859, 861, 863, 865, 867, 869, 884, 887, 
+	890, 893, 896, 899, 902, 905, 908, 911, 
+	914, 917, 920, 923, 926, 929, 933, 936, 
+	939, 942, 945, 948, 951, 954, 958, 961, 
+	964, 967, 970, 973, 976, 979, 982, 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, 1068, 1072, 1075, 1078, 1081, 1084, 
+	1087, 1090, 1093, 1096, 1099, 1102, 1105, 1108, 
+	1110, 1114, 1120, 1124, 1127, 1133, 1151, 1155, 
+	1158, 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, 1239, 1242, 1245, 1248, 1251, 
+	1254, 1257, 1260, 1263, 1266, 1269, 1274, 1278, 
+	1281, 1284, 1287, 1290, 1293, 1296, 1299, 1302, 
+	1305, 1308, 1311, 1313
 };
 
 static const short _lexer_trans_targs[] = {
 	2, 4, 4, 5, 15, 17, 31, 34, 
-	37, 39, 68, 86, 153, 157, 282, 282, 
-	283, 4, 0, 3, 0, 4, 0, 4, 
-	4, 5, 15, 17, 31, 34, 37, 39, 
-	68, 86, 153, 157, 282, 282, 283, 4, 
+	37, 69, 159, 195, 201, 205, 359, 359, 
+	360, 4, 0, 3, 0, 4, 0, 4, 
+	4, 5, 15, 17, 31, 34, 37, 69, 
+	159, 195, 201, 205, 359, 359, 360, 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, 
@@ -394,123 +465,158 @@ static const short _lexer_trans_targs[] = {
 	16, 15, 4, 0, 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, 326, 0, 
+	28, 0, 29, 0, 30, 0, 419, 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, 31, 0, 40, 325, 0, 
+	0, 38, 418, 0, 39, 0, 40, 0, 
 	41, 0, 42, 0, 43, 0, 44, 0, 
-	45, 0, 46, 0, 47, 0, 48, 0, 
-	49, 0, 51, 50, 51, 50, 51, 51, 
-	4, 52, 66, 4, 289, 291, 293, 300, 
-	304, 324, 324, 51, 50, 51, 53, 50, 
-	51, 54, 50, 51, 55, 50, 51, 56, 
-	50, 51, 57, 50, 51, 58, 50, 51, 
-	59, 50, 51, 60, 50, 51, 61, 50, 
-	51, 62, 50, 51, 63, 50, 51, 64, 
-	50, 51, 65, 50, 51, 4, 50, 51, 
-	67, 50, 4, 4, 5, 15, 17, 31, 
-	34, 37, 39, 68, 86, 153, 157, 282, 
-	282, 283, 4, 0, 69, 0, 70, 0, 
-	71, 0, 72, 0, 73, 0, 74, 0, 
-	75, 0, 76, 0, 78, 77, 78, 77, 
-	78, 78, 4, 79, 4, 78, 77, 78, 
-	80, 77, 78, 81, 77, 78, 82, 77, 
-	78, 83, 77, 78, 84, 77, 78, 85, 
-	77, 78, 67, 77, 87, 0, 88, 0, 
-	89, 0, 90, 0, 91, 0, 92, 0, 
-	93, 0, 95, 94, 95, 94, 95, 95, 
-	4, 96, 4, 110, 120, 127, 133, 95, 
-	94, 95, 97, 94, 95, 98, 94, 95, 
-	99, 94, 95, 100, 94, 95, 101, 94, 
-	95, 102, 94, 95, 103, 94, 95, 104, 
-	94, 95, 105, 94, 95, 106, 94, 95, 
-	107, 94, 95, 108, 94, 95, 109, 94, 
-	95, 4, 94, 95, 111, 94, 95, 112, 
-	94, 95, 113, 94, 95, 114, 94, 95, 
-	115, 94, 95, 116, 94, 95, 117, 94, 
-	95, 118, 94, 95, 119, 94, 95, 67, 
-	94, 95, 121, 94, 95, 122, 94, 95, 
-	123, 94, 95, 124, 94, 95, 125, 94, 
-	95, 126, 94, 95, 119, 94, 95, 128, 
-	94, 95, 129, 94, 95, 130, 94, 95, 
-	131, 94, 95, 132, 94, 95, 119, 94, 
-	95, 134, 94, 95, 135, 94, 95, 136, 
-	94, 95, 137, 94, 95, 138, 94, 95, 
-	139, 94, 95, 140, 94, 95, 141, 67, 
-	119, 94, 95, 142, 147, 94, 95, 143, 
-	94, 95, 144, 94, 95, 145, 94, 95, 
-	146, 94, 95, 132, 94, 95, 148, 94, 
-	95, 149, 94, 95, 150, 94, 95, 151, 
-	94, 95, 152, 94, 95, 132, 94, 154, 
-	0, 155, 0, 156, 0, 31, 0, 158, 
-	0, 159, 0, 160, 0, 161, 0, 162, 
-	0, 163, 0, 164, 0, 165, 220, 75, 
-	0, 166, 214, 0, 167, 0, 168, 0, 
-	169, 0, 170, 0, 171, 0, 172, 0, 
-	173, 0, 175, 174, 175, 174, 175, 175, 
-	4, 176, 190, 4, 191, 193, 195, 202, 
-	206, 213, 213, 175, 174, 175, 177, 174, 
-	175, 178, 174, 175, 179, 174, 175, 180, 
-	174, 175, 181, 174, 175, 182, 174, 175, 
-	183, 174, 175, 184, 174, 175, 185, 174, 
-	175, 186, 174, 175, 187, 174, 175, 188, 
-	174, 175, 189, 174, 175, 4, 174, 175, 
-	67, 174, 175, 192, 174, 175, 190, 174, 
-	175, 194, 174, 175, 190, 174, 175, 196, 
-	174, 175, 197, 174, 175, 198, 174, 175, 
-	199, 174, 175, 200, 174, 175, 201, 174, 
-	175, 67, 174, 175, 203, 174, 175, 204, 
-	174, 175, 205, 174, 175, 190, 174, 175, 
-	207, 174, 175, 208, 174, 175, 209, 174, 
-	175, 210, 174, 175, 211, 174, 175, 212, 
-	174, 175, 201, 174, 175, 204, 174, 215, 
-	0, 216, 0, 217, 0, 218, 0, 219, 
-	0, 171, 0, 222, 221, 222, 221, 222, 
-	222, 4, 223, 237, 4, 238, 240, 251, 
-	257, 261, 281, 281, 222, 221, 222, 224, 
-	221, 222, 225, 221, 222, 226, 221, 222, 
-	227, 221, 222, 228, 221, 222, 229, 221, 
-	222, 230, 221, 222, 231, 221, 222, 232, 
-	221, 222, 233, 221, 222, 234, 221, 222, 
-	235, 221, 222, 236, 221, 222, 4, 221, 
-	222, 67, 221, 222, 239, 221, 222, 237, 
-	221, 222, 241, 250, 221, 222, 242, 221, 
-	222, 243, 221, 222, 244, 221, 222, 245, 
-	221, 222, 246, 221, 222, 247, 221, 222, 
-	248, 221, 222, 249, 221, 222, 67, 221, 
-	222, 237, 221, 222, 252, 221, 222, 253, 
-	221, 222, 254, 221, 222, 255, 221, 222, 
-	256, 221, 222, 249, 221, 222, 258, 221, 
-	222, 259, 221, 222, 260, 221, 222, 237, 
-	221, 222, 262, 221, 222, 263, 221, 222, 
-	264, 221, 222, 265, 221, 222, 266, 221, 
-	222, 267, 221, 222, 268, 221, 222, 269, 
-	67, 221, 222, 270, 275, 221, 222, 271, 
-	221, 222, 272, 221, 222, 273, 221, 222, 
-	274, 221, 222, 256, 221, 222, 276, 221, 
-	222, 277, 221, 222, 278, 221, 222, 279, 
-	221, 222, 280, 221, 222, 256, 221, 222, 
-	259, 221, 155, 0, 283, 284, 283, 0, 
-	288, 287, 286, 284, 287, 285, 0, 286, 
-	284, 285, 0, 286, 285, 288, 287, 286, 
-	284, 287, 285, 288, 288, 5, 15, 17, 
-	31, 34, 37, 39, 68, 86, 153, 157, 
-	282, 282, 283, 288, 0, 51, 290, 50, 
-	51, 66, 50, 51, 292, 50, 51, 66, 
-	50, 51, 294, 50, 51, 295, 50, 51, 
-	296, 50, 51, 297, 50, 51, 298, 50, 
-	51, 299, 50, 51, 67, 50, 51, 301, 
-	50, 51, 302, 50, 51, 303, 50, 51, 
-	66, 50, 51, 305, 50, 51, 306, 50, 
-	51, 307, 50, 51, 308, 50, 51, 309, 
-	50, 51, 310, 50, 51, 311, 50, 51, 
-	312, 67, 50, 51, 313, 318, 50, 51, 
-	314, 50, 51, 315, 50, 51, 316, 50, 
-	51, 317, 50, 51, 298, 50, 51, 319, 
-	50, 51, 320, 50, 51, 321, 50, 51, 
-	322, 50, 51, 323, 50, 51, 298, 50, 
-	51, 302, 50, 31, 0, 0, 0
+	46, 45, 46, 45, 46, 46, 4, 47, 
+	4, 61, 366, 385, 392, 398, 46, 45, 
+	46, 48, 45, 46, 49, 45, 46, 50, 
+	45, 46, 51, 45, 46, 52, 45, 46, 
+	53, 45, 46, 54, 45, 46, 55, 45, 
+	46, 56, 45, 46, 57, 45, 46, 58, 
+	45, 46, 59, 45, 46, 60, 45, 46, 
+	4, 45, 46, 62, 45, 46, 63, 45, 
+	46, 64, 45, 46, 65, 45, 46, 66, 
+	45, 46, 67, 45, 46, 68, 45, 4, 
+	4, 5, 15, 17, 31, 34, 37, 69, 
+	159, 195, 201, 205, 359, 359, 360, 4, 
+	0, 70, 148, 0, 71, 0, 72, 0, 
+	73, 0, 74, 0, 75, 0, 76, 0, 
+	77, 0, 78, 0, 79, 0, 81, 80, 
+	81, 80, 81, 81, 4, 82, 96, 4, 
+	97, 105, 117, 123, 127, 147, 147, 81, 
+	80, 81, 83, 80, 81, 84, 80, 81, 
+	85, 80, 81, 86, 80, 81, 87, 80, 
+	81, 88, 80, 81, 89, 80, 81, 90, 
+	80, 81, 91, 80, 81, 92, 80, 81, 
+	93, 80, 81, 94, 80, 81, 95, 80, 
+	81, 4, 80, 81, 68, 80, 81, 98, 
+	104, 80, 81, 99, 80, 81, 100, 80, 
+	81, 101, 80, 81, 102, 80, 81, 103, 
+	80, 81, 68, 80, 81, 96, 80, 81, 
+	106, 80, 81, 107, 96, 80, 81, 108, 
+	80, 81, 109, 80, 81, 110, 80, 81, 
+	111, 80, 81, 112, 80, 81, 113, 80, 
+	81, 114, 80, 81, 115, 80, 81, 116, 
+	80, 81, 103, 80, 81, 118, 80, 81, 
+	119, 80, 81, 120, 80, 81, 121, 80, 
+	81, 122, 80, 81, 103, 80, 81, 124, 
+	80, 81, 125, 80, 81, 126, 80, 81, 
+	96, 80, 81, 128, 80, 81, 129, 80, 
+	81, 130, 80, 81, 131, 80, 81, 132, 
+	80, 81, 133, 80, 81, 134, 80, 81, 
+	135, 68, 80, 81, 136, 141, 80, 81, 
+	137, 80, 81, 138, 80, 81, 139, 80, 
+	81, 140, 80, 81, 122, 80, 81, 142, 
+	80, 81, 143, 80, 81, 144, 80, 81, 
+	145, 80, 81, 146, 80, 81, 122, 80, 
+	81, 125, 80, 149, 31, 0, 150, 0, 
+	151, 0, 152, 0, 153, 0, 154, 0, 
+	155, 0, 156, 0, 157, 0, 158, 0, 
+	43, 0, 160, 0, 161, 0, 162, 0, 
+	163, 0, 164, 0, 165, 0, 166, 0, 
+	167, 0, 169, 168, 169, 168, 169, 169, 
+	4, 170, 177, 189, 4, 169, 168, 169, 
+	171, 168, 169, 172, 168, 169, 173, 168, 
+	169, 174, 168, 169, 175, 168, 169, 176, 
+	168, 169, 68, 168, 169, 178, 168, 169, 
+	179, 168, 169, 180, 168, 169, 181, 168, 
+	169, 182, 168, 169, 183, 168, 169, 184, 
+	168, 169, 185, 168, 169, 186, 168, 169, 
+	187, 168, 169, 188, 168, 169, 176, 168, 
+	169, 190, 168, 169, 191, 168, 169, 192, 
+	168, 169, 193, 168, 169, 194, 168, 169, 
+	176, 168, 196, 0, 197, 0, 198, 0, 
+	199, 0, 200, 0, 43, 0, 202, 0, 
+	203, 0, 204, 0, 31, 0, 206, 0, 
+	207, 0, 208, 0, 209, 0, 210, 0, 
+	211, 0, 212, 0, 213, 283, 166, 0, 
+	214, 277, 0, 215, 0, 216, 0, 217, 
+	0, 218, 0, 219, 0, 220, 0, 221, 
+	0, 223, 222, 223, 222, 223, 223, 4, 
+	224, 238, 4, 239, 247, 259, 265, 269, 
+	276, 276, 223, 222, 223, 225, 222, 223, 
+	226, 222, 223, 227, 222, 223, 228, 222, 
+	223, 229, 222, 223, 230, 222, 223, 231, 
+	222, 223, 232, 222, 223, 233, 222, 223, 
+	234, 222, 223, 235, 222, 223, 236, 222, 
+	223, 237, 222, 223, 4, 222, 223, 68, 
+	222, 223, 240, 246, 222, 223, 241, 222, 
+	223, 242, 222, 223, 243, 222, 223, 244, 
+	222, 223, 245, 222, 223, 68, 222, 223, 
+	238, 222, 223, 248, 222, 223, 249, 238, 
+	222, 223, 250, 222, 223, 251, 222, 223, 
+	252, 222, 223, 253, 222, 223, 254, 222, 
+	223, 255, 222, 223, 256, 222, 223, 257, 
+	222, 223, 258, 222, 223, 245, 222, 223, 
+	260, 222, 223, 261, 222, 223, 262, 222, 
+	223, 263, 222, 223, 264, 222, 223, 245, 
+	222, 223, 266, 222, 223, 267, 222, 223, 
+	268, 222, 223, 238, 222, 223, 270, 222, 
+	223, 271, 222, 223, 272, 222, 223, 273, 
+	222, 223, 274, 222, 223, 275, 222, 223, 
+	245, 222, 223, 267, 222, 278, 0, 279, 
+	0, 280, 0, 281, 0, 282, 0, 219, 
+	0, 285, 284, 285, 284, 285, 285, 4, 
+	286, 300, 4, 301, 309, 328, 334, 338, 
+	358, 358, 285, 284, 285, 287, 284, 285, 
+	288, 284, 285, 289, 284, 285, 290, 284, 
+	285, 291, 284, 285, 292, 284, 285, 293, 
+	284, 285, 294, 284, 285, 295, 284, 285, 
+	296, 284, 285, 297, 284, 285, 298, 284, 
+	285, 299, 284, 285, 4, 284, 285, 68, 
+	284, 285, 302, 308, 284, 285, 303, 284, 
+	285, 304, 284, 285, 305, 284, 285, 306, 
+	284, 285, 307, 284, 285, 68, 284, 285, 
+	300, 284, 285, 310, 318, 284, 285, 311, 
+	284, 285, 312, 284, 285, 313, 284, 285, 
+	314, 284, 285, 315, 284, 285, 316, 284, 
+	285, 317, 284, 285, 307, 284, 285, 319, 
+	300, 284, 285, 320, 284, 285, 321, 284, 
+	285, 322, 284, 285, 323, 284, 285, 324, 
+	284, 285, 325, 284, 285, 326, 284, 285, 
+	327, 284, 285, 317, 284, 285, 329, 284, 
+	285, 330, 284, 285, 331, 284, 285, 332, 
+	284, 285, 333, 284, 285, 307, 284, 285, 
+	335, 284, 285, 336, 284, 285, 337, 284, 
+	285, 300, 284, 285, 339, 284, 285, 340, 
+	284, 285, 341, 284, 285, 342, 284, 285, 
+	343, 284, 285, 344, 284, 285, 345, 284, 
+	285, 346, 68, 284, 285, 347, 352, 284, 
+	285, 348, 284, 285, 349, 284, 285, 350, 
+	284, 285, 351, 284, 285, 333, 284, 285, 
+	353, 284, 285, 354, 284, 285, 355, 284, 
+	285, 356, 284, 285, 357, 284, 285, 333, 
+	284, 285, 336, 284, 203, 0, 360, 361, 
+	360, 0, 365, 364, 363, 361, 364, 362, 
+	0, 363, 361, 362, 0, 363, 362, 365, 
+	364, 363, 361, 364, 362, 365, 365, 5, 
+	15, 17, 31, 34, 37, 69, 159, 195, 
+	201, 205, 359, 359, 360, 365, 0, 46, 
+	367, 375, 45, 46, 368, 45, 46, 369, 
+	45, 46, 370, 45, 46, 371, 45, 46, 
+	372, 45, 46, 373, 45, 46, 374, 45, 
+	46, 67, 45, 46, 376, 45, 46, 377, 
+	45, 46, 378, 45, 46, 379, 45, 46, 
+	380, 45, 46, 381, 45, 46, 382, 45, 
+	46, 383, 45, 46, 384, 45, 46, 374, 
+	45, 46, 386, 45, 46, 387, 45, 46, 
+	388, 45, 46, 389, 45, 46, 390, 45, 
+	46, 391, 45, 46, 67, 45, 46, 393, 
+	45, 46, 394, 45, 46, 395, 45, 46, 
+	396, 45, 46, 397, 45, 46, 67, 45, 
+	46, 399, 45, 46, 400, 45, 46, 401, 
+	45, 46, 402, 45, 46, 403, 45, 46, 
+	404, 45, 46, 405, 45, 46, 406, 68, 
+	67, 45, 46, 407, 412, 45, 46, 408, 
+	45, 46, 409, 45, 46, 410, 45, 46, 
+	411, 45, 46, 397, 45, 46, 413, 45, 
+	46, 414, 45, 46, 415, 45, 46, 416, 
+	45, 46, 417, 45, 46, 397, 45, 31, 
+	0, 0, 0
 };
 
 static const unsigned char _lexer_trans_actions[] = {
@@ -531,87 +637,113 @@ static const unsigned char _lexer_trans_actions[] = {
 	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, 43, 0, 43, 0, 0, 43, 
-	0, 43, 0, 43, 0, 43, 0, 43, 
+	43, 0, 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, 0, 0, 54, 0, 0, 
+	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, 0, 0, 
 	54, 0, 0, 54, 0, 0, 54, 0, 
-	0, 54, 0, 0, 54, 15, 0, 54, 
-	15, 0, 130, 31, 60, 57, 31, 63, 
-	57, 63, 63, 63, 63, 63, 63, 63, 
-	63, 66, 31, 43, 0, 43, 0, 43, 
+	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, 66, 31, 
+	43, 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, 81, 84, 81, 0, 0, 54, 
+	0, 43, 0, 43, 0, 43, 144, 57, 
+	54, 0, 54, 0, 72, 33, 84, 72, 
+	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, 21, 0, 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, 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, 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, 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, 
+	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, 
+	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, 15, 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, 54, 0, 13, 
-	0, 0, 54, 0, 0, 0, 54, 0, 
+	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, 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, 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, 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, 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, 0, 0, 
-	43, 0, 0, 43, 0, 43, 0, 43, 
+	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, 
-	78, 33, 84, 78, 84, 84, 84, 84, 
-	84, 84, 84, 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, 0, 0, 43, 
+	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, 
+	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, 0, 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, 
+	0, 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, 54, 
 	0, 0, 54, 0, 0, 54, 0, 0, 
-	54, 19, 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, 54, 0, 0, 54, 0, 0, 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, 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, 144, 57, 54, 0, 54, 0, 75, 
+	33, 84, 75, 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, 0, 54, 0, 0, 54, 0, 0, 
+	54, 0, 0, 54, 17, 0, 54, 17, 
 	0, 54, 0, 0, 0, 54, 0, 0, 
 	54, 0, 0, 54, 0, 0, 54, 0, 
+	0, 54, 0, 0, 54, 17, 0, 54, 
+	0, 0, 54, 0, 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, 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, 
@@ -619,31 +751,40 @@ 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, 
-	17, 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, 17, 0, 54, 0, 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, 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, 99, 0, 43, 54, 0, 0, 
+	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, 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, 99, 0, 43, 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, 15, 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, 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, 15, 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, 54, 0, 13, 
+	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, 0, 43, 0, 0
+	54, 0, 0, 54, 0, 0, 54, 0, 
+	0, 54, 0, 0, 54, 0, 0, 0, 
+	43, 0, 0
 };
 
 static const unsigned char _lexer_eof_actions[] = {
@@ -687,11 +828,23 @@ 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
 };
 
 static const int lexer_start = 1;
-static const int lexer_first_final = 326;
+static const int lexer_first_final = 419;
 static const int lexer_error = 0;
 
 static const int lexer_en_main = 1;
@@ -865,14 +1018,14 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
     assert(*pe == '\0' && "pointer does not end on NULL");
     
     
-#line 869 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
+#line 1022 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
 	{
 	cs = lexer_start;
 	}
 
 #line 425 "/Users/ahellesoy/github/gherkin/tasks/../ragel/i18n/en.c.rl"
     
-#line 876 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
+#line 1029 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1162,7 +1315,7 @@ _match:
     }
   }
 	break;
-#line 1166 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
+#line 1319 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
 		}
 	}
 
@@ -1225,7 +1378,7 @@ _again:
     }
   }
 	break;
-#line 1229 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
+#line 1382 "ext/gherkin_lexer_en/gherkin_lexer_en.c"
 		}
 	}
 	}