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

pulling parser changes from prev branch

Browse Source
This commit is contained in:
damirka 2021-08-31 19:18:31 +03:00
parent 24e5c4d69e
commit 9951627c8c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser/src/parser/expression.rs
View File

@ -604,7 +604,9 @@ impl ParserContext {
} }
let first = self.parse_spread_or_expression()?; let first = self.parse_spread_or_expression()?;
if self.eat(Token::Semicolon).is_some() { if self.eat(Token::Semicolon).is_some() {
let dimensions = self.parse_array_dimensions()?; let dimensions = self
.parse_array_dimensions()?
.ok_or_else(|| ParserError::unable_to_parse_array_dimensions(span))?;
let end = self.expect(Token::RightSquare)?; let end = self.expect(Token::RightSquare)?;
let first = match first { let first = match first {
SpreadOrExpression::Spread(first) => { SpreadOrExpression::Spread(first) => {

8
parser/src/parser/type_.rs
View File

@ -58,9 +58,11 @@ impl ParserContext {
/// ///
/// Returns an [`ArrayDimensions`] AST node if the next tokens represent dimensions for an array type. /// Returns an [`ArrayDimensions`] AST node if the next tokens represent dimensions for an array type.
/// ///
pub fn parse_array_dimensions(&mut self) -> Result<ArrayDimensions> { pub fn parse_array_dimensions(&mut self) -> Result<Option<ArrayDimensions>> {
Ok(if let Some((int, _)) = self.eat_int() { Ok(if let Some((int, _)) = self.eat_int() {
ArrayDimensions(vec![int]) Some(ArrayDimensions(vec![int]))
} else if self.eat(Token::Underscore).is_some() {
None
} else { } else {
self.expect(Token::LeftParen)?; self.expect(Token::LeftParen)?;
let mut dimensions = Vec::new(); let mut dimensions = Vec::new();
@ -76,7 +78,7 @@ impl ParserContext {
} }
} }
self.expect(Token::RightParen)?; self.expect(Token::RightParen)?;
ArrayDimensions(dimensions) Some(ArrayDimensions(dimensions))
}) })
} }