Jengamon/magus - Change T7ZASL2GFGSN25EF3B6YSK3JG3SZGD6LOZ5EVLUUZM5QJTIJ77MQC

fix(lexer): more accurate character escape lexing

Created by Jengamon on February 29, 2024

T7ZASL2GFGSN25EF3B6YSK3JG3SZGD6LOZ5EVLUUZM5QJTIJ77MQC

Dependencies

In channels

main

Change contents

Insertion in magus_core/src/lexer.rs at line 22 [3.49]

[3.465]

[2.533]

    /// A char escape was used that is not implemented
    // NOTE if we didn't *need* the Clone impl due to Logos,
    // I would have stuck a Box here, but there isn't a point
    // in multiple instances of this *same* error referring
    // to unique allocations of the *same* character sequence
    #[error("Invalid character escape `{0}`")]
    InvalidCharEscape(std::sync::Arc<str>),

Replacement in magus_core/src/lexer.rs at line 250 [3.49]

B:BD[4.925] → [4.925:1017]

        c if name_map.contains_key(c) => name_map.get(c).copied().ok_or(LexError::Unknown),

[4.925]

[5.364]

        c if name_map.contains_key(c) => name_map
            .get(c)
            .copied()
            .ok_or(LexError::InvalidCharEscape(c.into())),

Replacement in magus_core/src/lexer.rs at line 261 [3.49]

B:BD[4.1292] → [4.1292:1379]

            char::from_u32(u32::from_str_radix(hex_str, 16)?).ok_or(LexError::Unknown)

[4.1292]

[4.1379]

            char::from_u32(u32::from_str_radix(hex_str, 16)?)
                .ok_or(LexError::InvalidCharEscape(c.into()))

Replacement in magus_core/src/lexer.rs at line 265 [3.49]

B:BD[4.1471] → [4.1471:1508]

        _ => Err(LexError::Unknown),

[4.1471]

[4.1508]

        c => Err(LexError::InvalidCharEscape(c.into())),

Replacement in magus_core/src/lexer.rs at line 296 [3.49]
∅:D[2.1423] → [4.1515:1566]
B:BD[6.173] → [4.1515:1566]
```
    #[regex(r"#\\[^[:space:]]+", parse_character)]
```
[2.1423]
[4.1566]
```
    #[regex(r"#\\(.|[a-zA-Z]+|x[0-9a-fA-F]+)", parse_character)]
```