VSinerva/compiler-course
Archived
1
0
Fork 0
Code Activity

Finalize parser for now :D

Browse source
This commit is contained in:
Vili Sinervä 2025-01-31 21:02:14 +02:00
parent 58d9ec015e
commit 71ca729682
No known key found for this signature in database
GPG key ID: DF8FEAF54EFAC996
1 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/compiler/parser/mod.rs
View file

@ -10,16 +10,47 @@ use crate::compiler::{
pub fn parse<'source>(tokens: &[Token<'source>]) -> Expression<'source> {
let mut pos = 0;
let result = parse_block_level_expressions(&mut pos, tokens);
let first_expression = parse_block_level_expressions(&mut pos, tokens);
if pos != tokens.len() {
panic!(
"Parsing naturally stopped at {}, despite there being more tokens!",
peek(&mut pos, tokens)
);
}
let mut expressions = vec![first_expression];
result
// Blocks don't need to be followed by a semicolon, but can be
if peek(&mut (pos - 1), tokens).text == "}" {
if peek(&mut pos, tokens).text == ";" {
consume_string(&mut pos, tokens, ";");
}
} else {
consume_string(&mut pos, tokens, ";");
}
while peek(&mut pos, tokens).token_type != TokenType::End {
expressions.push(parse_block_level_expressions(&mut pos, tokens));
if peek(&mut pos, tokens).token_type == TokenType::End {
break;
}
// Blocks don't need to be followed by a semicolon, but can be
if peek(&mut (pos - 1), tokens).text == "}" {
if peek(&mut pos, tokens).text == ";" {
consume_string(&mut pos, tokens, ";");
}
} else {
consume_string(&mut pos, tokens, ";");
}
}
let last_token = peek(&mut (pos - 1), tokens);
if last_token.text == ";" {
expressions.push(EmptyLiteral(last_token.loc));
}
Block(tokens[0].loc, expressions)
} else {
first_expression
}
}
// Horrible name, basically used to get the full expressions contained
@ -173,7 +204,7 @@ fn parse_block<'source>(pos: &mut usize, tokens: &[Token<'source>]) -> Expressio
let start = consume_string(pos, tokens, "{");
let mut expressions = Vec::new();
loop {
while peek(pos, tokens).text != "}" {
expressions.push(parse_block_level_expressions(pos, tokens));
// Last expression left as return expression, if no semicolon is present