diff options
author | Aleksey Kladov <[email protected]> | 2018-07-30 12:08:06 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-07-30 12:08:06 +0100 |
commit | 1edb58a802f183f79dc2c4bc15921394ef8abb31 (patch) | |
tree | 24114171c61a9f433b9a54008057fa0297f91302 /src/lexer | |
parent | 6983091d6d255bcfd17c4f8c14015d8abc77928d (diff) |
reformat
Diffstat (limited to 'src/lexer')
-rw-r--r-- | src/lexer/classes.rs | 9 | ||||
-rw-r--r-- | src/lexer/mod.rs | 16 | ||||
-rw-r--r-- | src/lexer/numbers.rs | 2 |
3 files changed, 16 insertions, 11 deletions
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 @@ | |||
1 | use unicode_xid::UnicodeXID; | 1 | use unicode_xid::UnicodeXID; |
2 | 2 | ||
3 | pub fn is_ident_start(c: char) -> bool { | 3 | pub fn is_ident_start(c: char) -> bool { |
4 | (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' | 4 | (c >= 'a' && c <= 'z') |
5 | || (c >= 'A' && c <= 'Z') | ||
6 | || c == '_' | ||
5 | || (c > '\x7f' && UnicodeXID::is_xid_start(c)) | 7 | || (c > '\x7f' && UnicodeXID::is_xid_start(c)) |
6 | } | 8 | } |
7 | 9 | ||
8 | pub fn is_ident_continue(c: char) -> bool { | 10 | pub fn is_ident_continue(c: char) -> bool { |
9 | (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_' | 11 | (c >= 'a' && c <= 'z') |
12 | || (c >= 'A' && c <= 'Z') | ||
13 | || (c >= '0' && c <= '9') | ||
14 | || c == '_' | ||
10 | || (c > '\x7f' && UnicodeXID::is_xid_continue(c)) | 15 | || (c > '\x7f' && UnicodeXID::is_xid_continue(c)) |
11 | } | 16 | } |
12 | 17 | ||
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 @@ | |||
1 | mod ptr; | 1 | mod classes; |
2 | mod comments; | 2 | mod comments; |
3 | mod strings; | ||
4 | mod numbers; | 3 | mod numbers; |
5 | mod classes; | 4 | mod ptr; |
5 | mod strings; | ||
6 | 6 | ||
7 | use { | 7 | use { |
8 | TextUnit, | ||
9 | SyntaxKind::{self, *}, | 8 | SyntaxKind::{self, *}, |
9 | TextUnit, | ||
10 | }; | 10 | }; |
11 | 11 | ||
12 | use self::{ | 12 | use self::{ |
13 | ptr::Ptr, | ||
14 | classes::*, | 13 | classes::*, |
14 | comments::{scan_comment, scan_shebang}, | ||
15 | numbers::scan_number, | 15 | numbers::scan_number, |
16 | ptr::Ptr, | ||
16 | strings::{ | 17 | strings::{ |
17 | is_string_literal_start, scan_byte_char_or_string, scan_char, | 18 | is_string_literal_start, scan_byte_char_or_string, scan_char, scan_raw_string, scan_string, |
18 | scan_raw_string, scan_string}, | 19 | }, |
19 | comments::{scan_comment, scan_shebang}, | ||
20 | }; | 20 | }; |
21 | 21 | ||
22 | /// A token of Rust source. | 22 | /// 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 @@ | |||
1 | use lexer::ptr::Ptr; | ||
2 | use lexer::classes::*; | 1 | use lexer::classes::*; |
2 | use lexer::ptr::Ptr; | ||
3 | 3 | ||
4 | use SyntaxKind::{self, *}; | 4 | use SyntaxKind::{self, *}; |
5 | 5 | ||