grammar: give top-level expressions high prio, clean up module rules, and inline terms

Author: leostera

Makefile

@@ -9,6 +9,10 @@ fmt:
 test: gen
 	$(TREE_SITTER) test
 
+.PHONY: debug
+debug: gen
+	$(TREE_SITTER) test -d
+
 .PHONY: gen
 gen:
 	$(TREE_SITTER) generate

grammar.js

@@ -69,6 +69,7 @@ const OP2_RIGHT_ASSOC = ["=!", "++", "--"];
 //
 ///////////////////////////////////////////////////////////////////////////////
 const PREC = {
+  TOP_LEVEL_EXPRESSION: 100,
   UNARY_OP: 10,
   BINARY_OP: 9,
   MODULE_DECLARATION: 8,
@@ -111,21 +112,17 @@ module.exports = grammar({
 
   extras: ($) => [/[\x00-\x20\x80-\xA0]/, $.comment],
 
+  inline: ($) => [$.term],
+
+  conflicts: ($) => [],
+
   rules: {
     source_file: ($) => repeat($._structure_item),
 
     _structure_item: ($) =>
-      prec(
-        PREC.MODULE_DECLARATION,
-        choice(
-          $.type_declaration,
-          $.function_spec,
-          $.function_declaration,
-          $.module_attribute,
-          $.module_name,
-          $.module_export,
-          $.expression
-        )
+      choice(
+        prec(PREC.TOP_LEVEL_EXPRESSION, $.expression),
+        prec(PREC.MODULE_DECLARATION, $._module)
       ),
 
     ////////////////////////////////////////////////////////////////////////////
@@ -134,6 +131,16 @@ module.exports = grammar({
     //
     ////////////////////////////////////////////////////////////////////////////
 
+    _module: ($) =>
+      choice(
+        $.type_declaration,
+        $.function_spec,
+        $.function_declaration,
+        $.module_attribute,
+        $.module_name,
+        $.module_export
+      ),
+
     module_attribute: ($) =>
       seq(DASH, $.atom, delim(PARENS_LEFT, $.expression, PARENS_RIGHT), DOT),
 

src/grammar.json

@@ -10,41 +10,54 @@
       }
     },
     "_structure_item": {
-      "type": "PREC",
-      "value": 8,
-      "content": {
-        "type": "CHOICE",
-        "members": [
-          {
-            "type": "SYMBOL",
-            "name": "type_declaration"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "function_spec"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "function_declaration"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "module_attribute"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "module_name"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "module_export"
-          },
-          {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PREC",
+          "value": 100,
+          "content": {
             "type": "SYMBOL",
             "name": "expression"
           }
-        ]
-      }
+        },
+        {
+          "type": "PREC",
+          "value": 8,
+          "content": {
+            "type": "SYMBOL",
+            "name": "_module"
+          }
+        }
+      ]
+    },
+    "_module": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "type_declaration"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "function_spec"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "function_declaration"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "module_attribute"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "module_name"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "module_export"
+        }
+      ]
     },
     "module_attribute": {
       "type": "SEQ",
@@ -3907,7 +3920,9 @@
   ],
   "conflicts": [],
   "externals": [],
-  "inline": [],
+  "inline": [
+    "term"
+  ],
   "supertypes": []
 }