Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uiua-0.13.0 #35

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tree-sitter-uiua"
description = "Uiua grammar for the tree-sitter parsing library"
version = "0.11.0"
version = "0.13.0"
keywords = ["incremental", "parsing", "Uiua"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/tree-sitter/tree-sitter-uiua"
@@ -20,7 +20,7 @@ include = [
path = "bindings/rust/lib.rs"

[dependencies]
tree-sitter = "~0.20.10"
tree-sitter = "^0.24"

[build-dependencies]
cc = "1.0"
51 changes: 37 additions & 14 deletions grammar.js
Original file line number Diff line number Diff line change
@@ -117,6 +117,7 @@ module.exports = grammar({
// Media
token('Logo'),
token('Lena'),
token('Cats'),
token('Music'),
token('Lorem'),
// System
@@ -141,6 +142,7 @@ module.exports = grammar({
token('Skin'),
token('People'),
token('Hair'),
token('Lorem'),

// End of other constants
),
@@ -185,7 +187,7 @@ module.exports = grammar({
$.function,
$.modifier1,
$.modifier2,
$.macro,
// $.macro,
$.deprecated,
),
constant: $ => choice(
@@ -470,12 +472,20 @@ module.exports = grammar({
token('auden'),
token('utf₈'),
token('datetime'),
token('chunk'),
token('⑄'),
token('choose'),
token('permute'),
token('orient'),
token('⤸'),
token('fft'),
token('graphemes'),
token('timezone'),
token('around'),
token('’'),
token('base'),
token('sort'),
token('⍆'),
token('last'),
token('⊣'),

// End of function
),
@@ -533,14 +543,24 @@ module.exports = grammar({
token('triangle'),
token('◹'),
token('astar'),
token('but'),
token('⤙'),
token('with'),
token('⤙'),
token('off'),
token('⤚'),
token('above'),
token('◠'),
token('below'),
token('◡'),

// Since 0.13.0
token('anti'),
token('⌝'),
token('obverse'),
token('⌅'),
token('tuples'),
token('⧅'),
token('/₁₂₃₄₅₆₇₈₉₀/')

// End of modifier1
),
modifier2: $ => choice(
@@ -579,10 +599,6 @@ module.exports = grammar({
token('do'),
token('⍢'),

// Since 0.4.0
token('setinv'),
token('setunder'),

// Since 0.9.0
token('f'),

@@ -593,9 +609,9 @@ module.exports = grammar({

// End of modifier2
),
macro: $ => choice(
token('struct'),
),
// macro: $ => choice(
// token('struct'),
// ),
deprecated: $ => choice(
token('❥'),
token('→'),
@@ -631,8 +647,8 @@ module.exports = grammar({
// token('types'), removed at 0.11.0

// Since 0.11.0
token('strands'),
token('‿'),
// token('strands'),
// token('‿'),

// Since 0.12.0
// (2, Member, DyadicArray, ("member", '∊')),
@@ -643,6 +659,13 @@ module.exports = grammar({
token('λ'),
token('⋊'),

// Since 0.13.0
token('chunk'),
token('⑄'),
token('setinv'),
token('setund'),
token('struct'),

// End of deprecated
),
// _whitespace: $ => /[ \t]+/,
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tree-sitter-uiua",
"version": "0.11.0",
"version": "0.13.0",
"description": "parser for Uiua",
"main": "bindings/node",
"scripts": {
@@ -32,4 +32,4 @@
"directories": {
"test": "test"
}
}
}
Loading