diff --git a/tree-sitter-kerolox/grammar.js b/tree-sitter-kerolox/grammar.js index 46f45a9..c068b74 100644 --- a/tree-sitter-kerolox/grammar.js +++ b/tree-sitter-kerolox/grammar.js @@ -66,7 +66,7 @@ export default grammar({ integer: _ => choice("0", /-?[1-9][0-9]*/), - string_literal: $ => seq( + string: $ => seq( '"', repeat(choice($.string_content, $.escape_sequence)), '"', @@ -140,7 +140,7 @@ export default grammar({ field("false", "False"), field("symbol", $.name), field("integer", $.integer), - field("string", $.string_literal), + field("string", $.string), // operations field("unary", $.unary_expr), diff --git a/tree-sitter-kerolox/src/grammar.json b/tree-sitter-kerolox/src/grammar.json index 1521dbe..b9175df 100644 --- a/tree-sitter-kerolox/src/grammar.json +++ b/tree-sitter-kerolox/src/grammar.json @@ -101,7 +101,7 @@ } ] }, - "string_literal": { + "string": { "type": "SEQ", "members": [ { @@ -763,7 +763,7 @@ "name": "string", "content": { "type": "SYMBOL", - "name": "string_literal" + "name": "string" } }, { diff --git a/tree-sitter-kerolox/src/node-types.json b/tree-sitter-kerolox/src/node-types.json index fbaf33b..e0f475e 100644 --- a/tree-sitter-kerolox/src/node-types.json +++ b/tree-sitter-kerolox/src/node-types.json @@ -280,7 +280,7 @@ "required": false, "types": [ { - "type": "string_literal", + "type": "string", "named": true } ] @@ -543,7 +543,7 @@ } }, { - "type": "string_literal", + "type": "string", "named": true, "fields": {}, "children": { diff --git a/tree-sitter-kerolox/src/parser.c b/tree-sitter-kerolox/src/parser.c index 87529ff..6b15788 100644 --- a/tree-sitter-kerolox/src/parser.c +++ b/tree-sitter-kerolox/src/parser.c @@ -68,7 +68,7 @@ enum ts_symbol_identifiers { sym_file = 46, sym_comment = 47, sym_integer = 48, - sym_string_literal = 49, + sym_string = 49, sym_type_alias = 50, sym_type = 51, sym_import = 52, @@ -85,7 +85,7 @@ enum ts_symbol_identifiers { sym_unary_op = 63, sym_binary_expr = 64, aux_sym_file_repeat1 = 65, - aux_sym_string_literal_repeat1 = 66, + aux_sym_string_repeat1 = 66, aux_sym_type_repeat1 = 67, aux_sym_import_repeat1 = 68, aux_sym_import_repeat2 = 69, @@ -145,7 +145,7 @@ static const char * const ts_symbol_names[] = { [sym_file] = "file", [sym_comment] = "comment", [sym_integer] = "integer", - [sym_string_literal] = "string_literal", + [sym_string] = "string", [sym_type_alias] = "type_alias", [sym_type] = "type", [sym_import] = "import", @@ -162,7 +162,7 @@ static const char * const ts_symbol_names[] = { [sym_unary_op] = "unary_op", [sym_binary_expr] = "binary_expr", [aux_sym_file_repeat1] = "file_repeat1", - [aux_sym_string_literal_repeat1] = "string_literal_repeat1", + [aux_sym_string_repeat1] = "string_repeat1", [aux_sym_type_repeat1] = "type_repeat1", [aux_sym_import_repeat1] = "import_repeat1", [aux_sym_import_repeat2] = "import_repeat2", @@ -222,7 +222,7 @@ static const TSSymbol ts_symbol_map[] = { [sym_file] = sym_file, [sym_comment] = sym_comment, [sym_integer] = sym_integer, - [sym_string_literal] = sym_string_literal, + [sym_string] = sym_string, [sym_type_alias] = sym_type_alias, [sym_type] = sym_type, [sym_import] = sym_import, @@ -239,7 +239,7 @@ static const TSSymbol ts_symbol_map[] = { [sym_unary_op] = sym_unary_op, [sym_binary_expr] = sym_binary_expr, [aux_sym_file_repeat1] = aux_sym_file_repeat1, - [aux_sym_string_literal_repeat1] = aux_sym_string_literal_repeat1, + [aux_sym_string_repeat1] = aux_sym_string_repeat1, [aux_sym_type_repeat1] = aux_sym_type_repeat1, [aux_sym_import_repeat1] = aux_sym_import_repeat1, [aux_sym_import_repeat2] = aux_sym_import_repeat2, @@ -446,7 +446,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = { .visible = true, .named = true, }, - [sym_string_literal] = { + [sym_string] = { .visible = true, .named = true, }, @@ -514,7 +514,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = { .visible = false, .named = false, }, - [aux_sym_string_literal_repeat1] = { + [aux_sym_string_repeat1] = { .visible = false, .named = false, }, @@ -2439,7 +2439,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [STATE(2)] = { [sym_comment] = STATE(2), [sym_integer] = STATE(107), - [sym_string_literal] = STATE(108), + [sym_string] = STATE(108), [sym_name] = STATE(2), [sym_expr] = STATE(123), [sym_apply] = STATE(57), @@ -2483,7 +2483,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [STATE(3)] = { [sym_comment] = STATE(3), [sym_integer] = STATE(107), - [sym_string_literal] = STATE(108), + [sym_string] = STATE(108), [sym_name] = STATE(3), [sym_expr] = STATE(111), [sym_apply] = STATE(57), @@ -2725,7 +2725,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(121), 1, sym_expr, STATE(148), 1, @@ -2781,7 +2781,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(121), 1, sym_expr, STATE(169), 1, @@ -2837,7 +2837,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(121), 1, sym_expr, STATE(161), 1, @@ -2893,7 +2893,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(121), 1, sym_expr, STATE(172), 1, @@ -2949,7 +2949,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(112), 1, sym_expr, STATE(241), 1, @@ -3003,7 +3003,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(119), 1, sym_expr, STATE(241), 1, @@ -3057,7 +3057,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(131), 1, sym_expr, STATE(241), 1, @@ -3111,7 +3111,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(118), 1, sym_expr, STATE(241), 1, @@ -3165,7 +3165,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(132), 1, sym_expr, STATE(255), 1, @@ -3219,7 +3219,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(131), 1, sym_expr, STATE(241), 1, @@ -3273,7 +3273,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(124), 1, sym_expr, STATE(241), 1, @@ -3327,7 +3327,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3381,7 +3381,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(132), 1, sym_expr, STATE(255), 1, @@ -3435,7 +3435,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(117), 1, sym_expr, STATE(241), 1, @@ -3489,7 +3489,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3543,7 +3543,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3597,7 +3597,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3651,7 +3651,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(122), 1, sym_expr, STATE(241), 1, @@ -3705,7 +3705,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3759,7 +3759,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3813,7 +3813,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3867,7 +3867,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3921,7 +3921,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -3975,7 +3975,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -4029,7 +4029,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -4083,7 +4083,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -4137,7 +4137,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(113), 1, sym_expr, STATE(241), 1, @@ -4189,7 +4189,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(120), 1, sym_expr, STATE(255), 1, @@ -4241,7 +4241,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(132), 1, sym_expr, STATE(255), 1, @@ -4293,7 +4293,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(116), 1, sym_expr, STATE(255), 1, @@ -4345,7 +4345,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(131), 1, sym_expr, STATE(241), 1, @@ -4397,7 +4397,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(114), 1, sym_expr, STATE(255), 1, @@ -4449,7 +4449,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(123), 1, sym_expr, STATE(255), 1, @@ -4501,7 +4501,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(115), 1, sym_expr, STATE(255), 1, @@ -4553,7 +4553,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(133), 1, sym_expr, STATE(255), 1, @@ -4601,7 +4601,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(109), 1, sym_expr, STATE(255), 1, @@ -4652,7 +4652,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(109), 1, sym_expr, STATE(241), 1, @@ -4709,7 +4709,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(255), 1, aux_sym_name_repeat1, ACTIONS(35), 2, @@ -4759,7 +4759,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(111), 1, sym_expr, STATE(241), 1, @@ -4811,7 +4811,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(128), 1, sym_expr, STATE(241), 1, @@ -4863,7 +4863,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(127), 1, sym_expr, STATE(241), 1, @@ -4917,7 +4917,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(241), 1, aux_sym_name_repeat1, ACTIONS(35), 2, @@ -4967,7 +4967,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(129), 1, sym_expr, STATE(241), 1, @@ -5019,7 +5019,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(130), 1, sym_expr, STATE(241), 1, @@ -5071,7 +5071,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(135), 1, sym_expr, STATE(241), 1, @@ -5123,7 +5123,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(107), 1, sym_integer, STATE(108), 1, - sym_string_literal, + sym_string, STATE(134), 1, sym_expr, STATE(255), 1, @@ -8713,7 +8713,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(206), 1, sym_comment, STATE(207), 1, - aux_sym_string_literal_repeat1, + aux_sym_string_repeat1, ACTIONS(590), 2, sym_string_content, sym_escape_sequence, @@ -8727,7 +8727,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(207), 1, sym_comment, STATE(208), 1, - aux_sym_string_literal_repeat1, + aux_sym_string_repeat1, ACTIONS(590), 2, sym_string_content, sym_escape_sequence, @@ -8743,7 +8743,7 @@ static const uint16_t ts_small_parse_table[] = { sym_escape_sequence, STATE(208), 2, sym_comment, - aux_sym_string_literal_repeat1, + aux_sym_string_repeat1, [8366] = 5, ACTIONS(27), 1, anon_sym_SEMI, @@ -9958,8 +9958,8 @@ static const TSParseActionEntry ts_parse_actions[] = { [121] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 9, 0, 78), [123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 2), [125] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 2), - [127] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_literal, 3, 0, 0), - [129] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_literal, 3, 0, 0), + [127] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, 0, 0), + [129] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 3, 0, 0), [131] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 10), [133] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 10), [135] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 3, 0, 32), @@ -10004,8 +10004,8 @@ static const TSParseActionEntry ts_parse_actions[] = { [213] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 5, 0, 61), [215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 6, 0, 58), [217] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 6, 0, 58), - [219] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_literal, 2, 0, 0), - [221] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_literal, 2, 0, 0), + [219] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, 0, 0), + [221] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 2, 0, 0), [223] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 6, 0, 67), [225] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 6, 0, 67), [227] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 2, 0, 0), @@ -10187,15 +10187,15 @@ static const TSParseActionEntry ts_parse_actions[] = { [588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79), [590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212), [592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56), - [594] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_literal_repeat1, 2, 0, 0), - [596] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_literal_repeat1, 2, 0, 0), SHIFT_REPEAT(212), + [594] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, 0, 0), + [596] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 2, 0, 0), SHIFT_REPEAT(212), [599] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2, 0, 49), SHIFT_REPEAT(268), [602] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2, 0, 49), [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239), [606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147), [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23), [610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77), - [612] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_literal_repeat1, 1, 0, 0), + [612] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_string_repeat1, 1, 0, 0), [614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242), [616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156), [618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),