arcayr/saphyr-serde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix lookahead spelling

Browse source
This commit is contained in:
Yuheng Chen 2015-05-24 14:38:54 +08:00
parent 1014e35108
commit 9fa4c839fc
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
saphyr/src/scanner.rs
View file

@ -166,7 +166,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
} }
} }
fn lookhead(&mut self, count: usize) { fn lookahead(&mut self, count: usize) {
if self.buffer.len() >= count { if self.buffer.len() >= count {
return; return;
} }
@ -232,7 +232,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
} }
pub fn fetch_next_token(&mut self) -> ScanResult { pub fn fetch_next_token(&mut self) -> ScanResult {
self.lookhead(1); self.lookahead(1);
// println!("--> fetch_next_token Cur {:?} {:?}", self.mark, self.ch()); // println!("--> fetch_next_token Cur {:?} {:?}", self.mark, self.ch());
if !self.stream_start_produced { if !self.stream_start_produced {
@ -246,7 +246,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
let mark = self.mark; let mark = self.mark;
self.unroll_indent(mark.col as isize); self.unroll_indent(mark.col as isize);
self.lookhead(4); self.lookahead(4);
if is_z(self.ch()) { if is_z(self.ch()) {
try!(self.fetch_stream_end()); try!(self.fetch_stream_end());
@ -362,7 +362,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
fn skip_to_next_token(&mut self) { fn skip_to_next_token(&mut self) {
loop { loop {
self.lookhead(1); self.lookahead(1);
// TODO(chenyh) BOM // TODO(chenyh) BOM
match self.ch() { match self.ch() {
' ' => self.skip(), ' ' => self.skip(),
@ -373,7 +373,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
self.allow_simple_key(); self.allow_simple_key();
} }
}, },
'#' => while !is_breakz(self.ch()) { self.skip(); self.lookhead(1); }, '#' => while !is_breakz(self.ch()) { self.skip(); self.lookahead(1); },
_ => break _ => break
} }
} }
@ -517,7 +517,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
loop { loop {
/* Check for a document indicator. */ /* Check for a document indicator. */
self.lookhead(4); self.lookahead(4);
if self.mark.col == 0 && if self.mark.col == 0 &&
((self.buffer[0] == '-') && ((self.buffer[0] == '-') &&
@ -569,11 +569,11 @@ impl<T: Iterator<Item=char>> Scanner<T> {
string.push(self.ch()); string.push(self.ch());
self.skip(); self.skip();
self.lookhead(2); self.lookahead(2);
} }
// is the end? // is the end?
if !(is_blank(self.ch()) || is_break(self.ch())) { break; } if !(is_blank(self.ch()) || is_break(self.ch())) { break; }
self.lookhead(1); self.lookahead(1);
while is_blank(self.ch()) || is_break(self.ch()) { while is_blank(self.ch()) || is_break(self.ch()) {
if is_blank(self.ch()) { if is_blank(self.ch()) {
@ -590,7 +590,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
self.skip(); self.skip();
} }
} else { } else {
self.lookhead(2); self.lookahead(2);
// Check if it is a first line break // Check if it is a first line break
if !leading_blanks { if !leading_blanks {
whitespaces.clear(); whitespaces.clear();
@ -600,7 +600,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
self.read_break(&mut trailing_breaks); self.read_break(&mut trailing_breaks);
} }
} }
self.lookhead(1); self.lookahead(1);
} }
// check intendation level // check intendation level