Fix more keyword/identifier clashes

Fixes stadelmanma#134
Fixes stadelmanma#136
Fixes stadelmanma#139

Author: ZedThree

grammar.js

@@ -97,6 +97,8 @@ module.exports = grammar({
     [$.preproc_ifdef_in_specification_part, $.program],
     [$.preproc_else_in_specification_part, $.program],
     [$.coarray_critical_statement, $.identifier],
+    [$.format_statement, $.identifier],
+    [$._inline_if_statement, $.arithmetic_if_statement, $._block_if_statement, $.identifier],
   ],
 
   rules: {
@@ -1052,7 +1054,6 @@ module.exports = grammar({
     _statements: $ => choice(
       $.assignment_statement,
       $.pointer_association_statement,
-      $.call_expression,
       $.subroutine_call,
       $.keyword_statement,
       $.if_statement,
@@ -1289,11 +1290,11 @@ module.exports = grammar({
       $._block_if_statement
     ),
 
-    _inline_if_statement: $ => prec.right(2, seq(
+    _inline_if_statement: $ => seq(
       caseInsensitive('if'),
       $.parenthesized_expression,
       $._statements
-    )),
+    ),
 
     arithmetic_if_statement: $ => prec.right(seq(
       caseInsensitive('if'),
@@ -1565,12 +1566,12 @@ module.exports = grammar({
       optional($._block_label)
     ),
 
-    format_statement: $ => prec(1, seq(
+    format_statement: $ => seq(
       caseInsensitive('format'),
       '(',
       alias($._transfer_items, $.transfer_items),
       ')'
-    )),
+    ),
 
     _transfer_item: $ => choice(
       $.string_literal,
@@ -2191,6 +2192,7 @@ module.exports = grammar({
       caseInsensitive('device'),
       prec(-1, caseInsensitive('dimension')),
       caseInsensitive('double'),
+      caseInsensitive('else'),
       caseInsensitive('elseif'),
       caseInsensitive('end'),
       caseInsensitive('endif'),

src/grammar.json

@@ -13029,10 +13029,6 @@
           "type": "SYMBOL",
           "name": "pointer_association_statement"
         },
-        {
-          "type": "SYMBOL",
-          "name": "call_expression"
-        },
         {
           "type": "SYMBOL",
           "name": "subroutine_call"
@@ -14584,30 +14580,26 @@
       ]
     },
     "_inline_if_statement": {
-      "type": "PREC_RIGHT",
-      "value": 2,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "ALIAS",
-            "content": {
-              "type": "PATTERN",
-              "value": "[iI][fF]"
-            },
-            "named": false,
-            "value": "if"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "parenthesized_expression"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "PATTERN",
+            "value": "[iI][fF]"
           },
-          {
-            "type": "SYMBOL",
-            "name": "_statements"
-          }
-        ]
-      }
+          "named": false,
+          "value": "if"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "parenthesized_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_statements"
+        }
+      ]
     },
     "arithmetic_if_statement": {
       "type": "PREC_RIGHT",
@@ -16474,39 +16466,35 @@
       ]
     },
     "format_statement": {
-      "type": "PREC",
-      "value": 1,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "ALIAS",
-            "content": {
-              "type": "PATTERN",
-              "value": "[fF][oO][rR][mM][aA][tT]"
-            },
-            "named": false,
-            "value": "format"
-          },
-          {
-            "type": "STRING",
-            "value": "("
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "PATTERN",
+            "value": "[fF][oO][rR][mM][aA][tT]"
           },
-          {
-            "type": "ALIAS",
-            "content": {
-              "type": "SYMBOL",
-              "name": "_transfer_items"
-            },
-            "named": true,
-            "value": "transfer_items"
+          "named": false,
+          "value": "format"
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_transfer_items"
           },
-          {
-            "type": "STRING",
-            "value": ")"
-          }
-        ]
-      }
+          "named": true,
+          "value": "transfer_items"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
     },
     "_transfer_item": {
       "type": "CHOICE",
@@ -20671,6 +20659,15 @@
           "named": false,
           "value": "double"
         },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "PATTERN",
+            "value": "[eE][lL][sS][eE]"
+          },
+          "named": false,
+          "value": "else"
+        },
         {
           "type": "ALIAS",
           "content": {
@@ -21213,6 +21210,16 @@
     [
       "coarray_critical_statement",
       "identifier"
+    ],
+    [
+      "format_statement",
+      "identifier"
+    ],
+    [
+      "_inline_if_statement",
+      "arithmetic_if_statement",
+      "_block_if_statement",
+      "identifier"
     ]
   ],
   "precedences": [],