From 2b2a5d7dfab952cde3f17d3c0e33e7196234b2d5 Mon Sep 17 00:00:00 2001 From: Ger Hobbelt Date: Fri, 8 Jul 2016 01:29:35 +0200 Subject: [PATCH] fix GerHobbelt/jison#1: fix grammar errors which caused a whole slew of conflicts which I didn't spot -- regenerated parser --- lex-parser.js | 1041 ++++++++++++++++++++++++------------------------- 1 file changed, 504 insertions(+), 537 deletions(-) diff --git a/lex-parser.js b/lex-parser.js index f22fb7c..458eca5 100644 --- a/lex-parser.js +++ b/lex-parser.js @@ -406,7 +406,7 @@ symbols_: { "=": 61, ">": 62, "?": 63, - "ACTION": 150, + "ACTION": 142, "ACTION_BODY": 152, "CHARACTER_LIT": 174, "CODE": 184, @@ -424,14 +424,14 @@ symbols_: { "REGEX_SET_END": 168, "REGEX_SET_START": 166, "SPECIAL_GROUP": 158, - "START_COND": 144, + "START_COND": 146, "START_EXC": 139, "START_INC": 137, "STRING_LIT": 173, - "UNKNOWN_DECL": 143, + "UNKNOWN_DECL": 145, "^": 94, - "action": 141, - "action_body": 147, + "action": 149, + "action_body": 141, "action_comments_body": 151, "any_group_regex": 162, "definition": 134, @@ -439,7 +439,7 @@ symbols_: { "error": 2, "escape_char": 164, "extra_lexer_module_code": 132, - "include_macro_code": 149, + "include_macro_code": 143, "init": 128, "lex": 127, "module_code_chunk": 183, @@ -451,7 +451,7 @@ symbols_: { "option": 178, "option_list": 176, "optional_module_code_chunk": 180, - "options": 142, + "options": 144, "range_regex": 161, "regex": 136, "regex_base": 157, @@ -459,12 +459,12 @@ symbols_: { "regex_list": 155, "regex_set": 167, "regex_set_atom": 169, - "rule": 145, + "rule": 147, "rules": 133, "rules_and_epilogue": 131, - "start_conditions": 146, + "start_conditions": 148, "string": 163, - "unbracketed_action_body": 148, + "unbracketed_action_body": 150, "{": 123, "|": 124, "}": 125 @@ -492,9 +492,9 @@ terminals_: { 135: "NAME", 137: "START_INC", 139: "START_EXC", - 143: "UNKNOWN_DECL", - 144: "START_COND", - 150: "ACTION", + 142: "ACTION", + 145: "UNKNOWN_DECL", + 146: "START_COND", 152: "ACTION_BODY", 158: "SPECIAL_GROUP", 159: "/!", @@ -522,31 +522,31 @@ productions_: bp({ 129, 129, s, - [134, 6], + [134, 8], 138, 138, 140, 140, 133, 133, - 145, - s, - [141, 3], - 148, - 148, - 147, 147, + s, + [149, 3], + 150, + 150, + 141, + 141, 151, 151, s, - [146, 3], + [148, 3], 153, 153, 136, 155, 155, s, - [154, 5], + [154, 3], 156, 156, s, @@ -561,15 +561,15 @@ productions_: bp({ 161, 163, 163, - 142, + 144, 176, 176, s, [178, 3], 132, 132, - 149, - 149, + 143, + 143, 183, 183, 180, @@ -586,16 +586,19 @@ productions_: bp({ 0, s, [2, 3], + 3, s, - [1, 4], + [1, 5], + 2, + 1, + 2, 2, 1, - c, - [8, 3], - 3, 3, c, - [10, 5], + [12, 4], + 2, + 1, 5, 0, 2, @@ -608,24 +611,25 @@ productions_: bp({ 0, 3, c, - [30, 4], + [24, 3], c, - [25, 4], + [23, 3], s, [2, 5], c, [10, 3], s, [1, 6], - 3, c, - [9, 12], + [21, 3], c, - [54, 3], + [9, 10], c, - [39, 4], - 2, - 1, + [52, 3], + c, + [31, 3], + c, + [28, 3], 0 ]) }), @@ -725,11 +729,11 @@ case 10: /*! Production:: definition : START_INC names_inclusive */ case 11: /*! Production:: definition : START_EXC names_exclusive */ -case 23: +case 25: /*! Production:: action : unbracketed_action_body */ -case 24: +case 26: /*! Production:: action : include_macro_code */ -case 27: +case 29: /*! Production:: action_body : action_comments_body */ case 67: /*! Production:: escape_char : ESCAPE_CHAR */ @@ -745,84 +749,91 @@ case 83: break; case 12: - /*! Production:: definition : action */ - yy.actionInclude.push($$[$0]); this.$ = null; + /*! Production:: definition : '{' action_body '}' */ + yy.actionInclude.push($$[$0 - 1]); this.$ = null; break; case 13: + /*! Production:: definition : ACTION */ +case 14: + /*! Production:: definition : include_macro_code */ + yy.actionInclude.push($$[$0]); this.$ = null; + break; + +case 15: /*! Production:: definition : options */ this.$ = null; break; -case 14: +case 16: /*! Production:: definition : UNKNOWN_DECL */ this.$ = {type: 'unknown', body: $$[$0]}; break; -case 15: +case 17: /*! Production:: names_inclusive : START_COND */ this.$ = {type: 'names', names: {}}; this.$.names[$$[$0]] = 0; break; -case 16: +case 18: /*! Production:: names_inclusive : names_inclusive START_COND */ this.$ = $$[$0 - 1]; this.$.names[$$[$0]] = 0; break; -case 17: +case 19: /*! Production:: names_exclusive : START_COND */ this.$ = {type: 'names', names: {}}; this.$.names[$$[$0]] = 1; break; -case 18: +case 20: /*! Production:: names_exclusive : names_exclusive START_COND */ this.$ = $$[$0 - 1]; this.$.names[$$[$0]] = 1; break; -case 19: +case 21: /*! Production:: rules : rules rule */ this.$ = $$[$0 - 1]; this.$.push($$[$0]); break; -case 20: +case 22: /*! Production:: rules : rule */ -case 34: +case 36: /*! Production:: name_list : NAME */ this.$ = [$$[$0]]; break; -case 21: +case 23: /*! Production:: rule : start_conditions regex action */ this.$ = $$[$0 - 2] ? [$$[$0 - 2], $$[$0 - 1], $$[$0]] : [$$[$0 - 1], $$[$0]]; break; -case 22: +case 24: /*! Production:: action : '{' action_body '}' */ -case 31: +case 33: /*! Production:: start_conditions : '<' name_list '>' */ this.$ = $$[$0 - 1]; break; -case 26: +case 28: /*! Production:: unbracketed_action_body : unbracketed_action_body ACTION */ this.$ = $$[$0 - 1] + '\n' + $$[$0]; break; -case 28: +case 30: /*! Production:: action_body : action_body '{' action_body '}' action_comments_body */ this.$ = $$[$0 - 4] + $$[$0 - 3] + $$[$0 - 2] + $$[$0 - 1] + $$[$0]; break; -case 29: +case 31: /*! Production:: action_comments_body : ε */ -case 38: +case 40: /*! Production:: regex_list : ε */ case 84: /*! Production:: optional_module_code_chunk : ε */ this.$ = ''; break; -case 30: +case 32: /*! Production:: action_comments_body : action_comments_body ACTION_BODY */ case 44: /*! Production:: regex_concat : regex_concat regex_base */ @@ -835,17 +846,17 @@ case 82: this.$ = $$[$0 - 1] + $$[$0]; break; -case 32: +case 34: /*! Production:: start_conditions : '<' '*' '>' */ this.$ = ['*']; break; -case 35: +case 37: /*! Production:: name_list : name_list ',' NAME */ this.$ = $$[$0 - 2]; this.$.push($$[$0]); break; -case 36: +case 38: /*! Production:: regex : nonempty_regex_list[re] */ // Detect if the regex ends with a pure (Unicode) word; // we *do* consider escaped characters which are 'alphanumeric' @@ -901,24 +912,14 @@ case 36: } break; -case 39: - /*! Production:: nonempty_regex_list : nonempty_regex_list '|' regex_concat */ - this.$ = $$[$0 - 2] + '|' + $$[$0]; - break; - -case 40: - /*! Production:: nonempty_regex_list : nonempty_regex_list '|' */ - this.$ = $$[$0 - 1] + '|'; - break; - case 41: - /*! Production:: nonempty_regex_list : '|' nonempty_regex_list */ - this.$ = '|' + $$[$0]; + /*! Production:: nonempty_regex_list : regex_concat '|' regex_list */ + this.$ = $$[$0 - 2] + '|' + $$[$0]; break; case 42: - /*! Production:: nonempty_regex_list : '|' */ - this.$ = '|'; + /*! Production:: nonempty_regex_list : '|' regex_list */ + this.$ = '|' + $$[$0]; break; case 46: @@ -1027,26 +1028,23 @@ table: bt({ len: u([ 11, 1, - 15, + 13, 1, - 15, + 13, 21, 2, 2, - s, - [9, 3], 5, - 24, - 24, - 3, - 24, + s, + [9, 4], 2, + 3, 20, 1, 9, - 10, - 30, + 9, 28, + 31, 28, 22, 22, @@ -1062,12 +1060,11 @@ table: bt({ [10, 4], 2, 3, - 24, + 25, + 25, 1, 4, 3, - 25, - 25, 1, 1, 6, @@ -1075,13 +1072,13 @@ table: bt({ 16, 21, 3, - 29, - 11, + 31, 28, + 10, + 10, s, [27, 5], 1, - 2, 1, 28, 28, @@ -1091,12 +1088,13 @@ table: bt({ 3, 10, 10, - 24, + 9, 5, 3, 9, - c, - [15, 3], + 1, + 2, + 1, s, [3, 3], 6, @@ -1107,7 +1105,7 @@ table: bt({ 1, 2, c, - [34, 4], + [33, 4], 1, s, [2, 3], @@ -1115,14 +1113,20 @@ table: bt({ [31, 3], 1, 16, - 13, - 1, - 13, + 5, + 17, + 16, + 17, + c, + [107, 3], 4, 1, 1, 2, - 3 + 17, + 2, + 3, + 16 ]), symbol: u([ 123, @@ -1132,8 +1136,8 @@ table: bt({ 135, 137, 139, - 143, - 150, + 142, + 145, 175, 181, 1, @@ -1141,17 +1145,15 @@ table: bt({ 129, 130, 134, - s, - [135, 4, 2], - 142, + c, + [12, 4], 143, - 148, - 149, + 144, c, - [16, 3], + [14, 3], 130, c, - [16, 15], + [14, 13], 36, 40, 46, @@ -1168,89 +1170,78 @@ table: bt({ 173, 174, 138, - 144, + 146, 140, - 144, + 146, 123, - c, - [66, 8], - c, - [9, 19], 125, - 147, + 141, 151, 152, - 1, - c, - [58, 4], - 60, - 94, 123, - 124, - c, - [22, 6], - 158, - 159, c, - [58, 5], + [67, 8], c, - [113, 3], - c, - [24, 23], + [9, 27], + 2, + 182, 135, 176, 178, + 1, c, - [27, 24], - 2, - 182, - c, - [26, 7], + [72, 4], + 60, + 94, 124, 130, 131, 133, - 145, - 146, + 147, + 148, + 158, + 159, c, - [24, 7], + [70, 5], 130, c, - [112, 10], - c, - [49, 7], - c, - [174, 4], + [44, 18], + 36, + 40, 41, c, - [175, 3], + [111, 3], + 123, + 124, c, - [16, 8], + [16, 6], c, - [181, 14], + [115, 12], c, - [30, 16], + [28, 16], + s, + [154, 7, 1], c, - [28, 17], + [31, 13], 42, 43, 46, 47, 63, c, - [126, 11], + [34, 9], + 158, + 159, 161, c, [27, 3], s, [172, 4, 1], c, - [56, 7], + [59, 7], 124, - s, - [154, 7, 1], c, - [52, 8], + [52, 15], c, [22, 24], c, @@ -1275,17 +1266,23 @@ table: bt({ c, [115, 81], c, - [487, 6], - 144, - c, - [609, 9], + [478, 7], + 146, c, - [10, 25], + [10, 33], 125, 123, 125, + 152, + c, + [553, 7], c, - [630, 25], + [70, 13], + c, + [69, 4], + 184, + c, + [25, 25], 177, 135, 176, @@ -1294,54 +1291,45 @@ table: bt({ 61, 135, 177, - c, - [32, 24], - 184, - c, - [25, 26], - 1, - 1, + s, + [1, 3], 132, 180, 181, 183, c, - [33, 8], + [41, 8], 124, 130, c, - [641, 9], + [617, 9], c, [18, 9], c, [16, 7], c, - [811, 21], + [724, 21], 42, 135, 153, c, - [631, 14], - c, - [660, 15], + [610, 59], 41, c, - [701, 13], + [707, 9], c, - [643, 28], + [10, 10], c, - [511, 132], + [498, 135], 41, 41, - 124, - 41, c, - [167, 47], + [795, 31], c, - [28, 9], + [28, 25], 168, c, - [543, 3], + [528, 3], 168, 169, 170, @@ -1350,35 +1338,35 @@ table: bt({ c, [3, 4], c, - [449, 20], + [444, 27], c, - [387, 24], + [443, 4], c, - [1103, 5], - c, - [476, 3], + [1037, 4], + 125, c, - [1008, 9], + [1040, 10], 177, 135, 179, 1, 1, - 149, + 143, 181, 1, c, - [413, 3], + [440, 3], c, [3, 3], c, - [414, 6], + [408, 6], c, - [397, 16], + [391, 16], 123, - 141, - c, - [1215, 3], + 142, + 143, + 149, + 150, 181, 44, 62, @@ -1386,22 +1374,31 @@ table: bt({ 44, 62, c, - [1015, 47], - c, - [290, 62], + [309, 91], 168, 123, 125, 135, 177, c, - [616, 3], + [542, 4], + c, + [133, 6], + c, + [142, 3], + c, + [136, 17], c, - [151, 7], + [189, 4], c, - [576, 4], + [21, 9], + 142, + c, + [565, 23], c, - [551, 21], + [33, 17], + c, + [582, 6], c, [13, 7], 135, @@ -1410,12 +1407,18 @@ table: bt({ 123, 125, c, - [1336, 3], + [81, 3], 1, + 123, + 125, + c, + [52, 17], 44, 62, c, - [237, 3] + [739, 10], + c, + [90, 9] ]), type: u([ 2, @@ -1428,178 +1431,170 @@ table: bt({ 0, 2, c, - [13, 4], + [13, 5], c, - [18, 3], + [19, 7], c, - [21, 7], + [14, 14], c, - [16, 16], + [11, 6], c, - [20, 5], - s, - [0, 3], + [13, 4], c, - [6, 8], + [6, 6], c, - [35, 9], - s, - [2, 27], + [33, 9], c, - [59, 11], + [32, 11], s, - [2, 41], - c, - [52, 37], + [2, 31], c, - [131, 9], + [74, 17], c, - [82, 38], + [55, 39], c, - [181, 12], - c, - [30, 17], + [47, 27], c, - [78, 32], + [146, 15], c, - [27, 16], + [64, 24], c, - [261, 15], + [52, 35], c, - [22, 27], + [22, 20], c, [17, 34], s, [2, 213], c, - [563, 13], + [472, 3], c, - [157, 147], + [227, 180], c, - [59, 57], + [688, 7], c, - [60, 13], + [616, 5], c, - [228, 31], + [436, 12], c, - [528, 17], + [204, 30], c, - [47, 15], + [504, 17], c, - [660, 29], + [47, 15], c, - [643, 32], + [610, 52], c, - [348, 153], + [307, 171], c, [28, 36], c, - [326, 4], + [335, 4], c, - [209, 54], + [227, 39], c, - [302, 20], + [294, 20], c, [19, 9], c, - [414, 14], + [408, 14], c, - [1021, 14], + [355, 13], c, - [1015, 52], + [243, 107], c, - [276, 72], + [204, 26], c, - [237, 53], + [135, 82], c, - [51, 9] + [81, 44] ]), state: u([ s, [1, 4, 1], - 8, - 9, - 12, - 13, - 18, + 10, + 11, + 16, c, - [6, 5], + [4, 3], + 17, + 18, 19, - 20, - 22, - 23, - 28, - 29, - 33, - 34, - 40, + 21, + 26, + 27, + 31, + 32, + 38, + 40, 42, - 44, - 45, + 43, + 46, 47, - 48, + 49, 52, - 55, - 56, + 53, + 54, 57, - 60, c, - [17, 6], - 61, + [15, 4], + 59, + 58, c, - [5, 4], + [23, 6], + 63, + 59, 65, - 68, - 67, c, - [14, 6], - 68, - 69, + [9, 6], + 59, + 66, c, [8, 6], - 70, + 67, c, [5, 4], - 71, + 68, c, [5, 4], - 75, 72, - 73, + 69, + 70, + 79, + 47, + 81, 82, - 48, - 84, - 85, - 86, - 90, - 57, - 91, + 83, + 87, + 54, + 88, c, - [67, 7], + [68, 7], + 89, + 59, 92, - 95, c, - [7, 5], - s, - [65, 3], - 75, - 99, - 73, - 100, - 45, + [54, 7], + 63, + 63, + 72, + 96, + 70, + 97, + 43, + 101, + 103, + 82, + 83, + 107, 104, 106, - 85, - 86, - 107, - 12, - 13, - c, - [72, 5], - 112, - 85, - 86, - 115 + 113, + 82, + 83, + 115, + 43, + 118 ]), mode: u([ s, @@ -1613,200 +1608,179 @@ table: bt({ s, [1, 13], s, - [2, 44], + [2, 39], c, - [45, 34], - c, - [34, 25], - c, - [106, 7], + [43, 8], c, [5, 3], c, - [35, 19], - c, - [19, 9], - c, - [166, 6], + [51, 27], c, - [16, 8], + [102, 6], c, - [162, 9], + [34, 8], c, - [23, 7], + [98, 9], c, - [75, 10], + [23, 23], c, - [185, 9], + [49, 6], c, - [30, 5], + [80, 16], c, - [77, 19], + [103, 6], c, - [239, 16], + [175, 15], c, - [253, 23], + [189, 23], c, - [266, 57], + [202, 52], s, - [2, 174], + [2, 179], c, - [220, 89], + [220, 90], c, - [88, 20], + [89, 20], c, - [20, 14], + [20, 13], c, [417, 19], c, - [29, 13], - c, - [154, 57], + [178, 39], c, - [592, 28], + [494, 9], c, - [551, 12], + [567, 31], c, - [516, 14], + [456, 18], c, - [580, 19], + [556, 47], c, - [64, 12], + [441, 160], c, - [591, 24], + [184, 27], c, - [456, 136], + [767, 28], c, - [246, 6], + [111, 53], c, - [166, 27], + [56, 5], c, - [784, 28], + [303, 7], c, - [584, 68], + [362, 23], c, - [71, 5], + [683, 103], c, - [891, 7], + [250, 5], c, - [370, 23], + [635, 48], c, - [943, 28], + [689, 53], c, - [728, 88], + [211, 23], c, - [278, 5], - c, - [1177, 52], - 1 + [22, 17] ]), goto: u([ s, [6, 9], - 11, + 8, 8, 5, 6, 7, - 10, - 15, + 9, + 12, 14, - 16, - 17, + 13, + 15, c, [10, 9], - 32, - 24, 30, - 26, - 31, - 21, + 22, + 28, + 24, + 29, + 20, + 23, 25, - 27, + 33, + 34, + 37, 35, 36, 39, - 37, - 38, 41, - 43, s, - [12, 9], + [31, 3], s, [13, 9], s, [14, 9], s, - [29, 3], + [15, 9], s, - [23, 14], - 46, - s, - [23, 9], - s, - [24, 24], - 49, - s, - [25, 24], - 51, + [16, 9], + 45, + 44, + 48, 50, - 53, s, - [33, 4], - 58, - 33, - 33, - 54, + [35, 4], + 55, + 35, + 35, + 51, s, - [33, 7], + [35, 7], 7, s, [9, 9], - 36, - 59, s, - [36, 8], - 32, - 24, - 42, + [38, 9], + 30, + 22, + 43, c, - [157, 3], - 42, - 21, + [93, 3], + 43, + 56, s, - [42, 6], + [43, 6], c, - [164, 7], - 42, - 42, - 32, - 24, + [100, 7], 43, + 43, + 30, + 22, + 40, c, [23, 3], + 40, + 20, s, - [43, 8], + [40, 6], c, [23, 7], - 43, - 43, + 40, + 40, s, [45, 3], - 63, - 62, + 61, + 60, 45, 45, - 64, + 62, s, [45, 14], - 66, + 64, s, [45, 4], - 32, - 24, - 38, c, - [230, 11], + [50, 6], + c, + [166, 8], c, [14, 16], c, @@ -1829,8 +1803,8 @@ table: bt({ [60, 27], s, [61, 29], - 35, - 74, + 33, + 71, s, [69, 27], s, @@ -1838,82 +1812,69 @@ table: bt({ s, [67, 27], s, - [10, 6], - 76, + [10, 7], + 73, + 10, + 10, s, - [10, 3], + [17, 10], s, - [15, 10], + [11, 7], + 74, + 11, + 11, s, - [11, 6], + [19, 10], + 76, + 75, + 29, + 29, 77, s, - [11, 3], + [79, 25], s, - [17, 10], - 79, + [80, 25], 78, - 27, - 27, - 80, - s, - [26, 24], - 81, - 49, + 48, 73, - 83, + 80, 74, 74, - s, - [79, 25], - s, - [80, 25], 1, 2, - 84, - 84, - 87, - 89, + s, + [84, 3], + 86, c, - [592, 7], - 88, + [567, 7], + 85, s, - [33, 7], + [35, 7], s, - [20, 16], + [22, 16], c, - [744, 13], - 93, - 94, - 32, - 24, - 40, - c, - [16, 3], - s, - [40, 8], + [656, 13], + 90, + 91, c, - [23, 7], - 40, - 40, - 41, - 41, - 59, - s, - [41, 8], + [556, 23], s, [44, 3], - 63, - 62, + 61, + 60, 44, 44, - 64, + 62, s, [44, 14], - 66, + 64, s, [44, 4], s, + [42, 10], + s, + [39, 10], + s, [48, 27], s, [49, 27], @@ -1923,89 +1884,78 @@ table: bt({ [54, 27], s, [68, 27], - 96, - 37, - 59, - 97, + 93, + 94, s, [51, 3], - 63, - 62, + 61, + 60, 51, 51, - 64, + 62, s, [51, 14], - 66, + 64, s, [51, 4], s, [52, 3], - 63, - 62, + 61, + 60, 52, 52, - 64, + 62, s, [52, 14], - 66, + 64, s, [52, 4], - 98, - 35, + 95, + 33, 64, - 74, + 71, s, [65, 3], s, [66, 3], s, - [16, 10], - s, [18, 10], s, - [22, 24], + [20, 10], + s, + [12, 9], s, - [29, 3], + [31, 3], s, - [30, 3], + [32, 3], s, [71, 9], 72, - 102, - 101, - 103, + 99, + 98, + 100, 77, - 16, + 13, 83, 83, - 105, + 102, s, [81, 3], - c, - [385, 3], + s, + [84, 3], 5, s, - [19, 16], - 11, - 15, - 16, - 109, + [21, 16], + 105, 108, + 13, 110, - 34, - 34, - 32, - 24, - 39, - c, - [363, 3], + 109, + 111, + 36, + 36, s, - [39, 8], - c, - [363, 7], - 39, - 39, + [41, 10], s, [46, 27], s, @@ -2013,47 +1963,64 @@ table: bt({ s, [62, 27], 63, - 79, - 111, + 76, + 112, 75, 75, 76, 76, 3, - c, - [140, 3], + s, + [84, 3], s, [82, 3], - 113, + 114, s, - [21, 16], + [23, 16], s, - [31, 13], - 114, + [31, 3], + s, + [25, 9], + 116, + s, + [25, 7], s, - [32, 13], + [26, 16], s, - [29, 3], + [27, 17], + s, + [33, 13], + 117, + s, + [34, 13], + s, + [31, 3], 78, 4, - 35, - 35, - 28, - 28, - 80 + 76, + 119, + s, + [28, 17], + 37, + 37, + 30, + 30, + 77, + s, + [24, 16] ]) }), defaultActions: bda({ idx: u([ - 18, - 52, - 53, - 82, - 89, - 99, - 103, - 112, - 113 + 16, + 49, + 50, + 79, + 86, + 96, + 100, + 113, + 114 ]), pop: u([ s, @@ -3179,12 +3146,12 @@ break; case 30 : /*! Conditions:: indented */ /*! Rule:: %\{(.|{BR})*?%\} */ - this.begin('trail'); yy_.yytext = yy_.yytext.substr(2, yy_.yytext.length - 4); return 150; + this.begin('trail'); yy_.yytext = yy_.yytext.substr(2, yy_.yytext.length - 4); return 142; break; case 31 : /*! Conditions:: indented trail rules macro INITIAL */ /*! Rule:: %\{(.|{BR})*?%\} */ - yy_.yytext = yy_.yytext.substr(2, yy_.yytext.length - 4); return 150; + yy_.yytext = yy_.yytext.substr(2, yy_.yytext.length - 4); return 142; break; case 32 : /*! Conditions:: indented */ @@ -3212,7 +3179,7 @@ break; case 33 : /*! Conditions:: indented */ /*! Rule:: .* */ - this.popState(); return 150; + this.popState(); return 142; break; case 34 : /*! Conditions:: indented trail rules macro INITIAL */ @@ -3314,7 +3281,7 @@ case 67 : /* ignore unrecognized decl */ console.warn('ignoring unsupported lexer option: ', yy_.yytext + ' while lexing in ' + this.topState() + ' state:', this._input, ' /////// ', this.matched); - return 143; + return 145; break; case 68 : @@ -3417,7 +3384,7 @@ simpleCaseActionClusters: { 22 : 179, /*! Conditions:: start_condition */ /*! Rule:: {ID} */ - 25 : 144, + 25 : 146, /*! Conditions:: indented trail rules macro INITIAL */ /*! Rule:: \| */ 44 : 124,