Version 0.8.0 for Uiua 0.5.1 (#22)

* modified: ChangeLog.md * modified: flake.lock * add `?`, remove removed glyphs by Uiua-0.5.0 * add a new category formatter for '\'' and '\'\'' * render `formatter` as `keyword.directive`
shnarazk · Dec 3, 2023 · c917a6c · c917a6c
1 parent fdae3c8
commit c917a6c
Show file tree

Hide file tree

Showing 9 changed files with 40,551 additions and 40,104 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-uiua"
 description = "Uiua grammar for the tree-sitter parsing library"
-version = "0.7.0"
+version = "0.8.0"
 keywords = ["incremental", "parsing", "Uiua"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-uiua"

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,23 @@
 # Changelog
 
+### 0.8.0: 2023-12-03
+
+- follow Uiua-0.5.1
+    - add `stack`
+    - remove `reach`, `distribute`, `tribute`, `level`, `combinate`
+    - add `'` and `''`
+
+### 0.7.0: 2023-12-03
+
+- handle $-string known as multi-line string correctly
+
+### 0.6.0: 2023-12-01
+
+- follow Uiua-0.4.0
+    - add `rectify`, `this`, `recur`, and `fix`
+    - add `all`, `this`, `setinv`, and `setunder`
+    - deprecate `⟜`
+
 ### 0.5.0: 2023-11-20
 
 - follow Uiua-0.3.0

diff --git a/flake.lock b/flake.lock
diff --git a/grammar.js b/grammar.js
@@ -49,6 +49,7 @@ module.exports = grammar({
       $.identifier,
       $.identifierDeprecated,
       $.placeHolder,
+      $.formatter,
     ),
     inlineFunction: $ => seq(
       $.openParen,
@@ -109,6 +110,7 @@ module.exports = grammar({
     underscore:  $ => token('_'),
     leftArrow:   $ => token('←'),
     placeHolder: $ => seq('^', /[0-9]+(\.[0-9]+)?/),
+    formatter:   $ => choice(token('\''), token('\'\'')),
     branchSeparator: $=> token('|'),
     compound:    $ => choice(
       prec(1, seq(
@@ -375,6 +377,9 @@ module.exports = grammar({
       token('☇'),
       token('fix'),
       token('¤'),
+
+      // Since 0.5.0
+      token('?'),
     ),
     modifier1:   $ => choice(
       // (1[1], Reduce, AggregatingModifier, ("reduce", '/')),
@@ -470,12 +475,6 @@ module.exports = grammar({
       token('⌂'),
       token('↰'),
 
-      // Since 0.3.0
-      token('◳'),
-      token('≑'),
-      token('≐'),
-      token('∺'),
-
       // Since 0.4.0
       token('⟜'),
     ),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-uiua",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "parser for Uiua",
   "main": "bindings/node",
   "scripts": {

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -44,8 +44,11 @@
   "⋅"
 ] @tag
 
-
 [
   (deprecated)
   (identifierDeprecated)
 ] @warning
+
+[
+  (formatter)
+] @keyword.directive
diff --git a/src/grammar.json b/src/grammar.json
@@ -244,6 +244,10 @@
         {
           "type": "SYMBOL",
           "name": "placeHolder"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "formatter"
         }
       ]
     },
@@ -726,6 +730,25 @@
         }
       ]
     },
+    "formatter": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "'"
+          }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "''"
+          }
+        }
+      ]
+    },
     "branchSeparator": {
       "type": "TOKEN",
       "content": {
@@ -1904,6 +1927,13 @@
             "type": "STRING",
             "value": "¤"
           }
+        },
+        {
+          "type": "TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "?"
+          }
         }
       ]
     },
@@ -2340,34 +2370,6 @@
             "value": "↰"
           }
         },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "◳"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "≑"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "≐"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "∺"
-          }
-        },
         {
           "type": "TOKEN",
           "content": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -151,6 +151,11 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "formatter",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "function",
     "named": true,
@@ -362,6 +367,10 @@
           "type": "compound",
           "named": true
         },
+        {
+          "type": "formatter",
+          "named": true
+        },
         {
           "type": "identifier",
           "named": true
@@ -413,6 +422,14 @@
     "type": "%",
     "named": false
   },
+  {
+    "type": "'",
+    "named": false
+  },
+  {
+    "type": "''",
+    "named": false
+  },
   {
     "type": "*",
     "named": false
@@ -465,6 +482,10 @@
     "type": ">=",
     "named": false
   },
+  {
+    "type": "?",
+    "named": false
+  },
   {
     "type": "Arch",
     "named": false
@@ -1109,22 +1130,10 @@
     "type": "∷",
     "named": false
   },
-  {
-    "type": "∺",
-    "named": false
-  },
   {
     "type": "≍",
     "named": false
   },
-  {
-    "type": "≐",
-    "named": false
-  },
-  {
-    "type": "≑",
-    "named": false
-  },
   {
     "type": "≠",
     "named": false
@@ -1313,10 +1322,6 @@
     "type": "◫",
     "named": false
   },
-  {
-    "type": "◳",
-    "named": false
-  },
   {
     "type": "◿",
     "named": false