operator sections

grammar.js

@@ -46,15 +46,17 @@ module.exports = grammar({
       ';'
     ),
 
-    variable : $ => seq(
+    variable_binding : $ => seq(
-      choice('variable', 'hypothesis'),
-      repeat1(seq(
       '(',
       repeat1(choice($.identifier, $.symbol)),
       ':',
       field('type', $.expr),
-        ')'
+      ')',
-      )),
+    ),
+
+    variable : $ => seq(
+      choice('variable', 'hypothesis'),
+      repeat1($.variable_binding),
       ';'
     ),
 
@@ -86,9 +88,16 @@ module.exports = grammar({
       $.expr,
     ),
 
+    op_section : $ => seq(
+      '(',
+      $.symbol,
+      ')',
+    ),
+
     term : $ => choice(
       $.identifier,
       $.sort,
+      $.op_section,
       seq('(', $.expr, ')'),
     ),
 

src/grammar.json

@@ -116,25 +116,7 @@
         }
       ]
     },
-    "variable": {
+    "variable_binding": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "variable"
-            },
-            {
-              "type": "STRING",
-              "value": "hypothesis"
-            }
-          ]
-        },
-        {
-          "type": "REPEAT1",
-          "content": {
       "type": "SEQ",
       "members": [
         {
@@ -174,6 +156,28 @@
           "value": ")"
         }
       ]
+    },
+    "variable": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "variable"
+            },
+            {
+              "type": "STRING",
+              "value": "hypothesis"
+            }
+          ]
+        },
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "variable_binding"
           }
         },
         {
@@ -360,6 +364,23 @@
         }
       ]
     },
+    "op_section": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "symbol"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "term": {
       "type": "CHOICE",
       "members": [
@@ -371,6 +392,10 @@
           "type": "SYMBOL",
           "name": "sort"
         },
+        {
+          "type": "SYMBOL",
+          "name": "op_section"
+        },
         {
           "type": "SEQ",
           "members": [

src/node-types.json

@@ -278,6 +278,21 @@
       ]
     }
   },
+  {
+    "type": "op_section",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "symbol",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "pabs",
     "named": true,
@@ -440,6 +455,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "op_section",
+          "named": true
+        },
         {
           "type": "sort",
           "named": true
@@ -450,9 +469,24 @@
   {
     "type": "variable",
     "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "variable_binding",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "variable_binding",
+    "named": true,
     "fields": {
       "type": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {

test/corpus/op_section.txt

@@ -0,0 +1,22 @@
+=================
+Operator Sections
+=================
+
+def foo := (+) one two;
+
+---
+
+    (program
+      (definition
+        (identifier)
+        (expr
+          (app_term
+            (binex
+              (app
+                (term
+                  (op_section
+                    (symbol)))
+                (term
+                  (identifier))
+                (term
+                  (identifier))))))))

test/corpus/section.txt

@@ -18,6 +18,7 @@ end Test
         (identifier)
         (program
           (variable
+            (variable_binding
               (identifier)
               (identifier)
               (identifier)
@@ -27,23 +28,9 @@ end Test
                     (app
                       (term
                         (sort
-                        (star))))))))
+                          (star)))))))))
           (variable
-            (identifier)
+            (variable_binding
-            (expr
-              (app_term
-                (binex
-                  (app
-                    (term
-                      (identifier))))))
-            (identifier)
-            (expr
-              (app_term
-                (binex
-                  (app
-                    (term
-                      (identifier))))))
-            (identifier)
               (identifier)
               (expr
                 (app_term
@@ -51,6 +38,23 @@ end Test
                     (app
                       (term
                         (identifier)))))))
+            (variable_binding
+              (identifier)
+              (expr
+                (app_term
+                  (binex
+                    (app
+                      (term
+                        (identifier)))))))
+            (variable_binding
+              (identifier)
+              (identifier)
+              (expr
+                (app_term
+                  (binex
+                    (app
+                      (term
+                        (identifier))))))))
           (section
             (identifier)
             (program