caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch from unicode_xid to unicode_ident (#1208)

Browse Source
This commit is contained in:
Kevin Stevens 2023-05-15 03:35:46 -04:00 committed by GitHub
parent 0fcac6d27e
commit 156aef10c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -2311,9 +2311,9 @@ dependencies = [
"ttf-parser", "ttf-parser",
"typst-macros", "typst-macros",
"unicode-general-category", "unicode-general-category",
"unicode-ident",
"unicode-math-class", "unicode-math-class",
"unicode-segmentation", "unicode-segmentation",
"unicode-xid",
"unscanny", "unscanny",
"usvg", "usvg",
"xmp-writer", "xmp-writer",
@ -2525,12 +2525,6 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "unicode-xid"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]] [[package]]
name = "unicode_names2" name = "unicode_names2"
version = "0.6.0" version = "0.6.0"

2
Cargo.toml
View File

@ -60,9 +60,9 @@ tiny-skia = "0.9.0"
tracing = "0.1.37" tracing = "0.1.37"
ttf-parser = "0.18.1" ttf-parser = "0.18.1"
unicode-general-category = "0.6" unicode-general-category = "0.6"
unicode-ident = "1.0"
unicode-math-class = "0.1" unicode-math-class = "0.1"
unicode-segmentation = "1" unicode-segmentation = "1"
unicode-xid = "0.2"
unscanny = "0.1" unscanny = "0.1"
usvg = { version = "0.32", default-features = false, features = ["text"] } usvg = { version = "0.32", default-features = false, features = ["text"] }
xmp-writer = "0.1" xmp-writer = "0.1"

10
src/syntax/lexer.rs
View File

@ -1,6 +1,6 @@
use ecow::{eco_format, EcoString}; use ecow::{eco_format, EcoString};
use unicode_ident::{is_xid_continue, is_xid_start};
use unicode_segmentation::UnicodeSegmentation; use unicode_segmentation::UnicodeSegmentation;
use unicode_xid::UnicodeXID;
use unscanny::Scanner; use unscanny::Scanner;
use super::{ErrorPos, SyntaxKind}; use super::{ErrorPos, SyntaxKind};
@ -723,23 +723,23 @@ pub fn is_ident(string: &str) -> bool {
/// Whether a character can start an identifier. /// Whether a character can start an identifier.
#[inline] #[inline]
pub(crate) fn is_id_start(c: char) -> bool { pub(crate) fn is_id_start(c: char) -> bool {
c.is_xid_start() || c == '_' is_xid_start(c) || c == '_'
} }
/// Whether a character can continue an identifier. /// Whether a character can continue an identifier.
#[inline] #[inline]
pub(crate) fn is_id_continue(c: char) -> bool { pub(crate) fn is_id_continue(c: char) -> bool {
c.is_xid_continue() || c == '_' || c == '-' is_xid_continue(c) || c == '_' || c == '-'
} }
/// Whether a character can start an identifier in math. /// Whether a character can start an identifier in math.
#[inline] #[inline]
fn is_math_id_start(c: char) -> bool { fn is_math_id_start(c: char) -> bool {
c.is_xid_start() is_xid_start(c)
} }
/// Whether a character can continue an identifier in math. /// Whether a character can continue an identifier in math.
#[inline] #[inline]
fn is_math_id_continue(c: char) -> bool { fn is_math_id_continue(c: char) -> bool {
c.is_xid_continue() && c != '_' is_xid_continue(c) && c != '_'
} }