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