caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-08-23 19:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

make the start and base variables immutable

Browse Source
This commit is contained in:
Ian Wrzesinski 2025-02-27 10:50:49 -05:00
parent 36be52c61f
commit 966ca4f0b4
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
crates/typst-syntax/src/lexer.rs
View File

@ -807,20 +807,14 @@ impl Lexer<'_> {
} }
} }
fn number(&mut self, mut start: usize, first_c: char) -> SyntaxKind { fn number(&mut self, start: usize, first_c: char) -> SyntaxKind {
// Handle alternative integer bases. // Handle alternative integer bases.
let mut base = 10; let base = match first_c {
let mut is_float = false; // `true` implies `base == 10` '0' if self.s.eat_if('b') => 2,
match first_c { '0' if self.s.eat_if('o') => 8,
'0' if self.s.eat_if('b') => base = 2, '0' if self.s.eat_if('x') => 16,
'0' if self.s.eat_if('o') => base = 8, _ => 10,
'0' if self.s.eat_if('x') => base = 16, };
'.' => is_float = true,
_ => {}
}
if base != 10 {
start = self.s.cursor();
}
// Read the initial digits. // Read the initial digits.
if base == 16 { if base == 16 {
@ -829,12 +823,14 @@ impl Lexer<'_> {
self.s.eat_while(char::is_ascii_digit); self.s.eat_while(char::is_ascii_digit);
} }
// Maybe read a floating point number. // Read floating point digits and exponents.
let mut is_float = false;
if base == 10 { if base == 10 {
// Read the fractional part if not already done. // Read digits following a dot. Make sure not to confuse a spread
// Make sure not to confuse a range for the decimal separator. // operator or a method call for the decimal separator.
if first_c != '.' if first_c == '.' {
&& !self.s.at("..") is_float = true; // We already ate the trailing digits above.
} else if !self.s.at("..")
&& !self.s.scout(1).is_some_and(is_id_start) && !self.s.scout(1).is_some_and(is_id_start)
&& self.s.eat_if('.') && self.s.eat_if('.')
{ {
@ -872,13 +868,14 @@ impl Lexer<'_> {
} else if base == 10 { } else if base == 10 {
Ok(()) Ok(())
} else { } else {
let (name, prefix) = match base { let name = match base {
2 => ("binary", "0b"), 2 => "binary",
8 => ("octal", "0o"), 8 => "octal",
16 => ("hexadecimal", "0x"), 16 => "hexadecimal",
_ => unreachable!(), _ => unreachable!(),
}; };
match i64::from_str_radix(number, base) { // The index `[2..]` skips the leading `0b`/`0o`/`0x`.
match i64::from_str_radix(&number[2..], base) {
Ok(_) if suffix.is_empty() => Ok(()), Ok(_) if suffix.is_empty() => Ok(()),
Ok(value) => { Ok(value) => {
if suffix_result.is_ok() { if suffix_result.is_ok() {
@ -888,7 +885,7 @@ impl Lexer<'_> {
} }
Err(eco_format!("{name} numbers cannot have a suffix")) Err(eco_format!("{name} numbers cannot have a suffix"))
} }
Err(_) => Err(eco_format!("invalid {name} number: {prefix}{number}")), Err(_) => Err(eco_format!("invalid {name} number: {number}")),
} }
}; };