gherkin 2.5.1 → 2.5.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.5.1)
+    gherkin (2.5.2)
       json (>= 1.4.6)
 
 GEM
@@ -29,8 +29,8 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    term-ansicolor (1.0.6)
-    therubyracer (0.9.4)
+    term-ansicolor (1.0.7)
+    therubyracer (0.9.8)
       libv8 (~> 3.3.10)
     yard (0.7.2)
 
@@ -39,7 +39,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder (>= 2.1.2)
-  bundler (>= 1.0.18)
+  bundler (>= 1.0.21)
   cucumber (>= 1.1.0)
   gherkin!
   rake (>= 0.9.2)
@@ -47,5 +47,5 @@ DEPENDENCIES
   rdiscount (>= 1.6.8)
   rspec (>= 2.6.0)
   term-ansicolor (>= 1.0.6)
-  therubyracer (>= 0.9.4)
+  therubyracer (>= 0.9.8)
   yard (>= 0.7.2)

data/History.md

@@ -1,3 +1,12 @@
+## [2.5.2](https://github.com/cucumber/gherkin/compare/v2.5.1...v2.5.2)
+
+### New Features
+
+* Added synonyms for Portuguese. (Rodrigo Dumont)
+* Added synonyms for Italian. (Alessandro Mencarini)
+* Added synonyms for Spanish. (Nahuel Garbezza)
+* Added synonyms for French. (Julein Biezemans)
+
 ## [2.5.1](https://github.com/cucumber/gherkin/compare/v2.5.0...v2.5.1)
 
 ### New Features

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/cucumber/gherkin.png)](http://travis-ci.org/cucumber/gherkin)
+
 A fast lexer and parser for the Gherkin language based on Ragel. Gherkin is two things:
 
 * The language that has evolved out of the Cucumber project.
@@ -52,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -207,9 +209,9 @@ Make sure you have openssl installed first.
   * java/pom.xml
   * ikvm/Gherkin/Gherkin.csproj (2 places)
   * js/package.json
-* Run bundle update, so Gemfile.lock gets updated with the changes.
+* Run `bundle update`, so Gemfile.lock gets updated with the changes.
 * Commit changes, otherwise you will get an error at the end when a tag is made.
-* bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL
+* Run `bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL`
   * The specs intermittently fail with a segfault from therubyracer. Running specs can be disabled with SKIP_JS_SPECS=true
 * Announce on Cucumber list, IRC and Twitter.
 

data/ext/gherkin_lexer_es/gherkin_lexer_es.c

@@ -128,38 +128,39 @@ static const short _lexer_key_offsets[] = {
 	293, 295, 297, 299, 301, 304, 306, 308, 
 	310, 312, 314, 316, 318, 320, 322, 324, 
 	326, 328, 330, 332, 334, 336, 338, 340, 
-	341, 342, 343, 344, 345, 348, 349, 350, 
-	351, 352, 353, 354, 355, 356, 357, 364, 
-	366, 368, 370, 372, 374, 376, 378, 380, 
-	382, 384, 386, 388, 390, 392, 394, 395, 
-	396, 397, 398, 399, 400, 402, 403, 404, 
-	405, 406, 407, 408, 409, 410, 411, 425, 
-	427, 429, 431, 433, 435, 437, 439, 441, 
-	443, 445, 447, 449, 451, 453, 455, 457, 
-	459, 461, 463, 465, 467, 469, 471, 473, 
-	475, 477, 479, 482, 484, 486, 488, 490, 
-	492, 494, 496, 498, 500, 502, 504, 506, 
-	508, 510, 512, 514, 516, 518, 521, 523, 
-	525, 527, 529, 531, 533, 536, 538, 540, 
-	542, 544, 546, 548, 550, 552, 554, 556, 
-	558, 560, 562, 564, 566, 568, 570, 572, 
-	574, 576, 577, 578, 579, 580, 581, 582, 
-	583, 584, 585, 586, 587, 588, 589, 590, 
-	591, 592, 593, 594, 595, 596, 597, 610, 
-	612, 614, 616, 618, 620, 622, 624, 626, 
-	628, 630, 632, 634, 636, 638, 640, 643, 
-	645, 647, 649, 651, 653, 655, 657, 659, 
-	661, 663, 665, 667, 669, 671, 673, 675, 
-	677, 679, 681, 684, 686, 688, 690, 692, 
-	694, 696, 698, 700, 702, 704, 706, 708, 
-	710, 712, 714, 715, 716, 720, 726, 729, 
-	731, 737, 753, 756, 758, 760, 762, 764, 
-	766, 768, 770, 772, 774, 776, 778, 780, 
-	782, 784, 786, 788, 790, 792, 794, 797, 
-	799, 801, 803, 805, 807, 809, 812, 814, 
-	816, 818, 820, 822, 824, 826, 828, 830, 
-	832, 834, 836, 838, 840, 842, 844, 846, 
-	848, 850, 852
+	341, 342, 343, 344, 345, 346, 348, 350, 
+	353, 354, 355, 356, 357, 358, 359, 360, 
+	361, 362, 369, 371, 373, 375, 377, 379, 
+	381, 383, 385, 387, 389, 391, 393, 395, 
+	397, 399, 400, 401, 402, 403, 404, 405, 
+	407, 408, 409, 410, 411, 412, 413, 414, 
+	415, 416, 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, 487, 489, 
+	491, 493, 495, 497, 499, 501, 503, 505, 
+	507, 509, 511, 513, 515, 517, 519, 521, 
+	523, 525, 528, 531, 534, 536, 538, 540, 
+	542, 544, 546, 549, 551, 553, 555, 557, 
+	559, 561, 563, 565, 567, 569, 571, 573, 
+	575, 577, 579, 581, 583, 585, 587, 589, 
+	590, 591, 592, 593, 594, 595, 596, 597, 
+	598, 599, 600, 601, 602, 603, 604, 605, 
+	606, 607, 608, 609, 610, 623, 625, 627, 
+	629, 631, 633, 635, 637, 639, 641, 643, 
+	645, 647, 649, 651, 653, 656, 658, 660, 
+	662, 664, 666, 668, 670, 672, 674, 676, 
+	678, 680, 682, 684, 686, 688, 690, 692, 
+	694, 696, 699, 702, 705, 707, 709, 711, 
+	713, 715, 717, 719, 721, 723, 725, 727, 
+	729, 731, 733, 735, 736, 737, 741, 747, 
+	750, 752, 758, 774, 777, 779, 781, 783, 
+	785, 787, 789, 791, 793, 795, 797, 799, 
+	801, 803, 805, 807, 809, 811, 813, 815, 
+	817, 820, 823, 826, 828, 830, 832, 834, 
+	836, 838, 841, 843, 845, 847, 849, 851, 
+	853, 855, 857, 859, 861, 863, 865, 867, 
+	869, 871, 873, 875, 877, 879, 881
 };
 
 static const char _lexer_trans_keys[] = {
@@ -206,70 +207,74 @@ static const char _lexer_trans_keys[] = {
 	10, 109, 10, 97, 10, 32, 10, 100, 
 	10, 101, 10, 108, 10, 32, 10, 101, 
 	10, 115, 10, 99, 97, 110, 100, 111, 
-	97, 106, 110, 115, 101, 109, 112, 108, 
-	111, 115, 58, 10, 10, 10, 32, 35, 
-	67, 124, 9, 13, 10, 97, 10, 114, 
-	10, 97, 10, 99, 10, 116, 10, 101, 
-	10, 114, -61, 10, -83, 10, 10, 115, 
-	10, 116, 10, 105, 10, 99, 10, 97, 
-	10, 58, 116, 111, 110, 99, 101, 115, 
-	99, 113, 101, 110, 97, 114, 105, 111, 
-	58, 10, 10, 10, 32, 35, 37, 42, 
-	64, 65, 67, 68, 69, 80, 89, 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, 116, 10, 101, 10, 99, 10, 
-	101, 10, 100, 10, 101, 10, 110, 10, 
-	116, 10, 101, 10, 115, 10, 58, 10, 
-	97, 117, 10, 114, 10, 97, 10, 99, 
-	10, 116, 10, 101, 10, 114, -61, 10, 
-	-83, 10, 10, 115, 10, 116, 10, 105, 
-	10, 99, 10, 97, 10, 97, 10, 110, 
-	10, 100, 10, 111, 10, 97, 10, 110, 
-	115, 10, 116, 10, 111, 10, 110, 10, 
-	99, 10, 101, 10, 115, 10, 99, 113, 
-	10, 101, 10, 110, 10, 97, 10, 114, 
-	10, 105, 10, 111, 10, 117, 10, 101, 
-	10, 109, 10, 97, 10, 32, 10, 100, 
-	10, 101, 10, 108, 10, 32, 10, 101, 
-	10, 115, 10, 99, 10, 101, 10, 114, 
-	117, 101, 109, 97, 32, 100, 101, 108, 
-	32, 101, 115, 99, 101, 110, 97, 114, 
-	105, 111, 58, 10, 10, 10, 32, 35, 
-	37, 42, 64, 67, 68, 69, 80, 89, 
-	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, 97, 117, 10, 114, 10, 97, 10, 
+	97, 100, 97, 111, 32, 115, 106, 110, 
+	115, 101, 109, 112, 108, 111, 115, 58, 
+	10, 10, 10, 32, 35, 67, 124, 9, 
+	13, 10, 97, 10, 114, 10, 97, 10, 
 	99, 10, 116, 10, 101, 10, 114, -61, 
 	10, -83, 10, 10, 115, 10, 116, 10, 
-	105, 10, 99, 10, 97, 10, 58, 10, 
-	97, 10, 110, 10, 100, 10, 111, 10, 
-	97, 10, 110, 115, 10, 116, 10, 111, 
-	10, 110, 10, 99, 10, 101, 10, 115, 
-	10, 99, 10, 101, 10, 110, 10, 97, 
-	10, 114, 10, 105, 10, 111, 10, 101, 
-	10, 114, 101, 114, 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, 67, 68, 69, 80, 89, 124, 9, 
-	13, 10, 97, 117, 10, 114, 10, 97, 
-	10, 99, 10, 116, 10, 101, 10, 114, 
-	-61, 10, -83, 10, 10, 115, 10, 116, 
-	10, 105, 10, 99, 10, 97, 10, 58, 
-	10, 97, 10, 110, 10, 100, 10, 111, 
-	10, 97, 10, 110, 115, 10, 116, 10, 
-	111, 10, 110, 10, 99, 10, 101, 10, 
-	115, 10, 99, 113, 10, 101, 10, 110, 
-	10, 97, 10, 114, 10, 105, 10, 111, 
-	10, 117, 10, 101, 10, 109, 10, 97, 
-	10, 32, 10, 100, 10, 101, 10, 108, 
-	10, 32, 10, 101, 10, 115, 10, 99, 
-	10, 101, 10, 114, 0
+	105, 10, 99, 10, 97, 10, 58, 116, 
+	111, 110, 99, 101, 115, 99, 113, 101, 
+	110, 97, 114, 105, 111, 58, 10, 10, 
+	10, 32, 35, 37, 42, 64, 65, 67, 
+	68, 69, 80, 89, 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, 116, 
+	10, 101, 10, 99, 10, 101, 10, 100, 
+	10, 101, 10, 110, 10, 116, 10, 101, 
+	10, 115, 10, 58, 10, 97, 117, 10, 
+	114, 10, 97, 10, 99, 10, 116, 10, 
+	101, 10, 114, -61, 10, -83, 10, 10, 
+	115, 10, 116, 10, 105, 10, 99, 10, 
+	97, 10, 97, 10, 110, 10, 100, 10, 
+	111, 10, 97, 10, 100, 10, 97, 111, 
+	10, 32, 115, 10, 110, 115, 10, 116, 
+	10, 111, 10, 110, 10, 99, 10, 101, 
+	10, 115, 10, 99, 113, 10, 101, 10, 
+	110, 10, 97, 10, 114, 10, 105, 10, 
+	111, 10, 117, 10, 101, 10, 109, 10, 
+	97, 10, 32, 10, 100, 10, 101, 10, 
+	108, 10, 32, 10, 101, 10, 115, 10, 
+	99, 10, 101, 10, 114, 117, 101, 109, 
+	97, 32, 100, 101, 108, 32, 101, 115, 
+	99, 101, 110, 97, 114, 105, 111, 58, 
+	10, 10, 10, 32, 35, 37, 42, 64, 
+	67, 68, 69, 80, 89, 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, 97, 117, 
+	10, 114, 10, 97, 10, 99, 10, 116, 
+	10, 101, 10, 114, -61, 10, -83, 10, 
+	10, 115, 10, 116, 10, 105, 10, 99, 
+	10, 97, 10, 58, 10, 97, 10, 110, 
+	10, 100, 10, 111, 10, 97, 10, 100, 
+	10, 97, 111, 10, 32, 115, 10, 110, 
+	115, 10, 116, 10, 111, 10, 110, 10, 
+	99, 10, 101, 10, 115, 10, 99, 10, 
+	101, 10, 110, 10, 97, 10, 114, 10, 
+	105, 10, 111, 10, 101, 10, 114, 101, 
+	114, 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, 67, 68, 
+	69, 80, 89, 124, 9, 13, 10, 97, 
+	117, 10, 114, 10, 97, 10, 99, 10, 
+	116, 10, 101, 10, 114, -61, 10, -83, 
+	10, 10, 115, 10, 116, 10, 105, 10, 
+	99, 10, 97, 10, 58, 10, 97, 10, 
+	110, 10, 100, 10, 111, 10, 97, 10, 
+	100, 10, 97, 111, 10, 32, 115, 10, 
+	110, 115, 10, 116, 10, 111, 10, 110, 
+	10, 99, 10, 101, 10, 115, 10, 99, 
+	113, 10, 101, 10, 110, 10, 97, 10, 
+	114, 10, 105, 10, 111, 10, 117, 10, 
+	101, 10, 109, 10, 97, 10, 32, 10, 
+	100, 10, 101, 10, 108, 10, 32, 10, 
+	101, 10, 115, 10, 99, 10, 101, 10, 
+	114, 0
 };
 
 static const char _lexer_single_lengths[] = {
@@ -292,38 +297,39 @@ static const char _lexer_single_lengths[] = {
 	2, 2, 2, 2, 3, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 1, 
-	1, 1, 1, 1, 3, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 5, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 1, 1, 
-	1, 1, 1, 1, 2, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 12, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
+	1, 1, 1, 1, 1, 2, 2, 3, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 5, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 1, 1, 1, 1, 1, 1, 2, 
+	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, 2, 3, 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, 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, 
+	2, 3, 3, 3, 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, 1, 1, 1, 1, 1, 11, 2, 
+	1, 1, 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, 3, 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, 3, 2, 2, 2, 2, 2, 
+	2, 3, 3, 3, 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, 
+	2, 2, 2, 1, 1, 2, 4, 3, 
+	2, 4, 14, 3, 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, 3, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
+	3, 3, 3, 2, 2, 2, 2, 2, 
+	2, 3, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 0
+	2, 2, 2, 2, 2, 2, 0
 };
 
 static const char _lexer_range_lengths[] = {
@@ -347,12 +353,12 @@ 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, 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, 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, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
@@ -363,21 +369,22 @@ 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, 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, 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, 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
 };
 
 static const short _lexer_index_offsets[] = {
@@ -400,46 +407,47 @@ static const short _lexer_index_offsets[] = {
 	406, 409, 412, 415, 418, 422, 425, 428, 
 	431, 434, 437, 440, 443, 446, 449, 452, 
 	455, 458, 461, 464, 467, 470, 473, 476, 
-	478, 480, 482, 484, 486, 490, 492, 494, 
-	496, 498, 500, 502, 504, 506, 508, 515, 
-	518, 521, 524, 527, 530, 533, 536, 539, 
-	542, 545, 548, 551, 554, 557, 560, 562, 
-	564, 566, 568, 570, 572, 575, 577, 579, 
-	581, 583, 585, 587, 589, 591, 593, 607, 
-	610, 613, 616, 619, 622, 625, 628, 631, 
-	634, 637, 640, 643, 646, 649, 652, 655, 
-	658, 661, 664, 667, 670, 673, 676, 679, 
-	682, 685, 688, 692, 695, 698, 701, 704, 
-	707, 710, 713, 716, 719, 722, 725, 728, 
-	731, 734, 737, 740, 743, 746, 750, 753, 
-	756, 759, 762, 765, 768, 772, 775, 778, 
-	781, 784, 787, 790, 793, 796, 799, 802, 
-	805, 808, 811, 814, 817, 820, 823, 826, 
-	829, 832, 834, 836, 838, 840, 842, 844, 
-	846, 848, 850, 852, 854, 856, 858, 860, 
-	862, 864, 866, 868, 870, 872, 874, 887, 
-	890, 893, 896, 899, 902, 905, 908, 911, 
-	914, 917, 920, 923, 926, 929, 932, 936, 
-	939, 942, 945, 948, 951, 954, 957, 960, 
-	963, 966, 969, 972, 975, 978, 981, 984, 
-	987, 990, 993, 997, 1000, 1003, 1006, 1009, 
-	1012, 1015, 1018, 1021, 1024, 1027, 1030, 1033, 
-	1036, 1039, 1042, 1044, 1046, 1050, 1056, 1060, 
-	1063, 1069, 1085, 1089, 1092, 1095, 1098, 1101, 
-	1104, 1107, 1110, 1113, 1116, 1119, 1122, 1125, 
-	1128, 1131, 1134, 1137, 1140, 1143, 1146, 1150, 
-	1153, 1156, 1159, 1162, 1165, 1168, 1172, 1175, 
-	1178, 1181, 1184, 1187, 1190, 1193, 1196, 1199, 
-	1202, 1205, 1208, 1211, 1214, 1217, 1220, 1223, 
-	1226, 1229, 1232
+	478, 480, 482, 484, 486, 488, 491, 494, 
+	498, 500, 502, 504, 506, 508, 510, 512, 
+	514, 516, 523, 526, 529, 532, 535, 538, 
+	541, 544, 547, 550, 553, 556, 559, 562, 
+	565, 568, 570, 572, 574, 576, 578, 580, 
+	583, 585, 587, 589, 591, 593, 595, 597, 
+	599, 601, 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, 700, 703, 
+	706, 709, 712, 715, 718, 721, 724, 727, 
+	730, 733, 736, 739, 742, 745, 748, 751, 
+	754, 757, 761, 765, 769, 772, 775, 778, 
+	781, 784, 787, 791, 794, 797, 800, 803, 
+	806, 809, 812, 815, 818, 821, 824, 827, 
+	830, 833, 836, 839, 842, 845, 848, 851, 
+	853, 855, 857, 859, 861, 863, 865, 867, 
+	869, 871, 873, 875, 877, 879, 881, 883, 
+	885, 887, 889, 891, 893, 906, 909, 912, 
+	915, 918, 921, 924, 927, 930, 933, 936, 
+	939, 942, 945, 948, 951, 955, 958, 961, 
+	964, 967, 970, 973, 976, 979, 982, 985, 
+	988, 991, 994, 997, 1000, 1003, 1006, 1009, 
+	1012, 1015, 1019, 1023, 1027, 1030, 1033, 1036, 
+	1039, 1042, 1045, 1048, 1051, 1054, 1057, 1060, 
+	1063, 1066, 1069, 1072, 1074, 1076, 1080, 1086, 
+	1090, 1093, 1099, 1115, 1119, 1122, 1125, 1128, 
+	1131, 1134, 1137, 1140, 1143, 1146, 1149, 1152, 
+	1155, 1158, 1161, 1164, 1167, 1170, 1173, 1176, 
+	1179, 1183, 1187, 1191, 1194, 1197, 1200, 1203, 
+	1206, 1209, 1213, 1216, 1219, 1222, 1225, 1228, 
+	1231, 1234, 1237, 1240, 1243, 1246, 1249, 1252, 
+	1255, 1258, 1261, 1264, 1267, 1270, 1273
 };
 
 static const short _lexer_trans_targs[] = {
 	2, 4, 4, 5, 15, 17, 31, 34, 
-	37, 68, 155, 156, 346, 31, 348, 4, 
+	37, 68, 155, 159, 355, 31, 357, 4, 
 	0, 3, 0, 4, 0, 4, 4, 5, 
-	15, 17, 31, 34, 37, 68, 155, 156, 
-	346, 31, 348, 4, 0, 6, 0, 7, 
+	15, 17, 31, 34, 37, 68, 155, 159, 
+	355, 31, 357, 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, 
@@ -448,22 +456,22 @@ 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, 402, 0, 32, 0, 0, 33, 
+	30, 0, 414, 0, 32, 0, 0, 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, 43, 0, 
 	44, 0, 45, 0, 46, 0, 47, 0, 
 	48, 0, 49, 0, 51, 50, 51, 50, 
-	51, 51, 4, 52, 66, 4, 354, 373, 
-	374, 400, 66, 51, 50, 51, 53, 50, 
+	51, 51, 4, 52, 66, 4, 363, 382, 
+	386, 412, 66, 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, 68, 155, 156, 346, 31, 348, 
+	34, 37, 68, 155, 159, 355, 31, 357, 
 	4, 0, 69, 151, 0, 70, 0, 71, 
 	0, 72, 0, 73, 0, 74, 0, 75, 
 	0, 76, 0, 77, 0, 78, 0, 79, 
@@ -495,101 +503,106 @@ static const short _lexer_trans_targs[] = {
 	145, 84, 85, 146, 84, 85, 147, 84, 
 	85, 148, 84, 85, 149, 84, 85, 150, 
 	84, 85, 133, 84, 152, 0, 153, 0, 
-	154, 0, 31, 0, 153, 0, 157, 182, 
-	188, 0, 158, 0, 159, 0, 160, 0, 
-	161, 0, 162, 0, 163, 0, 164, 0, 
-	166, 165, 166, 165, 166, 166, 4, 167, 
-	4, 166, 165, 166, 168, 165, 166, 169, 
-	165, 166, 170, 165, 166, 171, 165, 166, 
-	172, 165, 166, 173, 165, 166, 174, 165, 
-	175, 166, 165, 176, 166, 165, 166, 177, 
-	165, 166, 178, 165, 166, 179, 165, 166, 
-	180, 165, 166, 181, 165, 166, 67, 165, 
-	183, 0, 184, 0, 185, 0, 186, 0, 
-	187, 0, 31, 0, 189, 273, 0, 190, 
-	0, 191, 0, 192, 0, 193, 0, 194, 
-	0, 195, 0, 196, 0, 198, 197, 198, 
-	197, 198, 198, 4, 199, 213, 4, 214, 
-	226, 244, 245, 271, 213, 198, 197, 198, 
-	200, 197, 198, 201, 197, 198, 202, 197, 
-	198, 203, 197, 198, 204, 197, 198, 205, 
-	197, 198, 206, 197, 198, 207, 197, 198, 
-	208, 197, 198, 209, 197, 198, 210, 197, 
-	198, 211, 197, 198, 212, 197, 198, 4, 
-	197, 198, 67, 197, 198, 215, 197, 198, 
-	216, 197, 198, 217, 197, 198, 218, 197, 
-	198, 219, 197, 198, 220, 197, 198, 221, 
-	197, 198, 222, 197, 198, 223, 197, 198, 
-	224, 197, 198, 225, 197, 198, 67, 197, 
-	198, 227, 240, 197, 198, 228, 197, 198, 
-	229, 197, 198, 230, 197, 198, 231, 197, 
-	198, 232, 197, 198, 233, 197, 234, 198, 
-	197, 235, 198, 197, 198, 236, 197, 198, 
-	237, 197, 198, 238, 197, 198, 239, 197, 
-	198, 225, 197, 198, 241, 197, 198, 242, 
-	197, 198, 243, 197, 198, 213, 197, 198, 
-	242, 197, 198, 246, 252, 197, 198, 247, 
-	197, 198, 248, 197, 198, 249, 197, 198, 
-	250, 197, 198, 251, 197, 198, 213, 197, 
-	198, 253, 259, 197, 198, 254, 197, 198, 
-	255, 197, 198, 256, 197, 198, 257, 197, 
-	198, 258, 197, 198, 225, 197, 198, 260, 
-	197, 198, 261, 197, 198, 262, 197, 198, 
-	263, 197, 198, 264, 197, 198, 265, 197, 
-	198, 266, 197, 198, 267, 197, 198, 268, 
-	197, 198, 269, 197, 198, 270, 197, 198, 
-	253, 197, 198, 272, 197, 198, 243, 197, 
-	274, 0, 275, 0, 276, 0, 277, 0, 
-	278, 0, 279, 0, 280, 0, 281, 0, 
-	282, 0, 283, 0, 284, 0, 285, 0, 
-	286, 0, 287, 0, 288, 0, 289, 0, 
-	290, 0, 291, 0, 292, 0, 294, 293, 
-	294, 293, 294, 294, 4, 295, 309, 4, 
-	310, 329, 330, 344, 309, 294, 293, 294, 
-	296, 293, 294, 297, 293, 294, 298, 293, 
-	294, 299, 293, 294, 300, 293, 294, 301, 
-	293, 294, 302, 293, 294, 303, 293, 294, 
-	304, 293, 294, 305, 293, 294, 306, 293, 
-	294, 307, 293, 294, 308, 293, 294, 4, 
-	293, 294, 67, 293, 294, 311, 325, 293, 
-	294, 312, 293, 294, 313, 293, 294, 314, 
-	293, 294, 315, 293, 294, 316, 293, 294, 
-	317, 293, 318, 294, 293, 319, 294, 293, 
-	294, 320, 293, 294, 321, 293, 294, 322, 
-	293, 294, 323, 293, 294, 324, 293, 294, 
-	67, 293, 294, 326, 293, 294, 327, 293, 
-	294, 328, 293, 294, 309, 293, 294, 327, 
-	293, 294, 331, 337, 293, 294, 332, 293, 
-	294, 333, 293, 294, 334, 293, 294, 335, 
-	293, 294, 336, 293, 294, 309, 293, 294, 
-	338, 293, 294, 339, 293, 294, 340, 293, 
-	294, 341, 293, 294, 342, 293, 294, 343, 
-	293, 294, 324, 293, 294, 345, 293, 294, 
-	328, 293, 347, 0, 154, 0, 348, 349, 
-	348, 0, 353, 352, 351, 349, 352, 350, 
-	0, 351, 349, 350, 0, 351, 350, 353, 
-	352, 351, 349, 352, 350, 353, 353, 5, 
-	15, 17, 31, 34, 37, 68, 155, 156, 
-	346, 31, 348, 353, 0, 51, 355, 369, 
-	50, 51, 356, 50, 51, 357, 50, 51, 
-	358, 50, 51, 359, 50, 51, 360, 50, 
-	51, 361, 50, 362, 51, 50, 363, 51, 
-	50, 51, 364, 50, 51, 365, 50, 51, 
-	366, 50, 51, 367, 50, 51, 368, 50, 
-	51, 67, 50, 51, 370, 50, 51, 371, 
-	50, 51, 372, 50, 51, 66, 50, 51, 
-	371, 50, 51, 375, 381, 50, 51, 376, 
-	50, 51, 377, 50, 51, 378, 50, 51, 
-	379, 50, 51, 380, 50, 51, 66, 50, 
-	51, 382, 388, 50, 51, 383, 50, 51, 
-	384, 50, 51, 385, 50, 51, 386, 50, 
-	51, 387, 50, 51, 368, 50, 51, 389, 
-	50, 51, 390, 50, 51, 391, 50, 51, 
-	392, 50, 51, 393, 50, 51, 394, 50, 
-	51, 395, 50, 51, 396, 50, 51, 397, 
-	50, 51, 398, 50, 51, 399, 50, 51, 
-	382, 50, 51, 401, 50, 51, 372, 50, 
-	0, 0
+	154, 0, 31, 0, 156, 0, 157, 0, 
+	158, 158, 0, 32, 31, 0, 160, 185, 
+	191, 0, 161, 0, 162, 0, 163, 0, 
+	164, 0, 165, 0, 166, 0, 167, 0, 
+	169, 168, 169, 168, 169, 169, 4, 170, 
+	4, 169, 168, 169, 171, 168, 169, 172, 
+	168, 169, 173, 168, 169, 174, 168, 169, 
+	175, 168, 169, 176, 168, 169, 177, 168, 
+	178, 169, 168, 179, 169, 168, 169, 180, 
+	168, 169, 181, 168, 169, 182, 168, 169, 
+	183, 168, 169, 184, 168, 169, 67, 168, 
+	186, 0, 187, 0, 188, 0, 189, 0, 
+	190, 0, 31, 0, 192, 279, 0, 193, 
+	0, 194, 0, 195, 0, 196, 0, 197, 
+	0, 198, 0, 199, 0, 201, 200, 201, 
+	200, 201, 201, 4, 202, 216, 4, 217, 
+	229, 247, 251, 277, 216, 201, 200, 201, 
+	203, 200, 201, 204, 200, 201, 205, 200, 
+	201, 206, 200, 201, 207, 200, 201, 208, 
+	200, 201, 209, 200, 201, 210, 200, 201, 
+	211, 200, 201, 212, 200, 201, 213, 200, 
+	201, 214, 200, 201, 215, 200, 201, 4, 
+	200, 201, 67, 200, 201, 218, 200, 201, 
+	219, 200, 201, 220, 200, 201, 221, 200, 
+	201, 222, 200, 201, 223, 200, 201, 224, 
+	200, 201, 225, 200, 201, 226, 200, 201, 
+	227, 200, 201, 228, 200, 201, 67, 200, 
+	201, 230, 243, 200, 201, 231, 200, 201, 
+	232, 200, 201, 233, 200, 201, 234, 200, 
+	201, 235, 200, 201, 236, 200, 237, 201, 
+	200, 238, 201, 200, 201, 239, 200, 201, 
+	240, 200, 201, 241, 200, 201, 242, 200, 
+	201, 228, 200, 201, 244, 200, 201, 245, 
+	200, 201, 246, 200, 201, 216, 200, 201, 
+	248, 200, 201, 249, 200, 201, 250, 250, 
+	200, 201, 67, 216, 200, 201, 252, 258, 
+	200, 201, 253, 200, 201, 254, 200, 201, 
+	255, 200, 201, 256, 200, 201, 257, 200, 
+	201, 216, 200, 201, 259, 265, 200, 201, 
+	260, 200, 201, 261, 200, 201, 262, 200, 
+	201, 263, 200, 201, 264, 200, 201, 228, 
+	200, 201, 266, 200, 201, 267, 200, 201, 
+	268, 200, 201, 269, 200, 201, 270, 200, 
+	201, 271, 200, 201, 272, 200, 201, 273, 
+	200, 201, 274, 200, 201, 275, 200, 201, 
+	276, 200, 201, 259, 200, 201, 278, 200, 
+	201, 246, 200, 280, 0, 281, 0, 282, 
+	0, 283, 0, 284, 0, 285, 0, 286, 
+	0, 287, 0, 288, 0, 289, 0, 290, 
+	0, 291, 0, 292, 0, 293, 0, 294, 
+	0, 295, 0, 296, 0, 297, 0, 298, 
+	0, 300, 299, 300, 299, 300, 300, 4, 
+	301, 315, 4, 316, 335, 339, 353, 315, 
+	300, 299, 300, 302, 299, 300, 303, 299, 
+	300, 304, 299, 300, 305, 299, 300, 306, 
+	299, 300, 307, 299, 300, 308, 299, 300, 
+	309, 299, 300, 310, 299, 300, 311, 299, 
+	300, 312, 299, 300, 313, 299, 300, 314, 
+	299, 300, 4, 299, 300, 67, 299, 300, 
+	317, 331, 299, 300, 318, 299, 300, 319, 
+	299, 300, 320, 299, 300, 321, 299, 300, 
+	322, 299, 300, 323, 299, 324, 300, 299, 
+	325, 300, 299, 300, 326, 299, 300, 327, 
+	299, 300, 328, 299, 300, 329, 299, 300, 
+	330, 299, 300, 67, 299, 300, 332, 299, 
+	300, 333, 299, 300, 334, 299, 300, 315, 
+	299, 300, 336, 299, 300, 337, 299, 300, 
+	338, 338, 299, 300, 67, 315, 299, 300, 
+	340, 346, 299, 300, 341, 299, 300, 342, 
+	299, 300, 343, 299, 300, 344, 299, 300, 
+	345, 299, 300, 315, 299, 300, 347, 299, 
+	300, 348, 299, 300, 349, 299, 300, 350, 
+	299, 300, 351, 299, 300, 352, 299, 300, 
+	330, 299, 300, 354, 299, 300, 334, 299, 
+	356, 0, 154, 0, 357, 358, 357, 0, 
+	362, 361, 360, 358, 361, 359, 0, 360, 
+	358, 359, 0, 360, 359, 362, 361, 360, 
+	358, 361, 359, 362, 362, 5, 15, 17, 
+	31, 34, 37, 68, 155, 159, 355, 31, 
+	357, 362, 0, 51, 364, 378, 50, 51, 
+	365, 50, 51, 366, 50, 51, 367, 50, 
+	51, 368, 50, 51, 369, 50, 51, 370, 
+	50, 371, 51, 50, 372, 51, 50, 51, 
+	373, 50, 51, 374, 50, 51, 375, 50, 
+	51, 376, 50, 51, 377, 50, 51, 67, 
+	50, 51, 379, 50, 51, 380, 50, 51, 
+	381, 50, 51, 66, 50, 51, 383, 50, 
+	51, 384, 50, 51, 385, 385, 50, 51, 
+	67, 66, 50, 51, 387, 393, 50, 51, 
+	388, 50, 51, 389, 50, 51, 390, 50, 
+	51, 391, 50, 51, 392, 50, 51, 66, 
+	50, 51, 394, 400, 50, 51, 395, 50, 
+	51, 396, 50, 51, 397, 50, 51, 398, 
+	50, 51, 399, 50, 51, 377, 50, 51, 
+	401, 50, 51, 402, 50, 51, 403, 50, 
+	51, 404, 50, 51, 405, 50, 51, 406, 
+	50, 51, 407, 50, 51, 408, 50, 51, 
+	409, 50, 51, 410, 50, 51, 411, 50, 
+	51, 394, 50, 51, 413, 50, 51, 381, 
+	50, 0, 0
 };
 
 static const unsigned char _lexer_trans_actions[] = {
@@ -653,7 +666,8 @@ 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, 0, 43, 0, 43, 
-	0, 43, 0, 43, 0, 43, 0, 0, 
+	0, 43, 0, 43, 0, 43, 0, 43, 
+	0, 0, 43, 0, 0, 43, 0, 0, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
 	140, 57, 54, 0, 54, 0, 81, 84, 
@@ -686,10 +700,11 @@ 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, 54, 0, 
+	0, 0, 54, 0, 0, 54, 0, 0, 
+	0, 54, 17, 0, 0, 54, 0, 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, 
+	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, 
@@ -697,57 +712,60 @@ 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, 
-	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, 140, 57, 
-	54, 0, 54, 0, 78, 33, 84, 78, 
-	84, 84, 84, 84, 84, 0, 0, 54, 
+	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, 140, 57, 54, 0, 54, 0, 78, 
+	33, 84, 78, 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, 54, 0, 0, 0, 
 	54, 0, 0, 54, 0, 0, 54, 0, 
-	0, 54, 0, 0, 54, 0, 0, 54, 
+	0, 54, 19, 0, 54, 19, 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, 
-	19, 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, 
+	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, 
+	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, 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, 0, 0, 
+	0, 0, 0, 54, 19, 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, 
+	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, 0, 54, 0, 
-	0, 54, 0, 0, 54, 0, 0, 54, 
-	0, 0, 54, 0, 0, 0, 54, 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, 0, 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, 15, 
 	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, 
+	15, 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, 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, 0
+	54, 0, 0, 54, 0, 0, 54, 0, 
+	0, 0, 0
 };
 
 static const unsigned char _lexer_eof_actions[] = {
@@ -801,11 +819,12 @@ 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
 };
 
 static const int lexer_start = 1;
-static const int lexer_first_final = 402;
+static const int lexer_first_final = 414;
 static const int lexer_error = 0;
 
 static const int lexer_en_main = 1;
@@ -979,14 +998,14 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
     assert(*pe == '\0' && "pointer does not end on NULL");
     
     
-#line 983 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
+#line 1002 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
 	{
 	cs = lexer_start;
 	}
 
 #line 425 "/Users/ahellesoy/scm/gherkin/tasks/../ragel/i18n/es.c.rl"
     
-#line 990 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
+#line 1009 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1276,7 +1295,7 @@ _match:
     }
   }
 	break;
-#line 1280 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
+#line 1299 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
 		}
 	}
 
@@ -1339,7 +1358,7 @@ _again:
     }
   }
 	break;
-#line 1343 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
+#line 1362 "ext/gherkin_lexer_es/gherkin_lexer_es.c"
 		}
 	}
 	}