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

Fix _package_lit_without_slash

pull/70/head
Stephan Seitz 2021-04-18 22:09:34 +07:00
parent 5c457d613b
commit 20432d30e8
5 changed files with 206 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grammar.js
Unescape Escape View File

@ -102,7 +102,7 @@ module.exports = grammar(clojure, {
/[<>]/,
';',
seq(field('numberOfArgs', $._format_token), '*'),
seq('/', choice($._package_lit_without_slash, $._sym_lit_without_slash), '/'),
seq('/', choice(alias($._package_lit_without_slash, $.package_lit), $._sym_lit_without_slash), '/'),
'?',
"Newline",
seq(repeat(choice($._format_token, ',')), /[$rRbBdDgGxXeEoOsStTfF]/),
@ -224,11 +224,11 @@ module.exports = grammar(clojure, {
field('symbol', $.sym_lit)
)),
_package_lit_without_slash: $ => alias(prec(PREC.PACKAGE_LIT, seq(
_package_lit_without_slash: $ => seq(
field('package', $._sym_lit_without_slash), // Make optional, instead of keywords?
choice(':', '::'),
field('symbol', $._sym_lit_without_slash)
)), $.package_lit),
),
kwd_lit: $ => prec(PREC.KWD_LIT, seq(
choice(':', '::'),

14
src/grammar.json
Unescape Escape View File

@ -2007,9 +2007,14 @@
"type": "CHOICE",
"members": [
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "_package_lit_without_slash"
},
"named": true,
"value": "package_lit"
},
{
"type": "SYMBOL",
"name": "_sym_lit_without_slash"
@ -3550,11 +3555,6 @@
}
},
"_package_lit_without_slash": {
"type": "ALIAS",
"content": {
"type": "PREC",
"value": 2,
"content": {
"type": "SEQ",
"members": [
{
@ -3587,10 +3587,6 @@
}
}
]
}
},
"named": true,
"value": "package_lit"
},
"_sym_lit_without_slash": {
"type": "ALIAS",

34
src/node-types.json
Unescape Escape View File

@ -1490,16 +1490,6 @@
}
]
},
"package": {
"multiple": false,
"required": false,
"types": [
{
"type": "package_lit",
"named": true
}
]
},
"repetitions": {
"multiple": true,
"required": false,
@ -1517,16 +1507,6 @@
"named": true
}
]
},
"symbol": {
"multiple": false,
"required": false,
"types": [
{
"type": "package_lit",
"named": true
}
]
}
},
"children": {
@ -2439,7 +2419,7 @@
"fields": {
"package": {
"multiple": false,
"required": false,
"required": true,
"types": [
{
"type": "sym_lit",
@ -2449,7 +2429,7 @@
},
"symbol": {
"multiple": false,
"required": false,
"required": true,
"types": [
{
"type": "sym_lit",
@ -2457,16 +2437,6 @@
}
]
}
},
"children": {
"multiple": false,
"required": false,
"types": [
{
"type": "sym_lit",
"named": true
}
]
}
},
{

327
src/parser.c
Unescape Escape View File

@ -22,7 +22,7 @@
#define EXTERNAL_TOKEN_COUNT 0
#define FIELD_COUNT 21
#define MAX_ALIAS_SEQUENCE_LENGTH 11
#define PRODUCTION_ID_COUNT 86
#define PRODUCTION_ID_COUNT 85
enum {
sym__ws = 1,
@ -383,7 +383,7 @@ static const char *ts_symbol_names[] = {
[sym_defun_header] = "defun_header",
[sym_array_dimension] = "array_dimension",
[sym_package_lit] = "package_lit",
[sym__package_lit_without_slash] = "_package_lit_without_slash",
[sym__package_lit_without_slash] = "package_lit",
[sym__sym_lit_without_slash] = "_sym_lit_without_slash",
[sym_kwd_symbol] = "kwd_symbol",
[sym_include_reader_macro] = "include_reader_macro",
@ -572,7 +572,7 @@ static TSSymbol ts_symbol_map[] = {
[sym_defun_header] = sym_defun_header,
[sym_array_dimension] = sym_array_dimension,
[sym_package_lit] = sym_package_lit,
[sym__package_lit_without_slash] = sym__package_lit_without_slash,
[sym__package_lit_without_slash] = sym_package_lit,
[sym__sym_lit_without_slash] = sym__sym_lit_without_slash,
[sym_kwd_symbol] = sym_kwd_symbol,
[sym_include_reader_macro] = sym_include_reader_macro,
@ -1272,7 +1272,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
.named = true,
},
[sym__package_lit_without_slash] = {
.visible = false,
.visible = true,
.named = true,
},
[sym__sym_lit_without_slash] = {
@ -1437,40 +1437,39 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
[49] = {.index = 135, .length = 3},
[50] = {.index = 138, .length = 5},
[51] = {.index = 143, .length = 5},
[52] = {.index = 65, .length = 2},
[53] = {.index = 148, .length = 2},
[54] = {.index = 150, .length = 2},
[55] = {.index = 152, .length = 1},
[56] = {.index = 153, .length = 4},
[57] = {.index = 157, .length = 5},
[58] = {.index = 162, .length = 4},
[59] = {.index = 166, .length = 3},
[60] = {.index = 169, .length = 3},
[61] = {.index = 172, .length = 3},
[62] = {.index = 175, .length = 5},
[63] = {.index = 180, .length = 5},
[64] = {.index = 185, .length = 1},
[65] = {.index = 186, .length = 3},
[66] = {.index = 189, .length = 2},
[67] = {.index = 191, .length = 2},
[68] = {.index = 193, .length = 5},
[69] = {.index = 198, .length = 4},
[70] = {.index = 202, .length = 5},
[71] = {.index = 207, .length = 3},
[72] = {.index = 210, .length = 3},
[73] = {.index = 213, .length = 5},
[74] = {.index = 218, .length = 5},
[75] = {.index = 223, .length = 2},
[76] = {.index = 225, .length = 1},
[77] = {.index = 226, .length = 3},
[78] = {.index = 229, .length = 5},
[79] = {.index = 234, .length = 3},
[80] = {.index = 237, .length = 5},
[81] = {.index = 242, .length = 5},
[82] = {.index = 247, .length = 3},
[83] = {.index = 250, .length = 2},
[84] = {.index = 252, .length = 5},
[85] = {.index = 257, .length = 3},
[52] = {.index = 148, .length = 2},
[53] = {.index = 150, .length = 2},
[54] = {.index = 152, .length = 1},
[55] = {.index = 153, .length = 4},
[56] = {.index = 157, .length = 5},
[57] = {.index = 162, .length = 4},
[58] = {.index = 166, .length = 3},
[59] = {.index = 169, .length = 3},
[60] = {.index = 172, .length = 3},
[61] = {.index = 175, .length = 5},
[62] = {.index = 180, .length = 5},
[63] = {.index = 185, .length = 1},
[64] = {.index = 186, .length = 3},
[65] = {.index = 189, .length = 2},
[66] = {.index = 191, .length = 2},
[67] = {.index = 193, .length = 5},
[68] = {.index = 198, .length = 4},
[69] = {.index = 202, .length = 5},
[70] = {.index = 207, .length = 3},
[71] = {.index = 210, .length = 3},
[72] = {.index = 213, .length = 5},
[73] = {.index = 218, .length = 5},
[74] = {.index = 223, .length = 2},
[75] = {.index = 225, .length = 1},
[76] = {.index = 226, .length = 3},
[77] = {.index = 229, .length = 5},
[78] = {.index = 234, .length = 3},
[79] = {.index = 237, .length = 5},
[80] = {.index = 242, .length = 5},
[81] = {.index = 247, .length = 3},
[82] = {.index = 250, .length = 2},
[83] = {.index = 252, .length = 5},
[84] = {.index = 257, .length = 3},
};
static const TSFieldMapEntry ts_field_map_entries[] = {
@ -1824,17 +1823,9 @@ static TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGT
[29] = {
[0] = sym_sym_lit,
},
[52] = {
[0] = sym_package_lit,
[1] = sym_package_lit,
[2] = sym_package_lit,
},
};
static uint16_t ts_non_terminal_alias_map[] = {
sym__sym_lit_without_slash, 2,
sym__sym_lit_without_slash,
sym_package_lit,
aux_sym__sym_lit_without_slash_repeat1, 2,
aux_sym__sym_lit_without_slash_repeat1,
sym_sym_lit,
@ -137707,62 +137698,62 @@ static TSParseActionEntry ts_parse_actions[] = {
[2828] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 5, .production_id = 49),
[2830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_reader_macro, 5, .production_id = 50),
[2832] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_include_reader_macro, 5, .production_id = 50),
[2834] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 10, .production_id = 84),
[2836] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 10, .production_id = 84),
[2838] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_loop_macro, 6, .production_id = 53),
[2840] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_loop_macro, 6, .production_id = 53),
[2834] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 10, .production_id = 83),
[2836] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 10, .production_id = 83),
[2838] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_loop_macro, 6, .production_id = 52),
[2840] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_loop_macro, 6, .production_id = 52),
[2842] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 49),
[2844] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 49),
[2846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 60),
[2848] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 60),
[2850] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 61),
[2852] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 61),
[2854] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_reader_macro, 6, .production_id = 62),
[2856] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_include_reader_macro, 6, .production_id = 62),
[2858] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 63),
[2860] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 63),
[2862] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_loop_macro, 7, .production_id = 67),
[2864] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_loop_macro, 7, .production_id = 67),
[2846] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 59),
[2848] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 59),
[2850] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 60),
[2852] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 60),
[2854] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_reader_macro, 6, .production_id = 61),
[2856] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_include_reader_macro, 6, .production_id = 61),
[2858] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 6, .production_id = 62),
[2860] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 6, .production_id = 62),
[2862] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_loop_macro, 7, .production_id = 66),
[2864] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_loop_macro, 7, .production_id = 66),
[2866] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_evaling_lit, 2, .production_id = 7),
[2868] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_evaling_lit, 2, .production_id = 7),
[2870] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__form, 1),
[2872] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__form, 1),
[2874] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 60),
[2876] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 60),
[2878] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 61),
[2880] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 61),
[2882] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 71),
[2884] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 71),
[2886] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 72),
[2888] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 72),
[2890] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 63),
[2892] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 63),
[2894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 73),
[2896] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 73),
[2898] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 74),
[2900] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 74),
[2902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 71),
[2904] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 71),
[2906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 72),
[2908] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 72),
[2910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 79),
[2912] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 79),
[2914] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 73),
[2916] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 73),
[2918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 74),
[2920] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 74),
[2922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 80),
[2924] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 80),
[2926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 81),
[2928] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 81),
[2930] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 79),
[2932] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 79),
[2934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 80),
[2936] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 80),
[2938] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 81),
[2940] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 81),
[2942] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 84),
[2944] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 84),
[2874] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 59),
[2876] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 59),
[2878] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 60),
[2880] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 60),
[2882] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 70),
[2884] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 70),
[2886] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 71),
[2888] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 71),
[2890] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 62),
[2892] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 62),
[2894] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 72),
[2896] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 72),
[2898] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 7, .production_id = 73),
[2900] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 7, .production_id = 73),
[2902] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 70),
[2904] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 70),
[2906] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 71),
[2908] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 71),
[2910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 78),
[2912] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 78),
[2914] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 72),
[2916] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 72),
[2918] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 73),
[2920] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 73),
[2922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 79),
[2924] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 79),
[2926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 8, .production_id = 80),
[2928] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 8, .production_id = 80),
[2930] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 78),
[2932] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 78),
[2934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 79),
[2936] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 79),
[2938] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 80),
[2940] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 80),
[2942] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex_num_lit, 9, .production_id = 83),
[2944] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_complex_num_lit, 9, .production_id = 83),
[2946] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_set_lit, 1, .production_id = 6),
[2948] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_set_lit, 1, .production_id = 6),
[2950] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_vec_lit, 1, .production_id = 5),
@ -137778,56 +137769,56 @@ static TSParseActionEntry ts_parse_actions[] = {
[2974] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 3, .production_id = 43),
[2976] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 3, .production_id = 43), SHIFT(3005),
[2979] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 3, .production_id = 43),
[2981] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 83), SHIFT(1703),
[2984] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 83), SHIFT(215),
[2987] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 83),
[2989] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 83), SHIFT(3005),
[2992] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 7, .production_id = 83),
[2994] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82), SHIFT(1703),
[2997] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82), SHIFT(215),
[3000] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82),
[3002] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82), SHIFT(3005),
[3005] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 7, .production_id = 82),
[3007] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 77), SHIFT(1703),
[3010] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 77), SHIFT(215),
[3013] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 77),
[3015] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 77), SHIFT(3005),
[3018] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 6, .production_id = 77),
[3020] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76), SHIFT(1703),
[3023] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76), SHIFT(215),
[3026] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76),
[3028] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76), SHIFT(3005),
[3031] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 6, .production_id = 76),
[3033] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75), SHIFT(1703),
[3036] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75), SHIFT(215),
[3039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75),
[3041] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75), SHIFT(3005),
[3044] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 6, .production_id = 75),
[3046] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 85), SHIFT(1703),
[3049] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 85), SHIFT(215),
[3052] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 85),
[3054] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 85), SHIFT(3005),
[3057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 8, .production_id = 85),
[3059] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 66), SHIFT(1703),
[3062] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 66), SHIFT(215),
[3065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 66),
[3067] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 66), SHIFT(3005),
[3070] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 5, .production_id = 66),
[3072] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65), SHIFT(1703),
[3075] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65), SHIFT(215),
[3078] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65),
[3080] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65), SHIFT(3005),
[3083] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 5, .production_id = 65),
[3085] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64), SHIFT(1703),
[3088] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64), SHIFT(215),
[3091] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64),
[3093] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64), SHIFT(3005),
[3096] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 5, .production_id = 64),
[3098] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 55), SHIFT(1703),
[3101] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 55), SHIFT(215),
[3104] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 55),
[3106] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 55), SHIFT(3005),
[3109] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 4, .production_id = 55),
[2981] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82), SHIFT(1703),
[2984] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82), SHIFT(215),
[2987] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82),
[2989] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 82), SHIFT(3005),
[2992] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 7, .production_id = 82),
[2994] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 81), SHIFT(1703),
[2997] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 81), SHIFT(215),
[3000] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 81),
[3002] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 7, .production_id = 81), SHIFT(3005),
[3005] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 7, .production_id = 81),
[3007] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76), SHIFT(1703),
[3010] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76), SHIFT(215),
[3013] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76),
[3015] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 76), SHIFT(3005),
[3018] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 6, .production_id = 76),
[3020] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75), SHIFT(1703),
[3023] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75), SHIFT(215),
[3026] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75),
[3028] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 75), SHIFT(3005),
[3031] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 6, .production_id = 75),
[3033] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 74), SHIFT(1703),
[3036] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 74), SHIFT(215),
[3039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 74),
[3041] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 6, .production_id = 74), SHIFT(3005),
[3044] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 6, .production_id = 74),
[3046] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 84), SHIFT(1703),
[3049] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 84), SHIFT(215),
[3052] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 84),
[3054] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 8, .production_id = 84), SHIFT(3005),
[3057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 8, .production_id = 84),
[3059] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65), SHIFT(1703),
[3062] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65), SHIFT(215),
[3065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65),
[3067] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 65), SHIFT(3005),
[3070] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 5, .production_id = 65),
[3072] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64), SHIFT(1703),
[3075] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64), SHIFT(215),
[3078] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64),
[3080] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 64), SHIFT(3005),
[3083] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 5, .production_id = 64),
[3085] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 63), SHIFT(1703),
[3088] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 63), SHIFT(215),
[3091] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 63),
[3093] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 5, .production_id = 63), SHIFT(3005),
[3096] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 5, .production_id = 63),
[3098] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54), SHIFT(1703),
[3101] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54), SHIFT(215),
[3104] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54),
[3106] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54), SHIFT(3005),
[3109] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 4, .production_id = 54),
[3111] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_clause_repeat1, 2), SHIFT_REPEAT(1703),
[3114] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_clause_repeat1, 2), SHIFT_REPEAT(215),
[3117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_for_clause_repeat1, 2),
@ -137835,11 +137826,11 @@ static TSParseActionEntry ts_parse_actions[] = {
[3122] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_for_clause_repeat1, 2), SHIFT_REPEAT(1585),
[3125] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_for_clause_repeat1, 2), SHIFT_REPEAT(1585),
[3128] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_for_clause_repeat1, 2),
[3130] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54), SHIFT(1703),
[3133] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54), SHIFT(215),
[3136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54),
[3138] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 54), SHIFT(3005),
[3141] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 4, .production_id = 54),
[3130] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 53), SHIFT(1703),
[3133] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 53), SHIFT(215),
[3136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 53),
[3138] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_for_clause, 4, .production_id = 53), SHIFT(3005),
[3141] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_for_clause, 4, .production_id = 53),
[3143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(995),
[3145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(345),
[3147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1706),
@ -138016,32 +138007,32 @@ static TSParseActionEntry ts_parse_actions[] = {
[3507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(709),
[3509] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 1, .production_id = 10),
[3511] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 1, .production_id = 10),
[3513] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 57),
[3515] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 57),
[3517] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 58),
[3519] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 58),
[3513] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 56),
[3515] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 56),
[3517] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 57),
[3519] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 57),
[3521] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 3, .production_id = 33),
[3523] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 3, .production_id = 33),
[3525] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 3, .production_id = 34),
[3527] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 3, .production_id = 34),
[3529] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 6, .production_id = 69),
[3531] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 6, .production_id = 69),
[3533] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 7, .production_id = 78),
[3535] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 7, .production_id = 78),
[3537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 6, .production_id = 70),
[3539] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 6, .production_id = 70),
[3541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 56),
[3543] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 56),
[3529] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 6, .production_id = 68),
[3531] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 6, .production_id = 68),
[3533] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 7, .production_id = 77),
[3535] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 7, .production_id = 77),
[3537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 6, .production_id = 69),
[3539] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 6, .production_id = 69),
[3541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 55),
[3543] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 55),
[3545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 4, .production_id = 45),
[3547] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 4, .production_id = 45),
[3549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 6, .production_id = 68),
[3551] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 6, .production_id = 68),
[3549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 6, .production_id = 67),
[3551] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 6, .production_id = 67),
[3553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 4, .production_id = 46),
[3555] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 4, .production_id = 46),
[3557] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 4, .production_id = 47),
[3559] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 4, .production_id = 47),
[3561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 59),
[3563] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 59),
[3561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 5, .production_id = 58),
[3563] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 5, .production_id = 58),
[3565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_defun_header, 2, .production_id = 20),
[3567] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_defun_header, 2, .production_id = 20),
[3569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_accumulation_verb, 1),
@ -139320,7 +139311,7 @@ static TSParseActionEntry ts_parse_actions[] = {
[6146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2934),
[6148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2925),
[6150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3020),
[6152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__package_lit_without_slash, 3, .production_id = 52),
[6152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__package_lit_without_slash, 3, .production_id = 25),
[6154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3017),
[6156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2998),
[6158] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1935),

11
test/corpus/basic.txt
Unescape Escape View File

@ -851,6 +851,7 @@ Format
(load "~/quicklisp/setup")
2
(load "~/foo:quicklisp/setup")
--------------------------------------------------------------------------------
@ -893,4 +894,12 @@ Format
(format_specifier
(format_directive_type
(sym_lit)))))
(num_lit))
(num_lit)
(list_lit
(sym_lit)
(str_lit
(format_specifier
(format_directive_type
(package_lit
(sym_lit)
(sym_lit)))))))