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

"labeled" only has two 'l's and y'all never told me

pull/204/head
Jonathan Arnett 2022-01-02 03:38:05 +07:00
parent 35cd8b2dfd
commit 0e2c6951fe
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grammar.js
Unescape Escape View File

@ -170,7 +170,7 @@ module.exports = grammar({
field("body", $.external_function_body) field("body", $.external_function_body)
), ),
// Different from module function parameters in that module function // Different from module function parameters in that module function
// parameters may be labelled whereas external function parameters cannot. // parameters may be labeled whereas external function parameters cannot.
external_function_parameters: ($) => external_function_parameters: ($) =>
series_of( series_of(
alias($.external_function_parameter, $.function_parameter), alias($.external_function_parameter, $.function_parameter),
@ -201,17 +201,17 @@ module.exports = grammar({
function_parameter: ($) => function_parameter: ($) =>
seq( seq(
choice( choice(
$._labelled_discard_param, $._labeled_discard_param,
$._discard_param, $._discard_param,
$._labelled_name_param, $._labeled_name_param,
$._name_param $._name_param
), ),
optional($._type_annotation) optional($._type_annotation)
), ),
_labelled_discard_param: ($) => _labeled_discard_param: ($) =>
seq(field("label", $.identifier), $._discard_name), seq(field("label", $.identifier), $._discard_name),
_discard_param: ($) => $._discard_name, _discard_param: ($) => $._discard_name,
_labelled_name_param: ($) => _labeled_name_param: ($) =>
seq(field("label", $.identifier), field("name", $.identifier)), seq(field("label", $.identifier), field("name", $.identifier)),
_name_param: ($) => field("name", $.identifier), _name_param: ($) => field("name", $.identifier),
// This method diverges from the parser's `parse_expression_seq` somewhat. // This method diverges from the parser's `parse_expression_seq` somewhat.

8
src/grammar.json
Unescape Escape View File

@ -1485,7 +1485,7 @@
"members": [ "members": [
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "_labelled_discard_param" "name": "_labeled_discard_param"
}, },
{ {
"type": "SYMBOL", "type": "SYMBOL",
@ -1493,7 +1493,7 @@
}, },
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "_labelled_name_param" "name": "_labeled_name_param"
}, },
{ {
"type": "SYMBOL", "type": "SYMBOL",
@ -1515,7 +1515,7 @@
} }
] ]
}, },
"_labelled_discard_param": { "_labeled_discard_param": {
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
@ -1536,7 +1536,7 @@
"type": "SYMBOL", "type": "SYMBOL",
"name": "_discard_name" "name": "_discard_name"
}, },
"_labelled_name_param": { "_labeled_name_param": {
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {

44
src/parser.c
Unescape Escape View File

@ -142,9 +142,9 @@ enum {
sym__function = 123, sym__function = 123,
sym_function_parameters = 124, sym_function_parameters = 124,
sym_function_parameter = 125, sym_function_parameter = 125,
sym__labelled_discard_param = 126, sym__labeled_discard_param = 126,
sym__discard_param = 127, sym__discard_param = 127,
sym__labelled_name_param = 128, sym__labeled_name_param = 128,
sym__name_param = 129, sym__name_param = 129,
aux_sym__expression_seq = 130, aux_sym__expression_seq = 130,
sym_try = 131, sym_try = 131,
@ -399,9 +399,9 @@ static const char * const ts_symbol_names[] = {
[sym__function] = "_function", [sym__function] = "_function",
[sym_function_parameters] = "function_parameters", [sym_function_parameters] = "function_parameters",
[sym_function_parameter] = "function_parameter", [sym_function_parameter] = "function_parameter",
[sym__labelled_discard_param] = "_labelled_discard_param", [sym__labeled_discard_param] = "_labeled_discard_param",
[sym__discard_param] = "_discard_param", [sym__discard_param] = "_discard_param",
[sym__labelled_name_param] = "_labelled_name_param", [sym__labeled_name_param] = "_labeled_name_param",
[sym__name_param] = "_name_param", [sym__name_param] = "_name_param",
[aux_sym__expression_seq] = "_expression_seq", [aux_sym__expression_seq] = "_expression_seq",
[sym_try] = "try", [sym_try] = "try",
@ -656,9 +656,9 @@ static const TSSymbol ts_symbol_map[] = {
[sym__function] = sym__function, [sym__function] = sym__function,
[sym_function_parameters] = sym_function_parameters, [sym_function_parameters] = sym_function_parameters,
[sym_function_parameter] = sym_function_parameter, [sym_function_parameter] = sym_function_parameter,
[sym__labelled_discard_param] = sym__labelled_discard_param, [sym__labeled_discard_param] = sym__labeled_discard_param,
[sym__discard_param] = sym__discard_param, [sym__discard_param] = sym__discard_param,
[sym__labelled_name_param] = sym__labelled_name_param, [sym__labeled_name_param] = sym__labeled_name_param,
[sym__name_param] = sym__name_param, [sym__name_param] = sym__name_param,
[aux_sym__expression_seq] = aux_sym__expression_seq, [aux_sym__expression_seq] = aux_sym__expression_seq,
[sym_try] = sym_try, [sym_try] = sym_try,
@ -1291,7 +1291,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
.visible = true, .visible = true,
.named = true, .named = true,
}, },
[sym__labelled_discard_param] = { [sym__labeled_discard_param] = {
.visible = false, .visible = false,
.named = true, .named = true,
}, },
@ -1299,7 +1299,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
.visible = false, .visible = false,
.named = true, .named = true,
}, },
[sym__labelled_name_param] = { [sym__labeled_name_param] = {
.visible = false, .visible = false,
.named = true, .named = true,
}, },
@ -26446,11 +26446,11 @@ static const uint16_t ts_small_parse_table[] = {
STATE(524), 1, STATE(524), 1,
sym__discard_param, sym__discard_param,
STATE(534), 1, STATE(534), 1,
sym__labelled_discard_param, sym__labeled_discard_param,
STATE(544), 1, STATE(544), 1,
sym__name_param, sym__name_param,
STATE(558), 1, STATE(558), 1,
sym__labelled_name_param, sym__labeled_name_param,
STATE(584), 1, STATE(584), 1,
sym_function_parameter, sym_function_parameter,
STATE(1035), 1, STATE(1035), 1,
@ -26469,11 +26469,11 @@ static const uint16_t ts_small_parse_table[] = {
STATE(524), 1, STATE(524), 1,
sym__discard_param, sym__discard_param,
STATE(534), 1, STATE(534), 1,
sym__labelled_discard_param, sym__labeled_discard_param,
STATE(544), 1, STATE(544), 1,
sym__name_param, sym__name_param,
STATE(558), 1, STATE(558), 1,
sym__labelled_name_param, sym__labeled_name_param,
STATE(584), 1, STATE(584), 1,
sym_function_parameter, sym_function_parameter,
STATE(1042), 1, STATE(1042), 1,
@ -26492,11 +26492,11 @@ static const uint16_t ts_small_parse_table[] = {
STATE(524), 1, STATE(524), 1,
sym__discard_param, sym__discard_param,
STATE(534), 1, STATE(534), 1,
sym__labelled_discard_param, sym__labeled_discard_param,
STATE(544), 1, STATE(544), 1,
sym__name_param, sym__name_param,
STATE(558), 1, STATE(558), 1,
sym__labelled_name_param, sym__labeled_name_param,
STATE(584), 1, STATE(584), 1,
sym_function_parameter, sym_function_parameter,
STATE(1048), 1, STATE(1048), 1,
@ -26515,11 +26515,11 @@ static const uint16_t ts_small_parse_table[] = {
STATE(524), 1, STATE(524), 1,
sym__discard_param, sym__discard_param,
STATE(534), 1, STATE(534), 1,
sym__labelled_discard_param, sym__labeled_discard_param,
STATE(544), 1, STATE(544), 1,
sym__name_param, sym__name_param,
STATE(558), 1, STATE(558), 1,
sym__labelled_name_param, sym__labeled_name_param,
STATE(584), 1, STATE(584), 1,
sym_function_parameter, sym_function_parameter,
STATE(944), 1, STATE(944), 1,
@ -26538,11 +26538,11 @@ static const uint16_t ts_small_parse_table[] = {
STATE(524), 1, STATE(524), 1,
sym__discard_param, sym__discard_param,
STATE(534), 1, STATE(534), 1,
sym__labelled_discard_param, sym__labeled_discard_param,
STATE(544), 1, STATE(544), 1,
sym__name_param, sym__name_param,
STATE(558), 1, STATE(558), 1,
sym__labelled_name_param, sym__labeled_name_param,
STATE(584), 1, STATE(584), 1,
sym_function_parameter, sym_function_parameter,
STATE(941), 1, STATE(941), 1,
@ -26753,11 +26753,11 @@ static const uint16_t ts_small_parse_table[] = {
STATE(524), 1, STATE(524), 1,
sym__discard_param, sym__discard_param,
STATE(534), 1, STATE(534), 1,
sym__labelled_discard_param, sym__labeled_discard_param,
STATE(544), 1, STATE(544), 1,
sym__name_param, sym__name_param,
STATE(558), 1, STATE(558), 1,
sym__labelled_name_param, sym__labeled_name_param,
STATE(788), 1, STATE(788), 1,
sym_function_parameter, sym_function_parameter,
[27611] = 8, [27611] = 8,
@ -32385,8 +32385,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
[1232] = {.entry = {.count = 1, .reusable = false}}, SHIFT(159), [1232] = {.entry = {.count = 1, .reusable = false}}, SHIFT(159),
[1234] = {.entry = {.count = 1, .reusable = false}}, SHIFT(381), [1234] = {.entry = {.count = 1, .reusable = false}}, SHIFT(381),
[1236] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__pattern_constructor_argument, 1, .production_id = 47), [1236] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__pattern_constructor_argument, 1, .production_id = 47),
[1238] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__labelled_discard_param, 2, .production_id = 27), [1238] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__labeled_discard_param, 2, .production_id = 27),
[1240] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__labelled_name_param, 2, .production_id = 28), [1240] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__labeled_name_param, 2, .production_id = 28),
[1242] = {.entry = {.count = 1, .reusable = false}}, SHIFT(328), [1242] = {.entry = {.count = 1, .reusable = false}}, SHIFT(328),
[1244] = {.entry = {.count = 1, .reusable = false}}, SHIFT(447), [1244] = {.entry = {.count = 1, .reusable = false}}, SHIFT(447),
[1246] = {.entry = {.count = 1, .reusable = false}}, SHIFT(523), [1246] = {.entry = {.count = 1, .reusable = false}}, SHIFT(523),