folkert/tree-sitter-ada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: remove unncessary conflicts

Browse Source
This commit is contained in:
Amaan Qureshi 2023-08-12 22:44:00 -04:00
parent 99d845cd94
commit c0f6fedb25
No known key found for this signature in database
GPG Key ID: E67890ADC4227273
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grammar.js
View File

@ -46,9 +46,6 @@ module.exports = grammar({
// specified in at_clause. // specified in at_clause.
[$.at_clause, $._name], [$.at_clause, $._name],
// 'case' '(' identifier . '=>' ...
[$._name, $.component_choice_list],
// 'case' '(' _name '(' _discrete_range ')' . '=>' // 'case' '(' _name '(' _discrete_range ')' . '=>'
[$.slice, $._discrete_range], [$.slice, $._discrete_range],
@ -77,9 +74,6 @@ module.exports = grammar({
// could be either a record_extension_part or an aspect_specification. // could be either a record_extension_part or an aspect_specification.
[$.derived_type_definition], [$.derived_type_definition],
// 'for' name 'use' '(' 'for' identifier 'in' name . 'use'
[$.iterator_specification, $._subtype_indication],
// 'type' identifier known_discriminant_part . 'is' ... // 'type' identifier known_discriminant_part . 'is' ...
// This could be either a _discriminant_part or known_discriminant_part, // This could be either a _discriminant_part or known_discriminant_part,
// the latter in case we are declaring a private type. We can't make the // the latter in case we are declaring a private type. We can't make the
@ -95,7 +89,6 @@ module.exports = grammar({
// (via formal_complete_type_declaration) // (via formal_complete_type_declaration)
[$.formal_derived_type_definition], [$.formal_derived_type_definition],
[$.function_call, $.procedure_call_statement],
[$._name, $._aspect_mark], [$._name, $._aspect_mark],
[$._name, $.package_body_stub], [$._name, $.package_body_stub],
[$._name, $._subtype_indication], [$._name, $._subtype_indication],