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

chore: update C to v0.20.3

pull/594/head
Amaan Qureshi 2023-07-18 17:12:43 +07:00
parent 0e7b7a02b6
commit 03aec3de1f
No known key found for this signature in database
GPG Key ID: E67890ADC4227273
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
grammar.js
Unescape Escape View File

@ -44,6 +44,7 @@ module.exports = grammar(C, {
conflicts: ($, original) => original.concat([ conflicts: ($, original) => original.concat([
[$.template_function, $.template_type], [$.template_function, $.template_type],
[$.template_function, $.template_type, $._expression], [$.template_function, $.template_type, $._expression],
[$.template_function, $.template_type, $._expression_not_binary],
[$.template_function, $.template_type, $.qualified_identifier], [$.template_function, $.template_type, $.qualified_identifier],
[$.template_method, $.field_expression], [$.template_method, $.field_expression],
[$.template_type, $.qualified_type_identifier], [$.template_type, $.qualified_type_identifier],
@ -51,8 +52,11 @@ module.exports = grammar(C, {
[$.dependent_type_identifier, $.dependent_identifier], [$.dependent_type_identifier, $.dependent_identifier],
[$.comma_expression, $.initializer_list], [$.comma_expression, $.initializer_list],
[$._expression, $._declarator], [$._expression, $._declarator],
[$._expression_not_binary, $._declarator],
[$._expression, $.structured_binding_declarator], [$._expression, $.structured_binding_declarator],
[$._expression_not_binary, $.structured_binding_declarator],
[$._expression, $._declarator, $._type_specifier], [$._expression, $._declarator, $._type_specifier],
[$._expression_not_binary, $._declarator, $._type_specifier],
[$.parameter_list, $.argument_list], [$.parameter_list, $.argument_list],
[$._type_specifier, $.call_expression], [$._type_specifier, $.call_expression],
[$._declaration_specifiers, $._constructor_specifiers], [$._declaration_specifiers, $._constructor_specifiers],
@ -62,6 +66,7 @@ module.exports = grammar(C, {
[$._binary_fold_operator, $._fold_operator], [$._binary_fold_operator, $._fold_operator],
[$.expression_statement, $.for_statement], [$.expression_statement, $.for_statement],
[$.init_statement, $.for_statement], [$.init_statement, $.for_statement],
[$._typedef_type_specifier, $.sized_type_specifier],
]), ]),
inline: ($, original) => original.concat([ inline: ($, original) => original.concat([
@ -84,6 +89,21 @@ module.exports = grammar(C, {
alias($.operator_cast_declaration, $.declaration), alias($.operator_cast_declaration, $.declaration),
), ),
_block_item: ($, original) => choice(
original,
$.namespace_definition,
$.concept_definition,
$.namespace_alias_definition,
$.using_declaration,
$.alias_declaration,
$.static_assert_declaration,
$.template_declaration,
$.template_instantiation,
alias($.constructor_or_destructor_definition, $.function_definition),
alias($.operator_cast_definition, $.function_definition),
alias($.operator_cast_declaration, $.declaration),
),
// Types // Types
placeholder_type_specifier: $ => prec(1, seq( placeholder_type_specifier: $ => prec(1, seq(
@ -125,7 +145,6 @@ module.exports = grammar(C, {
type_qualifier: (_, original) => choice( type_qualifier: (_, original) => choice(
original, original,
'mutable', 'mutable',
'constexpr',
'constinit', 'constinit',
'consteval', 'consteval',
), ),
@ -249,6 +268,25 @@ module.exports = grammar(C, {
// Declarations // Declarations
_typedef_type_specifier: $ => choice(
$.macro_type_specifier,
alias($._typedef_sized_type_specifier, $.sized_type_specifier),
$.struct_specifier,
$.union_specifier,
$.enum_specifier,
$.class_specifier,
$.sized_type_specifier,
$.primitive_type,
$.template_type,
$.dependent_type,
$.placeholder_type_specifier,
$.decltype,
prec.right(choice(
alias($.qualified_type_identifier, $.qualified_identifier),
$._type_identifier,
)),
),
template_declaration: $ => seq( template_declaration: $ => seq(
'template', 'template',
field('parameters', $.template_parameter_list), field('parameters', $.template_parameter_list),
@ -694,6 +732,15 @@ module.exports = grammar(C, {
// Statements // Statements
_top_level_statement: ($, original) => choice(
original,
$.co_return_statement,
$.co_yield_statement,
$.for_range_loop,
$.try_statement,
$.throw_statement,
),
_non_case_statement: ($, original) => choice( _non_case_statement: ($, original) => choice(
original, original,
$.co_return_statement, $.co_return_statement,
@ -810,7 +857,7 @@ module.exports = grammar(C, {
// Expressions // Expressions
_expression: ($, original) => choice( _expression_not_binary: ($, original) => choice(
original, original,
$.co_await_expression, $.co_await_expression,
$.requires_expression, $.requires_expression,
@ -821,7 +868,6 @@ module.exports = grammar(C, {
$.delete_expression, $.delete_expression,
$.lambda_expression, $.lambda_expression,
$.parameter_pack_expansion, $.parameter_pack_expansion,
$.nullptr,
$.this, $.this,
$.raw_string_literal, $.raw_string_literal,
$.user_defined_literal, $.user_defined_literal,
@ -1191,7 +1237,6 @@ module.exports = grammar(C, {
)), )),
this: _ => 'this', this: _ => 'this',
nullptr: _ => 'nullptr',
concatenated_string: $ => seq( concatenated_string: $ => seq(
choice($.raw_string_literal, $.string_literal), choice($.raw_string_literal, $.string_literal),

4
package.json
Unescape Escape View File

@ -19,8 +19,8 @@
"devDependencies": { "devDependencies": {
"eslint": "^8.43.0", "eslint": "^8.43.0",
"eslint-config-google": "^0.14.0", "eslint-config-google": "^0.14.0",
"tree-sitter-c": "^0.20.2", "tree-sitter-c": "^0.20.3",
"tree-sitter-cli": "^0.20.0" "tree-sitter-cli": "^0.20.8"
}, },
"scripts": { "scripts": {
"build": "tree-sitter generate && node-gyp build", "build": "tree-sitter generate && node-gyp build",