gherkin 2.11.2 → 2.11.3

data/ext/gherkin_lexer_de/gherkin_lexer_de.c

@@ -853,7 +853,7 @@ static VALUE
 unindent(VALUE con, int start_col)
 {
   VALUE re;
-  // Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters
+  /* Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters */
   char pat[32]; 
   snprintf(pat, 32, "^[\t ]{0,%d}", start_col); 
   re = rb_reg_regcomp(rb_str_new2(pat));
@@ -1284,14 +1284,14 @@ _match:
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -1305,7 +1305,7 @@ _match:
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
@@ -1347,14 +1347,14 @@ _again:
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -1368,7 +1368,7 @@ _again:
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
@@ -1389,7 +1389,7 @@ _again:
     assert(lexer->content_start <= len && "content starts after data end");
     assert(lexer->mark < len && "mark is after data end");
     
-    // Reset lexer by re-initializing the whole thing
+    /* Reset lexer by re-initializing the whole thing */
     lexer_init(lexer);
 
     if (cs == lexer_error) {

data/ext/gherkin_lexer_en/gherkin_lexer_en.c

@@ -856,7 +856,7 @@ static VALUE
 unindent(VALUE con, int start_col)
 {
   VALUE re;
-  // Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters
+  /* Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters */
   char pat[32]; 
   snprintf(pat, 32, "^[\t ]{0,%d}", start_col); 
   re = rb_reg_regcomp(rb_str_new2(pat));
@@ -1287,14 +1287,14 @@ _match:
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -1308,7 +1308,7 @@ _match:
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
@@ -1350,14 +1350,14 @@ _again:
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -1371,7 +1371,7 @@ _again:
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
@@ -1392,7 +1392,7 @@ _again:
     assert(lexer->content_start <= len && "content starts after data end");
     assert(lexer->mark < len && "mark is after data end");
     
-    // Reset lexer by re-initializing the whole thing
+    /* Reset lexer by re-initializing the whole thing */
     lexer_init(lexer);
 
     if (cs == lexer_error) {

data/ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c

@@ -110,173 +110,339 @@ static const char _lexer_actions[] = {
 };
 
 static const short _lexer_key_offsets[] = {
-	0, 0, 17, 18, 19, 35, 36, 37, 
-	39, 41, 46, 51, 56, 61, 65, 69, 
-	71, 72, 73, 74, 75, 76, 77, 78, 
-	79, 80, 81, 82, 83, 84, 85, 86, 
-	87, 89, 91, 96, 103, 108, 110, 111, 
-	112, 113, 114, 115, 116, 117, 118, 119, 
-	120, 121, 135, 137, 139, 141, 143, 145, 
+	0, 0, 19, 20, 21, 39, 40, 41, 
+	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, 
+	115, 116, 117, 118, 119, 120, 121, 122, 
+	123, 124, 125, 126, 127, 128, 129, 145, 
 	147, 149, 151, 153, 155, 157, 159, 161, 
-	163, 165, 181, 184, 185, 186, 187, 188, 
-	189, 190, 191, 192, 193, 200, 202, 204, 
-	206, 208, 210, 212, 213, 214, 215, 216, 
-	217, 218, 219, 229, 231, 233, 235, 237, 
-	239, 241, 243, 245, 247, 249, 251, 253, 
-	255, 257, 260, 262, 264, 266, 268, 270, 
-	272, 274, 276, 278, 280, 282, 284, 286, 
-	289, 291, 293, 295, 297, 299, 301, 303, 
-	305, 307, 309, 311, 312, 313, 314, 315, 
-	316, 317, 331, 333, 335, 337, 339, 341, 
-	343, 345, 347, 349, 351, 353, 355, 357, 
-	359, 361, 364, 366, 368, 370, 372, 374, 
-	376, 378, 380, 382, 384, 386, 388, 390, 
-	393, 395, 397, 399, 401, 403, 405, 407, 
-	409, 411, 413, 415, 417, 419, 421, 424, 
-	426, 428, 430, 432, 434, 436, 438, 440, 
-	442, 444, 446, 447, 448, 449, 450, 451, 
-	453, 454, 455, 456, 457, 458, 459, 460, 
-	461, 462, 463, 464, 468, 474, 477, 479, 
-	485, 501, 503, 505, 507, 509, 511, 513, 
-	516, 518, 520, 522, 524, 526, 528, 530, 
-	532, 534, 536, 538, 540, 542, 544, 547, 
-	549, 551, 553, 555, 557, 559, 561, 563, 
-	565, 567, 569, 570, 571, 572, 573, 574, 
-	575, 576, 589, 591, 593, 595, 597, 599, 
-	601, 603, 605, 607, 609, 611, 613, 615, 
-	617, 619, 622, 624, 626, 628, 630, 632, 
-	634, 636, 638, 640, 642, 644, 646, 648, 
-	650, 652, 655, 657, 659, 661, 663, 665, 
-	667, 669, 671, 673, 675, 677
+	163, 165, 167, 169, 171, 173, 175, 193, 
+	194, 195, 196, 197, 198, 199, 200, 201, 
+	202, 203, 204, 205, 206, 207, 208, 209, 
+	210, 211, 212, 213, 214, 215, 216, 217, 
+	218, 219, 220, 221, 222, 223, 224, 225, 
+	226, 227, 228, 229, 230, 231, 232, 233, 
+	234, 235, 236, 237, 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, 310, 312, 314, 316, 318, 320, 322, 
+	324, 326, 328, 330, 332, 334, 336, 338, 
+	340, 342, 344, 346, 348, 350, 352, 354, 
+	356, 358, 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, 487, 489, 491, 493, 495, 497, 499, 
+	501, 503, 505, 507, 508, 509, 510, 511, 
+	512, 513, 514, 515, 516, 517, 518, 519, 
+	520, 521, 522, 523, 524, 525, 526, 527, 
+	528, 529, 530, 531, 532, 533, 534, 535, 
+	536, 537, 538, 539, 540, 541, 553, 555, 
+	557, 559, 561, 563, 565, 567, 569, 571, 
+	573, 575, 577, 579, 581, 583, 585, 587, 
+	589, 591, 593, 595, 597, 599, 601, 603, 
+	605, 607, 609, 611, 613, 615, 617, 619, 
+	621, 623, 625, 627, 629, 631, 633, 635, 
+	637, 639, 641, 643, 645, 647, 649, 651, 
+	653, 655, 657, 659, 661, 663, 665, 667, 
+	669, 671, 673, 675, 677, 679, 681, 683, 
+	685, 687, 689, 691, 693, 695, 697, 698, 
+	699, 700, 701, 702, 703, 704, 705, 706, 
+	707, 708, 709, 710, 711, 712, 713, 714, 
+	715, 729, 731, 733, 735, 737, 739, 741, 
+	743, 745, 747, 749, 751, 753, 755, 757, 
+	759, 761, 763, 765, 767, 769, 771, 773, 
+	775, 777, 779, 781, 783, 785, 787, 789, 
+	791, 793, 795, 797, 799, 801, 803, 805, 
+	807, 809, 811, 813, 815, 817, 819, 821, 
+	823, 825, 827, 829, 831, 833, 835, 837, 
+	839, 841, 843, 845, 847, 849, 851, 853, 
+	855, 857, 859, 861, 863, 865, 867, 869, 
+	871, 873, 875, 877, 879, 881, 883, 885, 
+	887, 889, 891, 893, 895, 897, 899, 901, 
+	903, 905, 907, 909, 911, 913, 915, 917, 
+	919, 921, 923, 925, 927, 929, 931, 933, 
+	936, 938, 940, 942, 944, 946, 948, 950, 
+	952, 954, 956, 957, 958, 959, 960, 961, 
+	962, 963, 964, 967, 968, 969, 970, 971, 
+	972, 973, 974, 975, 976, 977, 978, 979, 
+	980, 981, 982, 983, 984, 985, 986, 987, 
+	988, 989, 990, 997, 999, 1001, 1003, 1005, 
+	1007, 1009, 1011, 1013, 1015, 1017, 1019, 1023, 
+	1029, 1032, 1034, 1040, 1058, 1060, 1062, 1064, 
+	1066, 1068, 1070, 1072, 1074, 1076, 1078, 1080, 
+	1082, 1084, 1086, 1088, 1090, 1092, 1094, 1096, 
+	1098, 1100, 1102, 1104, 1106, 1108, 1110, 1112, 
+	1114, 1116, 1118, 1120, 1122, 1124, 1126, 1128, 
+	1130, 1132, 1134, 1136, 1138, 1140, 1142, 1144, 
+	1146, 1148, 1150, 1152, 1154, 1156, 1158, 1160, 
+	1162, 1164, 1166, 1168, 1170, 1172, 1174, 1176, 
+	1178, 1180, 1182, 1184, 1186, 1188, 1190, 1192, 
+	1194, 1196, 1198, 1200, 1202, 1204, 1206, 1208, 
+	1210, 1212, 1214, 1216, 1218, 1220, 1222, 1224, 
+	1226, 1228, 1230, 1232, 1234, 1236, 1238, 1240, 
+	1242, 1244, 1246, 1248, 1250, 1252, 1254, 1256, 
+	1258, 1260, 1262, 1264, 1266, 1268, 1270, 1272, 
+	1274, 1276, 1279, 1281, 1283, 1285, 1287, 1289, 
+	1291, 1293, 1295, 1297, 1299
 };
 
 static const char _lexer_trans_keys[] = {
 	-17, 10, 32, 34, 35, 37, 42, 64, 
-	66, 67, 77, 78, 87, 89, 124, 9, 
-	13, -69, -65, 10, 32, 34, 35, 37, 
-	42, 64, 66, 67, 77, 78, 87, 89, 
-	124, 9, 13, 34, 34, 10, 13, 10, 
-	13, 10, 32, 34, 9, 13, 10, 32, 
-	34, 9, 13, 10, 32, 34, 9, 13, 
-	10, 32, 34, 9, 13, 10, 32, 9, 
-	13, 10, 32, 9, 13, 10, 13, 10, 
-	95, 70, 69, 65, 84, 85, 82, 69, 
-	95, 69, 78, 68, 95, 37, 32, 10, 
-	13, 10, 13, 13, 32, 64, 9, 10, 
-	9, 10, 13, 32, 64, 11, 12, 10, 
-	32, 64, 9, 13, 97, 108, 99, 107, 
-	103, 114, 111, 117, 110, 100, 58, 10, 
-	10, 10, 32, 35, 37, 42, 64, 66, 
-	67, 77, 78, 87, 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, 32, 34, 
-	35, 37, 42, 64, 66, 67, 77, 78, 
-	87, 89, 124, 9, 13, 101, 111, 114, 
-	112, 116, 98, 98, 101, 114, 58, 10, 
-	10, 10, 32, 35, 67, 124, 9, 13, 
-	10, 114, 10, 105, 10, 107, 10, 101, 
-	10, 121, 10, 58, 105, 107, 101, 121, 
-	58, 10, 10, 10, 32, 35, 37, 64, 
-	66, 67, 77, 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, 108, 10, 99, 10, 107, 
-	10, 103, 10, 114, 10, 111, 10, 117, 
-	10, 110, 10, 100, 10, 58, 10, 111, 
-	10, 107, 10, 101, 10, 115, 10, 111, 
-	114, 10, 98, 10, 98, 10, 101, 10, 
-	114, 10, 105, 10, 107, 10, 101, 10, 
-	121, 10, 97, 10, 116, 10, 101, 97, 
-	116, 101, 58, 10, 10, 10, 32, 35, 
-	37, 42, 64, 66, 67, 77, 78, 87, 
-	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, 108, 10, 99, 10, 107, 
-	10, 103, 10, 114, 10, 111, 10, 117, 
-	10, 110, 10, 100, 10, 58, 10, 111, 
-	10, 107, 10, 101, 10, 115, 10, 101, 
-	114, 10, 112, 10, 116, 10, 105, 10, 
-	107, 10, 101, 10, 121, 10, 97, 10, 
-	116, 10, 101, 10, 104, 10, 101, 10, 
-	110, 10, 97, 10, 32, 10, 103, 107, 
-	10, 111, 10, 116, 10, 116, 10, 97, 
-	10, 110, 10, 111, 10, 119, 10, 32, 
-	10, 104, 10, 111, 10, 119, 104, 101, 
-	110, 97, 32, 103, 107, 111, 116, 116, 
-	97, 110, 111, 119, 32, 104, 111, 119, 
-	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, 66, 67, 77, 78, 
-	87, 89, 124, 9, 13, 10, 108, 10, 
-	111, 10, 107, 10, 101, 10, 115, 10, 
-	58, 10, 101, 114, 10, 112, 10, 116, 
-	10, 105, 10, 107, 10, 101, 10, 121, 
-	10, 97, 10, 116, 10, 101, 10, 104, 
-	10, 101, 10, 110, 10, 97, 10, 32, 
-	10, 103, 107, 10, 111, 10, 116, 10, 
-	116, 10, 97, 10, 110, 10, 111, 10, 
-	119, 10, 32, 10, 104, 10, 111, 10, 
-	119, 111, 107, 101, 115, 58, 10, 10, 
-	10, 32, 35, 37, 42, 64, 67, 77, 
-	78, 87, 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, 101, 114, 10, 112, 
-	10, 116, 10, 105, 10, 107, 10, 101, 
-	10, 121, 10, 58, 10, 97, 10, 116, 
-	10, 101, 10, 104, 10, 101, 10, 110, 
-	10, 97, 10, 32, 10, 103, 107, 10, 
-	111, 10, 116, 10, 116, 10, 97, 10, 
-	110, 10, 111, 10, 119, 10, 32, 10, 
-	104, 10, 111, 10, 119, 0
+	65, 66, 70, 73, 80, 82, 84, 89, 
+	124, 9, 13, -69, -65, 10, 32, 34, 
+	35, 37, 42, 64, 65, 66, 70, 73, 
+	80, 82, 84, 89, 124, 9, 13, 34, 
+	34, 10, 13, 10, 13, 10, 32, 34, 
+	9, 13, 10, 32, 34, 9, 13, 10, 
+	32, 34, 9, 13, 10, 32, 34, 9, 
+	13, 10, 32, 9, 13, 10, 32, 9, 
+	13, 10, 13, 10, 95, 70, 69, 65, 
+	84, 85, 82, 69, 95, 69, 78, 68, 
+	95, 37, 32, 10, 13, 10, 13, 13, 
+	32, 64, 9, 10, 9, 10, 13, 32, 
+	64, 11, 12, 10, 32, 64, 9, 13, 
+	119, 119, 119, 44, 32, 108, 111, 111, 
+	107, 32, 109, 97, 116, 101, 58, 10, 
+	10, 10, 32, 35, 37, 42, 64, 65, 
+	66, 70, 73, 80, 82, 84, 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, 
+	32, 34, 35, 37, 42, 64, 65, 66, 
+	70, 73, 80, 82, 84, 89, 124, 9, 
+	13, 117, 116, 32, 97, 116, 32, 116, 
+	104, 101, 32, 101, 110, 100, 32, 111, 
+	102, 32, 116, 104, 101, 32, 100, 97, 
+	121, 32, 73, 32, 114, 101, 99, 107, 
+	111, 110, 105, 114, 115, 116, 32, 111, 
+	102, 102, 58, 10, 10, 10, 32, 35, 
+	37, 42, 64, 65, 66, 73, 80, 82, 
+	84, 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, 119, 10, 119, 10, 119, 
+	10, 44, 10, 32, 10, 108, 10, 111, 
+	10, 111, 10, 107, 10, 32, 10, 109, 
+	10, 97, 10, 116, 10, 101, 10, 58, 
+	10, 117, 10, 116, 10, 32, 10, 97, 
+	10, 116, 10, 32, 10, 116, 10, 104, 
+	10, 101, 10, 32, 10, 101, 10, 110, 
+	10, 100, 10, 32, 10, 111, 10, 102, 
+	10, 32, 10, 116, 10, 104, 10, 101, 
+	10, 32, 10, 100, 10, 97, 10, 121, 
+	10, 32, 10, 73, 10, 32, 10, 114, 
+	10, 101, 10, 99, 10, 107, 10, 111, 
+	10, 110, 10, 116, 10, 39, 10, 115, 
+	10, 32, 10, 106, 10, 117, 10, 115, 
+	10, 116, 10, 32, 10, 117, 10, 110, 
+	10, 98, 10, 101, 10, 108, 10, 105, 
+	10, 101, 10, 118, 10, 97, 10, 98, 
+	10, 108, 10, 101, 10, 114, 10, 101, 
+	10, 116, 10, 116, 10, 121, 10, 32, 
+	10, 109, 10, 117, 10, 99, 10, 104, 
+	10, 101, 10, 99, 10, 107, 10, 111, 
+	10, 110, 10, 32, 10, 105, 10, 116, 
+	10, 39, 10, 115, 10, 32, 10, 108, 
+	10, 105, 10, 107, 10, 111, 10, 111, 
+	10, 32, 10, 114, 10, 105, 10, 103, 
+	10, 104, 10, 116, 10, 39, 101, 10, 
+	107, 10, 110, 10, 111, 10, 119, 10, 
+	97, 10, 104, 10, 32, 10, 110, 10, 
+	97, 10, 104, 116, 39, 115, 32, 106, 
+	117, 115, 116, 32, 117, 110, 98, 101, 
+	108, 105, 101, 118, 97, 98, 108, 101, 
+	114, 101, 116, 116, 121, 32, 109, 117, 
+	99, 104, 58, 10, 10, 10, 32, 35, 
+	37, 64, 65, 70, 80, 82, 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, 119, 10, 
+	119, 10, 119, 10, 44, 10, 32, 10, 
+	108, 10, 111, 10, 111, 10, 107, 10, 
+	32, 10, 109, 10, 97, 10, 116, 10, 
+	101, 10, 58, 10, 105, 10, 114, 10, 
+	115, 10, 116, 10, 32, 10, 111, 10, 
+	102, 10, 102, 10, 114, 10, 101, 10, 
+	116, 10, 116, 10, 121, 10, 32, 10, 
+	109, 10, 117, 10, 99, 10, 104, 10, 
+	101, 10, 99, 10, 107, 10, 111, 10, 
+	110, 10, 32, 10, 105, 10, 116, 10, 
+	39, 10, 115, 10, 32, 10, 108, 10, 
+	105, 10, 107, 10, 111, 10, 117, 10, 
+	39, 10, 108, 10, 108, 10, 32, 10, 
+	119, 10, 97, 10, 110, 10, 110, 10, 
+	97, 101, 99, 107, 111, 110, 32, 105, 
+	116, 39, 115, 32, 108, 105, 107, 101, 
+	58, 10, 10, 10, 32, 35, 37, 42, 
+	64, 65, 66, 73, 80, 84, 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, 
+	119, 10, 119, 10, 119, 10, 44, 10, 
+	32, 10, 108, 10, 111, 10, 111, 10, 
+	107, 10, 32, 10, 109, 10, 97, 10, 
+	116, 10, 101, 10, 58, 10, 117, 10, 
+	116, 10, 32, 10, 97, 10, 116, 10, 
+	32, 10, 116, 10, 104, 10, 101, 10, 
+	32, 10, 101, 10, 110, 10, 100, 10, 
+	32, 10, 111, 10, 102, 10, 32, 10, 
+	116, 10, 104, 10, 101, 10, 32, 10, 
+	100, 10, 97, 10, 121, 10, 32, 10, 
+	73, 10, 32, 10, 114, 10, 101, 10, 
+	99, 10, 107, 10, 111, 10, 110, 10, 
+	116, 10, 39, 10, 115, 10, 32, 10, 
+	106, 10, 117, 10, 115, 10, 116, 10, 
+	32, 10, 117, 10, 110, 10, 98, 10, 
+	101, 10, 108, 10, 105, 10, 101, 10, 
+	118, 10, 97, 10, 98, 10, 108, 10, 
+	101, 10, 114, 10, 101, 10, 116, 10, 
+	116, 10, 121, 10, 32, 10, 109, 10, 
+	117, 10, 99, 10, 104, 10, 111, 10, 
+	111, 10, 32, 10, 114, 10, 105, 10, 
+	103, 10, 104, 10, 116, 10, 39, 101, 
+	10, 107, 10, 110, 10, 111, 10, 119, 
+	10, 97, 10, 104, 10, 32, 10, 110, 
+	10, 97, 10, 104, 111, 111, 32, 114, 
+	105, 103, 104, 116, 39, 101, 111, 107, 
+	110, 111, 119, 97, 104, 32, 110, 97, 
+	104, 117, 39, 108, 108, 32, 119, 97, 
+	110, 110, 97, 58, 10, 10, 10, 32, 
+	35, 80, 124, 9, 13, 10, 114, 10, 
+	101, 10, 116, 10, 116, 10, 121, 10, 
+	32, 10, 109, 10, 117, 10, 99, 10, 
+	104, 10, 58, 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, 70, 73, 80, 82, 84, 89, 124, 
+	9, 13, 10, 119, 10, 119, 10, 119, 
+	10, 44, 10, 32, 10, 108, 10, 111, 
+	10, 111, 10, 107, 10, 32, 10, 109, 
+	10, 97, 10, 116, 10, 101, 10, 58, 
+	10, 117, 10, 116, 10, 32, 10, 97, 
+	10, 116, 10, 32, 10, 116, 10, 104, 
+	10, 101, 10, 32, 10, 101, 10, 110, 
+	10, 100, 10, 32, 10, 111, 10, 102, 
+	10, 32, 10, 116, 10, 104, 10, 101, 
+	10, 32, 10, 100, 10, 97, 10, 121, 
+	10, 32, 10, 73, 10, 32, 10, 114, 
+	10, 101, 10, 99, 10, 107, 10, 111, 
+	10, 110, 10, 105, 10, 114, 10, 115, 
+	10, 116, 10, 32, 10, 111, 10, 102, 
+	10, 102, 10, 116, 10, 39, 10, 115, 
+	10, 32, 10, 106, 10, 117, 10, 115, 
+	10, 116, 10, 32, 10, 117, 10, 110, 
+	10, 98, 10, 101, 10, 108, 10, 105, 
+	10, 101, 10, 118, 10, 97, 10, 98, 
+	10, 108, 10, 101, 10, 114, 10, 101, 
+	10, 116, 10, 116, 10, 121, 10, 32, 
+	10, 109, 10, 117, 10, 99, 10, 104, 
+	10, 101, 10, 99, 10, 107, 10, 111, 
+	10, 110, 10, 32, 10, 105, 10, 116, 
+	10, 39, 10, 115, 10, 32, 10, 108, 
+	10, 105, 10, 107, 10, 111, 10, 111, 
+	10, 32, 10, 114, 10, 105, 10, 103, 
+	10, 104, 10, 116, 10, 39, 101, 10, 
+	107, 10, 110, 10, 111, 10, 119, 10, 
+	97, 10, 104, 10, 32, 10, 110, 10, 
+	97, 10, 104, 0
 };
 
 static const char _lexer_single_lengths[] = {
-	0, 15, 1, 1, 14, 1, 1, 2, 
+	0, 17, 1, 1, 16, 1, 1, 2, 
 	2, 3, 3, 3, 3, 2, 2, 2, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	2, 2, 3, 5, 3, 2, 1, 1, 
+	2, 2, 3, 5, 3, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 12, 2, 2, 2, 2, 2, 2, 
+	1, 1, 1, 1, 1, 1, 14, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 16, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 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, 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, 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, 2, 2, 2, 
-	2, 14, 3, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 5, 2, 2, 2, 
-	2, 2, 2, 1, 1, 1, 1, 1, 
-	1, 1, 8, 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, 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, 
+	3, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 1, 1, 1, 1, 1, 
-	1, 12, 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, 1, 
+	1, 1, 1, 1, 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, 3, 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, 3, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 1, 1, 1, 1, 1, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 2, 4, 3, 2, 4, 
-	14, 2, 2, 2, 2, 2, 2, 3, 
+	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, 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, 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, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 3, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 1, 1, 1, 1, 1, 1, 
-	1, 11, 2, 2, 2, 2, 2, 2, 
+	1, 1, 3, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 5, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 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, 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, 
+	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, 2, 2, 
-	2, 3, 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, 0
+	2, 2, 2, 2, 0
 };
 
 static const char _lexer_range_lengths[] = {
@@ -286,18 +452,38 @@ 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, 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, 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, 1, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 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, 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, 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, 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, 
@@ -306,297 +492,609 @@ 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, 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, 1, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 1, 1, 
+	0, 0, 1, 1, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0
 };
 
 static const short _lexer_index_offsets[] = {
-	0, 0, 17, 19, 21, 37, 39, 41, 
-	44, 47, 52, 57, 62, 67, 71, 75, 
-	78, 80, 82, 84, 86, 88, 90, 92, 
-	94, 96, 98, 100, 102, 104, 106, 108, 
-	110, 113, 116, 121, 128, 133, 136, 138, 
-	140, 142, 144, 146, 148, 150, 152, 154, 
-	156, 158, 172, 175, 178, 181, 184, 187, 
+	0, 0, 19, 21, 23, 41, 43, 45, 
+	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, 
+	143, 145, 147, 149, 151, 153, 155, 157, 
+	159, 161, 163, 165, 167, 169, 171, 187, 
 	190, 193, 196, 199, 202, 205, 208, 211, 
-	214, 217, 233, 237, 239, 241, 243, 245, 
-	247, 249, 251, 253, 255, 262, 265, 268, 
-	271, 274, 277, 280, 282, 284, 286, 288, 
-	290, 292, 294, 304, 307, 310, 313, 316, 
-	319, 322, 325, 328, 331, 334, 337, 340, 
-	343, 346, 350, 353, 356, 359, 362, 365, 
-	368, 371, 374, 377, 380, 383, 386, 389, 
-	393, 396, 399, 402, 405, 408, 411, 414, 
-	417, 420, 423, 426, 428, 430, 432, 434, 
-	436, 438, 452, 455, 458, 461, 464, 467, 
-	470, 473, 476, 479, 482, 485, 488, 491, 
-	494, 497, 501, 504, 507, 510, 513, 516, 
-	519, 522, 525, 528, 531, 534, 537, 540, 
-	544, 547, 550, 553, 556, 559, 562, 565, 
-	568, 571, 574, 577, 580, 583, 586, 590, 
-	593, 596, 599, 602, 605, 608, 611, 614, 
-	617, 620, 623, 625, 627, 629, 631, 633, 
-	636, 638, 640, 642, 644, 646, 648, 650, 
-	652, 654, 656, 658, 662, 668, 672, 675, 
-	681, 697, 700, 703, 706, 709, 712, 715, 
-	719, 722, 725, 728, 731, 734, 737, 740, 
-	743, 746, 749, 752, 755, 758, 761, 765, 
-	768, 771, 774, 777, 780, 783, 786, 789, 
-	792, 795, 798, 800, 802, 804, 806, 808, 
-	810, 812, 825, 828, 831, 834, 837, 840, 
-	843, 846, 849, 852, 855, 858, 861, 864, 
-	867, 870, 874, 877, 880, 883, 886, 889, 
-	892, 895, 898, 901, 904, 907, 910, 913, 
-	916, 919, 923, 926, 929, 932, 935, 938, 
-	941, 944, 947, 950, 953, 956
+	214, 217, 220, 223, 226, 229, 232, 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, 310, 312, 314, 
+	316, 318, 320, 322, 324, 326, 328, 330, 
+	332, 334, 336, 338, 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, 449, 452, 455, 458, 
+	461, 464, 467, 470, 473, 476, 479, 482, 
+	485, 488, 491, 494, 497, 500, 503, 506, 
+	509, 512, 515, 518, 521, 524, 527, 530, 
+	533, 536, 539, 542, 545, 548, 551, 554, 
+	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, 674, 
+	677, 680, 683, 686, 689, 692, 695, 698, 
+	701, 705, 708, 711, 714, 717, 720, 723, 
+	726, 729, 732, 735, 737, 739, 741, 743, 
+	745, 747, 749, 751, 753, 755, 757, 759, 
+	761, 763, 765, 767, 769, 771, 773, 775, 
+	777, 779, 781, 783, 785, 787, 789, 791, 
+	793, 795, 797, 799, 801, 803, 815, 818, 
+	821, 824, 827, 830, 833, 836, 839, 842, 
+	845, 848, 851, 854, 857, 860, 863, 866, 
+	869, 872, 875, 878, 881, 884, 887, 890, 
+	893, 896, 899, 902, 905, 908, 911, 914, 
+	917, 920, 923, 926, 929, 932, 935, 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, 1033, 
+	1035, 1037, 1039, 1041, 1043, 1045, 1047, 1049, 
+	1051, 1053, 1055, 1057, 1059, 1061, 1063, 1065, 
+	1067, 1081, 1084, 1087, 1090, 1093, 1096, 1099, 
+	1102, 1105, 1108, 1111, 1114, 1117, 1120, 1123, 
+	1126, 1129, 1132, 1135, 1138, 1141, 1144, 1147, 
+	1150, 1153, 1156, 1159, 1162, 1165, 1168, 1171, 
+	1174, 1177, 1180, 1183, 1186, 1189, 1192, 1195, 
+	1198, 1201, 1204, 1207, 1210, 1213, 1216, 1219, 
+	1222, 1225, 1228, 1231, 1234, 1237, 1240, 1243, 
+	1246, 1249, 1252, 1255, 1258, 1261, 1264, 1267, 
+	1270, 1273, 1276, 1279, 1282, 1285, 1288, 1291, 
+	1294, 1297, 1300, 1303, 1306, 1309, 1312, 1315, 
+	1318, 1321, 1324, 1327, 1330, 1333, 1336, 1339, 
+	1342, 1345, 1348, 1351, 1354, 1357, 1360, 1363, 
+	1366, 1369, 1372, 1375, 1378, 1381, 1384, 1387, 
+	1391, 1394, 1397, 1400, 1403, 1406, 1409, 1412, 
+	1415, 1418, 1421, 1423, 1425, 1427, 1429, 1431, 
+	1433, 1435, 1437, 1441, 1443, 1445, 1447, 1449, 
+	1451, 1453, 1455, 1457, 1459, 1461, 1463, 1465, 
+	1467, 1469, 1471, 1473, 1475, 1477, 1479, 1481, 
+	1483, 1485, 1487, 1494, 1497, 1500, 1503, 1506, 
+	1509, 1512, 1515, 1518, 1521, 1524, 1527, 1531, 
+	1537, 1541, 1544, 1550, 1568, 1571, 1574, 1577, 
+	1580, 1583, 1586, 1589, 1592, 1595, 1598, 1601, 
+	1604, 1607, 1610, 1613, 1616, 1619, 1622, 1625, 
+	1628, 1631, 1634, 1637, 1640, 1643, 1646, 1649, 
+	1652, 1655, 1658, 1661, 1664, 1667, 1670, 1673, 
+	1676, 1679, 1682, 1685, 1688, 1691, 1694, 1697, 
+	1700, 1703, 1706, 1709, 1712, 1715, 1718, 1721, 
+	1724, 1727, 1730, 1733, 1736, 1739, 1742, 1745, 
+	1748, 1751, 1754, 1757, 1760, 1763, 1766, 1769, 
+	1772, 1775, 1778, 1781, 1784, 1787, 1790, 1793, 
+	1796, 1799, 1802, 1805, 1808, 1811, 1814, 1817, 
+	1820, 1823, 1826, 1829, 1832, 1835, 1838, 1841, 
+	1844, 1847, 1850, 1853, 1856, 1859, 1862, 1865, 
+	1868, 1871, 1874, 1877, 1880, 1883, 1886, 1889, 
+	1892, 1895, 1899, 1902, 1905, 1908, 1911, 1914, 
+	1917, 1920, 1923, 1926, 1929
 };
 
 static const short _lexer_trans_targs[] = {
 	2, 4, 4, 5, 15, 17, 31, 34, 
-	37, 66, 131, 31, 194, 197, 211, 4, 
-	0, 3, 0, 4, 0, 4, 4, 5, 
-	15, 17, 31, 34, 37, 66, 131, 31, 
-	194, 197, 211, 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, 
-	13, 10, 10, 4, 14, 14, 0, 4, 
-	14, 14, 0, 4, 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, 301, 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, 250, 0, 
-	39, 0, 40, 0, 41, 0, 42, 0, 
-	43, 0, 44, 0, 45, 0, 46, 0, 
-	47, 0, 49, 48, 49, 48, 49, 49, 
-	4, 50, 64, 4, 217, 223, 230, 64, 
-	233, 236, 49, 48, 49, 51, 48, 49, 
-	52, 48, 49, 53, 48, 49, 54, 48, 
-	49, 55, 48, 49, 56, 48, 49, 57, 
-	48, 49, 58, 48, 49, 59, 48, 49, 
-	60, 48, 49, 61, 48, 49, 62, 48, 
-	49, 63, 48, 49, 4, 48, 49, 65, 
-	48, 4, 4, 5, 15, 17, 31, 34, 
-	37, 66, 131, 31, 194, 197, 211, 4, 
-	0, 67, 69, 83, 0, 68, 0, 31, 
-	0, 70, 0, 71, 0, 72, 0, 73, 
-	0, 74, 0, 76, 75, 76, 75, 76, 
-	76, 4, 77, 4, 76, 75, 76, 78, 
-	75, 76, 79, 75, 76, 80, 75, 76, 
-	81, 75, 76, 82, 75, 76, 65, 75, 
-	84, 0, 85, 0, 86, 0, 87, 0, 
-	88, 0, 90, 89, 90, 89, 90, 90, 
-	4, 91, 4, 105, 119, 128, 90, 89, 
-	90, 92, 89, 90, 93, 89, 90, 94, 
-	89, 90, 95, 89, 90, 96, 89, 90, 
-	97, 89, 90, 98, 89, 90, 99, 89, 
-	90, 100, 89, 90, 101, 89, 90, 102, 
-	89, 90, 103, 89, 90, 104, 89, 90, 
-	4, 89, 90, 106, 115, 89, 90, 107, 
-	89, 90, 108, 89, 90, 109, 89, 90, 
-	110, 89, 90, 111, 89, 90, 112, 89, 
-	90, 113, 89, 90, 114, 89, 90, 65, 
-	89, 90, 116, 89, 90, 117, 89, 90, 
-	118, 89, 90, 114, 89, 90, 120, 124, 
-	89, 90, 121, 89, 90, 122, 89, 90, 
-	123, 89, 90, 114, 89, 90, 125, 89, 
-	90, 126, 89, 90, 127, 89, 90, 114, 
-	89, 90, 129, 89, 90, 130, 89, 90, 
-	114, 89, 132, 0, 133, 0, 134, 0, 
-	135, 0, 137, 136, 137, 136, 137, 137, 
-	4, 138, 152, 4, 153, 167, 174, 152, 
-	177, 180, 137, 136, 137, 139, 136, 137, 
-	140, 136, 137, 141, 136, 137, 142, 136, 
-	137, 143, 136, 137, 144, 136, 137, 145, 
-	136, 137, 146, 136, 137, 147, 136, 137, 
-	148, 136, 137, 149, 136, 137, 150, 136, 
-	137, 151, 136, 137, 4, 136, 137, 65, 
-	136, 137, 154, 163, 136, 137, 155, 136, 
-	137, 156, 136, 137, 157, 136, 137, 158, 
-	136, 137, 159, 136, 137, 160, 136, 137, 
-	161, 136, 137, 162, 136, 137, 65, 136, 
-	137, 164, 136, 137, 165, 136, 137, 166, 
-	136, 137, 162, 136, 137, 168, 170, 136, 
-	137, 169, 136, 137, 152, 136, 137, 171, 
-	136, 137, 172, 136, 137, 173, 136, 137, 
-	162, 136, 137, 175, 136, 137, 176, 136, 
-	137, 162, 136, 137, 178, 136, 137, 179, 
-	136, 137, 152, 136, 137, 181, 136, 137, 
-	182, 136, 137, 183, 187, 136, 137, 184, 
-	136, 137, 185, 136, 137, 186, 136, 137, 
-	152, 136, 137, 188, 136, 137, 189, 136, 
-	137, 190, 136, 137, 191, 136, 137, 192, 
-	136, 137, 193, 136, 137, 152, 136, 195, 
-	0, 196, 0, 31, 0, 198, 0, 199, 
-	0, 200, 204, 0, 201, 0, 202, 0, 
-	203, 0, 31, 0, 205, 0, 206, 0, 
-	207, 0, 208, 0, 209, 0, 210, 0, 
-	31, 0, 211, 212, 211, 0, 216, 215, 
-	214, 212, 215, 213, 0, 214, 212, 213, 
-	0, 214, 213, 216, 215, 214, 212, 215, 
-	213, 216, 216, 5, 15, 17, 31, 34, 
-	37, 66, 131, 31, 194, 197, 211, 216, 
-	0, 49, 218, 48, 49, 219, 48, 49, 
-	220, 48, 49, 221, 48, 49, 222, 48, 
-	49, 65, 48, 49, 224, 226, 48, 49, 
-	225, 48, 49, 64, 48, 49, 227, 48, 
-	49, 228, 48, 49, 229, 48, 49, 222, 
-	48, 49, 231, 48, 49, 232, 48, 49, 
-	222, 48, 49, 234, 48, 49, 235, 48, 
-	49, 64, 48, 49, 237, 48, 49, 238, 
-	48, 49, 239, 243, 48, 49, 240, 48, 
-	49, 241, 48, 49, 242, 48, 49, 64, 
-	48, 49, 244, 48, 49, 245, 48, 49, 
-	246, 48, 49, 247, 48, 49, 248, 48, 
-	49, 249, 48, 49, 64, 48, 251, 0, 
-	252, 0, 253, 0, 254, 0, 255, 0, 
-	257, 256, 257, 256, 257, 257, 4, 258, 
-	272, 4, 273, 281, 272, 284, 287, 257, 
-	256, 257, 259, 256, 257, 260, 256, 257, 
-	261, 256, 257, 262, 256, 257, 263, 256, 
-	257, 264, 256, 257, 265, 256, 257, 266, 
-	256, 257, 267, 256, 257, 268, 256, 257, 
-	269, 256, 257, 270, 256, 257, 271, 256, 
-	257, 4, 256, 257, 65, 256, 257, 274, 
-	276, 256, 257, 275, 256, 257, 272, 256, 
-	257, 277, 256, 257, 278, 256, 257, 279, 
-	256, 257, 280, 256, 257, 65, 256, 257, 
-	282, 256, 257, 283, 256, 257, 280, 256, 
-	257, 285, 256, 257, 286, 256, 257, 272, 
-	256, 257, 288, 256, 257, 289, 256, 257, 
-	290, 294, 256, 257, 291, 256, 257, 292, 
-	256, 257, 293, 256, 257, 272, 256, 257, 
-	295, 256, 257, 296, 256, 257, 297, 256, 
-	257, 298, 256, 257, 299, 256, 257, 300, 
-	256, 257, 272, 256, 0, 0
+	37, 71, 104, 243, 264, 350, 482, 490, 
+	526, 4, 0, 3, 0, 4, 0, 4, 
+	4, 5, 15, 17, 31, 34, 37, 71, 
+	104, 243, 264, 350, 482, 490, 526, 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, 13, 10, 10, 4, 
+	14, 14, 0, 4, 14, 14, 0, 4, 
+	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, 652, 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, 43, 0, 44, 0, 45, 
+	0, 46, 0, 47, 0, 48, 0, 49, 
+	0, 50, 0, 51, 0, 52, 0, 54, 
+	53, 54, 53, 54, 54, 4, 55, 69, 
+	4, 532, 547, 580, 588, 609, 619, 633, 
+	641, 54, 53, 54, 56, 53, 54, 57, 
+	53, 54, 58, 53, 54, 59, 53, 54, 
+	60, 53, 54, 61, 53, 54, 62, 53, 
+	54, 63, 53, 54, 64, 53, 54, 65, 
+	53, 54, 66, 53, 54, 67, 53, 54, 
+	68, 53, 54, 4, 53, 54, 70, 53, 
+	4, 4, 5, 15, 17, 31, 34, 37, 
+	71, 104, 243, 264, 350, 482, 490, 526, 
+	4, 0, 72, 0, 73, 0, 74, 0, 
+	75, 0, 76, 0, 77, 0, 78, 0, 
+	79, 0, 80, 0, 81, 0, 82, 0, 
+	83, 0, 84, 0, 85, 0, 86, 0, 
+	87, 0, 88, 0, 89, 0, 90, 0, 
+	91, 0, 92, 0, 93, 0, 94, 0, 
+	95, 0, 96, 0, 97, 0, 98, 0, 
+	99, 0, 100, 0, 101, 0, 102, 0, 
+	103, 0, 31, 0, 105, 0, 106, 0, 
+	107, 0, 108, 0, 109, 0, 110, 0, 
+	111, 0, 112, 0, 113, 0, 115, 114, 
+	115, 114, 115, 115, 4, 116, 130, 4, 
+	131, 146, 179, 200, 210, 224, 232, 115, 
+	114, 115, 117, 114, 115, 118, 114, 115, 
+	119, 114, 115, 120, 114, 115, 121, 114, 
+	115, 122, 114, 115, 123, 114, 115, 124, 
+	114, 115, 125, 114, 115, 126, 114, 115, 
+	127, 114, 115, 128, 114, 115, 129, 114, 
+	115, 4, 114, 115, 70, 114, 115, 132, 
+	114, 115, 133, 114, 115, 134, 114, 115, 
+	135, 114, 115, 136, 114, 115, 137, 114, 
+	115, 138, 114, 115, 139, 114, 115, 140, 
+	114, 115, 141, 114, 115, 142, 114, 115, 
+	143, 114, 115, 144, 114, 115, 145, 114, 
+	115, 70, 114, 115, 147, 114, 115, 148, 
+	114, 115, 149, 114, 115, 150, 114, 115, 
+	151, 114, 115, 152, 114, 115, 153, 114, 
+	115, 154, 114, 115, 155, 114, 115, 156, 
+	114, 115, 157, 114, 115, 158, 114, 115, 
+	159, 114, 115, 160, 114, 115, 161, 114, 
+	115, 162, 114, 115, 163, 114, 115, 164, 
+	114, 115, 165, 114, 115, 166, 114, 115, 
+	167, 114, 115, 168, 114, 115, 169, 114, 
+	115, 170, 114, 115, 171, 114, 115, 172, 
+	114, 115, 173, 114, 115, 174, 114, 115, 
+	175, 114, 115, 176, 114, 115, 177, 114, 
+	115, 178, 114, 115, 130, 114, 115, 180, 
+	114, 115, 181, 114, 115, 182, 114, 115, 
+	183, 114, 115, 184, 114, 115, 185, 114, 
+	115, 186, 114, 115, 187, 114, 115, 188, 
+	114, 115, 189, 114, 115, 190, 114, 115, 
+	191, 114, 115, 192, 114, 115, 193, 114, 
+	115, 194, 114, 115, 195, 114, 115, 196, 
+	114, 115, 197, 114, 115, 198, 114, 115, 
+	199, 114, 115, 130, 114, 115, 201, 114, 
+	115, 202, 114, 115, 203, 114, 115, 204, 
+	114, 115, 205, 114, 115, 206, 114, 115, 
+	207, 114, 115, 208, 114, 115, 209, 114, 
+	115, 145, 114, 115, 211, 114, 115, 212, 
+	114, 115, 213, 114, 115, 214, 114, 115, 
+	215, 114, 115, 216, 114, 115, 217, 114, 
+	115, 218, 114, 115, 219, 114, 115, 220, 
+	114, 115, 221, 114, 115, 222, 114, 115, 
+	223, 114, 115, 144, 114, 115, 225, 114, 
+	115, 226, 114, 115, 227, 114, 115, 228, 
+	114, 115, 229, 114, 115, 230, 114, 115, 
+	231, 114, 115, 130, 114, 115, 233, 237, 
+	114, 115, 234, 114, 115, 235, 114, 115, 
+	236, 114, 115, 130, 114, 115, 238, 114, 
+	115, 239, 114, 115, 240, 114, 115, 241, 
+	114, 115, 242, 114, 115, 130, 114, 244, 
+	0, 245, 0, 246, 0, 247, 0, 248, 
+	0, 249, 0, 250, 0, 251, 0, 252, 
+	0, 253, 0, 254, 0, 255, 0, 256, 
+	0, 257, 0, 258, 0, 259, 0, 260, 
+	0, 261, 0, 262, 0, 263, 0, 31, 
+	0, 265, 0, 266, 0, 267, 0, 268, 
+	0, 269, 0, 270, 0, 271, 0, 272, 
+	0, 273, 0, 274, 0, 275, 0, 277, 
+	276, 277, 276, 277, 277, 4, 278, 4, 
+	292, 307, 315, 325, 339, 277, 276, 277, 
+	279, 276, 277, 280, 276, 277, 281, 276, 
+	277, 282, 276, 277, 283, 276, 277, 284, 
+	276, 277, 285, 276, 277, 286, 276, 277, 
+	287, 276, 277, 288, 276, 277, 289, 276, 
+	277, 290, 276, 277, 291, 276, 277, 4, 
+	276, 277, 293, 276, 277, 294, 276, 277, 
+	295, 276, 277, 296, 276, 277, 297, 276, 
+	277, 298, 276, 277, 299, 276, 277, 300, 
+	276, 277, 301, 276, 277, 302, 276, 277, 
+	303, 276, 277, 304, 276, 277, 305, 276, 
+	277, 306, 276, 277, 70, 276, 277, 308, 
+	276, 277, 309, 276, 277, 310, 276, 277, 
+	311, 276, 277, 312, 276, 277, 313, 276, 
+	277, 314, 276, 277, 306, 276, 277, 316, 
+	276, 277, 317, 276, 277, 318, 276, 277, 
+	319, 276, 277, 320, 276, 277, 321, 276, 
+	277, 322, 276, 277, 323, 276, 277, 324, 
+	276, 277, 306, 276, 277, 326, 276, 277, 
+	327, 276, 277, 328, 276, 277, 329, 276, 
+	277, 330, 276, 277, 331, 276, 277, 332, 
+	276, 277, 333, 276, 277, 334, 276, 277, 
+	335, 276, 277, 336, 276, 277, 337, 276, 
+	277, 338, 276, 277, 305, 276, 277, 340, 
+	276, 277, 341, 276, 277, 342, 276, 277, 
+	343, 276, 277, 344, 276, 277, 345, 276, 
+	277, 346, 276, 277, 347, 276, 277, 348, 
+	276, 277, 349, 276, 277, 306, 276, 351, 
+	0, 352, 0, 353, 0, 354, 0, 355, 
+	0, 356, 0, 357, 0, 358, 0, 359, 
+	0, 360, 0, 361, 0, 362, 0, 363, 
+	0, 364, 0, 365, 0, 366, 0, 368, 
+	367, 368, 367, 368, 368, 4, 369, 383, 
+	4, 384, 399, 432, 453, 463, 471, 368, 
+	367, 368, 370, 367, 368, 371, 367, 368, 
+	372, 367, 368, 373, 367, 368, 374, 367, 
+	368, 375, 367, 368, 376, 367, 368, 377, 
+	367, 368, 378, 367, 368, 379, 367, 368, 
+	380, 367, 368, 381, 367, 368, 382, 367, 
+	368, 4, 367, 368, 70, 367, 368, 385, 
+	367, 368, 386, 367, 368, 387, 367, 368, 
+	388, 367, 368, 389, 367, 368, 390, 367, 
+	368, 391, 367, 368, 392, 367, 368, 393, 
+	367, 368, 394, 367, 368, 395, 367, 368, 
+	396, 367, 368, 397, 367, 368, 398, 367, 
+	368, 70, 367, 368, 400, 367, 368, 401, 
+	367, 368, 402, 367, 368, 403, 367, 368, 
+	404, 367, 368, 405, 367, 368, 406, 367, 
+	368, 407, 367, 368, 408, 367, 368, 409, 
+	367, 368, 410, 367, 368, 411, 367, 368, 
+	412, 367, 368, 413, 367, 368, 414, 367, 
+	368, 415, 367, 368, 416, 367, 368, 417, 
+	367, 368, 418, 367, 368, 419, 367, 368, 
+	420, 367, 368, 421, 367, 368, 422, 367, 
+	368, 423, 367, 368, 424, 367, 368, 425, 
+	367, 368, 426, 367, 368, 427, 367, 368, 
+	428, 367, 368, 429, 367, 368, 430, 367, 
+	368, 431, 367, 368, 383, 367, 368, 433, 
+	367, 368, 434, 367, 368, 435, 367, 368, 
+	436, 367, 368, 437, 367, 368, 438, 367, 
+	368, 439, 367, 368, 440, 367, 368, 441, 
+	367, 368, 442, 367, 368, 443, 367, 368, 
+	444, 367, 368, 445, 367, 368, 446, 367, 
+	368, 447, 367, 368, 448, 367, 368, 449, 
+	367, 368, 450, 367, 368, 451, 367, 368, 
+	452, 367, 368, 383, 367, 368, 454, 367, 
+	368, 455, 367, 368, 456, 367, 368, 457, 
+	367, 368, 458, 367, 368, 459, 367, 368, 
+	460, 367, 368, 461, 367, 368, 462, 367, 
+	368, 398, 367, 368, 464, 367, 368, 465, 
+	367, 368, 466, 367, 368, 467, 367, 368, 
+	468, 367, 368, 469, 367, 368, 470, 367, 
+	368, 383, 367, 368, 472, 476, 367, 368, 
+	473, 367, 368, 474, 367, 368, 475, 367, 
+	368, 383, 367, 368, 477, 367, 368, 478, 
+	367, 368, 479, 367, 368, 480, 367, 368, 
+	481, 367, 368, 383, 367, 483, 0, 484, 
+	0, 485, 0, 486, 0, 487, 0, 488, 
+	0, 489, 0, 31, 0, 491, 495, 501, 
+	0, 492, 0, 493, 0, 494, 0, 31, 
+	0, 496, 0, 497, 0, 498, 0, 499, 
+	0, 500, 0, 31, 0, 502, 0, 503, 
+	0, 504, 0, 505, 0, 506, 0, 507, 
+	0, 508, 0, 509, 0, 510, 0, 511, 
+	0, 512, 0, 514, 513, 514, 513, 514, 
+	514, 4, 515, 4, 514, 513, 514, 516, 
+	513, 514, 517, 513, 514, 518, 513, 514, 
+	519, 513, 514, 520, 513, 514, 521, 513, 
+	514, 522, 513, 514, 523, 513, 514, 524, 
+	513, 514, 525, 513, 514, 70, 513, 526, 
+	527, 526, 0, 531, 530, 529, 527, 530, 
+	528, 0, 529, 527, 528, 0, 529, 528, 
+	531, 530, 529, 527, 530, 528, 531, 531, 
+	5, 15, 17, 31, 34, 37, 71, 104, 
+	243, 264, 350, 482, 490, 526, 531, 0, 
+	54, 533, 53, 54, 534, 53, 54, 535, 
+	53, 54, 536, 53, 54, 537, 53, 54, 
+	538, 53, 54, 539, 53, 54, 540, 53, 
+	54, 541, 53, 54, 542, 53, 54, 543, 
+	53, 54, 544, 53, 54, 545, 53, 54, 
+	546, 53, 54, 70, 53, 54, 548, 53, 
+	54, 549, 53, 54, 550, 53, 54, 551, 
+	53, 54, 552, 53, 54, 553, 53, 54, 
+	554, 53, 54, 555, 53, 54, 556, 53, 
+	54, 557, 53, 54, 558, 53, 54, 559, 
+	53, 54, 560, 53, 54, 561, 53, 54, 
+	562, 53, 54, 563, 53, 54, 564, 53, 
+	54, 565, 53, 54, 566, 53, 54, 567, 
+	53, 54, 568, 53, 54, 569, 53, 54, 
+	570, 53, 54, 571, 53, 54, 572, 53, 
+	54, 573, 53, 54, 574, 53, 54, 575, 
+	53, 54, 576, 53, 54, 577, 53, 54, 
+	578, 53, 54, 579, 53, 54, 69, 53, 
+	54, 581, 53, 54, 582, 53, 54, 583, 
+	53, 54, 584, 53, 54, 585, 53, 54, 
+	586, 53, 54, 587, 53, 54, 546, 53, 
+	54, 589, 53, 54, 590, 53, 54, 591, 
+	53, 54, 592, 53, 54, 593, 53, 54, 
+	594, 53, 54, 595, 53, 54, 596, 53, 
+	54, 597, 53, 54, 598, 53, 54, 599, 
+	53, 54, 600, 53, 54, 601, 53, 54, 
+	602, 53, 54, 603, 53, 54, 604, 53, 
+	54, 605, 53, 54, 606, 53, 54, 607, 
+	53, 54, 608, 53, 54, 69, 53, 54, 
+	610, 53, 54, 611, 53, 54, 612, 53, 
+	54, 613, 53, 54, 614, 53, 54, 615, 
+	53, 54, 616, 53, 54, 617, 53, 54, 
+	618, 53, 54, 546, 53, 54, 620, 53, 
+	54, 621, 53, 54, 622, 53, 54, 623, 
+	53, 54, 624, 53, 54, 625, 53, 54, 
+	626, 53, 54, 627, 53, 54, 628, 53, 
+	54, 629, 53, 54, 630, 53, 54, 631, 
+	53, 54, 632, 53, 54, 545, 53, 54, 
+	634, 53, 54, 635, 53, 54, 636, 53, 
+	54, 637, 53, 54, 638, 53, 54, 639, 
+	53, 54, 640, 53, 54, 69, 53, 54, 
+	642, 646, 53, 54, 643, 53, 54, 644, 
+	53, 54, 645, 53, 54, 69, 53, 54, 
+	647, 53, 54, 648, 53, 54, 649, 53, 
+	54, 650, 53, 54, 651, 53, 54, 69, 
+	53, 0, 0
 };
 
 static const unsigned char _lexer_trans_actions[] = {
 	0, 54, 0, 5, 1, 0, 29, 1, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	35, 0, 43, 0, 43, 0, 43, 54, 
+	0, 5, 1, 0, 29, 1, 29, 29, 
 	29, 29, 29, 29, 29, 29, 35, 0, 
-	43, 0, 43, 0, 43, 54, 0, 5, 
-	1, 0, 29, 1, 29, 29, 29, 29, 
-	29, 29, 35, 0, 43, 0, 43, 0, 
-	43, 139, 48, 9, 106, 11, 0, 134, 
-	45, 45, 45, 3, 122, 33, 33, 33, 
-	0, 122, 33, 33, 33, 0, 122, 33, 
-	0, 33, 0, 102, 7, 7, 43, 54, 
-	0, 0, 43, 114, 25, 0, 54, 43, 
+	43, 0, 43, 0, 43, 139, 48, 9, 
+	106, 11, 0, 134, 45, 45, 45, 3, 
+	122, 33, 33, 33, 0, 122, 33, 33, 
+	33, 0, 122, 33, 0, 33, 0, 102, 
+	7, 7, 43, 54, 0, 0, 43, 114, 
+	25, 0, 54, 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, 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, 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, 75, 33, 84, 
+	75, 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, 17, 0, 54, 17, 0, 
+	130, 31, 60, 57, 31, 63, 57, 63, 
+	63, 63, 63, 63, 63, 63, 63, 66, 
+	31, 43, 0, 43, 0, 43, 0, 43, 
+	0, 43, 0, 43, 0, 43, 0, 43, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
-	0, 43, 0, 43, 0, 43, 149, 126, 
-	57, 110, 23, 0, 43, 43, 43, 43, 
-	0, 27, 118, 27, 27, 51, 27, 0, 
-	54, 0, 1, 0, 43, 0, 0, 43, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
 	0, 43, 0, 43, 0, 43, 0, 43, 
-	0, 43, 144, 57, 54, 0, 54, 0, 
-	72, 33, 84, 72, 84, 84, 84, 84, 
-	84, 84, 0, 0, 54, 0, 0, 54, 
+	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, 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, 15, 0, 54, 15, 
-	0, 130, 31, 60, 57, 31, 63, 57, 
-	63, 63, 63, 63, 63, 63, 66, 31, 
-	43, 0, 0, 0, 43, 0, 43, 0, 
-	43, 0, 43, 0, 43, 0, 43, 0, 
-	43, 0, 43, 144, 57, 54, 0, 54, 
-	0, 81, 84, 81, 0, 0, 54, 0, 
+	54, 15, 0, 54, 15, 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, 144, 57, 54, 0, 54, 0, 
-	69, 33, 69, 84, 84, 84, 0, 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, 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, 0, 0, 54, 
-	13, 0, 54, 0, 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, 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, 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, 144, 57, 54, 0, 54, 0, 
-	75, 33, 84, 75, 84, 84, 84, 84, 
-	84, 84, 0, 0, 54, 0, 0, 54, 
 	0, 0, 54, 0, 0, 54, 0, 0, 
 	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, 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, 0, 0, 54, 0, 
-	0, 54, 0, 0, 54, 0, 0, 0, 
+	0, 54, 0, 0, 54, 0, 0, 54, 
+	0, 0, 54, 0, 0, 54, 0, 0, 
 	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, 54, 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, 0, 
 	43, 0, 43, 0, 43, 0, 43, 0, 
-	43, 0, 0, 43, 0, 43, 0, 43, 
-	0, 43, 0, 43, 0, 43, 0, 43, 
-	0, 43, 0, 43, 0, 43, 0, 43, 
-	0, 43, 0, 0, 0, 43, 54, 37, 
-	37, 87, 37, 37, 43, 0, 39, 0, 
-	43, 0, 0, 54, 0, 0, 39, 0, 
-	0, 54, 0, 93, 90, 41, 96, 90, 
-	96, 96, 96, 96, 96, 96, 99, 0, 
-	43, 54, 0, 0, 54, 0, 0, 54, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 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, 15, 0, 54, 0, 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, 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, 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, 54, 0, 
-	0, 54, 0, 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, 0, 43, 
-	0, 43, 0, 43, 0, 43, 0, 43, 
-	144, 57, 54, 0, 54, 0, 78, 33, 
-	84, 78, 84, 84, 84, 84, 84, 0, 
+	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, 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, 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, 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, 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, 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, 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, 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, 0, 43, 0, 
+	43, 0, 43, 0, 43, 0, 43, 0, 
+	43, 0, 43, 0, 43, 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, 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, 0, 0, 54, 0, 
+	0, 54, 0, 0, 54, 21, 0, 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, 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, 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, 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, 
+	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, 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, 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, 
@@ -604,7 +1102,7 @@ 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, 0, 0
+	0, 0, 0
 };
 
 static const unsigned char _lexer_eof_actions[] = {
@@ -645,11 +1143,55 @@ static const unsigned char _lexer_eof_actions[] = {
 	43, 43, 43, 43, 43, 43, 43, 43, 
 	43, 43, 43, 43, 43, 43, 43, 43, 
 	43, 43, 43, 43, 43, 43, 43, 43, 
-	43, 43, 43, 43, 43, 43
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 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 = 301;
+static const int lexer_first_final = 652;
 static const int lexer_error = 0;
 
 static const int lexer_en_main = 1;
@@ -661,7 +1203,7 @@ static VALUE
 unindent(VALUE con, int start_col)
 {
   VALUE re;
-  // Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters
+  /* Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters */
   char pat[32]; 
   snprintf(pat, 32, "^[\t ]{0,%d}", start_col); 
   re = rb_reg_regcomp(rb_str_new2(pat));
@@ -823,14 +1365,14 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
     assert(*pe == '\0' && "pointer does not end on NULL");
     
     
-#line 827 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
+#line 1369 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
 	{
 	cs = lexer_start;
 	}
 
 #line 425 "/Users/ahellesoy/github/gherkin/tasks/../ragel/i18n/en_au.c.rl"
     
-#line 834 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
+#line 1376 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1092,14 +1634,14 @@ _match:
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -1113,14 +1655,14 @@ _match:
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
     }
   }
 	break;
-#line 1124 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
+#line 1666 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
 		}
 	}
 
@@ -1155,14 +1697,14 @@ _again:
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -1176,14 +1718,14 @@ _again:
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
     }
   }
 	break;
-#line 1187 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
+#line 1729 "ext/gherkin_lexer_en_au/gherkin_lexer_en_au.c"
 		}
 	}
 	}
@@ -1197,7 +1739,7 @@ _again:
     assert(lexer->content_start <= len && "content starts after data end");
     assert(lexer->mark < len && "mark is after data end");
     
-    // Reset lexer by re-initializing the whole thing
+    /* Reset lexer by re-initializing the whole thing */
     lexer_init(lexer);
 
     if (cs == lexer_error) {