eryn/sibil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[lexer] Bit of code cleanup in Lexer

Browse source
This commit is contained in:
Eryn Wells 2018-09-02 14:05:35 -07:00
parent f35fe5fd08
commit 7a6c2b91d1
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lexer/src/lib.rs
View file

@ -26,21 +26,26 @@ impl<T> Lexer<T> where T: Iterator<Item=char> {
Lexer {
input: input.peekable(),
line: 0,
offset: 0
offset: 0,
}
}
fn next(&mut self) -> Option<T::Item> {
let out = self.input.next();
out
}
fn handle_whitespace(&mut self, c: char) {
if c == '\n' {
self.line += 1;
self.offset = 1;
} else {
self.offset += 1;
}
}
}
impl<T> Lexer<T> where T: Iterator<Item=char> {
fn handle_whitespace(&mut self, c: char) {
if c == '\n' {
self.line += 1;
self.offset = 0;
}
else {
self.offset += 1;
}
}
}
impl<T> Iterator for Lexer<T> where T: Iterator<Item=char> {
@ -67,17 +72,17 @@ impl<T> Iterator for Lexer<T> where T: Iterator<Item=char> {
match result {
StateResult::Continue => {
buffer.push(c);
self.input.next();
self.next();
},
StateResult::Advance { to } => {
buffer.push(c);
self.input.next();
self.next();
state = to;
},
StateResult::Emit(token, resume) => {
if resume == Resume::AtNext {
buffer.push(c);
self.input.next();
self.next();
}
out = Some(Ok(Lex::new(token, &buffer, self.line, self.offset)));
break;
@ -86,7 +91,7 @@ impl<T> Iterator for Lexer<T> where T: Iterator<Item=char> {
panic!("{}", msg);
}
}
}
},
}
}
out