|
|
|
@ -4,7 +4,6 @@ const PREC = {
|
|
|
|
// https://introcs.cs.princeton.edu/java/11precedence/
|
|
|
|
// https://introcs.cs.princeton.edu/java/11precedence/
|
|
|
|
COMMENT: 0, // // /* */
|
|
|
|
COMMENT: 0, // // /* */
|
|
|
|
ASSIGN: 1, // = += -= *= /= %= &= ^= |= <<= >>= >>>=
|
|
|
|
ASSIGN: 1, // = += -= *= /= %= &= ^= |= <<= >>= >>>=
|
|
|
|
SWITCH_EXP: 1, // always prefer to parse switch as expression over statement
|
|
|
|
|
|
|
|
DECL: 2,
|
|
|
|
DECL: 2,
|
|
|
|
ELEMENT_VAL: 2,
|
|
|
|
ELEMENT_VAL: 2,
|
|
|
|
TERNARY: 3, // ?:
|
|
|
|
TERNARY: 3, // ?:
|
|
|
|
@ -25,6 +24,7 @@ const PREC = {
|
|
|
|
ARRAY: 16, // [Index]
|
|
|
|
ARRAY: 16, // [Index]
|
|
|
|
OBJ_ACCESS: 16, // .
|
|
|
|
OBJ_ACCESS: 16, // .
|
|
|
|
PARENS: 16, // (Expression)
|
|
|
|
PARENS: 16, // (Expression)
|
|
|
|
|
|
|
|
CLASS_LITERAL: 17, // .
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
module.exports = grammar({
|
|
|
|
module.exports = grammar({
|
|
|
|
@ -66,8 +66,11 @@ module.exports = grammar({
|
|
|
|
[$._unannotated_type, $.scoped_type_identifier],
|
|
|
|
[$._unannotated_type, $.scoped_type_identifier],
|
|
|
|
[$._unannotated_type, $.generic_type],
|
|
|
|
[$._unannotated_type, $.generic_type],
|
|
|
|
[$.generic_type, $.primary_expression],
|
|
|
|
[$.generic_type, $.primary_expression],
|
|
|
|
|
|
|
|
[$.expression, $.statement],
|
|
|
|
// Only conflicts in switch expressions
|
|
|
|
// Only conflicts in switch expressions
|
|
|
|
[$.lambda_expression, $.primary_expression],
|
|
|
|
[$.lambda_expression, $.primary_expression],
|
|
|
|
|
|
|
|
[$.inferred_parameters, $.primary_expression],
|
|
|
|
|
|
|
|
[$.class_literal, $.field_access],
|
|
|
|
],
|
|
|
|
],
|
|
|
|
|
|
|
|
|
|
|
|
word: $ => $.identifier,
|
|
|
|
word: $ => $.identifier,
|
|
|
|
@ -88,7 +91,6 @@ module.exports = grammar({
|
|
|
|
$.false,
|
|
|
|
$.false,
|
|
|
|
$.character_literal,
|
|
|
|
$.character_literal,
|
|
|
|
$.string_literal,
|
|
|
|
$.string_literal,
|
|
|
|
$.text_block,
|
|
|
|
|
|
|
|
$.null_literal
|
|
|
|
$.null_literal
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
@ -141,24 +143,58 @@ module.exports = grammar({
|
|
|
|
false: $ => 'false',
|
|
|
|
false: $ => 'false',
|
|
|
|
|
|
|
|
|
|
|
|
character_literal: $ => token(seq(
|
|
|
|
character_literal: $ => token(seq(
|
|
|
|
"'",
|
|
|
|
'\'',
|
|
|
|
repeat1(choice(
|
|
|
|
repeat1(choice(
|
|
|
|
/[^\\'\n]/,
|
|
|
|
/[^\\'\n]/,
|
|
|
|
/\\./,
|
|
|
|
/\\./,
|
|
|
|
/\\\n/
|
|
|
|
/\\\n/
|
|
|
|
)),
|
|
|
|
)),
|
|
|
|
"'"
|
|
|
|
'\''
|
|
|
|
)),
|
|
|
|
)),
|
|
|
|
|
|
|
|
|
|
|
|
string_literal: $ => token(choice(
|
|
|
|
string_literal: $ => choice($._string_literal, $._multiline_string_literal),
|
|
|
|
seq('"', repeat(choice(/[^\\"\n]/, /\\(.|\n)/)), '"'),
|
|
|
|
_string_literal: $ => seq(
|
|
|
|
// TODO: support multiline string literals by debugging the following:
|
|
|
|
'"',
|
|
|
|
// seq('"', repeat(choice(/[^\\"\n]/, /\\(.|\n)/)), '"', '+', /\n/, '"', repeat(choice(/[^\\"\n]/, /\\(.|\n)/)))
|
|
|
|
repeat(choice(
|
|
|
|
)),
|
|
|
|
$.string_fragment,
|
|
|
|
|
|
|
|
$.escape_sequence,
|
|
|
|
|
|
|
|
)),
|
|
|
|
|
|
|
|
'"'
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
_multiline_string_literal: $ => seq(
|
|
|
|
|
|
|
|
'"""',
|
|
|
|
|
|
|
|
repeat(choice(
|
|
|
|
|
|
|
|
alias($._multiline_string_fragment, $.multiline_string_fragment),
|
|
|
|
|
|
|
|
$._escape_sequence,
|
|
|
|
|
|
|
|
)),
|
|
|
|
|
|
|
|
'"""'
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
// Workaround to https://github.com/tree-sitter/tree-sitter/issues/1156
|
|
|
|
|
|
|
|
// We give names to the token() constructs containing a regexp
|
|
|
|
|
|
|
|
// so as to obtain a node in the CST.
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
string_fragment: $ =>
|
|
|
|
|
|
|
|
token.immediate(prec(1, /[^"\\]+/)),
|
|
|
|
|
|
|
|
_multiline_string_fragment: () =>
|
|
|
|
|
|
|
|
prec.right(choice(
|
|
|
|
|
|
|
|
/[^"]+/,
|
|
|
|
|
|
|
|
seq(/"[^"]*/, repeat(/[^"]+/))
|
|
|
|
|
|
|
|
)),
|
|
|
|
|
|
|
|
|
|
|
|
text_block: $ => token(choice(
|
|
|
|
_escape_sequence: $ =>
|
|
|
|
seq('"""', /\s*\n/, optional(repeat(choice(/[^\\"]/, /\\(.)/))), '"""'),
|
|
|
|
choice(
|
|
|
|
)),
|
|
|
|
prec(2, token.immediate(seq('\\', /[^abfnrtvxu'\"\\\?]/))),
|
|
|
|
|
|
|
|
prec(1, $.escape_sequence)
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
escape_sequence: () => token.immediate(seq(
|
|
|
|
|
|
|
|
'\\',
|
|
|
|
|
|
|
|
choice(
|
|
|
|
|
|
|
|
/[^xu0-7]/,
|
|
|
|
|
|
|
|
/[0-7]{1,3}/,
|
|
|
|
|
|
|
|
/x[0-9a-fA-F]{2}/,
|
|
|
|
|
|
|
|
/u[0-9a-fA-F]{4}/,
|
|
|
|
|
|
|
|
/u{[0-9a-fA-F]+}/
|
|
|
|
|
|
|
|
))),
|
|
|
|
|
|
|
|
|
|
|
|
null_literal: $ => 'null',
|
|
|
|
null_literal: $ => 'null',
|
|
|
|
|
|
|
|
|
|
|
|
@ -174,7 +210,7 @@ module.exports = grammar({
|
|
|
|
$.primary_expression,
|
|
|
|
$.primary_expression,
|
|
|
|
$.unary_expression,
|
|
|
|
$.unary_expression,
|
|
|
|
$.cast_expression,
|
|
|
|
$.cast_expression,
|
|
|
|
prec(PREC.SWITCH_EXP, $.switch_expression),
|
|
|
|
$.switch_expression,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
cast_expression: $ => prec(PREC.CAST, seq(
|
|
|
|
cast_expression: $ => prec(PREC.CAST, seq(
|
|
|
|
@ -227,12 +263,14 @@ module.exports = grammar({
|
|
|
|
instanceof_expression: $ => prec(PREC.REL, seq(
|
|
|
|
instanceof_expression: $ => prec(PREC.REL, seq(
|
|
|
|
field('left', $.expression),
|
|
|
|
field('left', $.expression),
|
|
|
|
'instanceof',
|
|
|
|
'instanceof',
|
|
|
|
field('right', $._type)
|
|
|
|
optional('final'),
|
|
|
|
|
|
|
|
field('right', $._type),
|
|
|
|
|
|
|
|
field('name', optional(choice($.identifier, $._reserved_identifier)))
|
|
|
|
)),
|
|
|
|
)),
|
|
|
|
|
|
|
|
|
|
|
|
lambda_expression: $ => seq(
|
|
|
|
lambda_expression: $ => seq(
|
|
|
|
field('parameters', choice(
|
|
|
|
field('parameters', choice(
|
|
|
|
$.identifier, $.formal_parameters, $.inferred_parameters
|
|
|
|
$.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier
|
|
|
|
)),
|
|
|
|
)),
|
|
|
|
'->',
|
|
|
|
'->',
|
|
|
|
field('body', choice($.expression, $.block))
|
|
|
|
field('body', choice($.expression, $.block))
|
|
|
|
@ -240,7 +278,7 @@ module.exports = grammar({
|
|
|
|
|
|
|
|
|
|
|
|
inferred_parameters: $ => seq(
|
|
|
|
inferred_parameters: $ => seq(
|
|
|
|
'(',
|
|
|
|
'(',
|
|
|
|
commaSep1($.identifier),
|
|
|
|
commaSep1(choice($.identifier, $._reserved_identifier)),
|
|
|
|
')'
|
|
|
|
')'
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
@ -289,6 +327,7 @@ module.exports = grammar({
|
|
|
|
|
|
|
|
|
|
|
|
array_creation_expression: $ => prec.right(seq(
|
|
|
|
array_creation_expression: $ => prec.right(seq(
|
|
|
|
'new',
|
|
|
|
'new',
|
|
|
|
|
|
|
|
repeat($._annotation),
|
|
|
|
field('type', $._simple_type),
|
|
|
|
field('type', $._simple_type),
|
|
|
|
choice(
|
|
|
|
choice(
|
|
|
|
seq(
|
|
|
|
seq(
|
|
|
|
@ -306,7 +345,7 @@ module.exports = grammar({
|
|
|
|
|
|
|
|
|
|
|
|
parenthesized_expression: $ => seq('(', $.expression, ')'),
|
|
|
|
parenthesized_expression: $ => seq('(', $.expression, ')'),
|
|
|
|
|
|
|
|
|
|
|
|
class_literal: $ => seq($._unannotated_type, '.', 'class'),
|
|
|
|
class_literal: $ => prec.dynamic(PREC.CLASS_LITERAL, seq($._unannotated_type, '.', 'class')),
|
|
|
|
|
|
|
|
|
|
|
|
object_creation_expression: $ => choice(
|
|
|
|
object_creation_expression: $ => choice(
|
|
|
|
$._unqualified_object_creation_expression,
|
|
|
|
$._unqualified_object_creation_expression,
|
|
|
|
@ -434,7 +473,7 @@ module.exports = grammar({
|
|
|
|
$.continue_statement,
|
|
|
|
$.continue_statement,
|
|
|
|
$.return_statement,
|
|
|
|
$.return_statement,
|
|
|
|
$.yield_statement,
|
|
|
|
$.yield_statement,
|
|
|
|
$.switch_expression, //switch statements and expressions are identical
|
|
|
|
$.switch_expression, // switch statements and expressions are identical
|
|
|
|
$.synchronized_statement,
|
|
|
|
$.synchronized_statement,
|
|
|
|
$.local_variable_declaration,
|
|
|
|
$.local_variable_declaration,
|
|
|
|
$.throw_statement,
|
|
|
|
$.throw_statement,
|
|
|
|
@ -635,6 +674,7 @@ module.exports = grammar({
|
|
|
|
$.package_declaration,
|
|
|
|
$.package_declaration,
|
|
|
|
$.import_declaration,
|
|
|
|
$.import_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
|
|
|
|
$.record_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
$.annotation_type_declaration,
|
|
|
|
$.annotation_type_declaration,
|
|
|
|
$.enum_declaration,
|
|
|
|
$.enum_declaration,
|
|
|
|
@ -827,6 +867,7 @@ module.exports = grammar({
|
|
|
|
$.field_declaration,
|
|
|
|
$.field_declaration,
|
|
|
|
$.record_declaration,
|
|
|
|
$.record_declaration,
|
|
|
|
$.method_declaration,
|
|
|
|
$.method_declaration,
|
|
|
|
|
|
|
|
$.compact_constructor_declaration, // For records.
|
|
|
|
$.class_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
$.annotation_type_declaration,
|
|
|
|
$.annotation_type_declaration,
|
|
|
|
@ -902,7 +943,9 @@ module.exports = grammar({
|
|
|
|
optional($.modifiers),
|
|
|
|
optional($.modifiers),
|
|
|
|
'record',
|
|
|
|
'record',
|
|
|
|
field('name', $.identifier),
|
|
|
|
field('name', $.identifier),
|
|
|
|
|
|
|
|
optional(field('type_parameters', $.type_parameters)),
|
|
|
|
field('parameters', $.formal_parameters),
|
|
|
|
field('parameters', $.formal_parameters),
|
|
|
|
|
|
|
|
optional(field('interfaces', $.super_interfaces)),
|
|
|
|
field('body', $.class_body)
|
|
|
|
field('body', $.class_body)
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
@ -919,6 +962,7 @@ module.exports = grammar({
|
|
|
|
$.constant_declaration,
|
|
|
|
$.constant_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
|
|
|
|
$.enum_declaration,
|
|
|
|
$.annotation_type_declaration
|
|
|
|
$.annotation_type_declaration
|
|
|
|
)),
|
|
|
|
)),
|
|
|
|
'}'
|
|
|
|
'}'
|
|
|
|
@ -962,6 +1006,7 @@ module.exports = grammar({
|
|
|
|
$.method_declaration,
|
|
|
|
$.method_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
$.class_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
$.interface_declaration,
|
|
|
|
|
|
|
|
$.record_declaration,
|
|
|
|
$.annotation_type_declaration,
|
|
|
|
$.annotation_type_declaration,
|
|
|
|
';'
|
|
|
|
';'
|
|
|
|
)),
|
|
|
|
)),
|
|
|
|
@ -1129,9 +1174,16 @@ module.exports = grammar({
|
|
|
|
choice(field('body', $.block), ';')
|
|
|
|
choice(field('body', $.block), ';')
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
compact_constructor_declaration: $ => seq(
|
|
|
|
|
|
|
|
optional($.modifiers),
|
|
|
|
|
|
|
|
field('name', $.identifier),
|
|
|
|
|
|
|
|
field('body', $.block)
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
|
|
_reserved_identifier: $ => alias(choice(
|
|
|
|
_reserved_identifier: $ => alias(choice(
|
|
|
|
'open',
|
|
|
|
'open',
|
|
|
|
'module'
|
|
|
|
'module',
|
|
|
|
|
|
|
|
'record'
|
|
|
|
), $.identifier),
|
|
|
|
), $.identifier),
|
|
|
|
|
|
|
|
|
|
|
|
this: $ => 'this',
|
|
|
|
this: $ => 'this',
|
|
|
|
|
Wilfred Hughes