Add F2023 features

grammar.js

@@ -80,6 +80,7 @@ module.exports = grammar({
     [$._argument_list, $.parenthesized_expression],
     [$.case_statement],
     [$.data_set, $._expression],
+    [$.data_statement, $.identifier],
     [$.data_value, $._expression],
     [$.else_clause],
     [$.elseif_clause, $.identifier],
@@ -492,6 +493,7 @@ module.exports = grammar({
       $.public_statement,
       $.private_statement,
       $.enum,
+      $.enumeration_type,
       $.interface,
       $.derived_type_definition,
       seq($.namelist_statement, $._end_of_statement),
@@ -755,7 +757,8 @@ module.exports = grammar({
       field('type', choice(
         $.intrinsic_type,
         $.derived_type,
-        alias($.procedure_declaration, $.procedure)
+        alias($.procedure_declaration, $.procedure),
+        $.declared_type,
       )),
       optional(seq(',',
         commaSep1(
@@ -866,6 +869,19 @@ module.exports = grammar({
       ')'
     ),
 
+    declared_type: $ => seq(
+      choice(
+        caseInsensitive('typeof'),
+        caseInsensitive('classof'),
+      ),
+      '(',
+      field('name', choice(
+        $.identifier,
+        $.derived_type_member_expression,
+      )),
+      ')'
+    ),
+
     unlimited_polymorphic: $ => '*',
 
     kind: $ => choice(
@@ -914,6 +930,10 @@ module.exports = grammar({
       caseInsensitive('private'),
       caseInsensitive('protected'),
       caseInsensitive('public'),
+      seq(
+        caseInsensitive('rank'),
+        $.argument_list
+      ),
       caseInsensitive('save'),
       caseInsensitive('sequence'),
       caseInsensitive('shared'),
@@ -939,7 +959,8 @@ module.exports = grammar({
       caseInsensitive('impure'),
       caseInsensitive('module'),
       caseInsensitive('pure'),
-      caseInsensitive('recursive')
+      caseInsensitive('recursive'),
+      caseInsensitive('simple'),
     ),
 
     parameter_statement: $ => prec(1, seq(
@@ -1081,10 +1102,10 @@ module.exports = grammar({
       field("path", alias($.string_literal, $.filename))
     ),
 
-    data_statement: $ => prec(1, seq(
+    data_statement: $ => seq(
       caseInsensitive('data'),
       commaSep1($.data_set)
-    )),
+    ),
     data_set: $ => prec(1, seq(
       commaSep1(
         choice(
@@ -1197,7 +1218,24 @@ module.exports = grammar({
       seq(
         caseInsensitive('default'),
         '(', caseInsensitive('none'), ')'
-      )
+      ),
+      seq(
+        caseInsensitive('reduce'),
+        '(', $.binary_op, ':', commaSep1($.identifier), ')',
+      ),
+    ),
+    binary_op: $ => choice(
+      '+',
+      '*',
+      caseInsensitive('\\.and\\.'),
+      caseInsensitive('\\.or\\.'),
+      caseInsensitive('\\.eqv\\.'),
+      caseInsensitive('\\.neqv\\.'),
+      caseInsensitive('iand'),
+      caseInsensitive('ieor'),
+      caseInsensitive('ior'),
+      caseInsensitive('max'),
+      caseInsensitive('min'),
     ),
 
     if_statement: $ => choice(
@@ -1434,7 +1472,7 @@ module.exports = grammar({
       $.extent_specifier
     )),
 
-    rank_statement: $ => seq(
+    rank_statement: $ => prec(2, seq(
       caseInsensitive('rank'),
       choice(
         seq('(', $.case_value_range_list, ')'),
@@ -1443,7 +1481,7 @@ module.exports = grammar({
       optional($._block_label),
       $._end_of_statement,
       repeat($._statement)
-    ),
+    )),
 
     block_construct: $ => seq(
       optional($.block_label_start_expression),
@@ -1586,6 +1624,21 @@ module.exports = grammar({
       $.language_binding
     ),
 
+    enumeration_type: $ => seq(
+      $.enumeration_type_statement,
+      repeat($.enumerator_statement),
+      $.end_enumeration_type_statement,
+      $._end_of_statement
+    ),
+
+    enumeration_type_statement: $ => seq(
+      caseInsensitive('enumeration'),
+      caseInsensitive('type'),
+      optional(seq(',', $.access_specifier)),
+      optional('::'),
+      $._type_name,
+    ),
+
     enumerator_statement: $ => seq(
       caseInsensitive('enumerator'),
       optional('::'),
@@ -1596,6 +1649,12 @@ module.exports = grammar({
     ),
 
     end_enum_statement: $ => whiteSpacedKeyword('end', 'enum'),
+    end_enumeration_type_statement: $ => seq(
+      caseInsensitive('end'),
+      caseInsensitive('enumeration'),
+      caseInsensitive('type'),
+      optional($._name)
+    ),
 
     // precedence is used to override a conflict with the complex literal
     unit_identifier: $ => prec(1, choice(
@@ -1714,6 +1773,7 @@ module.exports = grammar({
       $.call_expression,
       $.implied_do_loop_expression,
       $.coarray_expression,
+      $.conditional_expression,
     ),
 
     parenthesized_expression: $ => seq(
@@ -1839,7 +1899,9 @@ module.exports = grammar({
           $.extent_specifier,
           $.assumed_size,
           $.assumed_rank,
-          $._expression
+          $._expression,
+          $.multiple_subscript,
+          $.multiple_subscript_triplet,
         )),
         ')'
       )
@@ -1854,12 +1916,16 @@ module.exports = grammar({
       field("value",choice($._expression, $.assumed_size, $.assumed_shape))
     )),
 
-    extent_specifier: $ => seq(
+    _extent_specifier: $ => seq(
       optional($._expression), // start
       ':',
       optional(choice($._expression, $.assumed_size)), // stop
       optional(seq(':', $._expression)) // stride
     ),
+    extent_specifier: $=> $._extent_specifier,
+
+    multiple_subscript: $ => seq('@', $._expression),
+    multiple_subscript_triplet: $ => seq('@', $._extent_specifier),
 
     assumed_size: $ => '*',
 
@@ -2015,6 +2081,11 @@ module.exports = grammar({
         ),
         $.argument_list,
       )),
+      seq(
+        caseInsensitive('notify'),
+        caseInsensitive('wait'),
+        $.argument_list,
+      ),
     ),
 
     coarray_team_statement: $ => seq(
@@ -2047,12 +2118,24 @@ module.exports = grammar({
       optional($._block_label),
     ),
 
+    conditional_expression: $ => seq(
+      field('condition', $._expression),
+      '?',
+      field('consequence', choice(prec.left($._expression), $.nil_literal)),
+      ':',
+      field('alternative', choice(prec.left($._expression), $.nil_literal)),
+    ),
+
+    // Strictly only valid when used in a conditional_expression as an
+    // actual argument
+    nil_literal: $ => caseInsensitive('\\.nil\\.'),
+
     // Fortran doesn't have reserved keywords, and to allow _just
     // enough_ ambiguity so that tree-sitter can parse tokens
     // correctly as either a keyword or a plain identifier, we must
     // add the keywords here -- and possibly in `conflicts` too.
     identifier: $ => choice(
-      /[a-zA-Z_]\w*/,
+      /[a-zA-Z_$][\w$]*/,
       caseInsensitive('allocatable'),
       caseInsensitive('automatic'),
       caseInsensitive('block'),
@@ -2089,6 +2172,7 @@ module.exports = grammar({
       caseInsensitive('pointer'),
       caseInsensitive('private'),
       caseInsensitive('public'),
+      prec(-1, caseInsensitive('rank')),
       caseInsensitive('read'),
       caseInsensitive('real'),
       caseInsensitive('save'),