Version 0.11.2: conform to Uiua-0.11.0

shnarazk · Oct 20, 2024 · 9efbf32 · 9efbf32
1 parent 203ae18
commit 9efbf32
Show file tree

Hide file tree

Showing 5 changed files with 4,548 additions and 4,841 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -8,9 +8,9 @@
 
 - WIP conform to Uiua-0.12.0
 
-### 0.11.2: 2024-10-1X
+### 0.11.2: 2024-10-20
 
-- WIP conform to Uiua-0.11.0
+- conform to Uiua-0.11.0
 
 ### 0.11.1: 2024-10-18
 

diff --git a/grammar.js b/grammar.js
@@ -112,6 +112,12 @@ module.exports = grammar({
       token('NumProcs'),
       // FIXME: add Fun, Media
 
+      // Since 0.11.0
+      token('ThisFile'),
+      token('ThisFileName'),
+      token('ThisFileDir'),
+      token('WorkingDir'),
+
       // End of other constants
     ),
     character:   $ => prec(5,
@@ -430,8 +436,12 @@ module.exports = grammar({
       token('csv'),
       token('coordinate'),
       token('⟔'),
-      token('strands'),
-      token('‿'),
+
+      // Since 0.11
+      token('λ'),
+      token('⋊'),
+      token('json'),
+      token('xlsx'),
 
       // End of function
     ),
@@ -561,16 +571,20 @@ module.exports = grammar({
       token(';'),
 
       // Since 0.9.0
-      token('↬'),
-      token('↫'),
-      token('all'),
-      token('⋔'),
+      // token('↬'), removed at 0.11.0
+      // token('↫'), removed at 0.11.0
+      // token('all'), removed at 0.11.0
+      // token('⋔'), removed at 0.11.0
 
       // Since 0.10.0
-      token('bind'),
+      // token('bind'), removed at 0.11.0
       token('deal'),
-      token('shapes'),
-      token('types'),
+      // token('shapes'), removed at 0.11.0
+      // token('types'), removed at 0.11.0
+
+      // Since 0.11.0
+      token('strands'),
+      token('‿'),
 
       // End of deprecated
     ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -732,6 +732,34 @@
             "type": "STRING",
             "value": "NumProcs"
           }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "ThisFile"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "ThisFileName"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "ThisFileDir"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "WorkingDir"
+          }
         }
       ]
     },
@@ -2185,14 +2213,28 @@
           "type": "TOKEN",
           "content": {
             "type": "STRING",
-            "value": "strands"
+            "value": "λ"
           }
         },
         {
           "type": "TOKEN",
           "content": {
             "type": "STRING",
-            "value": "‿"
+            "value": "⋊"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "json"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "xlsx"
           }
         }
       ]
@@ -2693,41 +2735,6 @@
             "value": ";"
           }
         },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "↬"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "↫"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "all"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "⋔"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "bind"
-          }
-        },
         {
           "type": "TOKEN",
           "content": {
@@ -2739,14 +2746,14 @@
           "type": "TOKEN",
           "content": {
             "type": "STRING",
-            "value": "shapes"
+            "value": "strands"
           }
         },
         {
           "type": "TOKEN",
           "content": {
             "type": "STRING",
-            "value": "types"
+            "value": "‿"
           }
         }
       ]

diff --git a/src/node-types.json b/src/node-types.json
@@ -611,6 +611,10 @@
     "type": "WorkingDIr",
     "named": false
   },
+  {
+    "type": "WorkingDir",
+    "named": false
+  },
   {
     "type": "Yellow",
     "named": false
@@ -631,10 +635,6 @@
     "type": "absolute value",
     "named": false
   },
-  {
-    "type": "all",
-    "named": false
-  },
   {
     "type": "assert",
     "named": false
@@ -643,10 +643,6 @@
     "type": "atangent",
     "named": false
   },
-  {
-    "type": "bind",
-    "named": false
-  },
   {
     "type": "bits",
     "named": false
@@ -859,6 +855,10 @@
     "type": "join",
     "named": false
   },
+  {
+    "type": "json",
+    "named": false
+  },
   {
     "type": "keep",
     "named": false
@@ -1047,10 +1047,6 @@
     "type": "shape",
     "named": false
   },
-  {
-    "type": "shapes",
-    "named": false
-  },
   {
     "type": "sign",
     "named": false
@@ -1123,10 +1119,6 @@
     "type": "type",
     "named": false
   },
-  {
-    "type": "types",
-    "named": false
-  },
   {
     "type": "un",
     "named": false
@@ -1163,6 +1155,10 @@
     "type": "windows",
     "named": false
   },
+  {
+    "type": "xlsx",
+    "named": false
+  },
   {
     "type": "|",
     "named": false
@@ -1203,6 +1199,10 @@
     "type": "η",
     "named": false
   },
+  {
+    "type": "λ",
+    "named": false
+  },
   {
     "type": "π",
     "named": false
@@ -1251,14 +1251,6 @@
     "type": "↧",
     "named": false
   },
-  {
-    "type": "↫",
-    "named": false
-  },
-  {
-    "type": "↬",
-    "named": false
-  },
   {
     "type": "↯",
     "named": false
@@ -1416,7 +1408,7 @@
     "named": false
   },
   {
-    "type": "⋔",
+    "type": "⋊",
     "named": false
   },
   {