15330141384

Committed 29 May 2025 05:54PM UTC coverage: 72.802%. Remained the same

Build # 15330141384

Build Type

Pull #270

github

Committed by

web-flow

Commit Message

Merge 2268e309c into 3bdbdbd62

Pull Request Pull Request #270: Adding support for comments

Run Details

0 of 1 new or added line in 1 file covered. (0.0%)

1 existing line in 1 file now uncovered.

3445 of 4732 relevant lines covered (72.8%)

2189.89 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

74.78

/lambda_compiler/src/parsing.rs

use crate::{
    ast::{self, LambdaParameter},
    compilation::{CompilerError, SourceLocation},
    tokenization::{Token, TokenContent},
};
use lambda::name::{Name, NamespaceId};

#[derive(Debug)]
pub struct ParserError {
    pub message: String,
    pub location: SourceLocation,
}

impl ParserError {
    pub fn new(message: String, location: SourceLocation) -> Self {
        Self { message, location }
    }
}

impl std::fmt::Display for ParserError {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        write!(f, "{}", &self.message)
    }
}

pub type ParserResult<T> = std::result::Result<T, ParserError>;

pub fn pop_next_non_whitespace_token<'t>(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
) -> Option<&'t Token> {
    let token = peek_next_non_whitespace_token(tokens);
    if token.is_some() {
        tokens.next();
    }

    token
}

pub fn peek_next_non_whitespace_token<'t>(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
) -> Option<&'t Token> {
    loop {
        let next = tokens.peek();
        match next {
            Some(token) => match token.content {
                TokenContent::Whitespace | TokenContent::Comment(_) => {
                    tokens.next();
                    continue;
                }

                TokenContent::Identifier(_)
                | TokenContent::Assign
                | TokenContent::LeftParenthesis
                | TokenContent::RightParenthesis
                | TokenContent::LeftBracket
                | TokenContent::RightBracket
                | TokenContent::LeftBrace
                | TokenContent::RightBrace
                | TokenContent::Dot
                | TokenContent::Colon
                | TokenContent::Quotes(_)
                | TokenContent::FatArrow
                | TokenContent::Comma
                | TokenContent::EndOfFile => return Some(token),
            },
            None => return None,
        }
    }
}

fn expect_right_brace(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
) -> ParserResult<()> {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_) => todo!(),
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => todo!(),
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => {
                pop_next_non_whitespace_token(tokens);
                Ok(())
            }
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => todo!(),
            TokenContent::EndOfFile => todo!(),
        },
        None => todo!(),
    }
}

fn try_skip_right_parenthesis(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
) -> bool {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_) => false,
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => {
                pop_next_non_whitespace_token(tokens);
                true
            }
            TokenContent::LeftBracket => false,
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => false,
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => false,
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => false,
            TokenContent::EndOfFile => todo!(),
        },
        None => todo!(),
    }
}

fn try_skip_assign(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_) => false,
            TokenContent::Assign => {
                pop_next_non_whitespace_token(tokens);
                true
            }
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => todo!(),
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => false,
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => false,
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => false,
            TokenContent::EndOfFile => todo!(),
        },
        None => todo!(),
    }
}

fn expect_fat_arrow(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) {
    match pop_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_identifier) => todo!(),
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => todo!(),
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => {}
            TokenContent::Comma => todo!(),
            TokenContent::EndOfFile => todo!(),
        },
        None => todo!(),
    }
}

fn expect_comma(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) {
    match pop_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_) => todo!(),
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => todo!(),
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => {}
            TokenContent::EndOfFile => todo!(),
        },
        None => todo!(),
    }
}

fn skip_right_bracket(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {
    let maybe_right_bracket = peek_next_non_whitespace_token(tokens);
    match maybe_right_bracket {
        Some(token) => match &token.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => unreachable!(),
            TokenContent::Identifier(_) => false,
            TokenContent::Assign => false,
            TokenContent::LeftParenthesis => false,
            TokenContent::RightParenthesis => false,
            TokenContent::LeftBracket => false,
            TokenContent::RightBracket => {
                tokens.next();
                true
            }
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => false,
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => false,
            TokenContent::FatArrow => false,
            TokenContent::Comma => false,
            TokenContent::EndOfFile => todo!(),
        },
        None => false,
    }
}

fn parse_tree_construction(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
    local_namespace: &NamespaceId,
) -> ParserResult<ast::Expression> {
    let mut elements = Vec::new();
    loop {
        if skip_right_bracket(tokens) {
            break;
        }
        if !elements.is_empty() {
            expect_comma(tokens);
        }
        if skip_right_bracket(tokens) {
            break;
        }
        let element = parse_expression(tokens, local_namespace)?;
        elements.push(element);
    }
    Ok(ast::Expression::ConstructTree(elements))
}

fn parse_braces(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
    local_namespace: &NamespaceId,
) -> ParserResult<ast::Expression> {
    let content = parse_expression(tokens, local_namespace)?;
    expect_right_brace(tokens)?;
    Ok(ast::Expression::Braces(Box::new(content)))
}

fn parse_let(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
    local_namespace: &NamespaceId,
    let_location: &SourceLocation,
) -> ParserResult<ast::Expression> {
    let (name, location) = match try_pop_identifier(tokens) {
        Some((name, location)) => (name, location),
        None => {
            return Err(ParserError::new(
                "Expected identifier after 'let' keyword.".to_string(),
                *let_location,
            ))
        }
    };
    if !try_skip_assign(tokens) {
        return Err(ParserError::new(
            "Expected '=' after 'let' identifier.".to_string(),
            *let_location,
        ));
    }
    let value = parse_expression(tokens, local_namespace)?;
    let body = parse_expression(tokens, local_namespace)?;
    Ok(ast::Expression::Let {
        name: Name::new(*local_namespace, name),
        location,
        value: Box::new(value),
        body: Box::new(body),
    })
}

fn parse_expression_start<'t>(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
    local_namespace: &NamespaceId,
) -> ParserResult<ast::Expression> {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(identifier) => {
                pop_next_non_whitespace_token(tokens);
                if identifier.as_str() == "let" {
                    parse_let(tokens, local_namespace, &non_whitespace.location)
                } else {
                    Ok(ast::Expression::Identifier(
                        Name::new(*local_namespace, identifier.clone()),
                        non_whitespace.location,
                    ))
                }
            }
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => {
                pop_next_non_whitespace_token(tokens);
                parse_lambda(tokens, local_namespace)
            }
            TokenContent::RightParenthesis => Err(ParserError::new(
                "Expected expression, found right parenthesis.".to_string(),
                non_whitespace.location,
            )),
            TokenContent::LeftBracket => {
                pop_next_non_whitespace_token(tokens);
                parse_tree_construction(tokens, local_namespace)
            }
            TokenContent::RightBracket => Err(ParserError::new(
                "Expected expression, found right bracket.".to_string(),
                non_whitespace.location,
            )),
            TokenContent::LeftBrace => {
                pop_next_non_whitespace_token(tokens);
                parse_braces(tokens, local_namespace)
            }
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(content) => {
                pop_next_non_whitespace_token(tokens);
                Ok(ast::Expression::StringLiteral(content.clone()))
            }
            TokenContent::FatArrow => Err(ParserError::new(
                "Expected expression, found fat arrow.".to_string(),
                non_whitespace.location,
            )),
            TokenContent::Comma => Err(ParserError::new(
                "Expected expression, found comma.".to_string(),
                non_whitespace.location,
            )),
            TokenContent::EndOfFile => Err(ParserError::new(
                "Expected expression, got end of file.".to_string(),
                non_whitespace.location,
            )),
        },
        None => todo!(),
    }
}

fn parse_apply(
    callee: ast::Expression,
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
    local_namespace: &NamespaceId,
) -> ParserResult<ast::Expression> {
    let mut arguments = Vec::new();
    loop {
        if try_skip_right_parenthesis(tokens) {
            break;
        }
        if !arguments.is_empty() {
            expect_comma(tokens);
        }
        if try_skip_right_parenthesis(tokens) {
            break;
        }
        let argument = parse_expression(tokens, local_namespace)?;
        arguments.push(argument);
    }
    Ok(ast::Expression::Apply {
        callee: Box::new(callee),
        arguments,
    })
}

pub fn parse_expression<'t>(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
    local_namespace: &NamespaceId,
) -> ParserResult<ast::Expression> {
    let start = parse_expression_start(tokens, local_namespace)?;
    match peek_next_non_whitespace_token(tokens) {
        Some(more) => match &more.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => unreachable!(),
            TokenContent::Identifier(_) => Ok(start),
            TokenContent::Assign => Ok(start),
            TokenContent::LeftParenthesis => {
                tokens.next();
                parse_apply(start, tokens, local_namespace)
            }
            TokenContent::RightParenthesis => Ok(start),
            TokenContent::LeftBracket => Ok(start),
            TokenContent::RightBracket => Ok(start),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => Ok(start),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => Ok(start),
            TokenContent::EndOfFile => Ok(start),
        },
        None => todo!(),
    }
}

fn try_pop_identifier(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
) -> Option<(String, SourceLocation)> {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(identifier) => {
                pop_next_non_whitespace_token(tokens);
                Some((identifier.clone(), non_whitespace.location))
            }
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => None,
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => None,
            TokenContent::EndOfFile => None,
        },
        None => None,
    }
}

fn try_skip_comma(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_identifier) => false,
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => false,
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => todo!(),
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => {
                pop_next_non_whitespace_token(tokens);
                true
            }
            TokenContent::EndOfFile => false,
        },
        None => false,
    }
}

fn try_skip_colon(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {
    match peek_next_non_whitespace_token(tokens) {
        Some(non_whitespace) => match &non_whitespace.content {
            TokenContent::Comment(_) => todo!(),
            TokenContent::Whitespace => todo!(),
            TokenContent::Identifier(_identifier) => false,
            TokenContent::Assign => todo!(),
            TokenContent::LeftParenthesis => todo!(),
            TokenContent::RightParenthesis => false,
            TokenContent::LeftBracket => todo!(),
            TokenContent::RightBracket => todo!(),
            TokenContent::LeftBrace => todo!(),
            TokenContent::RightBrace => todo!(),
            TokenContent::Dot => todo!(),
            TokenContent::Colon => {
                pop_next_non_whitespace_token(tokens);
                true
            }
            TokenContent::Quotes(_) => todo!(),
            TokenContent::FatArrow => todo!(),
            TokenContent::Comma => false,
            TokenContent::EndOfFile => false,
        },
        None => false,
    }
}

fn parse_lambda<'t>(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
    local_namespace: &NamespaceId,
) -> ParserResult<ast::Expression> {
    let mut parameters = Vec::new();
    while let Some((parameter_name, parameter_location)) = try_pop_identifier(tokens) {
        let namespaced_name = Name::new(*local_namespace, parameter_name);
        let mut type_annotation = None;
        if try_skip_colon(tokens) {
            type_annotation = Some(parse_expression(tokens, local_namespace)?);
        }
        parameters.push(LambdaParameter::new(
            namespaced_name,
            parameter_location,
            type_annotation,
        ));
        if !try_skip_comma(tokens) {
            break;
        }
    }
    if !try_skip_right_parenthesis(tokens) {
        let next_token = peek_next_non_whitespace_token(tokens).unwrap();
        return Err(ParserError::new(
            "Expected comma or right parenthesis in lambda parameter list.".to_string(),
            next_token.location,
        ));
    }
    expect_fat_arrow(tokens);
    let body = parse_expression(tokens, local_namespace)?;
    Ok(ast::Expression::Lambda {
        parameters,
        body: Box::new(body),
    })
}

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
pub struct ParserOutput {
    pub entry_point: Option<ast::Expression>,
    pub errors: Vec<CompilerError>,
}

impl ParserOutput {
    pub fn new(entry_point: Option<ast::Expression>, errors: Vec<CompilerError>) -> ParserOutput {
        ParserOutput {
            entry_point,
            errors,
        }
    }
}

pub fn parse_expression_tolerantly<'t>(
    tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
    local_namespace: &NamespaceId,
) -> ParserOutput {
    let mut errors = Vec::new();
    let entry_point_result = parse_expression(tokens, local_namespace);
    match entry_point_result {
        Ok(entry_point) => ParserOutput::new(Some(entry_point), errors),
        Err(error) => {
            errors.push(CompilerError::new(
                format!("Parser error: {}", &error),
                error.location,
            ));
            ParserOutput::new(None, errors)
        }
    }
}

1	use crate::{
2	ast::{self, LambdaParameter},
3	compilation::{CompilerError, SourceLocation},
4	tokenization::{Token, TokenContent},
5	};
6	use lambda::name::{Name, NamespaceId};
7
8	#[derive(Debug)]
9	pub struct ParserError {
10	pub message: String,
11	pub location: SourceLocation,
12	}
13
14	impl ParserError {
15	pub fn new(message: String, location: SourceLocation) -> Self {	5✔
16	Self { message, location }
17	}
18	}
19
20	impl std::fmt::Display for ParserError {
21	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {	5✔
22	write!(f, "{}", &self.message)	5✔
23	}
24	}
25
26	pub type ParserResult<T> = std::result::Result<T, ParserError>;
27
28	pub fn pop_next_non_whitespace_token<'t>(	391✔
29	tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
30	) -> Option<&'t Token> {
31	let token = peek_next_non_whitespace_token(tokens);	391✔
32	if token.is_some() {	782✔
33	tokens.next();	391✔
34	}
35
36	token	391✔
37	}
38
39	pub fn peek_next_non_whitespace_token<'t>(	1,102✔
40	tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
41	) -> Option<&'t Token> {
42	loop {	×
43	let next = tokens.peek();	1,302✔
44	match next {	1,302✔
45	Some(token) => match token.content {	1,302✔
NEW 46	TokenContent::Whitespace \| TokenContent::Comment(_) => {	×
47	tokens.next();	200✔
48	continue;	200✔
49	}
50
51	TokenContent::Identifier(_)	×
52	\| TokenContent::Assign	×
53	\| TokenContent::LeftParenthesis	×
54	\| TokenContent::RightParenthesis	×
55	\| TokenContent::LeftBracket	×
56	\| TokenContent::RightBracket	×
57	\| TokenContent::LeftBrace	×
58	\| TokenContent::RightBrace	×
59	\| TokenContent::Dot	×
60	\| TokenContent::Colon	×
61	\| TokenContent::Quotes(_)	×
62	\| TokenContent::FatArrow	×
63	\| TokenContent::Comma	×
64	\| TokenContent::EndOfFile => return Some(token),	1,102✔
65	},
66	None => return None,	×
67	}
68	}
69	}
70
71	fn expect_right_brace(	10✔
72	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
73	) -> ParserResult<()> {
74	match peek_next_non_whitespace_token(tokens) {	10✔
75	Some(non_whitespace) => match &non_whitespace.content {	10✔
76	TokenContent::Comment(_) => todo!(),
77	TokenContent::Whitespace => todo!(),
78	TokenContent::Identifier(_) => todo!(),
79	TokenContent::Assign => todo!(),
80	TokenContent::LeftParenthesis => todo!(),
81	TokenContent::RightParenthesis => todo!(),
82	TokenContent::LeftBracket => todo!(),
83	TokenContent::RightBracket => todo!(),
84	TokenContent::LeftBrace => todo!(),
85	TokenContent::RightBrace => {
86	pop_next_non_whitespace_token(tokens);	10✔
87	Ok(())	10✔
88	}
89	TokenContent::Dot => todo!(),
90	TokenContent::Colon => todo!(),
91	TokenContent::Quotes(_) => todo!(),
92	TokenContent::FatArrow => todo!(),
93	TokenContent::Comma => todo!(),
94	TokenContent::EndOfFile => todo!(),
95	},
96	None => todo!(),
97	}
98	}
99
100	fn try_skip_right_parenthesis(	63✔
101	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
102	) -> bool {
103	match peek_next_non_whitespace_token(tokens) {	63✔
104	Some(non_whitespace) => match &non_whitespace.content {	63✔
105	TokenContent::Comment(_) => todo!(),
106	TokenContent::Whitespace => todo!(),
107	TokenContent::Identifier(_) => false,	5✔
108	TokenContent::Assign => todo!(),
109	TokenContent::LeftParenthesis => todo!(),
110	TokenContent::RightParenthesis => {
111	pop_next_non_whitespace_token(tokens);	46✔
112	true	46✔
113	}
114	TokenContent::LeftBracket => false,	×
115	TokenContent::RightBracket => todo!(),
116	TokenContent::LeftBrace => false,	×
117	TokenContent::RightBrace => todo!(),
118	TokenContent::Dot => todo!(),
119	TokenContent::Colon => todo!(),
120	TokenContent::Quotes(_) => false,	8✔
121	TokenContent::FatArrow => todo!(),
122	TokenContent::Comma => false,	4✔
123	TokenContent::EndOfFile => todo!(),
124	},
125	None => todo!(),
126	}
127	}
128
129	fn try_skip_assign(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {	5✔
130	match peek_next_non_whitespace_token(tokens) {	5✔
131	Some(non_whitespace) => match &non_whitespace.content {	5✔
132	TokenContent::Comment(_) => todo!(),
133	TokenContent::Whitespace => todo!(),
UNCOV 134	TokenContent::Identifier(_) => false,	×
135	TokenContent::Assign => {
136	pop_next_non_whitespace_token(tokens);	5✔
137	true	5✔
138	}
139	TokenContent::LeftParenthesis => todo!(),
140	TokenContent::RightParenthesis => todo!(),
141	TokenContent::LeftBracket => todo!(),
142	TokenContent::RightBracket => todo!(),
143	TokenContent::LeftBrace => false,	×
144	TokenContent::RightBrace => todo!(),
145	TokenContent::Dot => todo!(),
146	TokenContent::Colon => todo!(),
147	TokenContent::Quotes(_) => false,	×
148	TokenContent::FatArrow => todo!(),
149	TokenContent::Comma => false,	×
150	TokenContent::EndOfFile => todo!(),
151	},
152	None => todo!(),
153	}
154	}
155
156	fn expect_fat_arrow(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) {	39✔
157	match pop_next_non_whitespace_token(tokens) {	39✔
158	Some(non_whitespace) => match &non_whitespace.content {	39✔
159	TokenContent::Comment(_) => todo!(),
160	TokenContent::Whitespace => todo!(),
161	TokenContent::Identifier(_identifier) => todo!(),
162	TokenContent::Assign => todo!(),
163	TokenContent::LeftParenthesis => todo!(),
164	TokenContent::RightParenthesis => todo!(),
165	TokenContent::LeftBracket => todo!(),
166	TokenContent::RightBracket => todo!(),
167	TokenContent::LeftBrace => todo!(),
168	TokenContent::RightBrace => todo!(),
169	TokenContent::Dot => todo!(),
170	TokenContent::Colon => todo!(),
171	TokenContent::Quotes(_) => todo!(),
172	TokenContent::FatArrow => {}	39✔
173	TokenContent::Comma => todo!(),
174	TokenContent::EndOfFile => todo!(),
175	},
176	None => todo!(),
177	}
178	}
179
180	fn expect_comma(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) {	34✔
181	match pop_next_non_whitespace_token(tokens) {	34✔
182	Some(non_whitespace) => match &non_whitespace.content {	34✔
183	TokenContent::Comment(_) => todo!(),
184	TokenContent::Whitespace => todo!(),
185	TokenContent::Identifier(_) => todo!(),
186	TokenContent::Assign => todo!(),
187	TokenContent::LeftParenthesis => todo!(),
188	TokenContent::RightParenthesis => todo!(),
189	TokenContent::LeftBracket => todo!(),
190	TokenContent::RightBracket => todo!(),
191	TokenContent::LeftBrace => todo!(),
192	TokenContent::RightBrace => todo!(),
193	TokenContent::Dot => todo!(),
194	TokenContent::Colon => todo!(),
195	TokenContent::Quotes(_) => todo!(),
196	TokenContent::FatArrow => todo!(),
197	TokenContent::Comma => {}	34✔
198	TokenContent::EndOfFile => todo!(),
199	},
200	None => todo!(),
201	}
202	}
203
204	fn skip_right_bracket(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {	142✔
205	let maybe_right_bracket = peek_next_non_whitespace_token(tokens);	142✔
206	match maybe_right_bracket {	142✔
207	Some(token) => match &token.content {	142✔
208	TokenContent::Comment(_) => todo!(),
209	TokenContent::Whitespace => unreachable!(),
210	TokenContent::Identifier(_) => false,	64✔
211	TokenContent::Assign => false,	×
212	TokenContent::LeftParenthesis => false,	×
213	TokenContent::RightParenthesis => false,	×
214	TokenContent::LeftBracket => false,	2✔
215	TokenContent::RightBracket => {
216	tokens.next();	35✔
217	true	35✔
218	}
219	TokenContent::LeftBrace => todo!(),
220	TokenContent::RightBrace => todo!(),
221	TokenContent::Dot => false,	×
222	TokenContent::Colon => todo!(),
223	TokenContent::Quotes(_) => false,	9✔
224	TokenContent::FatArrow => false,	×
225	TokenContent::Comma => false,	32✔
226	TokenContent::EndOfFile => todo!(),
227	},
228	None => false,	×
229	}
230	}
231
232	fn parse_tree_construction(	35✔
233	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
234	local_namespace: &NamespaceId,
235	) -> ParserResult<ast::Expression> {
236	let mut elements = Vec::new();	35✔
237	loop {
238	if skip_right_bracket(tokens) {	83✔
239	break;	24✔
240	}
241	if !elements.is_empty() {	91✔
242	expect_comma(tokens);	32✔
243	}
244	if skip_right_bracket(tokens) {
245	break;	11✔
246	}
247	let element = parse_expression(tokens, local_namespace)?;	48✔
248	elements.push(element);
249	}
250	Ok(ast::Expression::ConstructTree(elements))	35✔
251	}
252
253	fn parse_braces(	10✔
254	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
255	local_namespace: &NamespaceId,
256	) -> ParserResult<ast::Expression> {
257	let content = parse_expression(tokens, local_namespace)?;	20✔
258	expect_right_brace(tokens)?;	×
259	Ok(ast::Expression::Braces(Box::new(content)))	10✔
260	}
261
262	fn parse_let(	5✔
263	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
264	local_namespace: &NamespaceId,
265	let_location: &SourceLocation,
266	) -> ParserResult<ast::Expression> {
267	let (name, location) = match try_pop_identifier(tokens) {	10✔
268	Some((name, location)) => (name, location),	5✔
269	None => {
270	return Err(ParserError::new(	×
271	"Expected identifier after 'let' keyword.".to_string(),	×
272	*let_location,	×
273	))
274	}
275	};
276	if !try_skip_assign(tokens) {	5✔
277	return Err(ParserError::new(	×
278	"Expected '=' after 'let' identifier.".to_string(),	×
279	*let_location,	×
280	));
281	}
282	let value = parse_expression(tokens, local_namespace)?;	10✔
283	let body = parse_expression(tokens, local_namespace)?;	5✔
284	Ok(ast::Expression::Let {
285	name: Name::new(*local_namespace, name),
286	location,
287	value: Box::new(value),
288	body: Box::new(body),
289	})
290	}
291
292	fn parse_expression_start<'t>(	185✔
293	tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
294	local_namespace: &NamespaceId,
295	) -> ParserResult<ast::Expression> {
296	match peek_next_non_whitespace_token(tokens) {	185✔
297	Some(non_whitespace) => match &non_whitespace.content {	185✔
298	TokenContent::Comment(_) => todo!(),
299	TokenContent::Whitespace => todo!(),
300	TokenContent::Identifier(identifier) => {	82✔
301	pop_next_non_whitespace_token(tokens);	82✔
302	if identifier.as_str() == "let" {	82✔
303	parse_let(tokens, local_namespace, &non_whitespace.location)	5✔
304	} else {
305	Ok(ast::Expression::Identifier(	77✔
306	Name::new(*local_namespace, identifier.clone()),	77✔
307	non_whitespace.location,	77✔
308	))
309	}
310	}
311	TokenContent::Assign => todo!(),
312	TokenContent::LeftParenthesis => {	×
313	pop_next_non_whitespace_token(tokens);	41✔
314	parse_lambda(tokens, local_namespace)	41✔
315	}
316	TokenContent::RightParenthesis => Err(ParserError::new(	1✔
317	"Expected expression, found right parenthesis.".to_string(),	1✔
318	non_whitespace.location,	1✔
319	)),
320	TokenContent::LeftBracket => {	×
321	pop_next_non_whitespace_token(tokens);	35✔
322	parse_tree_construction(tokens, local_namespace)	35✔
323	}
324	TokenContent::RightBracket => Err(ParserError::new(	×
325	"Expected expression, found right bracket.".to_string(),	×
326	non_whitespace.location,	×
327	)),
328	TokenContent::LeftBrace => {	×
329	pop_next_non_whitespace_token(tokens);	10✔
330	parse_braces(tokens, local_namespace)	10✔
331	}
332	TokenContent::RightBrace => todo!(),
333	TokenContent::Dot => todo!(),
334	TokenContent::Colon => todo!(),
335	TokenContent::Quotes(content) => {	13✔
336	pop_next_non_whitespace_token(tokens);	13✔
337	Ok(ast::Expression::StringLiteral(content.clone()))	13✔
338	}
339	TokenContent::FatArrow => Err(ParserError::new(	1✔
340	"Expected expression, found fat arrow.".to_string(),	1✔
341	non_whitespace.location,	1✔
342	)),
343	TokenContent::Comma => Err(ParserError::new(	1✔
344	"Expected expression, found comma.".to_string(),	1✔
345	non_whitespace.location,	1✔
346	)),
347	TokenContent::EndOfFile => Err(ParserError::new(	1✔
348	"Expected expression, got end of file.".to_string(),	1✔
349	non_whitespace.location,	1✔
350	)),
351	},
352	None => todo!(),
353	}
354	}
355
356	fn parse_apply(	8✔
357	callee: ast::Expression,
358	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
359	local_namespace: &NamespaceId,
360	) -> ParserResult<ast::Expression> {
361	let mut arguments = Vec::new();	8✔
362	loop {
363	if try_skip_right_parenthesis(tokens) {	15✔
364	break;	7✔
365	}
366	if !arguments.is_empty() {	10✔
367	expect_comma(tokens);	2✔
368	}
369	if try_skip_right_parenthesis(tokens) {
370	break;	×
371	}
372	let argument = parse_expression(tokens, local_namespace)?;	8✔
373	arguments.push(argument);
374	}
375	Ok(ast::Expression::Apply {	7✔
376	callee: Box::new(callee),	7✔
377	arguments,	7✔
378	})
379	}
380
381	pub fn parse_expression<'t>(	185✔
382	tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
383	local_namespace: &NamespaceId,
384	) -> ParserResult<ast::Expression> {
385	let start = parse_expression_start(tokens, local_namespace)?;	370✔
386	match peek_next_non_whitespace_token(tokens) {	×
387	Some(more) => match &more.content {	177✔
388	TokenContent::Comment(_) => todo!(),
389	TokenContent::Whitespace => unreachable!(),
390	TokenContent::Identifier(_) => Ok(start),	3✔
391	TokenContent::Assign => Ok(start),	×
392	TokenContent::LeftParenthesis => {	×
393	tokens.next();	8✔
394	parse_apply(start, tokens, local_namespace)	8✔
395	}
396	TokenContent::RightParenthesis => Ok(start),	9✔
397	TokenContent::LeftBracket => Ok(start),	1✔
398	TokenContent::RightBracket => Ok(start),	16✔
399	TokenContent::LeftBrace => todo!(),
400	TokenContent::RightBrace => Ok(start),	16✔
401	TokenContent::Dot => todo!(),
402	TokenContent::Colon => todo!(),
403	TokenContent::Quotes(_) => todo!(),
404	TokenContent::FatArrow => todo!(),
405	TokenContent::Comma => Ok(start),	36✔
406	TokenContent::EndOfFile => Ok(start),	88✔
407	},
408	None => todo!(),
409	}
410	}
411
412	fn try_pop_identifier(	59✔
413	tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>,
414	) -> Option<(String, SourceLocation)> {
415	match peek_next_non_whitespace_token(tokens) {	59✔
416	Some(non_whitespace) => match &non_whitespace.content {	59✔
417	TokenContent::Comment(_) => todo!(),
418	TokenContent::Whitespace => todo!(),
419	TokenContent::Identifier(identifier) => {	40✔
420	pop_next_non_whitespace_token(tokens);	40✔
421	Some((identifier.clone(), non_whitespace.location))	40✔
422	}
423	TokenContent::Assign => todo!(),
424	TokenContent::LeftParenthesis => todo!(),
425	TokenContent::RightParenthesis => None,	19✔
426	TokenContent::LeftBracket => todo!(),
427	TokenContent::RightBracket => todo!(),
428	TokenContent::LeftBrace => todo!(),
429	TokenContent::RightBrace => todo!(),
430	TokenContent::Dot => todo!(),
431	TokenContent::Colon => todo!(),
432	TokenContent::Quotes(_) => todo!(),
433	TokenContent::FatArrow => todo!(),
434	TokenContent::Comma => None,	×
435	TokenContent::EndOfFile => None,	×
436	},
437	None => None,	×
438	}
439	}
440
441	fn try_skip_comma(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {	34✔
442	match peek_next_non_whitespace_token(tokens) {	34✔
443	Some(non_whitespace) => match &non_whitespace.content {	34✔
444	TokenContent::Comment(_) => todo!(),
445	TokenContent::Whitespace => todo!(),
446	TokenContent::Identifier(_identifier) => false,	1✔
447	TokenContent::Assign => todo!(),
448	TokenContent::LeftParenthesis => todo!(),
449	TokenContent::RightParenthesis => false,	20✔
450	TokenContent::LeftBracket => todo!(),
451	TokenContent::RightBracket => todo!(),
452	TokenContent::LeftBrace => todo!(),
453	TokenContent::RightBrace => todo!(),
454	TokenContent::Dot => todo!(),
455	TokenContent::Colon => todo!(),
456	TokenContent::Quotes(_) => todo!(),
457	TokenContent::FatArrow => todo!(),
458	TokenContent::Comma => {
459	pop_next_non_whitespace_token(tokens);	13✔
460	true	13✔
461	}
462	TokenContent::EndOfFile => false,	×
463	},
464	None => false,	×
465	}
466	}
467
468	fn try_skip_colon(tokens: &mut std::iter::Peekable<std::slice::Iter<'_, Token>>) -> bool {	35✔
469	match peek_next_non_whitespace_token(tokens) {	35✔
470	Some(non_whitespace) => match &non_whitespace.content {	35✔
471	TokenContent::Comment(_) => todo!(),
472	TokenContent::Whitespace => todo!(),
473	TokenContent::Identifier(_identifier) => false,	1✔
474	TokenContent::Assign => todo!(),
475	TokenContent::LeftParenthesis => todo!(),
476	TokenContent::RightParenthesis => false,	18✔
477	TokenContent::LeftBracket => todo!(),
478	TokenContent::RightBracket => todo!(),
479	TokenContent::LeftBrace => todo!(),
480	TokenContent::RightBrace => todo!(),
481	TokenContent::Dot => todo!(),
482	TokenContent::Colon => {
483	pop_next_non_whitespace_token(tokens);	5✔
484	true	5✔
485	}
486	TokenContent::Quotes(_) => todo!(),
487	TokenContent::FatArrow => todo!(),
488	TokenContent::Comma => false,	11✔
489	TokenContent::EndOfFile => false,	×
490	},
491	None => false,	×
492	}
493	}
494
495	fn parse_lambda<'t>(	41✔
496	tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
497	local_namespace: &NamespaceId,
498	) -> ParserResult<ast::Expression> {
499	let mut parameters = Vec::new();	41✔
500	while let Some((parameter_name, parameter_location)) = try_pop_identifier(tokens) {	89✔
501	let namespaced_name = Name::new(*local_namespace, parameter_name);	×
502	let mut type_annotation = None;	×
503	if try_skip_colon(tokens) {	×
504	type_annotation = Some(parse_expression(tokens, local_namespace)?);	10✔
505	}
506	parameters.push(LambdaParameter::new(	34✔
507	namespaced_name,	34✔
508	parameter_location,	34✔
509	type_annotation,	34✔
510	));
511	if !try_skip_comma(tokens) {	34✔
512	break;	21✔
513	}
514	}
515	if !try_skip_right_parenthesis(tokens) {	40✔
516	let next_token = peek_next_non_whitespace_token(tokens).unwrap();	1✔
517	return Err(ParserError::new(	1✔
518	"Expected comma or right parenthesis in lambda parameter list.".to_string(),	1✔
519	next_token.location,	1✔
520	));
521	}
522	expect_fat_arrow(tokens);	39✔
523	let body = parse_expression(tokens, local_namespace)?;	78✔
524	Ok(ast::Expression::Lambda {	×
525	parameters,	×
526	body: Box::new(body),	×
527	})
528	}
529
530	#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
531	pub struct ParserOutput {
532	pub entry_point: Option<ast::Expression>,
533	pub errors: Vec<CompilerError>,
534	}
535
536	impl ParserOutput {
537	pub fn new(entry_point: Option<ast::Expression>, errors: Vec<CompilerError>) -> ParserOutput {	26✔
538	ParserOutput {
539	entry_point,
540	errors,
541	}
542	}
543	}
544
545	pub fn parse_expression_tolerantly<'t>(	22✔
546	tokens: &mut std::iter::Peekable<std::slice::Iter<'t, Token>>,
547	local_namespace: &NamespaceId,
548	) -> ParserOutput {
549	let mut errors = Vec::new();	22✔
550	let entry_point_result = parse_expression(tokens, local_namespace);	22✔
551	match entry_point_result {	22✔
552	Ok(entry_point) => ParserOutput::new(Some(entry_point), errors),	17✔
553	Err(error) => {	5✔
554	errors.push(CompilerError::new(	5✔
555	format!("Parser error: {}", &error),	5✔
556	error.location,	5✔
557	));
558	ParserOutput::new(None, errors)	5✔
559	}
560	}
561	}

TyRoXx / NonlocalityOS / 15330141384

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous