From 1edb58a802f183f79dc2c4bc15921394ef8abb31 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 30 Jul 2018 14:08:06 +0300 Subject: reformat --- src/lexer/classes.rs | 9 +++++++-- src/lexer/mod.rs | 16 ++++++++-------- src/lexer/numbers.rs | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'src/lexer') diff --git a/src/lexer/classes.rs b/src/lexer/classes.rs index 7fed008af..4235d2648 100644 --- a/src/lexer/classes.rs +++ b/src/lexer/classes.rs @@ -1,12 +1,17 @@ use unicode_xid::UnicodeXID; pub fn is_ident_start(c: char) -> bool { - (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' + (c >= 'a' && c <= 'z') + || (c >= 'A' && c <= 'Z') + || c == '_' || (c > '\x7f' && UnicodeXID::is_xid_start(c)) } pub fn is_ident_continue(c: char) -> bool { - (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_' + (c >= 'a' && c <= 'z') + || (c >= 'A' && c <= 'Z') + || (c >= '0' && c <= '9') + || c == '_' || (c > '\x7f' && UnicodeXID::is_xid_continue(c)) } diff --git a/src/lexer/mod.rs b/src/lexer/mod.rs index 69cab5b57..f647838ea 100644 --- a/src/lexer/mod.rs +++ b/src/lexer/mod.rs @@ -1,22 +1,22 @@ -mod ptr; +mod classes; mod comments; -mod strings; mod numbers; -mod classes; +mod ptr; +mod strings; use { - TextUnit, SyntaxKind::{self, *}, + TextUnit, }; use self::{ - ptr::Ptr, classes::*, + comments::{scan_comment, scan_shebang}, numbers::scan_number, + ptr::Ptr, strings::{ - is_string_literal_start, scan_byte_char_or_string, scan_char, - scan_raw_string, scan_string}, - comments::{scan_comment, scan_shebang}, + is_string_literal_start, scan_byte_char_or_string, scan_char, scan_raw_string, scan_string, + }, }; /// A token of Rust source. diff --git a/src/lexer/numbers.rs b/src/lexer/numbers.rs index 38eac9212..5c4641a2d 100644 --- a/src/lexer/numbers.rs +++ b/src/lexer/numbers.rs @@ -1,5 +1,5 @@ -use lexer::ptr::Ptr; use lexer::classes::*; +use lexer::ptr::Ptr; use SyntaxKind::{self, *}; -- cgit v1.2.3