extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2025-01-19 11:48:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid panic because of invalid number literal

Browse Source
This commit is contained in:
bakk 2021-05-23 00:04:50 +02:00
parent 594d139345
commit 7af71ff332
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kalk/src/parser.rs
View File

@ -448,7 +448,7 @@ fn parse_primary(context: &mut Context) -> Result<Expr, CalcError> {
TokenKind::OpenParenthesis => parse_group(context)?, TokenKind::OpenParenthesis => parse_group(context)?,
TokenKind::Pipe | TokenKind::OpenCeil | TokenKind::OpenFloor => parse_group_fn(context)?, TokenKind::Pipe | TokenKind::OpenCeil | TokenKind::OpenFloor => parse_group_fn(context)?,
TokenKind::Identifier => parse_identifier(context)?, TokenKind::Identifier => parse_identifier(context)?,
TokenKind::Literal => Expr::Literal(string_to_num(&advance(context).value)), TokenKind::Literal => Expr::Literal(string_to_num(&advance(context).value)?),
_ => return Err(CalcError::UnableToParseExpression), _ => return Err(CalcError::UnableToParseExpression),
}; };
@ -656,8 +656,12 @@ fn is_at_end(context: &Context) -> bool {
context.pos >= context.tokens.len() || peek(context).kind == TokenKind::EOF context.pos >= context.tokens.len() || peek(context).kind == TokenKind::EOF
} }
fn string_to_num(value: &str) -> f64 { fn string_to_num(value: &str) -> Result<f64, CalcError> {
value.replace(" ", "").parse::<f64>().unwrap() if let Ok(result) = value.replace(" ", "").parse::<f64>() {
Ok(result)
} else {
Err(CalcError::InvalidNumberLiteral(value.into()))
}
} }
#[cfg(test)] #[cfg(test)]