ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-23 18:21:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

better match pattern for catching more error situations

Browse Source
This commit is contained in:
gluax 2022-04-12 11:52:12 -07:00
parent 9f79ca7169
commit 168080942b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,19 +70,26 @@ impl ParserContext<'_> {
let const_ = self.eat(Token::Const); let const_ = self.eat(Token::Const);
if const_.is_some() { if const_.is_some() {
dbg!(&const_.as_ref().unwrap().span);
self.emit_err(ParserError::const_parameter_or_input(&const_.as_ref().unwrap().span)); self.emit_err(ParserError::const_parameter_or_input(&const_.as_ref().unwrap().span));
} }
match (public, constant) { match (public, constant, const_) {
(None, Some(_)) => Ok(ParamMode::Constant), (None, Some(_), None) => Ok(ParamMode::Constant),
(None, None) if const_.is_some() => Ok(ParamMode::Constant), (None, None, Some(_)) => Ok(ParamMode::Constant),
(None, None) => Ok(ParamMode::Private), (None, None, None) => Ok(ParamMode::Private),
(Some(p), None) if const_.is_some() => { (Some(_), None, None) => Ok(ParamMode::Public),
Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + const_.unwrap().span)).into()) (Some(p), None, Some(c)) => {
Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into())
}
(None, Some(c), Some(co)) => {
Err(ParserError::inputs_multiple_variable_types_specified(&(c.span + co.span)).into())
}
(Some(p), Some(c), None) => {
Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into())
}
(Some(p), Some(c), Some(co)) => {
Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span + co.span)).into())
} }
(Some(_), None) => Ok(ParamMode::Public),
(Some(p), Some(c)) => Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into()),
} }
} }

BIN
docs/grammar/README.md
View File

Binary file not shown.

2
docs/grammar/abnf-grammar.txt
View File

@ -318,7 +318,7 @@ function-declaration = %s"function" identifier
function-parameters = function-parameter *( "," function-parameter ) [ "," ] function-parameters = function-parameter *( "," function-parameter ) [ "," ]
function-parameter = [ %s"public" / %s"constant" ] identifier ":" type function-parameter = [ %s"public" / %s"constant" / %s"const" ] identifier ":" type
declaration = function-declaration declaration = function-declaration