Merge branch 'main' into when-clause-guards

2023-01-30 11:40:29 -05:00
parent 0ea2be0e95 f7421032bd
commit b653714c0c
23 changed files with 2099 additions and 1015 deletions
--- a/crates/aiken-lang/src/parser/lexer.rs
+++ b/crates/aiken-lang/src/parser/lexer.rs
@@ -52,8 +52,8 @@ pub fn lexer() -> impl Parser<char, Vec<(Token, Span)>, Error = ParseError> {
        just('|').to(Token::Vbar),
        just("&&").to(Token::AmperAmper),
        just('#').to(Token::Hash),
-        just("\n\n").to(Token::EmptyLine),
-        just("\n").to(Token::NewLine),
+        choice((just("\n\n"), just("\r\n\r\n"))).to(Token::EmptyLine),
+        choice((just("\n"), just("\r\n"))).to(Token::NewLine),
    ));

    let grouping = choice((