Completely overhaul the grammar

1 files changed, 36 insertions, 67 deletions

diff --git a/src/node-types.json b/src/node-types.json
index ebd7712..0c5aa23 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -1,6 +1,11 @@
 [
   {
-    "type": "attribute",
+    "type": "attr",
+    "named": true,
+    "fields": {}
+  },
+  {
+    "type": "attrs",
     "named": true,
     "fields": {},
     "children": {
@@ -8,41 +13,42 @@
       "required": true,
       "types": [
         {
-          "type": "attribute_name",
-          "named": true
-        },
-        {
-          "type": "attribute_value",
+          "type": "attr",
           "named": true
         },
         {
-          "type": "class_shorthand",
+          "type": "class_attr",
           "named": true
         },
         {
-          "type": "id_shorthand",
+          "type": "id_attr",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "attribute_list",
+    "type": "class_attr",
+    "named": true,
+    "fields": {}
+  },
+  {
+    "type": "comment",
     "named": true,
     "fields": {},
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": true,
       "types": [
         {
-          "type": "attribute",
+          "type": "node",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "comment",
+    "type": "document",
     "named": true,
     "fields": {},
     "children": {
@@ -50,21 +56,22 @@
       "required": false,
       "types": [
         {
-          "type": "attribute_list",
-          "named": true
-        },
-        {
-          "type": "node_body",
+          "type": "comment",
           "named": true
         },
         {
-          "type": "node_name",
+          "type": "node",
           "named": true
         }
       ]
     }
   },
   {
+    "type": "id_attr",
+    "named": true,
+    "fields": {}
+  },
+  {
     "type": "node",
     "named": true,
     "fields": {},
@@ -73,7 +80,7 @@
       "required": true,
       "types": [
         {
-          "type": "attribute_list",
+          "type": "attrs",
           "named": true
         },
         {
@@ -111,23 +118,9 @@
     }
   },
   {
-    "type": "source_file",
+    "type": "node_name",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "comment",
-          "named": true
-        },
-        {
-          "type": "node",
-          "named": true
-        }
-      ]
-    }
+    "fields": {}
   },
   {
     "type": "text",
@@ -135,17 +128,13 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "comment",
           "named": true
         },
         {
-          "type": "literal_text",
-          "named": true
-        },
-        {
           "type": "node",
           "named": true
         }
@@ -153,48 +142,28 @@
     }
   },
   {
-    "type": "-",
+    "type": "#",
     "named": false
   },
   {
-    "type": "/",
+    "type": "-",
     "named": false
   },
   {
-    "type": "=",
+    "type": ".",
     "named": false
   },
   {
-    "type": ">",
+    "type": "/",
     "named": false
   },
   {
-    "type": "@",
+    "type": "=",
     "named": false
   },
   {
-    "type": "attribute_name",
-    "named": true
-  },
-  {
-    "type": "attribute_value",
-    "named": true
-  },
-  {
-    "type": "class_shorthand",
-    "named": true
-  },
-  {
-    "type": "id_shorthand",
-    "named": true
-  },
-  {
-    "type": "literal_text",
-    "named": true
-  },
-  {
-    "type": "node_name",
-    "named": true
+    "type": "@",
+    "named": false
   },
   {
     "type": "{",