fmt improvements

This commit is contained in:
Mark Thom
2025-07-08 13:47:08 -07:00
parent e303e5a805
commit b78ccf8f28
3 changed files with 22 additions and 16 deletions

View File

@@ -665,10 +665,7 @@ impl<'a, R: CharRead> Lexer<'a, R> {
let n = parse_float_lossy(&token)?; let n = parse_float_lossy(&token)?;
Ok(Number::Float(float_alloc!( Ok(Number::Float(float_alloc!(n, self.machine_st.arena)))
n,
self.machine_st.arena
)))
} }
fn skip_underscore_in_number(&mut self) -> Result<char, ParserError> { fn skip_underscore_in_number(&mut self) -> Result<char, ParserError> {
@@ -944,9 +941,10 @@ impl<'a, R: CharRead> Lexer<'a, R> {
Ok(n) => Ok(Token::Literal(n.to_literal())), Ok(n) => Ok(Token::Literal(n.to_literal())),
Err(_) => { Err(_) => {
let n = parse_float_lossy(&token_string)?; let n = parse_float_lossy(&token_string)?;
Ok(Token::Literal(Literal::F64Offset( Ok(Token::Literal(Literal::F64Offset(float_alloc!(
float_alloc!(n, self.machine_st.arena), n,
))) self.machine_st.arena
))))
} }
}, },
Ok(NumberToken::Number(n)) => return Ok(Token::Literal(n.to_literal())), Ok(NumberToken::Number(n)) => return Ok(Token::Literal(n.to_literal())),

View File

@@ -962,7 +962,15 @@ impl<'a, R: CharRead> Parser<'a, R> {
Token::Literal(Literal::Rational(n)) => { Token::Literal(Literal::Rational(n)) => {
self.negate_number(n, negate_rat_rc, |r, _| Literal::Rational(r)) self.negate_number(n, negate_rat_rc, |r, _| Literal::Rational(r))
} }
Token::Literal(Literal::F64Offset(n)) if self.lexer.machine_st.arena.f64_tbl.get_entry(n).is_infinite() => { Token::Literal(Literal::F64Offset(n))
if self
.lexer
.machine_st
.arena
.f64_tbl
.get_entry(n)
.is_infinite() =>
{
return Err(ParserError::InfiniteFloat( return Err(ParserError::InfiniteFloat(
self.lexer.line_num, self.lexer.line_num,
self.lexer.col_num, self.lexer.col_num,