Parse optional let type.
This commit is contained in:
+50
-15
@@ -87,30 +87,35 @@ where
|
||||
name: self.slice(*ident.span())?.to_string(),
|
||||
span: *ident.span(),
|
||||
};
|
||||
let ty = if self.next_if(Token::Colon).is_some() {
|
||||
Some(self.parse_type()?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
self.next_expected(Token::Equals)?;
|
||||
let expr = self.parse_expr()?;
|
||||
let semi = self.next_expected(Token::Semicolon)?;
|
||||
Ok(Let {
|
||||
name: ident,
|
||||
ty: None,
|
||||
ty: ty,
|
||||
value: expr,
|
||||
span: r#let.span_to(&semi),
|
||||
}
|
||||
.into())
|
||||
}
|
||||
Some(Token::Ident) => {
|
||||
let token = self.next().unwrap();
|
||||
let ident = self.next().unwrap();
|
||||
let ident = Ident {
|
||||
name: self.slice(*token.span())?.to_string(),
|
||||
span: *token.span(),
|
||||
name: self.slice(*ident.span())?.to_string(),
|
||||
span: *ident.span(),
|
||||
};
|
||||
self.next_expected(Token::Equals)?;
|
||||
let expr = self.parse_expr()?;
|
||||
let semi = self.next_expected(Token::Semicolon)?;
|
||||
Ok(Assign {
|
||||
span: ident.span.to(semi.span()),
|
||||
name: ident,
|
||||
value: expr,
|
||||
span: token.span_to(&semi),
|
||||
}
|
||||
.into())
|
||||
}
|
||||
@@ -125,21 +130,17 @@ where
|
||||
self.next_expected(Token::ParenL)?;
|
||||
let mut params = Vec::new();
|
||||
while self.peek() != Some(&Token::ParenR) {
|
||||
let name_token = self.next_expected(Token::Ident)?;
|
||||
let name = self.next_expected(Token::Ident)?;
|
||||
let name = Ident {
|
||||
name: self.slice(*name_token.span())?.to_string(),
|
||||
span: *name_token.span(),
|
||||
name: self.slice(*name.span())?.to_string(),
|
||||
span: *name.span(),
|
||||
};
|
||||
self.next_expected(Token::Colon)?;
|
||||
let ty_token = self.next_expected(Token::Ident)?;
|
||||
let ty = Ident {
|
||||
name: self.slice(*ty_token.span())?.to_string(),
|
||||
span: *ty_token.span(),
|
||||
};
|
||||
let ty = self.parse_type()?;
|
||||
params.push(FnParam {
|
||||
span: name.span.to(&ty.span),
|
||||
name,
|
||||
ty,
|
||||
span: name_token.span_to(&ty_token),
|
||||
});
|
||||
if self.next_if(Token::Comma).is_none() {
|
||||
break;
|
||||
@@ -151,7 +152,7 @@ where
|
||||
name,
|
||||
params,
|
||||
body: block.stmts,
|
||||
span: r#fn.span().extend(&block.span),
|
||||
span: r#fn.span().to(&block.span),
|
||||
}
|
||||
.into())
|
||||
}
|
||||
@@ -231,6 +232,14 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_type(&mut self) -> Result<Ident, ParseError> {
|
||||
let token = self.next_expected(Token::Ident)?;
|
||||
Ok(Ident {
|
||||
name: self.slice(*token.span())?.to_string(),
|
||||
span: *token.span(),
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_block(&mut self) -> Result<Block, ParseError> {
|
||||
let lbrace = self.next_expected(Token::CurlyBracketL)?;
|
||||
let mut stmts = Vec::new();
|
||||
@@ -334,6 +343,32 @@ mod tests {
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next(), None);
|
||||
|
||||
let input = "let x: Number = 500.0;";
|
||||
let lexer = Lexer::new(input);
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
pretty_assertions::assert_eq!(
|
||||
parser.parse_stmt(),
|
||||
Ok(Stmt::Let(Let {
|
||||
name: Ident {
|
||||
name: "x".to_string(),
|
||||
span: Span::new(4, 5),
|
||||
},
|
||||
ty: Some(Ident {
|
||||
name: "Number".to_string(),
|
||||
span: Span::new(7, 13),
|
||||
}),
|
||||
value: Expr::Literal(
|
||||
LitNumber {
|
||||
value: 500.0,
|
||||
span: Span::new(16, 21)
|
||||
}
|
||||
.into()
|
||||
),
|
||||
span: Span::new(0, 22),
|
||||
}))
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next(), None);
|
||||
|
||||
let input = "let x = \"hello\";";
|
||||
let lexer = Lexer::new(input);
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ impl Span {
|
||||
self.end - self.start
|
||||
}
|
||||
|
||||
pub fn extend(&self, other: &Span) -> Span {
|
||||
pub fn to(&self, other: &Span) -> Span {
|
||||
Span::new(self.start, other.end)
|
||||
}
|
||||
}
|
||||
@@ -52,6 +52,6 @@ impl<T> Spanned<T> {
|
||||
}
|
||||
|
||||
pub fn span_to(&self, other: &Spanned<T>) -> Span {
|
||||
self.span.extend(&other.span)
|
||||
self.span.to(&other.span)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user