Merge pull request #80 from kit494way/fix-null

Fix parsing of null
nushell · Feb 5, 2024 · d0210a0 · d0210a0
2 parents 358c4f5 + 6e8ebb6
commit d0210a0
Show file tree

Hide file tree

Showing 6 changed files with 212,508 additions and 207,689 deletions.
diff --git a/corpus/expr/values.nu b/corpus/expr/values.nu
@@ -47,14 +47,19 @@ values-002-booleans
 values-003-nothing
 =====
 
-null
+[
+  null
+  ()
+]
 
 -----
 
 (nu_script
   (pipeline
     (pipe_element
-      (val_nothing))))
+      (val_list
+        (val_nothing)
+        (val_nothing)))))
 
 =====
 values-004-binary

diff --git a/grammar.js b/grammar.js
@@ -862,7 +862,11 @@ module.exports = grammar({
       ),
 
     /// Literals
-    val_nothing: ($) => SPECIAL().null,
+    val_nothing: ($) =>
+      choice(
+        SPECIAL().null,
+        seq(token(BRACK().open_paren), token.immediate(BRACK().close_paren)),
+      ),
 
     val_bool: ($) => choice(SPECIAL().true, SPECIAL().false),
 
@@ -871,7 +875,7 @@ module.exports = grammar({
     _var: ($) =>
       seq(
         PUNC().dollar,
-        field("name", choice("nu", "in", "env", "nothing", $.identifier)),
+        field("name", choice("nu", "in", "env", $.identifier)),
       ),
 
     val_number: ($) => $._val_number,

diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
@@ -262,7 +262,6 @@
    "in"
    "nu"
    "env"
-   "nothing"
    ] @special
 )
 ;;; ---

diff --git a/src/grammar.json b/src/grammar.json
@@ -7994,8 +7994,32 @@
       ]
     },
     "val_nothing": {
-      "type": "STRING",
-      "value": "null"
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "null"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "("
+              }
+            },
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": ")"
+              }
+            }
+          ]
+        }
+      ]
     },
     "val_bool": {
       "type": "CHOICE",
@@ -8057,10 +8081,6 @@
                 "type": "STRING",
                 "value": "env"
               },
-              {
-                "type": "STRING",
-                "value": "nothing"
-              },
               {
                 "type": "SYMBOL",
                 "name": "identifier"

diff --git a/src/node-types.json b/src/node-types.json
@@ -4652,6 +4652,11 @@
       ]
     }
   },
+  {
+    "type": "val_nothing",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "val_number",
     "named": true,
@@ -4818,10 +4823,6 @@
             "type": "in",
             "named": false
           },
-          {
-            "type": "nothing",
-            "named": false
-          },
           {
             "type": "nu",
             "named": false
@@ -5925,6 +5926,10 @@
     "type": "nu",
     "named": false
   },
+  {
+    "type": "null",
+    "named": false
+  },
   {
     "type": "number",
     "named": false
@@ -6081,10 +6086,6 @@
     "type": "val_date",
     "named": true
   },
-  {
-    "type": "val_nothing",
-    "named": true
-  },
   {
     "type": "var-with-opt-type",
     "named": false
-Original file line number
+Diff line change
@@ Expand Up / @@ -262,7 +262,6 @@ @@
        "in"
        "nu"
        "env"
-       "nothing"
        ] @special
     )
     ;;; ---
@@ Expand Down @@