Not intoing into Expr seems more expressive.
This commit is contained in:
-12
@@ -66,18 +66,6 @@ pub enum Expr {
|
||||
FnCall(FnCall),
|
||||
}
|
||||
|
||||
impl From<LitNumber> for Expr {
|
||||
fn from(lit: LitNumber) -> Self {
|
||||
Expr::Literal(lit.into())
|
||||
}
|
||||
}
|
||||
|
||||
impl From<LitString> for Expr {
|
||||
fn from(lit: LitString) -> Self {
|
||||
Expr::Literal(lit.into())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum Literal {
|
||||
Number(LitNumber),
|
||||
|
||||
+30
-20
@@ -110,28 +110,32 @@ where
|
||||
match self.peek_token() {
|
||||
Some(Token::Number) => {
|
||||
let token = self.next_token().unwrap();
|
||||
let number = self
|
||||
.slice(*token.span())?
|
||||
.parse::<f64>()
|
||||
.map_err(|e| ParseError {
|
||||
let raw = self.slice(*token.span())?;
|
||||
let number = LitNumber {
|
||||
value: raw.parse::<f64>().map_err(|e| ParseError {
|
||||
span: *token.span(),
|
||||
message: format!("Failed to parse number: {}", e),
|
||||
})?;
|
||||
Ok(LitNumber {
|
||||
value: number,
|
||||
})?,
|
||||
span: *token.span(),
|
||||
}
|
||||
.into())
|
||||
};
|
||||
Ok(Expr::Literal(number.into()))
|
||||
}
|
||||
Some(Token::String) => {
|
||||
let token = self.next_token().unwrap();
|
||||
let string = self.slice(*token.span())?;
|
||||
Ok(LitString {
|
||||
// Copy without the surrounding quotes
|
||||
value: string[1..string.len() - 1].to_string(),
|
||||
let raw = self.slice(*token.span())?;
|
||||
let string = LitString {
|
||||
value: raw[1..raw.len() - 1].to_string(),
|
||||
span: *token.span(),
|
||||
};
|
||||
Ok(Expr::Literal(string.into()))
|
||||
}
|
||||
.into())
|
||||
Some(Token::Ident) => {
|
||||
let token = self.next_token().unwrap();
|
||||
let ident = Ident {
|
||||
name: self.slice(*token.span())?.to_string(),
|
||||
span: *token.span(),
|
||||
};
|
||||
Ok(Expr::Variable(ident))
|
||||
}
|
||||
Some(_) => Err(ParseError {
|
||||
span: self.current_span,
|
||||
@@ -180,11 +184,13 @@ mod tests {
|
||||
span: Span::new(4, 5),
|
||||
},
|
||||
ty: None,
|
||||
value: LitNumber {
|
||||
value: Expr::Literal(
|
||||
LitNumber {
|
||||
value: 500.0,
|
||||
span: Span::new(8, 13)
|
||||
}
|
||||
.into(),
|
||||
.into()
|
||||
),
|
||||
span: Span::new(0, 14),
|
||||
}))
|
||||
);
|
||||
@@ -198,11 +204,13 @@ mod tests {
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
pretty_assertions::assert_eq!(
|
||||
parser.parse_expr(),
|
||||
Ok(LitNumber {
|
||||
Ok(Expr::Literal(
|
||||
LitNumber {
|
||||
value: 500.0,
|
||||
span: Span::new(0, 5)
|
||||
}
|
||||
.into())
|
||||
.into()
|
||||
))
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next_token(), None);
|
||||
}
|
||||
@@ -214,11 +222,13 @@ mod tests {
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
pretty_assertions::assert_eq!(
|
||||
parser.parse_expr(),
|
||||
Ok(LitString {
|
||||
Ok(Expr::Literal(
|
||||
LitString {
|
||||
value: "hello".to_string(),
|
||||
span: Span::new(0, 7)
|
||||
}
|
||||
.into())
|
||||
.into()
|
||||
))
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next_token(), None);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user