rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make nextnextch() more closely resemble nextch().

Browse Source
This commit is contained in:
Nicholas Nethercote
2018-05-09 13:20:55 +10:00
parent 548067e00f
commit 444b770f4c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libsyntax/parse/lexer/mod.rs
View File

@@ -477,15 +477,14 @@ impl<'a> StringReader<'a> {
pub fn nextnextch(&self) -> Option<char> {
let next_src_index = self.src_index(self.next_pos);
if next_src_index >= self.end_src_index {
return None;
}
let next_next_src_index = next_src_index + char_at(&self.src, next_src_index).len_utf8();
if next_next_src_index < self.end_src_index {
Some(char_at(&self.src, next_next_src_index))
} else {
None
if next_src_index < self.end_src_index {
let next_next_src_index =
next_src_index + char_at(&self.src, next_src_index).len_utf8();
if next_next_src_index < self.end_src_index {
return Some(char_at(&self.src, next_next_src_index));
}
}
None
}
pub fn nextnextch_is(&self, c: char) -> bool {