jeff/tree-sitter-dust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests for new grammar

Browse Source
This commit is contained in:
Jeff 2023-10-01 01:13:29 -04:00
parent 17ba01c0dc
commit 8c05154e43
9 changed files with 10824 additions and 7569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
corpus/control_flow.txt
View File

@ -9,17 +9,15 @@ if true then "True"
(root
(item
(statement
(open_statement
(expression
(control_flow
(expression
(value
(boolean)))
(statement
(open_statement
(expression
(value
(string)))))))))))
(string)))))))))
==================
@ -33,20 +31,16 @@ x = if true then 1
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(assignment
(identifier)
(expression
(control_flow
(expression
(value
(boolean)))
(statement
(open_statement
(expression
(value
(integer)))))))))))))
(integer)))))))))))

20
corpus/functions.txt
View File

@ -10,15 +10,13 @@ function { "Hiya" }
(root
(item
(statement
(open_statement
(expression
(value
(function
(statement
(open_statement
(expression
(value
(string))))))))))))
(string))))))))))
==================
Function Call
@ -31,12 +29,11 @@ foobar <"Hiya">
(root
(item
(statement
(open_statement
(expression
(function_call
(identifier)
(value
(string))))))))
(string)))))))
==================
Complex Function
@ -52,25 +49,20 @@ function <message, number> {
(root
(item
(statement
(open_statement
(expression
(value
(function
(identifier)
(identifier)
(statement
(open_statement
(expression
(identifier))))
(identifier)))
(statement
(open_statement
(expression
(identifier))))
(identifier)))
(statement
(open_statement
(expression
(identifier))))
(identifier)))
(statement
(open_statement
(expression
(identifier)))))))))))
(identifier)))))))))

76
corpus/lists.txt
View File

@ -9,14 +9,13 @@ List Declaration
(root
(item
(statement
(open_statement
(expression
(value
(list
(value
(string))
(value
(integer)))))))))
(integer))))))))
==================
List Assignment
@ -29,58 +28,9 @@ foobar = ['answer', 42]
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(expression
(value
(list
(value
(string))
(value
(integer)))))))))))
==================
List Access
==================
x = foobar.0
---
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(expression
(identifier))))))))
==================
List Mutation
==================
foobar = ['answer', 42]
foobar += 'hiya'
---
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(assignment
(identifier)
(expression
(value
(list
@ -88,17 +38,6 @@ foobar += 'hiya'
(string))
(value
(integer))))))))))
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(expression
(value
(string)))))))))
==================
List Nesting
@ -111,12 +50,9 @@ foobar = ['answers', [42, [666]]]
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(assignment
(identifier)
(expression
(value
(list
@ -129,4 +65,4 @@ foobar = ['answers', [42, [666]]]
(value
(list
(value
(integer)))))))))))))))
(integer))))))))))))))

36
corpus/maps.txt
View File

@ -1,5 +1,5 @@
==================
Simple Maps
Simple Map
==================
map {
@ -11,13 +11,12 @@ map {
(root
(item
(statement
(open_statement
(expression
(value
(map
(identifier)
(value
(integer)))))))))
(integer))))))))
==================
Map Assignment
@ -32,27 +31,20 @@ x = map {
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(assignment
(identifier)
(expression
(value
(map
(identifier)
(value
(integer)))))))))))
(integer))))))))))
==================
Map Access
==================
x = map {
answer = 42
}
x.answer
---
@ -60,20 +52,6 @@ x.answer
(root
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(expression
(value
(map
(identifier)
(value
(integer))))))))))
(item
(statement
(open_statement
(expression
(identifier))))))
(identifier)))))

34
examples/fizzbuzz.ds Normal file
View File

@ -0,0 +1,34 @@
fizzbuzz_basic = function <limit> {
count = 1
while count < limit {
count += 1
if count % 3 == 0 && count % 5 == 0 {
output 'fizzbuzz'
} else {
if count % 3 == 0 {
output 'fizz'
}
if count % 5 == 0 {
output 'buzz'
}
}
}
}
fizzbuzz_match <limit> {
count = 1
while count < 1 {
output match [count % 3 == 0, count % 5 == 0] {
[true, false] => 'fizz'
[false, true] => 'buzz'
[true, true] => 'fizzbuzz'
}
}
}
fizzbuzz_basic<15>
fizzbuzz_match<15>

32
grammar.js
View File

@ -35,6 +35,8 @@ module.exports = grammar({
$.assignment,
$.math,
$.logic,
$.loop,
$.match,
)),
identifier: $ => /[a-z|_|.]+[0-9]?/,
@ -56,8 +58,6 @@ module.exports = grammar({
string: $ => /(".*?")|('.*?')|(`.*?`)/,
empty: $ => '()',
boolean: $ => choice(
'true',
'false',
@ -162,5 +162,33 @@ module.exports = grammar({
),
'>',
)),
loop: $ => choice(
$.break_loop,
$.while_loop,
),
while_loop: $ => seq(
'while',
$.expression,
'{',
$.statement,
'}',
),
break_loop: $ => seq(
'loop',
'{',
$.statement,
'}',
),
match: $ => seq(
'match',
$.expression,
'{',
repeat1(seq($.expression, '=>', $.statement)),
'}',
),
}
});

112
src/grammar.json
View File

@ -143,6 +143,14 @@
{
"type": "SYMBOL",
"name": "logic"
},
{
"type": "SYMBOL",
"name": "loop"
},
{
"type": "SYMBOL",
"name": "match"
}
]
}
@ -204,10 +212,6 @@
"type": "PATTERN",
"value": "(\".*?\")|('.*?')|(`.*?`)"
},
"empty": {
"type": "STRING",
"value": "()"
},
"boolean": {
"type": "CHOICE",
"members": [
@ -728,6 +732,106 @@
}
]
}
},
"loop": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "break_loop"
},
{
"type": "SYMBOL",
"name": "while_loop"
}
]
},
"while_loop": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "while"
},
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "STRING",
"value": "{"
},
{
"type": "SYMBOL",
"name": "statement"
},
{
"type": "STRING",
"value": "}"
}
]
},
"break_loop": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "loop"
},
{
"type": "STRING",
"value": "{"
},
{
"type": "SYMBOL",
"name": "statement"
},
{
"type": "STRING",
"value": "}"
}
]
},
"match": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "match"
},
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "STRING",
"value": "{"
},
{
"type": "REPEAT1",
"content": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "STRING",
"value": "=>"
},
{
"type": "SYMBOL",
"name": "statement"
}
]
}
},
{
"type": "STRING",
"value": "}"
}
]
}
},
"extras": [

96
src/node-types.json
View File

@ -23,6 +23,21 @@
"named": true,
"fields": {}
},
{
"type": "break_loop",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "statement",
"named": true
}
]
}
},
{
"type": "comment",
"named": true,
@ -79,6 +94,14 @@
"type": "logic",
"named": true
},
{
"type": "loop",
"named": true
},
{
"type": "match",
"named": true
},
{
"type": "math",
"named": true
@ -213,6 +236,25 @@
"named": true,
"fields": {}
},
{
"type": "loop",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "break_loop",
"named": true
},
{
"type": "while_loop",
"named": true
}
]
}
},
{
"type": "map",
"named": true,
@ -232,6 +274,25 @@
]
}
},
{
"type": "match",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "expression",
"named": true
},
{
"type": "statement",
"named": true
}
]
}
},
{
"type": "math",
"named": true,
@ -371,6 +432,25 @@
]
}
},
{
"type": "while_loop",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "expression",
"named": true
},
{
"type": "statement",
"named": true
}
]
}
},
{
"type": "yield",
"named": true,
@ -450,6 +530,10 @@
"type": "==",
"named": false
},
{
"type": "=>",
"named": false
},
{
"type": ">",
"named": false
@ -506,10 +590,18 @@
"type": "into",
"named": false
},
{
"type": "loop",
"named": false
},
{
"type": "map",
"named": false
},
{
"type": "match",
"named": false
},
{
"type": "or",
"named": false
@ -538,6 +630,10 @@
"type": "where",
"named": false
},
{
"type": "while",
"named": false
},
{
"type": "{",
"named": false

17819
src/parser.c
View File

File diff suppressed because it is too large Load Diff