ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-27 20:24:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

simplify parse_function_parameter_mode

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2022-04-13 22:27:56 +02:00
parent 31fcc2f216
commit 66efa91b08
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/parser/src/parser/file.rs
View File

@ -64,12 +64,12 @@ impl ParserContext<'_> {
/// Returns a [`ParamMode`] AST node if the next tokens represent a function parameter mode.
///
pub fn parse_function_parameter_mode(&mut self) -> Result<ParamMode> {
let public = self.eat(&Token::Public).then(|| self.prev_token.clone());
let constant = self.eat(&Token::Constant).then(|| self.prev_token.clone());
let const_ = self.eat(&Token::Const).then(|| self.prev_token.clone());
let public = self.eat(&Token::Public).then(|| self.prev_token.span.clone());
let constant = self.eat(&Token::Constant).then(|| self.prev_token.span.clone());
let const_ = self.eat(&Token::Const).then(|| self.prev_token.span.clone());
if let Some(token) = &const_ {
self.emit_err(ParserError::const_parameter_or_input(&token.span));
if let Some(span) = &const_ {
self.emit_err(ParserError::const_parameter_or_input(span));
}
match (public, constant, const_) {
@ -78,10 +78,10 @@ impl ParserContext<'_> {
(None, None, None) => Ok(ParamMode::Private),
(Some(_), None, None) => Ok(ParamMode::Public),
(Some(m1), Some(m2), None) | (Some(m1), None, Some(m2)) | (None, Some(m1), Some(m2)) => {
Err(ParserError::inputs_multiple_variable_types_specified(&(m1.span + m2.span)).into())
Err(ParserError::inputs_multiple_variable_types_specified(&(m1 + m2)).into())
}
(Some(m1), Some(m2), Some(m3)) => {
Err(ParserError::inputs_multiple_variable_types_specified(&(m1.span + m2.span + m3.span)).into())
Err(ParserError::inputs_multiple_variable_types_specified(&(m1 + m2 + m3)).into())
}
}
}