cleanup

src/grammar.json

@@ -175,16 +175,12 @@
           "name": "string_lit"
         },
         {
-          "type": "STRING",
-          "value": "true"
+          "type": "SYMBOL",
+          "name": "bool_lit"
         },
         {
-          "type": "STRING",
-          "value": "false"
-        },
-        {
-          "type": "STRING",
-          "value": "null"
+          "type": "SYMBOL",
+          "name": "null_lit"
         }
       ]
     },
@@ -192,6 +188,43 @@
       "type": "PATTERN",
       "value": "[0-9]+(\\.[0-9]+([eE][-+]?[0-9]+)?)?"
     },
+    "string_lit": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\""
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "PATTERN",
+            "value": "."
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
+      ]
+    },
+    "bool_lit": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "true"
+        },
+        {
+          "type": "STRING",
+          "value": "false"
+        }
+      ]
+    },
+    "null_lit": {
+      "type": "STRING",
+      "value": "null"
+    },
     "collection_value": {
       "type": "CHOICE",
       "members": [
@@ -336,23 +369,6 @@
       "type": "SYMBOL",
       "name": "identifier"
     },
-    "string_lit": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "\""
-        },
-        {
-          "type": "PATTERN",
-          "value": "\\w+"
-        },
-        {
-          "type": "STRING",
-          "value": "\""
-        }
-      ]
-    },
     "comment": {
       "type": "TOKEN",
       "content": {

src/node-types.json

@@ -60,6 +60,11 @@
       ]
     }
   },
+  {
+    "type": "bool_lit",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "collection_value",
     "named": true,
@@ -142,8 +147,16 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
+        {
+          "type": "bool_lit",
+          "named": true
+        },
+        {
+          "type": "null_lit",
+          "named": true
+        },
         {
           "type": "numeric_lit",
           "named": true
@@ -269,8 +282,8 @@
     "named": true
   },
   {
-    "type": "null",
-    "named": false
+    "type": "null_lit",
+    "named": true
   },
   {
     "type": "numeric_lit",