Ensure nodes appear in the syntax tree

Previously, these nodes were defined using regexes, preventing them
from being explicitly represented in the tree.

Author: inaki-amatria

grammar.js

@@ -428,7 +428,8 @@ module.exports = grammar({
     ),
 
     assignment: $ => seq(caseInsensitive('assignment'), '(', '=', ')'),
-    operator: $ => seq(caseInsensitive('operator'), '(', /[^()]+/, ')'),
+    operator: $ => seq(caseInsensitive('operator'), '(', $.operator_name, ')'),
+    operator_name: $ => /[^()]+/,
     defined_io_procedure: $ => seq(
       choice(caseInsensitive('read'), caseInsensitive('write')),
       '(',
@@ -689,9 +690,10 @@ module.exports = grammar({
     ),
 
     implicit_range: $ => seq(
-      /[a-zA-Z]/,
-      optional(seq('-', /[a-zA-Z]/))
+      $.implicit_range_letter,
+      optional(seq('-', $.implicit_range_letter))
     ),
+    implicit_range_letter: $ => /[a-zA-Z]/,
 
     import_statement: $ => prec.left(seq(
       caseInsensitive('import'),
@@ -1934,8 +1936,9 @@ module.exports = grammar({
     )),
 
     user_defined_operator: $ => prec.right(seq(
-      '.', /[a-zA-Z]+/, '.'
+      '.', $.user_defined_operator_name, '.'
     )),
+    user_defined_operator_name: $ => /[a-zA-Z]+/,
 
     // Due to the fact Fortran uses parentheses for both function calls and
     // array access there is no way to differentiate the two except for the

src/grammar.json

@@ -8181,15 +8181,19 @@
           "value": "("
         },
         {
-          "type": "PATTERN",
-          "value": "[^()]+"
+          "type": "SYMBOL",
+          "name": "operator_name"
         },
         {
           "type": "STRING",
           "value": ")"
         }
       ]
     },
+    "operator_name": {
+      "type": "PATTERN",
+      "value": "[^()]+"
+    },
     "defined_io_procedure": {
       "type": "SEQ",
       "members": [
@@ -10397,8 +10401,8 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "PATTERN",
-          "value": "[a-zA-Z]"
+          "type": "SYMBOL",
+          "name": "implicit_range_letter"
         },
         {
           "type": "CHOICE",
@@ -10411,8 +10415,8 @@
                   "value": "-"
                 },
                 {
-                  "type": "PATTERN",
-                  "value": "[a-zA-Z]"
+                  "type": "SYMBOL",
+                  "name": "implicit_range_letter"
                 }
               ]
             },
@@ -10423,6 +10427,10 @@
         }
       ]
     },
+    "implicit_range_letter": {
+      "type": "PATTERN",
+      "value": "[a-zA-Z]"
+    },
     "import_statement": {
       "type": "PREC_LEFT",
       "value": 0,
@@ -18858,8 +18866,8 @@
             "value": "."
           },
           {
-            "type": "PATTERN",
-            "value": "[a-zA-Z]+"
+            "type": "SYMBOL",
+            "name": "user_defined_operator_name"
           },
           {
             "type": "STRING",
@@ -18868,6 +18876,10 @@
         ]
       }
     },
+    "user_defined_operator_name": {
+      "type": "PATTERN",
+      "value": "[a-zA-Z]+"
+    },
     "call_expression": {
       "type": "PREC",
       "value": 80,

src/node-types.json

@@ -6976,7 +6976,17 @@
   {
     "type": "implicit_range",
     "named": true,
-    "fields": {}
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "implicit_range_letter",
+          "named": true
+        }
+      ]
+    }
   },
   {
     "type": "implicit_statement",
@@ -9717,7 +9727,17 @@
   {
     "type": "operator",
     "named": true,
-    "fields": {}
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "operator_name",
+          "named": true
+        }
+      ]
+    }
   },
   {
     "type": "output_item_list",
@@ -14684,7 +14704,17 @@
   {
     "type": "user_defined_operator",
     "named": true,
-    "fields": {}
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "user_defined_operator_name",
+          "named": true
+        }
+      ]
+    }
   },
   {
     "type": "variable_attributes",
@@ -15585,6 +15615,10 @@
     "type": "implicit",
     "named": false
   },
+  {
+    "type": "implicit_range_letter",
+    "named": true
+  },
   {
     "type": "import",
     "named": false
@@ -15709,6 +15743,10 @@
     "type": "operator",
     "named": false
   },
+  {
+    "type": "operator_name",
+    "named": true
+  },
   {
     "type": "optional",
     "named": false
@@ -15921,6 +15959,10 @@
     "type": "use",
     "named": false
   },
+  {
+    "type": "user_defined_operator_name",
+    "named": true
+  },
   {
     "type": "value",
     "named": false