sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: don't allow maximizeing

html_output
Stephan Seitz 2022-01-28 21:33:11 +07:00
parent 77fded65fb
commit c7e814975a
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grammar.js
Unescape Escape View File

@ -238,7 +238,7 @@ module.exports = grammar(clojure, {
_for_part: $ => seq(repeat($._gap), $.for_clause_word, repeat($._gap), $._form),
accumulation_verb: _ => loopSymbol(/((collect|append|nconc|count|maximize|minimize)(ing)?|sum(ming)?|maximizing|minimizing)/),
accumulation_verb: _ => loopSymbol(/(maximize|minimize|(collect|append|nconc|count)(ing)?|sum(ming)?|maximizing|minimizing)/),
for_clause: $ => choice(seq(choice(loopSymbol('for'), loopSymbol('and'), loopSymbol('as')), repeat($._gap), field('variable', $._form), optional(field('type', seq(repeat($._gap), $._form))),
repeat1($._for_part)), loopSymbol('and')),
with_clause: $ => seq(loopSymbol('with'), repeat($._gap), choice($._form, seq($._form, repeat($._gap), field('type', $._form))), repeat($._gap), optSeq(loopSymbol("="), repeat($._gap)), optSeq($._form, repeat($._gap))),

2
src/grammar.json
Unescape Escape View File

@ -2550,7 +2550,7 @@
},
{
"type": "PATTERN",
"value": "((collect|append|nconc|count|maximize|minimize)(ing)?|sum(ming)?|maximizing|minimizing)"
"value": "(maximize|minimize|(collect|append|nconc|count)(ing)?|sum(ming)?|maximizing|minimizing)"
}
]
},

74
src/parser.c
Unescape Escape View File

@ -7253,7 +7253,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'i') ADVANCE(349);
if (lookahead == 'm') ADVANCE(312);
if (lookahead == 'n') ADVANCE(323);
if (lookahead == 'r') ADVANCE(331);
if (lookahead == 'r') ADVANCE(332);
if (lookahead == 's') ADVANCE(453);
if (lookahead == 't') ADVANCE(359);
if (lookahead == 'u') ADVANCE(395);
@ -7295,7 +7295,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'i') ADVANCE(349);
if (lookahead == 'm') ADVANCE(312);
if (lookahead == 'n') ADVANCE(323);
if (lookahead == 'r') ADVANCE(331);
if (lookahead == 'r') ADVANCE(332);
if (lookahead == 's') ADVANCE(292);
if (lookahead == 't') ADVANCE(359);
if (lookahead == 'u') ADVANCE(395);
@ -7341,7 +7341,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'i') ADVANCE(349);
if (lookahead == 'm') ADVANCE(312);
if (lookahead == 'n') ADVANCE(323);
if (lookahead == 'r') ADVANCE(331);
if (lookahead == 'r') ADVANCE(332);
if (lookahead == 's') ADVANCE(453);
if (lookahead == 't') ADVANCE(359);
if (lookahead == 'u') ADVANCE(395);
@ -7382,7 +7382,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'i') ADVANCE(349);
if (lookahead == 'm') ADVANCE(312);
if (lookahead == 'n') ADVANCE(323);
if (lookahead == 'r') ADVANCE(331);
if (lookahead == 'r') ADVANCE(332);
if (lookahead == 's') ADVANCE(292);
if (lookahead == 't') ADVANCE(359);
if (lookahead == 'u') ADVANCE(395);
@ -7459,7 +7459,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '^') ADVANCE(478);
if (lookahead == '`') ADVANCE(493);
if (lookahead == 'c') ADVANCE(375);
if (lookahead == 'd') ADVANCE(336);
if (lookahead == 'd') ADVANCE(337);
if (lookahead == 'l') ADVANCE(318);
if (lookahead == 'n') ADVANCE(363);
if (lookahead == '|') ADVANCE(465);
@ -7491,7 +7491,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '^') ADVANCE(478);
if (lookahead == '`') ADVANCE(493);
if (lookahead == 'a') ADVANCE(321);
if (lookahead == 'b') ADVANCE(334);
if (lookahead == 'b') ADVANCE(335);
if (lookahead == 'c') ADVANCE(375);
if (lookahead == 'd') ADVANCE(288);
if (lookahead == 'f') ADVANCE(291);
@ -7536,7 +7536,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '^') ADVANCE(478);
if (lookahead == '`') ADVANCE(493);
if (lookahead == 'a') ADVANCE(321);
if (lookahead == 'b') ADVANCE(334);
if (lookahead == 'b') ADVANCE(335);
if (lookahead == 'c') ADVANCE(375);
if (lookahead == 'd') ADVANCE(416);
if (lookahead == 'f') ADVANCE(433);
@ -7834,7 +7834,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '=') ADVANCE(562);
if (lookahead == '^') ADVANCE(478);
if (lookahead == 'a') ADVANCE(321);
if (lookahead == 'b') ADVANCE(334);
if (lookahead == 'b') ADVANCE(335);
if (lookahead == 'd') ADVANCE(416);
if (lookahead == 'f') ADVANCE(433);
if (lookahead == 'i') ADVANCE(400);
@ -7891,7 +7891,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 34:
if (lookahead == '#') ADVANCE(228);
if (lookahead == 'd') ADVANCE(336);
if (lookahead == 'd') ADVANCE(337);
if (lookahead == 'l') ADVANCE(424);
if (!aux_sym_sym_lit_token1_character_set_3(lookahead)) ADVANCE(477);
END_STATE();
@ -8028,11 +8028,11 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'e') ADVANCE(541);
END_STATE();
case 72:
if (lookahead == 'e') ADVANCE(564);
if (lookahead == 'i') ADVANCE(160);
if (lookahead == 'e') ADVANCE(577);
END_STATE();
case 73:
if (lookahead == 'e') ADVANCE(577);
if (lookahead == 'e') ADVANCE(563);
if (lookahead == 'i') ADVANCE(160);
END_STATE();
case 74:
if (lookahead == 'e') ADVANCE(525);
@ -8235,7 +8235,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'l') ADVANCE(77);
END_STATE();
case 134:
if (lookahead == 'l') ADVANCE(73);
if (lookahead == 'l') ADVANCE(72);
END_STATE();
case 135:
if (lookahead == 'l') ADVANCE(87);
@ -8520,7 +8520,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'y') ADVANCE(197);
END_STATE();
case 227:
if (lookahead == 'z') ADVANCE(72);
if (lookahead == 'z') ADVANCE(73);
END_STATE();
case 228:
if (lookahead == '|') ADVANCE(229);
@ -9216,64 +9216,64 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 331:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(430);
if (lookahead == 'e') ADVANCE(477);
if (lookahead == 'i') ADVANCE(399);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 332:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(596);
if (lookahead == 'e') ADVANCE(430);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 333:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(578);
if (lookahead == 'e') ADVANCE(596);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 334:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(370);
if (lookahead == 'y') ADVANCE(558);
if (lookahead == 'e') ADVANCE(578);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 335:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(542);
if (lookahead == 'e') ADVANCE(370);
if (lookahead == 'y') ADVANCE(558);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 336:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(350);
if (lookahead == 'e') ADVANCE(542);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 337:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(446);
if (lookahead == 'e') ADVANCE(350);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 338:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(436);
if (lookahead == 'e') ADVANCE(446);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 339:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(325);
if (lookahead == 'e') ADVANCE(436);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 340:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(432);
if (lookahead == 'e') ADVANCE(325);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 341:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(315);
if (lookahead == 'e') ADVANCE(432);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 342:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'e') ADVANCE(369);
if (lookahead == 'i') ADVANCE(399);
if (lookahead == 'e') ADVANCE(315);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 343:
@ -9365,7 +9365,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 359:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'h') ADVANCE(338);
if (lookahead == 'h') ADVANCE(339);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 360:
@ -9493,7 +9493,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 383:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'l') ADVANCE(337);
if (lookahead == 'l') ADVANCE(338);
if (lookahead == 't') ADVANCE(368);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
@ -9504,7 +9504,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 385:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'l') ADVANCE(339);
if (lookahead == 'l') ADVANCE(340);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 386:
@ -9514,7 +9514,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 387:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'l') ADVANCE(333);
if (lookahead == 'l') ADVANCE(334);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 388:
@ -9730,7 +9730,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 430:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'p') ADVANCE(341);
if (lookahead == 'p') ADVANCE(342);
if (lookahead == 't') ADVANCE(454);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
@ -9806,7 +9806,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 445:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 's') ADVANCE(332);
if (lookahead == 's') ADVANCE(333);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 446:
@ -9856,12 +9856,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 455:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'v') ADVANCE(335);
if (lookahead == 'v') ADVANCE(336);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 456:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'v') ADVANCE(340);
if (lookahead == 'v') ADVANCE(341);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 457:
@ -9901,7 +9901,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
END_STATE();
case 464:
ACCEPT_TOKEN(aux_sym_sym_lit_token1);
if (lookahead == 'z') ADVANCE(342);
if (lookahead == 'z') ADVANCE(331);
if (!aux_sym_sym_lit_token1_character_set_4(lookahead)) ADVANCE(477);
END_STATE();
case 465: