1
0

Compare commits

..

No commits in common. "02cded4af4d113b32f1f62f14a288dabe0e8c58e" and "0c37e5e3a6a5fd00f1300f13047cbc83c4b5ab58" have entirely different histories.

21 changed files with 8899 additions and 14796 deletions

View File

@ -7,14 +7,16 @@ async { (output 'Whaddup') }
---
(root
(statement
(async
(statement
(expression
(tool
(item
(statement
(async
(item
(statement
(expression
(value
(string)))))))))
(tool
(expression
(value
(string)))))))))))
==================
Complex Async Statements
@ -33,35 +35,40 @@ async {
---
(root
(statement
(async
(statement
(if_else
(if
(expression
(logic
(item
(statement
(async
(item
(statement
(if_else
(if
(expression
(math
(logic
(expression
(value
(integer)))
(math_operator)
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(statement
(expression
(value
(boolean)))))
(else
(statement
(expression
(value
(boolean))))))
(expression
(value
(string)))))))
(item
(statement
(expression
(value
(boolean))))))
(else
(item
(statement
(expression
(value
(boolean))))))))
(statement
(expression
(value
(string)))))))))

View File

@ -0,0 +1,240 @@
==================
If
==================
if true { "True" }
---
(root
(item
(statement
(if_else
(if
(expression
(value
(boolean)))
(item
(statement
(expression
(value
(string))))))))))
==================
Complex If
==================
if (1 == 1) && (2 == 2) && (3 == 3) { "True" }
---
(root
(item
(statement
(if_else
(if
(expression
(logic
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(logic
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))))))
(item
(statement
(expression
(value
(string))))))))))
==================
If Assignment
==================
x = if true { 1 }
---
(root
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(if_else
(if
(expression
(value
(boolean)))
(item
(statement
(expression
(value
(integer))))))))))))
==================
If Else
==================
if false { "True" } else { "False" }
---
(root
(item
(statement
(if_else
(if
(expression
(value
(boolean)))
(item
(statement
(expression
(value
(string))))))
(else
(item
(statement
(expression
(value
(string))))))))))
==================
If Else If
==================
if 1 == 1 {
"math is fun"
} else if 4 == 9 {
"math is broken"
}
---
(root
(item
(statement
(if_else
(if
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(string))))))
(else_if
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(string))))))))))
==================
If Else Else If Else
==================
if false {
"no"
} else if false {
"no"
} else if 1 + 1 == 9 {
"not the answer"
} else {
"42"
}
---
(root
(item
(statement
(if_else
(if
(expression
(value
(boolean)))
(item
(statement
(expression
(value
(string))))))
(else_if
(expression
(value
(boolean)))
(item
(statement
(expression
(value
(string))))))
(else_if
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(string))))))
(else
(item
(statement
(expression
(value
(string))))))))))

View File

@ -1,5 +1,5 @@
==================
Simple Filter Loop
Filter Loop
==================
filter i in [1, 2, 3] {
@ -9,54 +9,23 @@ filter i in [1, 2, 3] {
---
(root
(statement
(filter
(identifier)
(expression
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(statement
(item
(statement
(filter
(identifier)
(expression
(logic
(expression
(identifier))
(logic_operator)
(expression
(value
(integer)))))))))
==================
Nested Filter Loop
==================
filter i in big_list {
filter j in i {
i != 42
}
}
---
(root
(statement
(filter
(identifier)
(expression
(identifier))
(statement
(filter
(identifier)
(expression
(identifier))
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(item
(statement
(expression
(logic
@ -66,3 +35,45 @@ filter i in big_list {
(expression
(value
(integer)))))))))))
==================
Filter Loop Assignment
==================
list = filter i in ["one", "two", "three"] {
i == "one"
}
---
(root
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(filter
(identifier)
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(string)))
(expression
(value
(string))))))
(item
(statement
(expression
(logic
(expression
(identifier))
(logic_operator)
(expression
(value
(string)))))))))))))

View File

@ -1,5 +1,5 @@
==================
Simple Find Loop
Find Loop
==================
find i in [1, 2, 3] {
@ -9,75 +9,65 @@ find i in [1, 2, 3] {
---
(root
(statement
(find
(identifier)
(expression
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(statement
(item
(statement
(find
(identifier)
(expression
(logic
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(item
(statement
(expression
(identifier))
(logic_operator)
(expression
(value
(integer)))))))))
(logic
(expression
(identifier))
(logic_operator)
(expression
(value
(integer)))))))))))
==================
Nested Find Loop
Find Loop Assignment
==================
find i in ["one", "two", "three"] {
found = find j in i {
i == "e"
}
if (type found) != 'empty' {
true
} else {
false
}
found = find i in ["one", "two", "three"] {
i == "three"
}
---
(root
(statement
(find
(identifier)
(expression
(value
(list
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(find
(identifier)
(expression
(value
(string)))
(expression
(value
(string)))
(expression
(value
(string))))))
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(find
(identifier)
(expression
(identifier))
(list
(expression
(value
(string)))
(expression
(value
(string)))
(expression
(value
(string))))))
(item
(statement
(expression
(logic
@ -86,25 +76,4 @@ find i in ["one", "two", "three"] {
(logic_operator)
(expression
(value
(string)))))))))
(if_else
(if
(expression
(logic
(expression
(tool
(expression
(identifier))))
(logic_operator)
(expression
(value
(string)))))
(statement
(expression
(value
(boolean)))))
(else
(statement
(expression
(value
(boolean))))))))))
(string)))))))))))))

View File

@ -9,26 +9,28 @@ for i in [1, 2, 3] {
---
(root
(statement
(for
(identifier)
(expression
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(statement
(item
(statement
(for
(identifier)
(expression
(tool
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(item
(statement
(expression
(identifier))))))))
(tool
(expression
(identifier))))))))))
==================
Nested For Loop
@ -43,18 +45,21 @@ for list in list_of_lists {
---
(root
(statement
(for
(identifier)
(expression
(identifier))
(statement
(for
(identifier)
(expression
(identifier))
(item
(statement
(for
(identifier)
(expression
(identifier))
(item
(statement
(expression
(tool
(expression
(identifier))))))))))
(for
(identifier)
(expression
(identifier))
(item
(statement
(expression
(tool
(expression
(identifier)))))))))))))

View File

@ -7,14 +7,16 @@ function { "Hiya" }
---
(root
(statement
(expression
(value
(function
(statement
(expression
(value
(string)))))))))
(item
(statement
(expression
(value
(function
(item
(statement
(expression
(value
(string)))))))))))
==================
Function Call
@ -25,13 +27,14 @@ Function Call
---
(root
(statement
(expression
(function_call
(identifier)
(expression
(value
(string)))))))
(item
(statement
(expression
(function_call
(identifier)
(expression
(value
(string))))))))
==================
Complex Function
@ -45,21 +48,24 @@ function <message number> {
---
(root
(statement
(expression
(value
(function
(identifier)
(identifier)
(statement
(expression
(tool
(item
(statement
(expression
(value
(function
(identifier)
(identifier)
(item
(statement
(expression
(identifier))))
(expression
(tool
(tool
(expression
(identifier)))))
(statement
(expression
(identifier))))))))))
(tool
(expression
(identifier))))))))))))
==================
Complex Function Call
@ -77,24 +83,25 @@ Complex Function Call
---
(root
(statement
(expression
(function_call
(identifier)
(expression
(value
(string)))
(expression
(value
(integer)))
(expression
(value
(map
(identifier)
(expression
(value
(integer)))
(identifier)
(expression
(value
(integer))))))))))
(item
(statement
(expression
(function_call
(identifier)
(expression
(value
(string)))
(expression
(value
(integer)))
(expression
(value
(map
(identifier)
(expression
(value
(integer)))
(identifier)
(expression
(value
(integer)))))))))))

View File

@ -9,12 +9,15 @@ __xyz__
---
(root
(statement
(expression
(identifier)))
(statement
(expression
(identifier)))
(statement
(expression
(identifier))))
(item
(statement
(expression
(identifier))))
(item
(statement
(expression
(identifier))))
(item
(statement
(expression
(identifier)))))

View File

@ -1,242 +0,0 @@
==================
Simple If
==================
if true { "True" }
---
(root
(statement
(if_else
(if
(expression
(value
(boolean)))
(statement
(expression
(value
(string))))))))
==================
Complex If
==================
if 1 == 1 && 2 == 2 && 3 == 3 { "True" }
---
(root
(statement
(if_else
(if
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))))))))))
(statement
(expression
(value
(string))))))))
==================
Nested If
==================
if true {
if 42 == 12 {
'hiya'
} else {
'bye'
}
}
---
(root
(statement
(if_else
(if
(expression
(value
(boolean)))
(statement
(if_else
(if
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(statement
(expression
(value
(string)))))
(else
(statement
(expression
(value
(string)))))))))))
==================
If Else
==================
if false { "True" } else { "False" }
---
(root
(statement
(if_else
(if
(expression
(value
(boolean)))
(statement
(expression
(value
(string)))))
(else
(statement
(expression
(value
(string))))))))
==================
If Else If
==================
if 1 == 1 {
"math is fun"
} else if 4 == 9 {
"math is broken"
}
---
(root
(statement
(if_else
(if
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(statement
(expression
(value
(string)))))
(else_if
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(integer)))))
(statement
(expression
(value
(string))))))))
==================
If Else Else If Else
==================
if false {
"no"
} else if false {
"no"
} else if 1 + 1 == 9 {
"not the answer"
} else {
"42"
}
---
(root
(statement
(if_else
(if
(expression
(value
(boolean)))
(statement
(expression
(value
(string)))))
(else_if
(expression
(value
(boolean)))
(statement
(expression
(value
(string)))))
(else_if
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(statement
(expression
(value
(string)))))
(else
(statement
(expression
(value
(string))))))))

View File

@ -1,5 +1,5 @@
==================
Simple Indexes
Indexing
==================
dust_data:1:name
@ -11,82 +11,70 @@ foobar:1:42
---
(root
(statement
(expression
(index
(expression
(index
(expression
(identifier))
(expression
(value
(integer)))))
(expression
(identifier)))))
(statement
(expression
(index
(expression
(identifier))
(expression
(identifier)))))
(statement
(expression
(index
(expression
(index
(expression
(identifier))
(expression
(value
(integer)))))
(expression
(value
(integer)))))))
(item
(statement
(expression
(index
(expression
(index
(expression
(identifier))
(expression
(value
(integer)))))
(expression
(identifier))))))
(item
(statement
(expression
(index
(expression
(identifier))
(expression
(identifier))))))
(item
(statement
(expression
(index
(expression
(index
(expression
(identifier))
(expression
(value
(integer)))))
(expression
(value
(integer))))))))
==================
Nested Indexes
Sublist
==================
[['answers' 'foobar'], 42, 666]:0:1:0..2
['answers', 42, 666]:1..2
---
(root
(statement
(expression
(index
(expression
(index
(expression
(index
(item
(statement
(expression
(index
(expression
(value
(list
(expression
(value
(list
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(string))))))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(string)))
(expression
(value
(integer)))))
(expression
(value
(integer)))))
(expression
(value
(integer)))
(expression
(value
(integer)))))))
(integer)))
(expression
(value
(integer))))))
(expression
(value
(integer)))
(expression
(value
(integer))))))))

View File

@ -7,16 +7,49 @@ List Declaration
---
(root
(statement
(expression
(value
(list
(item
(statement
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer)))))))))
==================
List Assignment
==================
empty = []
foobar = ['foobar']
---
(root
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(string)))
(list)))))))
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(integer))))))))
(list
(expression
(value
(string)))))))))))
==================
List Nesting
@ -27,22 +60,23 @@ List Nesting
---
(root
(statement
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(list
(expression
(value
(integer)))
(expression
(value
(list
(expression
(value
(integer))))))))))))))
(item
(statement
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(list
(expression
(value
(integer)))
(expression
(value
(list
(expression
(value
(integer)))))))))))))))

View File

@ -2,62 +2,44 @@
Simple Map
==================
{ answer = 42 }
---
(root
(statement
(expression
(value
(map
(identifier)
(expression
(value
(integer))))))))
==================
Nested Maps
==================
x = {
y = {
foo = 'bar'
z = {
message = 'hiya'
}
}
f = 12
{
answer = 42
}
---
(root
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(map
(identifier)
(expression
(value
(map
(identifier)
(expression
(value
(string)))
(identifier)
(expression
(value
(map
(identifier)
(expression
(value
(string)))))))))
(identifier)
(expression
(value
(integer))))))))))
(item
(statement
(expression
(value
(map
(identifier)
(expression
(value
(integer)))))))))
==================
Map Assignment
==================
x = {
answer = 42
}
---
(root
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(map
(identifier)
(expression
(value
(integer)))))))))))

View File

@ -7,89 +7,139 @@ Equality
---
(root
(statement
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(math
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(math_operator)
(expression
(value
(integer)))))))))
(item
(statement
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(math
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(math_operator)
(expression
(value
(integer))))))))))
==================
&&
==================
4 + 2 == 42 && true
(((4 + 2) == 42) && true)
---
(root
(statement
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(boolean)))))))))
(item
(statement
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(boolean)))))))))
(item
(statement
(expression
(logic
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(boolean))))))))
==================
\||
==================
4 + 2 == 42 || true
((4 + 2) == 42) || true
---
(root
(statement
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(boolean)))))))))
(item
(statement
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(value
(boolean)))))))))
(item
(statement
(expression
(logic
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(boolean))))))))

View File

@ -8,14 +8,16 @@ false
---
(root
(statement
(expression
(value
(boolean))))
(statement
(expression
(value
(boolean)))))
(item
(statement
(expression
(value
(boolean)))))
(item
(statement
(expression
(value
(boolean))))))
==================
Integers
@ -27,26 +29,31 @@ Integers
---
(root
(statement
(expression
(value
(integer))))
(statement
(expression
(value
(integer))))
(statement
(expression
(value
(integer))))
(statement
(expression
(value
(integer))))
(statement
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(integer))))))
==================
Strings
@ -57,23 +64,28 @@ Strings
---
(root
(statement
(expression
(value
(string))))
(statement
(expression
(value
(string))))
(statement
(expression
(value
(string))))
(statement
(expression
(value
(string))))
(item
(statement
(expression
(value
(string)))))
(item
(statement
(expression
(value
(string)))))
(item
(statement
(expression
(value
(string)))))
(item
(statement
(expression
(value
(string)))))
(item
(statement
(expression
(value
(string))))))

View File

@ -9,17 +9,20 @@ x
---
(root
(statement
(expression
(value
(integer))))
(statement
(expression
(value
(string))))
(statement
(expression
(identifier))))
(item
(statement
(expression
(value
(integer)))))
(item
(statement
(expression
(value
(string)))))
(item
(statement
(expression
(identifier)))))
==================
Simple Assignment
@ -31,100 +34,83 @@ y = "one"
---
(root
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(integer))))))
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(string)))))))
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(integer)))))))
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(string))))))))
==================
Complex Assignment
==================
x = if 1 + 1 == 2 {
'yo'
} else {
'no'
}
x = 1 + 1
---
(root
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(if_else
(if
(expression
(logic
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(logic_operator)
(expression
(value
(integer)))))
(statement
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(math
(expression
(value
(string)))))
(else
(statement
(integer)))
(math_operator)
(expression
(value
(string))))))))))
(integer))))))))))
==================
Expression Precedence
==================
x = 3 == 1 + 2 + 2
x = (3 == (1 + (2 + 2)))
---
(root
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(math
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer)))))
(math_operator)
(expression
(value
(integer)))))))))))
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(logic
(expression
(value
(integer)))
(logic_operator)
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(math
(expression
(value
(integer)))
(math_operator)
(expression
(value
(integer))))))))))))))

View File

@ -11,42 +11,79 @@ table <messages, numbers> [
---
(root
(statement
(expression
(value
(table
(identifier)
(identifier)
(item
(statement
(expression
(value
(table
(identifier)
(identifier)
(expression
(value
(list
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer))))))
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer))))))
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(float)))))))))))))))
==================
Table Assignment
==================
foobar = table <text, number> [
['answer', 42]
]
---
(root
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(expression
(value
(list
(table
(identifier)
(identifier)
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer))))))
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer))))))
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(float))))))))))))))
(list
(expression
(value
(string)))
(expression
(value
(integer)))))))))))))))))
==================
Table Access
==================
@ -58,20 +95,22 @@ select <number> from foobar {
---
(root
(statement
(select
(identifier)
(expression
(identifier))
(statement
(item
(statement
(select
(identifier)
(expression
(logic
(identifier))
(item
(statement
(expression
(identifier))
(logic_operator)
(expression
(value
(string)))))))))
(logic
(expression
(identifier))
(logic_operator)
(expression
(value
(string)))))))))))
==================
Table Insert
@ -84,18 +123,19 @@ insert into foobar [
---
(root
(statement
(insert
(identifier)
(expression
(value
(list
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer))))))))))))
(item
(statement
(insert
(identifier)
(expression
(value
(list
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(integer)))))))))))))

View File

@ -9,74 +9,63 @@ transform i in [1, 2, 3] {
---
(root
(statement
(transform
(identifier)
(expression
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(statement
(item
(statement
(transform
(identifier)
(expression
(tool
(value
(list
(expression
(value
(integer)))
(expression
(value
(integer)))
(expression
(value
(integer))))))
(item
(statement
(expression
(identifier))))))))
(tool
(expression
(identifier))))))))))
==================
Nested Transform Loop
Transform Loop Assignment
==================
transform i in [['one'] ['two'] ['three']] {
transform j in i {
j += 'foobar'
}
list = transform i in ["one", "two", "three"] {
(output i)
}
---
(root
(statement
(transform
(identifier)
(expression
(value
(list
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(transform
(identifier)
(expression
(value
(list
(expression
(value
(string)))
(expression
(value
(string)))
(expression
(value
(string))))))
(expression
(value
(list
(expression
(value
(string))))))
(expression
(value
(list
(expression
(value
(string)))))))))
(statement
(transform
(identifier)
(expression
(identifier))
(statement
(assignment
(identifier)
(assignment_operator)
(item
(statement
(expression
(value
(string)))))))))))
(tool
(expression
(identifier))))))))))))

View File

@ -9,58 +9,42 @@ while true {
---
(root
(statement
(while
(expression
(value
(boolean)))
(statement
(item
(statement
(while
(expression
(tool
(value
(boolean)))
(item
(statement
(expression
(value
(string)))))))))
(tool
(expression
(value
(string)))))))))))
==================
Nested While Loop
While Loop Assignment
==================
while true {
x = 4
while x > 0 {
x -= 1
}
answer = while false {
42
}
---
(root
(statement
(while
(expression
(value
(boolean)))
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(item
(statement
(assignment
(identifier)
(assignment_operator)
(statement
(while
(expression
(value
(integer)))))
(while
(expression
(logic
(expression
(identifier))
(logic_operator)
(expression
(value
(integer)))))
(statement
(assignment
(identifier)
(assignment_operator)
(boolean)))
(item
(statement
(expression
(value

View File

@ -11,8 +11,8 @@ module.exports = grammar({
comment: $ => /[#][^#\n]*[#|\n]/,
statement: $ => prec.left(choice(
repeat1($._statement_kind),
seq('{', repeat1($._statement_kind), '}'),
$._statement_kind,
seq('{', $._statement_kind, '}'),
)),
_statement_kind: $ => prec.left(choice(
@ -37,7 +37,7 @@ module.exports = grammar({
seq('(', $._expression_kind, ')'),
),
_expression_kind: $ => prec.right(choice(
_expression_kind: $ => prec.left(choice(
$.function_call,
$.identifier,
$.index,
@ -60,19 +60,9 @@ module.exports = grammar({
$.map,
),
integer: $ => prec.left(token(seq(
optional('-'),
repeat1(
choice('1', '2', '3', '4', '5', '6', '7', '8', '9', '0')
),
))),
integer: $ => /0[bB][01](_?[01])*|0[oO]?[0-7](_?[0-7])*|(0[dD])?\d(_?\d)*|0[xX][0-9a-fA-F](_?[0-9a-fA-F])*/,
float: $ => prec.left(token(seq(
optional('-'),
repeat1(choice('1', '2', '3', '4', '5', '6', '7', '8', '9', '0')),
'.',
repeat1(choice('1', '2', '3', '4', '5', '6', '7', '8', '9', '0')),
))),
float: $ => /\d(_?\d)*(\.\d)?(_?\d)*([eE][\+-]?\d(_?\d)*)?/,
string: $ => /("[^"]*?")|('[^']*?')|(`[^`]*?`)/,
@ -83,18 +73,13 @@ module.exports = grammar({
list: $ => seq(
'[',
repeat(prec.left(seq($.expression, optional(',')))),
repeat(seq($.expression, optional(','))),
']',
),
map: $ => seq(
'{',
repeat(seq(
$.identifier,
'=',
$.expression,
optional(',')
)),
$.assignment,
'}',
),
@ -128,13 +113,13 @@ module.exports = grammar({
$.expression,
)),
math_operator: $ => token(choice(
math_operator: $ => choice(
'+',
'-',
'*',
'/',
'%',
)),
),
logic: $ => prec.right(seq(
$.expression,
@ -142,7 +127,7 @@ module.exports = grammar({
$.expression,
)),
logic_operator: $ => token(choice(
logic_operator: $ => choice(
'==',
'!=',
'&&',
@ -151,7 +136,7 @@ module.exports = grammar({
'<',
">=",
"<=",
)),
),
assignment: $ => prec.right(seq(
$.identifier,
@ -159,11 +144,11 @@ module.exports = grammar({
$.statement,
)),
assignment_operator: $ => token(choice(
assignment_operator: $ => choice(
"=",
"+=",
"-=",
)),
),
if_else: $ => prec.left(seq(
$.if,
@ -197,7 +182,7 @@ module.exports = grammar({
function_call: $ => seq(
'(',
$.identifier,
repeat(prec.left(seq($.expression, optional(',')))),
repeat(seq($.expression, optional(','))),
')',
),
@ -304,13 +289,15 @@ module.exports = grammar({
async: $ => seq(
'async',
'{',
$.statement,
repeat($.statement),
'}'
),
tool: $ => prec.right(seq(
'(',
$._tool_kind,
repeat(prec.left(seq($.expression, optional(',')))),
repeat(seq($.expression, optional(','))),
')',
)),
_tool_kind: $ => choice(
@ -330,6 +317,7 @@ module.exports = grammar({
'metadata',
'move',
'read',
'remove',
'write',
// Format conversion

View File

@ -20,11 +20,8 @@
"type": "CHOICE",
"members": [
{
"type": "REPEAT1",
"content": {
"type": "SYMBOL",
"name": "_statement_kind"
}
"type": "SYMBOL",
"name": "_statement_kind"
},
{
"type": "SEQ",
@ -34,11 +31,8 @@
"value": "{"
},
{
"type": "REPEAT1",
"content": {
"type": "SYMBOL",
"name": "_statement_kind"
}
"type": "SYMBOL",
"name": "_statement_kind"
},
{
"type": "STRING",
@ -141,7 +135,7 @@
]
},
"_expression_kind": {
"type": "PREC_RIGHT",
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "CHOICE",
@ -219,200 +213,12 @@
]
},
"integer": {
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "TOKEN",
"content": {
"type": "SEQ",
"members": [
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "-"
},
{
"type": "BLANK"
}
]
},
{
"type": "REPEAT1",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "1"
},
{
"type": "STRING",
"value": "2"
},
{
"type": "STRING",
"value": "3"
},
{
"type": "STRING",
"value": "4"
},
{
"type": "STRING",
"value": "5"
},
{
"type": "STRING",
"value": "6"
},
{
"type": "STRING",
"value": "7"
},
{
"type": "STRING",
"value": "8"
},
{
"type": "STRING",
"value": "9"
},
{
"type": "STRING",
"value": "0"
}
]
}
}
]
}
}
"type": "PATTERN",
"value": "0[bB][01](_?[01])*|0[oO]?[0-7](_?[0-7])*|(0[dD])?\\d(_?\\d)*|0[xX][0-9a-fA-F](_?[0-9a-fA-F])*"
},
"float": {
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "TOKEN",
"content": {
"type": "SEQ",
"members": [
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "-"
},
{
"type": "BLANK"
}
]
},
{
"type": "REPEAT1",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "1"
},
{
"type": "STRING",
"value": "2"
},
{
"type": "STRING",
"value": "3"
},
{
"type": "STRING",
"value": "4"
},
{
"type": "STRING",
"value": "5"
},
{
"type": "STRING",
"value": "6"
},
{
"type": "STRING",
"value": "7"
},
{
"type": "STRING",
"value": "8"
},
{
"type": "STRING",
"value": "9"
},
{
"type": "STRING",
"value": "0"
}
]
}
},
{
"type": "STRING",
"value": "."
},
{
"type": "REPEAT1",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "1"
},
{
"type": "STRING",
"value": "2"
},
{
"type": "STRING",
"value": "3"
},
{
"type": "STRING",
"value": "4"
},
{
"type": "STRING",
"value": "5"
},
{
"type": "STRING",
"value": "6"
},
{
"type": "STRING",
"value": "7"
},
{
"type": "STRING",
"value": "8"
},
{
"type": "STRING",
"value": "9"
},
{
"type": "STRING",
"value": "0"
}
]
}
}
]
}
}
"type": "PATTERN",
"value": "\\d(_?\\d)*(\\.\\d)?(_?\\d)*([eE][\\+-]?\\d(_?\\d)*)?"
},
"string": {
"type": "PATTERN",
@ -438,60 +244,11 @@
"type": "STRING",
"value": "["
},
{
"type": "REPEAT",
"content": {
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
}
}
},
{
"type": "STRING",
"value": "]"
}
]
},
"map": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "{"
},
{
"type": "REPEAT",
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "identifier"
},
{
"type": "STRING",
"value": "="
},
{
"type": "SYMBOL",
"name": "expression"
@ -511,6 +268,23 @@
]
}
},
{
"type": "STRING",
"value": "]"
}
]
},
"map": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "{"
},
{
"type": "SYMBOL",
"name": "assignment"
},
{
"type": "STRING",
"value": "}"
@ -701,32 +475,29 @@
}
},
"math_operator": {
"type": "TOKEN",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "+"
},
{
"type": "STRING",
"value": "-"
},
{
"type": "STRING",
"value": "*"
},
{
"type": "STRING",
"value": "/"
},
{
"type": "STRING",
"value": "%"
}
]
}
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "+"
},
{
"type": "STRING",
"value": "-"
},
{
"type": "STRING",
"value": "*"
},
{
"type": "STRING",
"value": "/"
},
{
"type": "STRING",
"value": "%"
}
]
},
"logic": {
"type": "PREC_RIGHT",
@ -750,44 +521,41 @@
}
},
"logic_operator": {
"type": "TOKEN",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "=="
},
{
"type": "STRING",
"value": "!="
},
{
"type": "STRING",
"value": "&&"
},
{
"type": "STRING",
"value": "||"
},
{
"type": "STRING",
"value": ">"
},
{
"type": "STRING",
"value": "<"
},
{
"type": "STRING",
"value": ">="
},
{
"type": "STRING",
"value": "<="
}
]
}
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "=="
},
{
"type": "STRING",
"value": "!="
},
{
"type": "STRING",
"value": "&&"
},
{
"type": "STRING",
"value": "||"
},
{
"type": "STRING",
"value": ">"
},
{
"type": "STRING",
"value": "<"
},
{
"type": "STRING",
"value": ">="
},
{
"type": "STRING",
"value": "<="
}
]
},
"assignment": {
"type": "PREC_RIGHT",
@ -811,24 +579,21 @@
}
},
"assignment_operator": {
"type": "TOKEN",
"content": {
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "="
},
{
"type": "STRING",
"value": "+="
},
{
"type": "STRING",
"value": "-="
}
]
}
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": "="
},
{
"type": "STRING",
"value": "+="
},
{
"type": "STRING",
"value": "-="
}
]
},
"if_else": {
"type": "PREC_LEFT",
@ -952,29 +717,25 @@
{
"type": "REPEAT",
"content": {
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
}
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
}
},
{
@ -1398,8 +1159,11 @@
"value": "{"
},
{
"type": "SYMBOL",
"name": "statement"
"type": "REPEAT",
"content": {
"type": "SYMBOL",
"name": "statement"
}
},
{
"type": "STRING",
@ -1413,6 +1177,10 @@
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{
"type": "SYMBOL",
"name": "_tool_kind"
@ -1420,30 +1188,30 @@
{
"type": "REPEAT",
"content": {
"type": "PREC_LEFT",
"value": 0,
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
}
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
}
},
{
"type": "STRING",
"value": ")"
}
]
}
@ -1503,6 +1271,10 @@
"type": "STRING",
"value": "read"
},
{
"type": "STRING",
"value": "remove"
},
{
"type": "STRING",
"value": "write"

View File

@ -22,13 +22,18 @@
]
}
},
{
"type": "assignment_operator",
"named": true,
"fields": {}
},
{
"type": "async",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"multiple": true,
"required": false,
"types": [
{
"type": "statement",
@ -184,11 +189,6 @@
]
}
},
{
"type": "float",
"named": true,
"fields": {}
},
{
"type": "for",
"named": true,
@ -326,11 +326,6 @@
]
}
},
{
"type": "integer",
"named": true,
"fields": {}
},
{
"type": "list",
"named": true,
@ -365,20 +360,21 @@
]
}
},
{
"type": "logic_operator",
"named": true,
"fields": {}
},
{
"type": "map",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"multiple": false,
"required": true,
"types": [
{
"type": "expression",
"named": true
},
{
"type": "identifier",
"type": "assignment",
"named": true
}
]
@ -422,6 +418,11 @@
]
}
},
{
"type": "math_operator",
"named": true,
"fields": {}
},
{
"type": "reduce",
"named": true,
@ -511,7 +512,7 @@
"named": true,
"fields": {},
"children": {
"multiple": true,
"multiple": false,
"required": true,
"types": [
{
@ -692,6 +693,18 @@
]
}
},
{
"type": "!=",
"named": false
},
{
"type": "%",
"named": false
},
{
"type": "&&",
"named": false
},
{
"type": "(",
"named": false
@ -700,14 +713,38 @@
"type": ")",
"named": false
},
{
"type": "*",
"named": false
},
{
"type": "+",
"named": false
},
{
"type": "+=",
"named": false
},
{
"type": ",",
"named": false
},
{
"type": "-",
"named": false
},
{
"type": "-=",
"named": false
},
{
"type": "..",
"named": false
},
{
"type": "/",
"named": false
},
{
"type": ":",
"named": false
@ -716,10 +753,18 @@
"type": "<",
"named": false
},
{
"type": "<=",
"named": false
},
{
"type": "=",
"named": false
},
{
"type": "==",
"named": false
},
{
"type": "=>",
"named": false
@ -728,6 +773,10 @@
"type": ">",
"named": false
},
{
"type": ">=",
"named": false
},
{
"type": "[",
"named": false
@ -748,10 +797,6 @@
"type": "assert_equal",
"named": false
},
{
"type": "assignment_operator",
"named": true
},
{
"type": "async",
"named": false
@ -796,6 +841,10 @@
"type": "fish",
"named": false
},
{
"type": "float",
"named": true
},
{
"type": "for",
"named": false
@ -832,6 +881,10 @@
"type": "insert",
"named": false
},
{
"type": "integer",
"named": true
},
{
"type": "into",
"named": false
@ -840,18 +893,10 @@
"type": "length",
"named": false
},
{
"type": "logic_operator",
"named": true
},
{
"type": "match",
"named": false
},
{
"type": "math_operator",
"named": true
},
{
"type": "metadata",
"named": false
@ -972,6 +1017,10 @@
"type": "{",
"named": false
},
{
"type": "||",
"named": false
},
{
"type": "}",
"named": false

File diff suppressed because it is too large Load Diff