Update syntax

bindings/dust

@@ -1 +1 @@
-Subproject commit a42b43ed7853b73e8bb42b0ab23765acc1fc78c1
+Subproject commit 7fa5dd0f54e389052274affd8237040af545b938

grammar.js

@@ -8,7 +8,7 @@ module.exports = grammar({
     
     item: $ => choice(
       $.comment,
-      field('source', $.statement),
+      $.statement,
     ),
 
     comment: $ => seq(token('#'), /.*/),
@@ -52,8 +52,8 @@ module.exports = grammar({
       $.integer,
       $.float,
       $.string,
-      $.list,
       $.boolean,
+      $.list,
       $.function,
       $.table,
       $.map,
@@ -72,7 +72,7 @@ module.exports = grammar({
 
     list: $ => seq(
       '[',
-      repeat1(seq(field('item', $.value), optional(','))),
+      repeat1(seq($.value, optional(','))),
       ']'
     ),
 
@@ -95,7 +95,7 @@ module.exports = grammar({
     map: $ => seq(
       'map',
       '{',
-      repeat(field('key_value_pair', seq($.identifier, "=", $.value))),
+      repeat(seq($.identifier, "=", $.value)),
       '}',
     ),
 

src/grammar.json

@@ -17,12 +17,8 @@
           "name": "comment"
         },
         {
-          "type": "FIELD",
+          "type": "SYMBOL",
-          "name": "source",
+          "name": "statement"
-          "content": {
-            "type": "SYMBOL",
-            "name": "statement"
-          }
         }
       ]
     },
@@ -200,11 +196,11 @@
         },
         {
           "type": "SYMBOL",
-          "name": "list"
+          "name": "boolean"
         },
         {
           "type": "SYMBOL",
-          "name": "boolean"
+          "name": "list"
         },
         {
           "type": "SYMBOL",
@@ -258,12 +254,8 @@
             "type": "SEQ",
             "members": [
               {
-                "type": "FIELD",
+                "type": "SYMBOL",
-                "name": "item",
+                "name": "value"
-                "content": {
-                  "type": "SYMBOL",
-                  "name": "value"
-                }
               },
               {
                 "type": "CHOICE",
@@ -430,25 +422,21 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "FIELD",
+            "type": "SEQ",
-            "name": "key_value_pair",
+            "members": [
-            "content": {
+              {
-              "type": "SEQ",
+                "type": "SYMBOL",
-              "members": [
+                "name": "identifier"
-                {
+              },
-                  "type": "SYMBOL",
+              {
-                  "name": "identifier"
+                "type": "STRING",
-                },
+                "value": "="
-                {
+              },
-                  "type": "STRING",
+              {
-                  "value": "="
+                "type": "SYMBOL",
-                },
+                "name": "value"
-                {
+              }
-                  "type": "SYMBOL",
+            ]
-                  "name": "value"
-                }
-              ]
-            }
           }
         },
         {

src/node-types.json

@@ -198,25 +198,18 @@
   {
     "type": "item",
     "named": true,
-    "fields": {
+    "fields": {},
-      "source": {
-        "multiple": false,
-        "required": false,
-        "types": [
-          {
-            "type": "statement",
-            "named": true
-          }
-        ]
-      }
-    },
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "comment",
           "named": true
+        },
+        {
+          "type": "statement",
+          "named": true
         }
       ]
     }
@@ -224,17 +217,16 @@
   {
     "type": "list",
     "named": true,
-    "fields": {
+    "fields": {},
-      "item": {
+    "children": {
-        "multiple": true,
+      "multiple": true,
-        "required": true,
+      "required": true,
-        "types": [
+      "types": [
-          {
+        {
-            "type": "value",
+          "type": "value",
-            "named": true
+          "named": true
-          }
+        }
-        ]
+      ]
-      }
     }
   },
   {
@@ -283,25 +275,20 @@
   {
     "type": "map",
     "named": true,
-    "fields": {
+    "fields": {},
-      "key_value_pair": {
+    "children": {
-        "multiple": true,
+      "multiple": true,
-        "required": false,
+      "required": false,
-        "types": [
+      "types": [
-          {
+        {
-            "type": "=",
+          "type": "identifier",
-            "named": false
+          "named": true
-          },
+        },
-          {
+        {
-            "type": "identifier",
+          "type": "value",
-            "named": true
+          "named": true
-          },
+        }
-          {
+      ]
-            "type": "value",
-            "named": true
-          }
-        ]
-      }
     }
   },
   {