Parser - Prevent return from being used outside of functions
This commit is contained in:
parent
0edabd4a48
commit
3bd3c31210
1 changed files with 28 additions and 8 deletions
|
@ -440,6 +440,7 @@ impl Parser {
|
||||||
/// return_statement := "return" expression? ";"
|
/// return_statement := "return" expression? ";"
|
||||||
/// ```
|
/// ```
|
||||||
fn parse_return_statement(&mut self, ret_token: &Token) -> ParserResult<ast::StmtNode> {
|
fn parse_return_statement(&mut self, ret_token: &Token) -> ParserResult<ast::StmtNode> {
|
||||||
|
if self.can_use_return() {
|
||||||
let value = if self.check(&TokenType::Semicolon) {
|
let value = if self.check(&TokenType::Semicolon) {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
|
@ -449,6 +450,12 @@ impl Parser {
|
||||||
token: ret_token.clone(),
|
token: ret_token.clone(),
|
||||||
value,
|
value,
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
Err(ParserError::new(
|
||||||
|
ret_token,
|
||||||
|
"'return' found outside of function",
|
||||||
|
))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Parse the following rule:
|
/// Parse the following rule:
|
||||||
|
@ -758,4 +765,17 @@ impl Parser {
|
||||||
}
|
}
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Check whether the `return` keyword can be used. This is true whenever
|
||||||
|
/// the first `LoopParsingState::None` found in the loop parsing state is
|
||||||
|
/// not the one at position 0.
|
||||||
|
fn can_use_return(&self) -> bool {
|
||||||
|
let mut pos = self.loop_state.len() - 1;
|
||||||
|
loop {
|
||||||
|
if self.loop_state[pos] == LoopParsingState::None {
|
||||||
|
return pos == 0;
|
||||||
|
}
|
||||||
|
pos -= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue