scott/rudus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: scott:01a052f37a9cc4fd584d14a369b2f4befcbf0f10
Branches Tags
scott:main
...
compare: scott:e4f70dde42342e71583f20b14153beeffc6e9bf3
Branches Tags
scott:main

2 Commits
01a052f37a ... e4f70dde42

Author SHA1 Message Date
Scott Richmond
e4f70dde42 Use chumsky::recursive::Recursive in place of fn recursive 2024-10-31 16:28:15 -04:00
Scott Richmond
1b9f1d56bc Fix Stream::from_iter call 2024-10-31 15:38:55 -04:00
1 changed files with 360 additions and 374 deletions
Show Stats Expand all files Collapse all files

162
src/main.rs
View File

@ -9,9 +9,9 @@
// * ignored words
// todo:
// * [ ] rewrite fn parser to use chumsky::Recursive::declare/define
// - [ ] do this to extract/simplify/DRY things like tuple patterns, fn clauses, etc.
// * [ ] Work around chumsky::Stream::from_iter().spanned disappearing in most recent version
// * [x] rewrite fn parser to use chumsky::Recursive::declare/define
// - [x] do this to extract/simplify/DRY things like tuple patterns, fn clauses, etc.
// * [x] Work around chumsky::Stream::from_iter().spanned disappearing in most recent version
// * [x] investigate using labels (which is behind a compiler flag, somehow)
// * [ ] wire up Ariadne parsing errors
// * [ ] validation
@ -28,6 +28,7 @@
use chumsky::{
input::{Stream, ValueInput},
prelude::*,
recursive::Recursive,
};
use imbl::{HashMap, Vector};
use std::fmt;
@ -344,21 +345,33 @@ fn parser<'src, I>(
where
I: ValueInput<'src, Token = Token<'src>, Span = Span>,
{
recursive(|expr| {
let mut expr = Recursive::declare();
let mut pattern = Recursive::declare();
let mut simple = Recursive::declare();
let mut nonbinding = Recursive::declare();
let separators = recursive(|separators| {
just(Token::Punctuation(","))
.or(just(Token::Punctuation("\n")))
.then(separators.clone().repeated())
});
let pattern = recursive(|pattern| {
let placeholder = select! {Token::Punctuation("_") => Pattern::Placeholder}
.map_with(|p, e| (p, e.span()));
let terminators = recursive(|terminators| {
just(Token::Punctuation(";"))
.or(just(Token::Punctuation("\n")))
.then(terminators.clone().repeated())
});
let word =
let placeholder_pattern =
select! {Token::Punctuation("_") => Pattern::Placeholder}.map_with(|p, e| (p, e.span()));
let word_pattern =
select! { Token::Word(w) => Pattern::Word(w) }.map_with(|w, e| (w, e.span()));
let atom = select! {
let atom_pattern = select! {
Token::Nil => Pattern::Atom(Value::Nil),
Token::Boolean(b) => Pattern::Atom(Value::Boolean(b)),
Token::Number(n) => Pattern::Atom(Value::Number(n)),
@ -366,16 +379,17 @@ where
}
.map_with(|a, e| (a, e.span()));
let tuple = pattern
let tuple_pattern = pattern
.clone()
.separated_by(separators.clone())
.allow_leading()
.allow_trailing()
.collect()
.delimited_by(just(Token::Punctuation("(")), just(Token::Punctuation(")")))
.map_with(|tuple, e| (Pattern::Tuple(tuple), e.span()));
.map_with(|tuple, e| (Pattern::Tuple(tuple), e.span()))
.labelled("tuple pattern");
let list = pattern
let list_pattern = pattern
.clone()
.separated_by(separators.clone())
.allow_leading()
@ -384,19 +398,19 @@ where
.delimited_by(just(Token::Punctuation("[")), just(Token::Punctuation("]")))
.map_with(|list, e| (Pattern::List(list), e.span()));
let pair = select! {Token::Keyword(k) => Value::Keyword(k)}
let pair_pattern = select! {Token::Keyword(k) => Value::Keyword(k)}
.then(pattern.clone())
.map_with(|(kw, patt), e| (Pattern::Pair(kw, Box::new(patt)), e.span()));
let shorthand = select! {Token::Word(w) => w}.map_with(|w, e| {
let shorthand_pattern = select! {Token::Word(w) => w}.map_with(|w, e| {
(
Pattern::Pair(Value::Keyword(w), Box::new((Pattern::Word(w), e.span()))),
e.span(),
)
});
let dict = pair
.or(shorthand)
let dict_pattern = pair_pattern
.or(shorthand_pattern)
.separated_by(separators.clone())
.allow_leading()
.allow_trailing()
@ -407,13 +421,15 @@ where
)
.map_with(|dict, e| (Pattern::Dict(dict), e.span()));
atom.or(word)
.or(placeholder)
.or(tuple)
.or(list)
.or(dict)
.labelled("pattern")
});
pattern.define(
atom_pattern
.or(word_pattern)
.or(placeholder_pattern)
.or(tuple_pattern.clone())
.or(list_pattern)
.or(dict_pattern)
.labelled("pattern"),
);
let placeholder =
select! {Token::Punctuation("_") => Ast::Placeholder}.map_with(|p, e| (p, e.span()));
@ -422,7 +438,6 @@ where
.map_with(|w, e| (w, e.span()))
.labelled("word");
let simple = recursive(|simple| {
let value = select! {
Token::Nil => Ast::Value(Value::Nil),
Token::Boolean(b) => Ast::Value(Value::Boolean(b)),
@ -434,8 +449,6 @@ where
let keyword = select! {Token::Keyword(k) => Ast::Value(Value::Keyword(k)),}
.map_with(|k, e| (k, e.span()));
// let word = select! {Token::Word(w) => Ast::Word(w)}.map_with(|w, e| (w, e.span()));
let tuple = simple
.clone()
.separated_by(separators.clone())
@ -445,9 +458,6 @@ where
.delimited_by(just(Token::Punctuation("(")), just(Token::Punctuation(")")))
.map_with(|tuple, e| (Ast::Tuple(tuple), e.span()));
// let placeholder = select! {Token::Punctuation("_") => Ast::Placeholder}
// .map_with(|p, e| (p, e.span()));
let args = simple
.clone()
.or(placeholder)
@ -504,6 +514,7 @@ where
)
.map_with(|dict, e| (Ast::Dict(dict), e.span()));
simple.define(
synthetic
.or(word)
.or(keyword)
@ -511,17 +522,9 @@ where
.or(tuple)
.or(list)
.or(dict)
.labelled("simple expression")
});
.labelled("simple expression"),
);
let terminators = recursive(|terminators| {
just(Token::Punctuation("\n"))
.or(just(Token::Punctuation(";")))
.then(terminators.clone().repeated())
.labelled("terminator")
});
let nonbinding = recursive(|nonbinding| {
let block = expr
.clone()
.separated_by(terminators.clone())
@ -561,9 +564,7 @@ where
.clone()
.then_ignore(just(Token::Punctuation("->")))
.then(expr.clone())
.map_with(|(cond, body), e| {
(Ast::WhenClause(Box::new(cond), Box::new(body)), e.span())
});
.map_with(|(cond, body), e| (Ast::WhenClause(Box::new(cond), Box::new(body)), e.span()));
let when = just(Token::Reserved("when"))
.ignore_then(
@ -580,9 +581,7 @@ where
.clone()
.then_ignore(just(Token::Punctuation("->")))
.then(expr.clone())
.map_with(|(patt, body), e| {
(Ast::MatchClause(Box::new(patt), Box::new(body)), e.span())
});
.map_with(|(patt, body), e| (Ast::MatchClause(Box::new(patt), Box::new(body)), e.span()));
let match_ = just(Token::Reserved("match"))
.ignore_then(simple.clone())
@ -615,8 +614,7 @@ where
nonbinding
.clone()
.separated_by(
just(Token::Punctuation(">"))
.then(just(Token::Punctuation("\n")).repeated()),
just(Token::Punctuation(">")).then(just(Token::Punctuation("\n")).repeated()),
)
.collect(),
)
@ -625,34 +623,20 @@ where
let repeat = just(Token::Reserved("repeat"))
.ignore_then(simple.clone())
.then(block.clone())
.map_with(|(count, body), e| {
(Ast::Repeat(Box::new(count), Box::new(body)), e.span())
});
let tuple_pattern = pattern
.clone()
.separated_by(separators.clone())
.allow_leading()
.allow_trailing()
.collect()
.delimited_by(just(Token::Punctuation("(")), just(Token::Punctuation(")")))
.map_with(|tuple, e| (Pattern::Tuple(tuple), e.span()))
.labelled("tuple pattern");
.map_with(|(count, body), e| (Ast::Repeat(Box::new(count), Box::new(body)), e.span()));
let fn_clause = tuple_pattern
.clone()
.then_ignore(just(Token::Punctuation("->")))
.then(nonbinding.clone())
.map_with(|(pattern, body), e| {
(Ast::FnClause(Box::new(pattern), Box::new(body)), e.span())
})
.map_with(|(pattern, body), e| (Ast::FnClause(Box::new(pattern), Box::new(body)), e.span()))
.labelled("function clause");
let lambda = just(Token::Reserved("fn"))
.ignore_then(fn_clause)
.ignore_then(fn_clause.clone())
.map_with(|clause, e| (Ast::Fn("anonymous", vec![clause]), e.span()));
let loop_ = just(Token::Reserved("loop"));
nonbinding.define(
simple
.clone()
.or(conditional)
@ -660,8 +644,9 @@ where
.or(lambda)
.or(panic)
.or(do_)
.labelled("nonbinding expression")
});
.or(repeat)
.labelled("nonbinding expression"),
);
let let_ = just(Token::Reserved("let"))
.ignore_then(pattern.clone())
@ -695,21 +680,14 @@ where
(Ast::FnDeclaration(name), e.span())
});
let tuple_pattern = pattern
.clone()
.separated_by(separators.clone())
.allow_leading()
.allow_trailing()
.collect()
.delimited_by(just(Token::Punctuation("(")), just(Token::Punctuation(")")))
.map_with(|tuple, e| (Pattern::Tuple(tuple), e.span()));
let fn_clause = tuple_pattern
.then_ignore(just(Token::Punctuation("->")))
.then(nonbinding.clone())
.map_with(|(pattern, body), e| {
(Ast::FnClause(Box::new(pattern), Box::new(body)), e.span())
});
// let tuple_pattern = pattern
// .clone()
// .separated_by(separators.clone())
// .allow_leading()
// .allow_trailing()
// .collect()
// .delimited_by(just(Token::Punctuation("(")), just(Token::Punctuation(")")))
// .map_with(|tuple, e| (Pattern::Tuple(tuple), e.span()));
let fn_named = just(Token::Reserved("fn"))
.ignore_then(word.clone())
@ -728,7 +706,7 @@ where
.then(
fn_clause
.clone()
.separated_by(terminators)
.separated_by(terminators.clone())
.allow_leading()
.allow_trailing()
.collect()
@ -747,12 +725,20 @@ where
let binding = let_.or(box_).or(fn_);
nonbinding.or(binding)
})
expr.define(binding.or(nonbinding));
let script = expr
.separated_by(terminators.clone())
.allow_trailing()
.allow_leading()
.collect()
.map_with(|exprs, e| (Ast::Block(exprs), e.span()));
script
}
pub fn main() {
let src = "let #{a, :b b} = foo";
let src = "let #{a, :b b} = foo\na(b(c),d)";
let (tokens, lex_errs) = lexer().parse(src).into_output_errors();
if lex_errs.len() > 0 {
println!("{:?}", lex_errs);
@ -764,7 +750,7 @@ pub fn main() {
println!("{}", token)
}
let (ast, _) = parser()
.parse(Stream::from_iter(to_parse).spanned(SimpleSpan::new(0, src.len())))
.parse(Stream::from_iter(to_parse).map((0..src.len()).into(), |(t, s)| (t, s)))
.unwrap();
println!("{}", ast);
}