Compare commits

..

No commits in common. "96d0e967681147ff4255ab8b1d517b7d482fcd57" and "17ba01c0dc3f1f45f868dde8085f473bdd0abf35" have entirely different histories.

12 changed files with 7327 additions and 10570 deletions

@ -1 +1 @@
Subproject commit b476818ba3a5e005684fe3e3ee144b1014a6d5d0
Subproject commit 1f829d930a8a5d4683ac41c6a2085c5f482868cd

View File

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

View File

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

View File

@ -9,13 +9,14 @@ List Declaration
(root
(item
(statement
(expression
(value
(list
(value
(string))
(value
(integer))))))))
(open_statement
(expression
(value
(list
(value
(string))
(value
(integer)))))))))
==================
List Assignment
@ -28,16 +29,76 @@ foobar = ['answer', 42]
(root
(item
(statement
(expression
(assignment
(identifier)
(expression
(value
(list
(value
(string))
(value
(integer))))))))))
(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)
(expression
(value
(list
(value
(string))
(value
(integer))))))))))
(item
(statement
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(expression
(value
(string)))))))))
==================
List Nesting
@ -50,19 +111,22 @@ foobar = ['answers', [42, [666]]]
(root
(item
(statement
(expression
(assignment
(identifier)
(expression
(value
(list
(value
(string))
(value
(list
(value
(integer))
(value
(list
(value
(integer))))))))))))))
(open_statement
(expression
(operation
(expression
(identifier))
(operator)
(expression
(value
(list
(value
(string))
(value
(list
(value
(integer))
(value
(list
(value
(integer)))))))))))))))

View File

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

View File

@ -1,4 +1,4 @@
raw_data = download <"https://api.sampleapis.com/futurama/cast">
dust_data = from_json <raw_data>
raw_data = download("https://api.sampleapis.com/futurama/cast");
data = from_json(raw_data);
assert_equal <"Billy West", data.0.name>
assert_equal("Billy West", data.0.name);

View File

@ -1,34 +0,0 @@
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>

View File

@ -1,7 +1,12 @@
numbers = [1, 2 3]
# Lists are created by grouping items in partheses and separating them with
# commas.
x = numbers.0
y = numbers.1
z = numbers.2
numbers = (1, 2, 3);
assert_equal <x + y, z>
# To access the values in a list, use an integer as an index.
x = numbers.0;
y = numbers.1;
z = numbers.2;
assert_equal(x + y, z);

View File

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

View File

@ -143,14 +143,6 @@
{
"type": "SYMBOL",
"name": "logic"
},
{
"type": "SYMBOL",
"name": "loop"
},
{
"type": "SYMBOL",
"name": "match"
}
]
}
@ -212,6 +204,10 @@
"type": "PATTERN",
"value": "(\".*?\")|('.*?')|(`.*?`)"
},
"empty": {
"type": "STRING",
"value": "()"
},
"boolean": {
"type": "CHOICE",
"members": [
@ -550,7 +546,7 @@
},
{
"type": "SYMBOL",
"name": "statement"
"name": "expression"
}
]
}
@ -732,106 +728,6 @@
}
]
}
},
"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": [

View File

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

17292
src/parser.c

File diff suppressed because it is too large Load Diff